diff --git a/src/api/MessageEvents.ts b/src/api/MessageEvents.ts index 8b1d9e78..6e752c90 100644 --- a/src/api/MessageEvents.ts +++ b/src/api/MessageEvents.ts @@ -62,7 +62,7 @@ export interface MessageReplyOptions { }; } -export interface MessageExtra { +export interface MessageOptions { stickers?: string[]; uploads?: Upload[]; replyOptions: MessageReplyOptions; @@ -72,17 +72,17 @@ export interface MessageExtra { openWarningPopout: (props: any) => any; } -export type MessageSendListener = (channelId: string, messageObj: MessageObject, extra: MessageExtra) => Promisable; +export type MessageSendListener = (channelId: string, messageObj: MessageObject, options: MessageOptions) => Promisable; export type MessageEditListener = (channelId: string, messageId: string, messageObj: MessageObject) => Promisable; const sendListeners = new Set(); const editListeners = new Set(); -export async function _handlePreSend(channelId: string, messageObj: MessageObject, extra: MessageExtra, replyOptions: MessageReplyOptions) { - extra.replyOptions = replyOptions; +export async function _handlePreSend(channelId: string, messageObj: MessageObject, options: MessageOptions, replyOptions: MessageReplyOptions) { + options.replyOptions = replyOptions; for (const listener of sendListeners) { try { - const result = await listener(channelId, messageObj, extra); + const result = await listener(channelId, messageObj, options); if (result?.cancel) { return true; } diff --git a/src/utils/discord.tsx b/src/utils/discord.tsx index d7a38ebb..f236943b 100644 --- a/src/utils/discord.tsx +++ b/src/utils/discord.tsx @@ -110,7 +110,7 @@ export function insertTextIntoChatInputBox(text: string) { }); } -interface MessageExtra { +interface MessageOptions { messageReference: Message["messageReference"]; allowedMentions: { parse: string[]; @@ -122,8 +122,8 @@ interface MessageExtra { export function sendMessage( channelId: string, data: Partial, - waitForChannelReady?: boolean, - extra?: Partial + waitForChannelReady = true, + options: Partial = {} ) { const messageData = { content: "", @@ -133,7 +133,7 @@ export function sendMessage( ...data }; - return MessageActions.sendMessage(channelId, messageData, waitForChannelReady, extra); + return MessageActions.sendMessage(channelId, messageData, waitForChannelReady, options); } /**