ulysia/Vencord
1
0
Fork 0
Code Pull requests Activity

MessageEvents: Support sendMessage with attachments (#1023)

Browse source
This commit is contained in:
V 2023-05-02 02:55:21 +02:00 committed by GitHub
parent 4dce836ff7
commit 7bc1362cbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/api/MessageEvents.ts
View file

@ -36,10 +36,36 @@ export interface Emoji {
export interface MessageObject { export interface MessageObject {
content: string, content: string,
validNonShortcutEmojis: Emoji[]; validNonShortcutEmojis: Emoji[];
invalidEmojis: any[];
tts: boolean;
} }
export interface Upload {
classification: string;
currentSize: number;
description: string | null;
filename: string;
id: string;
isImage: boolean;
isVideo: boolean;
item: {
file: File;
platform: number;
};
loaded: number;
mimeType: string;
preCompressionSize: number;
responseUrl: string;
sensitive: boolean;
showLargeMessageDialog: boolean;
spoiler: boolean;
status: "NOT_STARTED" | "STARTED" | "UPLOADING" | "ERROR" | "COMPLETED" | "CANCELLED";
uniqueId: string;
uploadedFilename: string;
}
export interface MessageExtra { export interface MessageExtra {
stickerIds?: string[]; stickerIds?: string[];
uploads?: Upload[];
} }
export type SendListener = (channelId: string, messageObj: MessageObject, extra: MessageExtra) => Promisable<void | { cancel: boolean; }>; export type SendListener = (channelId: string, messageObj: MessageObject, extra: MessageExtra) => Promisable<void | { cancel: boolean; }>;
@ -48,7 +74,8 @@ export type EditListener = (channelId: string, messageId: string, messageObj: Me
const sendListeners = new Set<SendListener>(); const sendListeners = new Set<SendListener>();
const editListeners = new Set<EditListener>(); const editListeners = new Set<EditListener>();
export async function _handlePreSend(channelId: string, messageObj: MessageObject, extra: MessageExtra) { export async function _handlePreSend(channelId: string, messageObj: MessageObject, extra: MessageExtra, uploads: Upload[]) {
extra.uploads = uploads;
for (const listener of sendListeners) { for (const listener of sendListeners) {
try { try {
const result = await listener(channelId, messageObj, extra); const result = await listener(channelId, messageObj, extra);

22
src/plugins/apiMessageEvents.ts
View file

@ -22,17 +22,25 @@ import definePlugin from "@utils/types";
export default definePlugin({ export default definePlugin({
name: "MessageEventsAPI", name: "MessageEventsAPI",
description: "Api required by anything using message events.", description: "Api required by anything using message events.",
authors: [Devs.Arjix, Devs.hunt], authors: [Devs.Arjix, Devs.hunt, Devs.Ven],
patches: [ patches: [
{ {
find: '"MessageActionCreators"', find: '"MessageActionCreators"',
replacement: [{ replacement: {
match: /_sendMessage:(function\([^)]+\)){/, // editMessage: function (...) {
replace: "_sendMessage:async $1{if(await Vencord.Api.MessageEvents._handlePreSend(...arguments))return;" match: /\beditMessage:(function\(.+?\))\{/,
}, { // editMessage: async function (...) { await handlePreEdit(...); ...
match: /\beditMessage:(function\([^)]+\)){/,
replace: "editMessage:async $1{await Vencord.Api.MessageEvents._handlePreEdit(...arguments);" replace: "editMessage:async $1{await Vencord.Api.MessageEvents._handlePreEdit(...arguments);"
}] }
},
{
find: ".handleSendMessage=",
replacement: {
// checkIsMessageValid().then((function (isValidData) { ... getSendMessageOptionsForReply(data); ... sendMessage(channel.id, msg, void 0, mergeMessageSendOptions(...))
match: /(?<=uploads:(\i),channel:\i\}\)\.then\(\()function\((\i)\)\{(var \i=\i\.valid.+?\.getSendMessageOptionsForReply\(\i\);)(?=.+?\.sendMessage\((\i)\.id,(\i),void 0,(\i\(.+?)\):)/,
// checkIsMessageValid().then((async function (isValidData) { ...; if (await handlePresend(channel.id, msg, extra)) return; ...
replace: "async function($2){$3 if (await Vencord.Api.MessageEvents._handlePreSend($4.id,$5,$6,$1)) return {shouldClear:true,shouldRefocus:true};"
}
}, },
{ {
find: '("interactionUsernameProfile', find: '("interactionUsernameProfile',