feat(commands): specify which user sent a message command

Qbox-project · Sep 19, 2024 · 1482fec · 1482fec
1 parent 80e28a2
commit 1482fec
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/src/components/qbox/commands/support/message-command.ts b/src/components/qbox/commands/support/message-command.ts
@@ -4,7 +4,7 @@ import {
     InteractionContextType,
     MessageFlags,
 } from '@discordjs/core';
-import { messageLink } from '@discordjs/formatters';
+import { messageLink, subtext, userMention } from '@discordjs/formatters';
 import { supportMessage } from './message.js';
 import { MessageCommand } from '/components/types.js';
 
@@ -21,10 +21,14 @@ export const supportMessageCommand = {
             flags: MessageFlags.Ephemeral,
         });
 
+        const user = interaction.user ?? interaction.member!.user;
         const message = await api.channels.createMessage(
             interaction.channel.id,
             {
-                content: supportMessage,
+                content: [
+                    supportMessage,
+                    subtext(`Sent by ${userMention(user.id)}`),
+                ].join('\n'),
                 message_reference: { message_id: interaction.data.target_id },
             },
         );

diff --git a/src/components/utility/commands/plshelp/message-command.ts b/src/components/utility/commands/plshelp/message-command.ts
@@ -1,5 +1,5 @@
 import { ApplicationCommandType, MessageFlags } from '@discordjs/core';
-import { messageLink } from '@discordjs/formatters';
+import { messageLink, subtext, userMention } from '@discordjs/formatters';
 import { plshelpMessage } from './message.js';
 import { MessageCommand } from '/components/types.js';
 
@@ -13,10 +13,14 @@ export const plshelpMessageCommand = {
             flags: MessageFlags.Ephemeral,
         });
 
+        const user = interaction.user ?? interaction.member!.user;
         const message = await api.channels.createMessage(
             interaction.channel.id,
             {
-                content: plshelpMessage(),
+                content: [
+                    plshelpMessage(),
+                    subtext(`Sent by ${userMention(user.id)}`),
+                ].join('\n'),
                 message_reference: { message_id: interaction.data.target_id },
             },
         );

diff --git a/src/components/utility/commands/spoonfeed/message-command.ts b/src/components/utility/commands/spoonfeed/message-command.ts
@@ -1,5 +1,5 @@
 import { ApplicationCommandType, MessageFlags } from '@discordjs/core';
-import { messageLink } from '@discordjs/formatters';
+import { messageLink, subtext, userMention } from '@discordjs/formatters';
 import { spoonfeedMessage } from './message.js';
 import { MessageCommand } from '/components/types.js';
 
@@ -13,10 +13,14 @@ export const spoonfeedMessageCommand = {
             flags: MessageFlags.Ephemeral,
         });
 
+        const user = interaction.user ?? interaction.member!.user;
         const message = await api.channels.createMessage(
             interaction.channel.id,
             {
-                content: spoonfeedMessage(),
+                content: [
+                    spoonfeedMessage(),
+                    subtext(`Sent by ${userMention(user.id)}`),
+                ].join('\n'),
                 message_reference: { message_id: interaction.data.target_id },
             },
         );