Slash Command のバグ修正 (#35)

* fix: Fix buildCommandStr * fix: Extract hardcode and Add gurad * fix: Fix to remove old commands * refactor: Remove unused class
approvers · Aug 4, 2021 · bc3e8d3 · bc3e8d3
1 parent f939156
commit bc3e8d3
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 72 deletions.
diff --git a/src/bot/skin/discord-command.ts b/src/bot/skin/discord-command.ts
diff --git a/src/bot/skin/interactions-command.ts b/src/bot/skin/interactions-command.ts
@@ -58,6 +58,8 @@ const prCommand: ApplicationCommand = {
 
 const commands = [repositoryCommand, branchCommand, issueCommand, prCommand];
 
+const GUILD_ID = "683939861539192860";
+
 export type Handler = (message: Message) => Promise<void>;
 
 export class InteractionsCommandReceiver {
@@ -67,16 +69,23 @@ export class InteractionsCommandReceiver {
         return;
       }
       this.initialized = true;
-      const registrar = client.guilds.cache.get("683939861539192860")?.commands;
+      const registrar = client.guilds.cache.get(GUILD_ID)?.commands;
       if (!registrar) {
         return;
       }
+      const oldCommands = await registrar.fetch();
+      await Promise.all(
+        [...oldCommands.values()].map((com) => registrar.delete(com)),
+      );
       await Promise.all(commands.map((command) => registrar.create(command)));
     });
     client.on("interactionCreate", (interaction) => {
       if (!interaction.isCommand()) {
         return;
       }
+      if (interaction.guildId !== GUILD_ID) {
+        return;
+      }
       this.onCommand(interaction);
     });
   }
@@ -123,14 +132,28 @@ export class InteractionsCommandReceiver {
 
   private buildCommandStr(interaction: CommandInteraction): string {
     let commandStr = `/${interaction.commandName} `;
-    commandStr += interaction.options.data
-      .filter(({ name }) => name !== "branch")
-      .map(({ value }) => value)
-      .join("/");
-    commandStr += interaction.options.data
-      .filter(({ name }) => name === "branch")
-      .map(({ value }) => value)
-      .join(" ");
+    const [orgArg] = interaction.options.data.filter(
+      ({ name }) => name === "org",
+    );
+    if (orgArg) {
+      commandStr += `${orgArg.value}/`;
+    }
+    const [repoArg] = interaction.options.data.filter(
+      ({ name }) => name === "repo",
+    );
+    commandStr += repoArg.value;
+    const [issueArg] = interaction.options.data.filter(
+      ({ name }) => name === "issue",
+    );
+    if (issueArg) {
+      commandStr += `/${issueArg.value}`;
+    }
+    const [branchArg] = interaction.options.data.filter(
+      ({ name }) => name === "branch",
+    );
+    if (branchArg) {
+      commandStr += ` ${branchArg.value}`;
+    }
     return commandStr;
   }
 }