@pikokr/command.ts 3.2.4 → 4.0.0

package/dist/structures/Registry.d.ts

@@ -1,9 +1,10 @@
 import { CommandClient } from './CommandClient';
 import { Module } from './Module';
-import { Command, SlashArgumentConverter } from '../command';
+import { Command, ApplicationCommandArgumentConverter } from '../command';
 import { Collection } from 'discord.js';
 import { ArgumentConverter } from '../command';
-import { SlashCommand } from '../slashCommand';
+import { AppCommand } from '../applicationCommand';
+import { MessageComponentHandler } from '../messageComponents/base';
 export declare class Registry {
     client: CommandClient;
     constructor(client: CommandClient);
@@ -11,8 +12,9 @@ export declare class Registry {
     private get logger();
     get commands(): Command[];
     get argumentConverters(): ArgumentConverter[];
-    get slashArgumentConverters(): SlashArgumentConverter[];
-    get slashCommands(): SlashCommand[];
+    get applicationCommandArgumentConverters(): ApplicationCommandArgumentConverter[];
+    get applicationCommands(): AppCommand[];
+    get messageComponentHandlers(): MessageComponentHandler[];
     registerModule(module: Module): Module;
     loadModulesIn(dir: string, absolute?: boolean): Promise<void>;
     loadModule(file: string, absolute?: boolean): Promise<Module>;

package/dist/structures/Registry.js

@@ -38,7 +38,6 @@ const path_1 = __importDefault(require("path"));
 const error_1 = require("../error");
 const discord_js_1 = require("discord.js");
 const walk_sync_1 = __importDefault(require("walk-sync"));
-const v9_1 = require("discord-api-types/v9");
 const fs = __importStar(require("fs"));
 class Registry {
     constructor(client) {
@@ -64,17 +63,24 @@ class Registry {
         }
         return result;
     }
-    get slashArgumentConverters() {
+    get applicationCommandArgumentConverters() {
         const result = [];
         for (const [, module] of this.modules) {
-            result.push(...module.slashArgumentConverters);
+            result.push(...module.applicationCommandArgumentConverters);
         }
         return result;
     }
-    get slashCommands() {
+    get applicationCommands() {
         const result = [];
         for (const [, module] of this.modules) {
-            result.push(...module.slashCommands);
+            result.push(...module.applicationCommands);
+        }
+        return result;
+    }
+    get messageComponentHandlers() {
+        const result = [];
+        for (const [, module] of this.modules) {
+            result.push(...module.messageComponentHandlers);
         }
         return result;
     }
@@ -127,21 +133,20 @@ class Registry {
         });
     }
     syncCommands() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.debug(`Syncing commands...`);
-            const commands = this.slashCommands.filter((x) => !x.guild);
-            const guild = this.client.options.slashCommands.guild;
+            const commands = this.applicationCommands.filter((x) => !x.guild);
+            const guild = this.client.options.applicationCommands.guild;
             if (guild) {
                 const syncForGuild = (g) => __awaiter(this, void 0, void 0, function* () {
                     this.logger.debug(`Syncing for guild ${g.name}(${g.id})`);
                     const commandsToRegister = [
-                        ...commands.map((x) => x.commandBuilder),
-                        ...this.slashCommands.filter((y) => { var _a; return y.guild === g.id || ((_a = y.guild) === null || _a === void 0 ? void 0 : _a.includes(g.id)) || false; }).map((x) => x.commandBuilder),
+                        ...commands.map((x) => x.command),
+                        ...this.applicationCommands.filter((y) => { var _a; return y.guild === g.id || ((_a = y.guild) === null || _a === void 0 ? void 0 : _a.includes(g.id)) || false; }).map((x) => x.command),
                     ];
                     this.logger.debug(`Command List: ${commandsToRegister.map((x) => x.name).join(', ')}`);
-                    yield this.client.rest.put(v9_1.Routes.applicationGuildCommands(this.client.client.application.id, g.id), {
-                        body: commandsToRegister.map((x) => x.toJSON()),
-                    });
+                    yield g.commands.set(commandsToRegister);
                 });
                 if (typeof guild === 'string') {
                     yield syncForGuild(yield this.client.client.guilds.fetch(guild));
@@ -154,9 +159,7 @@ class Registry {
             }
             else {
                 this.logger.debug('Syncing global...');
-                yield this.client.rest.put(v9_1.Routes.applicationCommands(this.client.client.application.id), {
-                    body: commands.map((x) => x.commandBuilder.toJSON()),
-                });
+                yield ((_a = this.client.client.application) === null || _a === void 0 ? void 0 : _a.commands.set(commands.map((x) => x.command)));
             }
             this.logger.debug('Syncing ended.');
         });

package/dist/structures/Registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"Registry.js","sourceRoot":"","sources":["../../src/structures/Registry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Registry.js","sourceRoot":"","sources":["../../src/structures/Registry.ts"],"names":[],"mappings":"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"}

package/dist/typings.d.ts

@@ -1,6 +1,6 @@
 import type { Command } from './command';
 import { CommandClient } from './structures';
-import { SlashCommand } from './slashCommand';
+import { AppCommand } from './applicationCommand';
 declare module 'discord.js' {
     interface Message {
         data: {
@@ -11,7 +11,19 @@ declare module 'discord.js' {
     }
     interface CommandInteraction {
         data: {
-            command: SlashCommand;
+            command: AppCommand;
+            cts: CommandClient;
+        };
+    }
+    interface MessageComponentInteraction {
+        data: {
+            command: AppCommand;
+            cts: CommandClient;
+        };
+    }
+    interface ContextMenuInteraction {
+        data: {
+            command: AppCommand;
             cts: CommandClient;
         };
     }

package/package.json

@@ -1,16 +1,14 @@
 {
   "name": "@pikokr/command.ts",
   "description": "Discord.js command framework for typescript.",
-  "version": "3.2.4",
+  "version": "4.0.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",
   "devDependencies": {
-    "@discordjs/builders": "^0.6.0",
-    "@discordjs/rest": "^0.1.0-canary.0",
     "@types/lodash": "^4.14.172",
     "all-contributors-cli": "^6.20.0",
-    "discord.js": "^13.1.0",
+    "discord.js": "^13.6.0",
     "prettier": "^2.2.1",
     "ts-node": "^10.1.0",
     "typedoc": "^0.20.35"

package/src/applicationCommand/AppCommand.ts

@@ -0,0 +1,28 @@
+import { Module } from '../structures'
+import { ApplicationCommandDataResolvable, Snowflake } from 'discord.js'
+import { KApplicationCommandChecks } from '../constants'
+import { ApplicationCommandCheckFunction } from '../command'
+
+export type AppCommandArgument = {
+  type: any
+  name?: string
+}
+
+export class AppCommand {
+  get checks(): ApplicationCommandCheckFunction[] {
+    return Reflect.getMetadata(KApplicationCommandChecks, this.module, this.key) || []
+  }
+
+  execute(module: Module, args: any[]) {
+    return this.run.apply(module, args)
+  }
+
+  constructor(
+    public command: ApplicationCommandDataResolvable,
+    private run: Function,
+    public module: Module,
+    public params: AppCommandArgument[],
+    public guild: Snowflake | Snowflake[] | undefined,
+    private key: string | symbol,
+  ) {}
+}

package/src/{slashCommand → applicationCommand}/decorator.ts

@@ -1,15 +1,15 @@
-import { Collection, Snowflake } from 'discord.js'
+import { ApplicationCommandDataResolvable, Collection, Snowflake } from 'discord.js'
 import { checkTarget } from '../utils'
-import { KSlashCommandOptions, KSlashCommands } from '../constants'
+import { KSlashCommandOptions, KApplicationCommands } from '../constants'
 import { Module } from '../structures'
-import { SlashCommand } from './SlashCommand'
-import { SlashCommandBuilder } from '@discordjs/builders'
+import { AppCommand } from './AppCommand'
 
-type SlashOptions = {
+type ApplicationCommandOptions = {
   guild: Snowflake | Snowflake[]
+  optionTypes?: any[]
 }
 
-export const slashCommand = (opt: Partial<SlashOptions> & { command: SlashCommandBuilder | Omit<SlashCommandBuilder, 'addSubcommand' | 'addSubcommandGroup'> }) => {
+export const applicationCommand = (opt: Partial<ApplicationCommandOptions> & { command: ApplicationCommandDataResolvable }) => {
   return (
     target: Object,
     propertyKey: string,
@@ -17,13 +17,13 @@ export const slashCommand = (opt: Partial<SlashOptions> & { command: SlashComman
   ) => {
     checkTarget(target)
 
-    let properties: SlashCommand[] = Reflect.getMetadata(KSlashCommands, target)
+    let properties: AppCommand[] = Reflect.getMetadata(KApplicationCommands, target)
 
-    const params: any[] = Reflect.getMetadata('design:paramtypes', target, propertyKey)
+    const params: any[] = opt.optionTypes ?? Reflect.getMetadata('design:paramtypes', target, propertyKey)
 
     const options: Collection<number, string> = Reflect.getMetadata(KSlashCommandOptions, target, propertyKey) || new Collection<number, string>()
 
-    const command = new SlashCommand(
+    const command = new AppCommand(
       opt.command,
       Reflect.get(target, propertyKey),
       target as Module,
@@ -39,7 +39,7 @@ export const slashCommand = (opt: Partial<SlashOptions> & { command: SlashComman
       properties.push(command)
     } else {
       properties = [command]
-      Reflect.defineMetadata(KSlashCommands, properties, target)
+      Reflect.defineMetadata(KApplicationCommands, properties, target)
     }
   }
 }

package/src/applicationCommand/index.ts

@@ -0,0 +1,2 @@
+export * from './decorator'
+export * from './AppCommand'

package/src/builtinModules/BuiltinApplicationCommandConverters.ts

@@ -0,0 +1,12 @@
+import { BuiltInModule } from './BuiltInModule'
+import { Client } from 'discord.js'
+import { CommandClient } from '../structures'
+
+export class BuiltinApplicationCommandConverters extends BuiltInModule {
+  client: Client
+
+  constructor(private cts: CommandClient) {
+    super()
+    this.client = cts.client
+  }
+}

package/src/builtinModules/CommandHandler.ts

@@ -1,11 +1,24 @@
 import { BuiltInModule } from './BuiltInModule'
 import { Registry } from '../structures'
 import { listener } from '../listener'
-import { CommandInteraction, GuildMember, Interaction, Message, Role, User } from 'discord.js'
+import {
+  CommandInteraction,
+  CommandInteractionOptionResolver,
+  GuildMember,
+  Interaction,
+  Message,
+  MessageComponentInteraction,
+  MessageContextMenuInteraction,
+  Role,
+  User,
+  UserContextMenuInteraction,
+} from 'discord.js'
 import { CommandClient } from '../structures'
 import { Command } from '../command'
-import { ArgumentConverterNotFound, ArgumentNotProvided, CommandCheckFailed, SlashArgumentConverterNotFound, SlashCommandCheckFailed } from '../error'
+import { ArgumentConverterNotFound, ArgumentNotProvided, CommandCheckFailed, ApplicationCommandArgumentConverterNotFound, ApplicationCommandCheckFailed } from '../error'
 import { CommandNotFound } from '../error/CommandNotFound'
+import { SlashCommandGlobalCheckError } from '../error/checks/SlashCommandGlobalCheckError'
+import { MessageComponentHandler } from '../messageComponents/base'
 
 export class CommandHandler extends BuiltInModule {
   private readonly client: CommandClient
@@ -15,6 +28,7 @@ export class CommandHandler extends BuiltInModule {
     this.client = registry.client
   }
 
+  // region message command handler
   @listener('messageCreate')
   async message(msg: Message) {
     const error = (error: Error) => this.client.client.emit('commandError', error, msg)
@@ -48,12 +62,16 @@ export class CommandHandler extends BuiltInModule {
 
       let cmd: Command | null = null
 
+      const globalAliases = await this.client.options.command.globalAliases(command, msg)
+
       for (const c of this.registry.commands) {
-        if (c.name === command) {
+        const globalAliases2 = await this.client.options.command.globalAliases(c.name, msg)
+        const aliases = typeof c.aliases === 'function' ? await c.aliases(msg) : c.aliases
+        if ([...aliases, c.name].some((x) => x === command)) {
           cmd = c
           break
         }
-        if ((typeof c.aliases === 'function' ? await c.aliases(msg) : c.aliases).includes(command)) {
+        if (globalAliases.every((x, i) => globalAliases2[i] === x)) {
           cmd = c
           break
         }
@@ -125,36 +143,47 @@ export class CommandHandler extends BuiltInModule {
       return error(e)
     }
   }
+  // endregion
 
+  // region slash command handler
   private async command(i: CommandInteraction) {
-    const error = (error: Error) => this.client.client.emit('slashCommandError', error, i)
+    const error = (error: Error) => this.client.client.emit('applicationCommandError', error, i)
     try {
-      const cmd = this.registry.slashCommands.find((x) => x.commandBuilder.name === i.commandName)
+      const cmd = this.registry.applicationCommands.find((x) => x.command.type === 'CHAT_INPUT' && x.command.name === i.commandName)
+
+      if (!cmd) return
 
-      const module = this.registry.modules.find((x) => x.slashCommands.includes(cmd!))
+      const module = this.registry.modules.find((x) => x.applicationCommands.includes(cmd))
 
       if (!module) return
 
       const argList: any[] = []
 
-      if (!cmd)
-        return i.reply({
-          content: 'Unknown command.',
-          ephemeral: true,
-        })
-
       i.data = {
         cts: this.client,
         command: cmd,
       }
 
+      if (!(await this.client.options.slashCommands.check(i))) {
+        return error(new SlashCommandGlobalCheckError(i))
+      }
       for (const check of cmd.checks) {
-        if (!(await check(i))) return error(new SlashCommandCheckFailed(i, cmd))
+        if (!(await check(i))) return error(new ApplicationCommandCheckFailed(i, cmd))
       }
 
       for (let j = 0; j < cmd.params.length; j++) {
         const argType = cmd.params[j]
-        const converter = this.registry.slashArgumentConverters.find((x) => x.type === argType.type)
+        const converter = this.registry.applicationCommandArgumentConverters.find((x) => x.type === argType.type)
+
+        if (argType.type === CommandInteraction) {
+          argList.push(i)
+          continue
+        }
+
+        if (argType.type === CommandInteractionOptionResolver) {
+          argList.push(i.options)
+          continue
+        }
 
         if (argType.name) {
           switch (argType.type) {
@@ -191,16 +220,119 @@ export class CommandHandler extends BuiltInModule {
           continue
         }
 
-        if (!converter) return error(new SlashArgumentConverterNotFound(argType, i))
+        if (!converter) return error(new ApplicationCommandArgumentConverterNotFound(argType, i))
 
         argList.push(await converter.execute(module, i))
       }
 
-      try {
-        await cmd.execute(module, argList)
-      } catch (e: any) {
-        return error(e)
+      await cmd.execute(module, argList)
+    } catch (e) {
+      return error(e)
+    }
+  }
+  // endregion
+
+  private async messageComponent(i: MessageComponentInteraction) {
+    const error = (e: any) => this.client.client.emit('messageComponentError', e)
+
+    try {
+      const handlers: MessageComponentHandler[] = []
+
+      for (const handler of this.registry.messageComponentHandlers) {
+        if (handler.componentId === handler.componentId && handler.componentType === i.componentType) {
+          handlers.push(handler)
+        }
+      }
+
+      for (const handler of handlers) {
+        const module = this.registry.modules.find((x) => x.messageComponentHandlers.includes(handler))
+        if (!module) continue
+        await handler.run(module, i)
       }
+    } catch (e) {
+      error(e)
+    }
+  }
+
+  private async userContextMenu(i: UserContextMenuInteraction) {
+    const error = (error: Error) => this.client.client.emit('applicationCommandError', error, i)
+    try {
+      const cmd = this.registry.applicationCommands.find((x) => x.command.type === 'USER' && x.command.name === i.commandName)
+
+      if (!cmd) return
+
+      const module = this.registry.modules.find((x) => x.applicationCommands.includes(cmd))
+
+      if (!module) return
+
+      i.data = {
+        cts: this.client,
+        command: cmd,
+      }
+
+      for (const check of cmd.checks) {
+        if (!(await check(i))) return error(new ApplicationCommandCheckFailed(i, cmd))
+      }
+
+      let argList: any[] = []
+
+      for (let j = 0; j < cmd.params.length; j++) {
+        const argType = cmd.params[j]
+        const converter = this.registry.applicationCommandArgumentConverters.find((x) => x.type === argType.type)
+
+        if (argType.type === UserContextMenuInteraction) {
+          argList.push(i)
+          continue
+        }
+
+        if (!converter) return error(new ApplicationCommandArgumentConverterNotFound(argType, i))
+
+        argList.push(await converter.execute(module, i))
+      }
+
+      await cmd.execute(module, argList)
+    } catch (e) {
+      return error(e)
+    }
+  }
+
+  private async messageContextMenu(i: MessageContextMenuInteraction) {
+    const error = (error: Error) => this.client.client.emit('applicationCommandError', error, i)
+    try {
+      const cmd = this.registry.applicationCommands.find((x) => x.command.type === 'MESSAGE' && x.command.name === i.commandName)
+
+      if (!cmd) return
+
+      const module = this.registry.modules.find((x) => x.applicationCommands.includes(cmd))
+
+      if (!module) return
+
+      i.data = {
+        cts: this.client,
+        command: cmd,
+      }
+
+      for (const check of cmd.checks) {
+        if (!(await check(i))) return error(new ApplicationCommandCheckFailed(i, cmd))
+      }
+
+      let argList: any[] = []
+
+      for (let j = 0; j < cmd.params.length; j++) {
+        const argType = cmd.params[j]
+        const converter = this.registry.applicationCommandArgumentConverters.find((x) => x.type === argType.type)
+
+        if (argType.type === MessageContextMenuInteraction) {
+          argList.push(i)
+          continue
+        }
+
+        if (!converter) return error(new ApplicationCommandArgumentConverterNotFound(argType, i))
+
+        argList.push(await converter.execute(module, i))
+      }
+
+      await cmd.execute(module, argList)
     } catch (e) {
       return error(e)
     }
@@ -208,8 +340,28 @@ export class CommandHandler extends BuiltInModule {
 
   @listener('interactionCreate')
   async interaction(i: Interaction) {
-    if (i.isCommand()) {
-      await this.command(i)
+    const error = (e: any) => this.client.client.emit('interactionError', e, i)
+
+    try {
+      await this.client.options.applicationCommands.beforeRunCheck(i)
+      if (i.isCommand()) {
+        await this.command(i)
+        return
+      }
+      if (i.isMessageComponent()) {
+        await this.messageComponent(i)
+        return
+      }
+      if (i.isMessageContextMenu()) {
+        await this.messageContextMenu(i)
+        return
+      }
+      if (i.isUserContextMenu()) {
+        await this.userContextMenu(i)
+        return
+      }
+    } catch (e) {
+      return error(e)
     }
   }
 }

package/src/builtinModules/index.ts

@@ -1,3 +1,3 @@
 export * from './CommandHandler'
 export * from './BuiltinCommandConverters'
-export * from './BuiltinSlashCommandConverters'
+export * from './BuiltinApplicationCommandConverters'

package/src/command/ArgumentConverter.ts

@@ -1,5 +1,5 @@
 import { Module } from '../structures'
-import { CommandInteraction, Message } from 'discord.js'
+import { CommandInteraction, ContextMenuInteraction, Message } from 'discord.js'
 
 export class ArgumentConverter {
   execute(module: Module, msg: Message, arg?: string) {
@@ -9,8 +9,8 @@ export class ArgumentConverter {
   constructor(public type: object, private run: Function, public withoutParameter: boolean) {}
 }
 
-export class SlashArgumentConverter {
-  execute(module: Module, interaction: CommandInteraction) {
+export class ApplicationCommandArgumentConverter {
+  execute(module: Module, interaction: CommandInteraction | ContextMenuInteraction) {
     return this.run.apply(module, [interaction])
   }
 

package/src/command/Command.ts

@@ -1,5 +1,5 @@
 import { Module } from '../structures'
-import { CommandInteraction, Message } from 'discord.js'
+import { CommandInteraction, ContextMenuInteraction, Message, MessageComponentInteraction } from 'discord.js'
 import { KCommandChecks } from '../constants'
 
 export type Argument = {
@@ -9,7 +9,7 @@ export type Argument = {
 }
 
 export type CheckFunction = (msg: Message) => boolean | Promise<boolean>
-export type SlashCheckFunction = (i: CommandInteraction) => boolean | Promise<boolean>
+export type ApplicationCommandCheckFunction = (i: CommandInteraction | MessageComponentInteraction | ContextMenuInteraction) => boolean | Promise<boolean>
 
 export class Command {
   execute(module: Module, args: any[]) {

package/src/command/decorator.ts

@@ -1,7 +1,7 @@
 import { KArgumentConverters, KCommands, KOptionals, KRest, KSlashArgumentConverters } from '../constants'
 import { Command } from './Command'
 import { checkTarget } from '../utils'
-import { ArgumentConverter, SlashArgumentConverter } from './ArgumentConverter'
+import { ArgumentConverter, ApplicationCommandArgumentConverter } from './ArgumentConverter'
 import { Module } from '../structures'
 import { createCheckDecorator } from './utils'
 import { GuildMember, Message, PermissionResolvable, Permissions, TextChannel } from 'discord.js'
@@ -10,6 +10,7 @@ import { ClientPermissionRequired, DMOnlyCommandError, GuildOnlyCommandError, Ow
 type CommandOptions = {
   name: string
   aliases: string[] | ((msg: Message) => string[])
+  optionTypes?: any[]
 }
 
 export const command = (options: Partial<CommandOptions> = {}) => {
@@ -22,7 +23,7 @@ export const command = (options: Partial<CommandOptions> = {}) => {
 
     let properties: Command[] = Reflect.getMetadata(KCommands, target)
 
-    const params: any[] = Reflect.getMetadata('design:paramtypes', target, propertyKey)
+    const params: any[] = options.optionTypes ?? Reflect.getMetadata('design:paramtypes', target, propertyKey)
 
     const optionals: number = Reflect.getMetadata(KOptionals, target, propertyKey) || -1
 
@@ -71,7 +72,7 @@ export const argumentConverter = (type: object, requireParameter = true) => {
   }
 }
 
-export const slashArgumentConverter = (type: object) => {
+export const applicationCommandArgumentConverter = (type: object) => {
   return (
     target: Object,
     propertyKey: string,
@@ -79,9 +80,9 @@ export const slashArgumentConverter = (type: object) => {
   ) => {
     checkTarget(target)
 
-    let properties: SlashArgumentConverter[] = Reflect.getMetadata(KSlashArgumentConverters, target)
+    let properties: ApplicationCommandArgumentConverter[] = Reflect.getMetadata(KSlashArgumentConverters, target)
 
-    const converter = new SlashArgumentConverter(type, Reflect.get(target, propertyKey))
+    const converter = new ApplicationCommandArgumentConverter(type, Reflect.get(target, propertyKey))
 
     if (properties) {
       properties.push(converter)