feat(commandManager): support multiple application commands from a si…

…ngle command class
onesoft-sudo · Aug 3, 2023 · 92abe80 · 92abe80
1 parent b6b8a8b
commit 92abe80
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/scripts/deploy-commands.ts b/scripts/deploy-commands.ts
@@ -70,6 +70,7 @@ function makeContextMenuCommandBuilder(command: any) {
             if (!command.supportsInteractions) continue;
 
             commands.push(
+                ...(command.otherApplicationCommandBuilders ?? []),
                 command.applicationCommandType === ApplicationCommandType.ChatInput
                     ? makeSlashCommandBuilder(command)
                     : makeContextMenuCommandBuilder(command)

diff --git a/src/core/Command.ts b/src/core/Command.ts
@@ -22,6 +22,7 @@ import {
     ApplicationCommandType,
     CacheType,
     ChatInputCommandInteraction,
+    ContextMenuCommandBuilder,
     ContextMenuCommandInteraction,
     GuildMember,
     InteractionDeferReplyOptions,
@@ -103,6 +104,7 @@ export default abstract class Command {
         | Omit<SlashCommandBuilder, "addSubcommand" | "addSubcommandGroup">;
 
     public readonly applicationCommandType: ApplicationCommandType = ApplicationCommandType.ChatInput;
+    public readonly otherApplicationCommandBuilders: (ContextMenuCommandBuilder | SlashCommandBuilder)[] = [];
 
     public readonly subcommands: string[] = [];
 

diff --git a/src/services/CommandManager.ts b/src/services/CommandManager.ts
@@ -32,6 +32,7 @@ export interface CommandContext {
 
 export interface LegacyCommandContext extends CommandContext {
     isLegacy: true;
+    isContextMenu: false;
     argv: string[];
     args: string[];
     parsedArgs: any[];
@@ -41,11 +42,13 @@ export interface LegacyCommandContext extends CommandContext {
 
 export interface ChatInputCommandContext extends CommandContext {
     isLegacy: false;
+    isContextMenu: false;
     options: ChatInputCommandInteraction["options"];
 }
 
 export interface ContextMenuCommandContext extends CommandContext {
     isLegacy: false;
+    isContextMenu: true;
     options: ContextMenuCommandInteraction["options"];
 }
 
@@ -80,6 +83,7 @@ export default class CommandManager extends Service {
                 config,
                 parsedArgs: [],
                 parsedNamedArgs: {},
+                isContextMenu: false,
                 has(arg: string) {
                     return this.args.includes(arg);
                 }
@@ -113,8 +117,9 @@ export default class CommandManager extends Service {
             .run(interaction, {
                 isLegacy: false,
                 config,
-                options: interaction.options
-            } as ContextMenuCommandContext)
+                options: interaction.options,
+                isContextMenu: interaction.isContextMenuCommand()
+            } as ContextMenuCommandContext | ChatInputCommandContext)
             .then(result => {
                 if (result && typeof result === "object" && "__reply" in result && result.__reply === true) {
                     interaction.reply(result as any).catch(console.error);