Fix wrong tunnel author using buttons in requests

utarwyn · Jan 28, 2022 · 06dda8c · 06dda8c
1 parent 4781342
commit 06dda8c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/bot/command/AppCommandRegister.ts b/src/bot/command/AppCommandRegister.ts
@@ -72,7 +72,7 @@ export default class AppCommandRegister {
                 description: localize.__('command.description'),
                 options: [
                     {
-                        type: 6,
+                        type: 'USER',
                         name: this.optionName,
                         description: localize.__('command.option-user')
                     }

diff --git a/src/bot/entity/DuelRequest.ts b/src/bot/entity/DuelRequest.ts
@@ -160,7 +160,7 @@ export default class DuelRequest {
      */
     private async challengeButtonAnswered(interaction: MessageComponentInteraction): Promise<void> {
         // now that an interaction using buttons has been operated on message, use it
-        this.tunnel = new ComponentInteractionMessagingTunnel(interaction);
+        this.tunnel = new ComponentInteractionMessagingTunnel(interaction, this.tunnel.author);
         return this.challengeAnswered(interaction.customId === 'yes');
     }
 

diff --git a/src/bot/messaging/ComponentInteractionMessagingTunnel.ts b/src/bot/messaging/ComponentInteractionMessagingTunnel.ts
@@ -14,6 +14,11 @@ export default class ComponentInteractionMessagingTunnel extends MessagingTunnel
      * @private
      */
     private readonly interaction: MessageComponentInteraction;
+    /**
+     * Original author of the message
+     * @private
+     */
+    private readonly originalAuthor?: GuildMember;
     /**
      * Last reply sent into the tunnnel
      * @private
@@ -25,17 +30,19 @@ export default class ComponentInteractionMessagingTunnel extends MessagingTunnel
      * tunnel using Discord interactions.
      *
      * @param interaction interaction generic object
+     * @param originalAuthor original author of the message if provided
      */
-    constructor(interaction: MessageComponentInteraction) {
+    constructor(interaction: MessageComponentInteraction, originalAuthor?: GuildMember) {
         super();
         this.interaction = interaction;
+        this.originalAuthor = originalAuthor;
     }
 
     /**
      * @inheritdoc
      */
     public get author(): GuildMember {
-        return this.interaction.member as GuildMember;
+        return this.originalAuthor ?? (this.interaction.member as GuildMember);
     }
 
     /**