Gh-56: Add method to handle custom interactions

utarwyn · Nov 21, 2021 · 97a665f · 97a665f
1 parent 6238012
commit 97a665f
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 21 deletions.
diff --git a/src/bot/TicTacToeBot.ts b/src/bot/TicTacToeBot.ts
@@ -1,9 +1,9 @@
+import AppCommandRegister from '@bot/command/AppCommandRegister';
 import GameCommand from '@bot/command/GameCommand';
 import EventHandler from '@bot/EventHandler';
 import GameStateManager from '@bot/state/GameStateManager';
 import Config from '@config/Config';
 import { Client, Message, WSEventType } from 'discord.js';
-import AppCommandRegister from './command/AppCommandRegister';
 
 /**
  * Manages all interactions with the Discord bot.
@@ -84,4 +84,14 @@ export default class TicTacToeBot {
     public handleMessage(message: Message): void {
         this.command.handleMessage(message, true);
     }
+
+    /**
+     * Programmatically handles a discord.js interaction to request a game.
+     *
+     * @param interaction Discord.js interaction object
+     * @param client Discord.js client instance
+     */
+    public handleInteraction(interaction: any, client: Client): void {
+        this.command.handleInteraction(client, interaction, true);
+    }
 }
diff --git a/src/bot/command/GameCommand.ts b/src/bot/command/GameCommand.ts
@@ -57,32 +57,35 @@ export default class GameCommand {
     /**
      * Handles an incoming interaction.
      *
+     * @param client discord.js client
      * @param interaction discord.js interaction instance
+     * @param noTrigger true to bypass trigger checks
      */
-    public async handleInteraction(client: Client, interaction: any): Promise<void> {
-        // Retrieve all interaction entities from cache or Discord API
-        const channel = client.channels.cache.get(interaction.channel_id);
-        const guild = client.guilds.cache.get(interaction.guild_id);
-        const user = await client.users.fetch(interaction.member.user.id);
-
+    public async handleInteraction(
+        client: Client,
+        interaction: any,
+        noTrigger = false
+    ): Promise<void> {
         if (
-            guild &&
-            user &&
-            channel instanceof TextChannel &&
-            interaction.data.type === 1 &&
-            interaction.data.name === this.config.slashCommand &&
-            !user.bot
+            noTrigger ||
+            (interaction.data.type === 1 && interaction.data.name === this.config.slashCommand)
         ) {
-            // Retrieve the inviter and create an interaction tunnel
-            const inviter = await guild.members.fetch(user.id);
-            const tunnel = new InteractionMessagingTunnel(interaction, client, inviter, channel);
+            // Retrieve all interaction entities from cache or Discord API
+            const channel = client.channels.cache.get(interaction.channel_id);
+            const guild = client.guilds.cache.get(interaction.guild_id);
 
-            // Retrieve invited user from options if provided
-            const invited = interaction.data.options
-                ? await guild.members.fetch(interaction.data.options[0]?.value)
-                : undefined;
+            if (guild && channel instanceof TextChannel) {
+                // Retrieve the inviter and create an interaction tunnel
+                const inviter = await guild.members.fetch(interaction.member.user.id);
+                const tun = new InteractionMessagingTunnel(interaction, client, inviter, channel);
 
-            return this.handleInvitation(tunnel, inviter, invited);
+                // Retrieve invited user from options if provided
+                const invited = interaction.data.options
+                    ? await guild.members.fetch(interaction.data.options[0]?.value)
+                    : undefined;
+
+                return this.handleInvitation(tun, inviter, invited);
+            }
         }
     }
 

diff --git a/src/index.ts b/src/index.ts
@@ -66,6 +66,8 @@ class TicTacToe {
 
     /**
      * Attaches an external Discord Client to the module.
+     *
+     * @param client Discord.js client instance
      */
     public attach(client: Client): void {
         this.bot.attachToClient(client);
@@ -80,6 +82,16 @@ class TicTacToe {
         this.bot.handleMessage(message);
     }
 
+    /**
+     * Programmatically handles a discord.js interaction to request a game.
+     *
+     * @param interaction Discord.js interaction object
+     * @param client Discord.js client instance
+     */
+    public handleInteraction(interaction: any, client: Client): void {
+        this.bot.handleInteraction(interaction, client);
+    }
+
     /**
      * Register a listener to a specific event by its name.
      *