@pikokr/command.ts 3.2.4 → 4.0.1-dev.1c9fbc0

package/src/error/CommandCheckFailed.ts

@@ -1,6 +1,10 @@
-import { CommandInteraction, Message } from 'discord.js'
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
+import { CommandInteraction, ContextMenuInteraction, Message, MessageComponentInteraction } from 'discord.js'
 import { Command } from '../command'
-import { SlashCommand } from '../slashCommand'
+import { AppCommand } from '../applicationCommand'
 
 export class CommandCheckFailed extends Error {
   constructor(public msg: Message, public command: Command) {
@@ -8,8 +12,8 @@ export class CommandCheckFailed extends Error {
   }
 }
 
-export class SlashCommandCheckFailed extends Error {
-  constructor(public interaction: CommandInteraction, public command: SlashCommand) {
+export class ApplicationCommandCheckFailed extends Error {
+  constructor(public interaction: CommandInteraction | MessageComponentInteraction | ContextMenuInteraction, public command: AppCommand) {
     super()
   }
 }

package/src/error/CommandNotFound.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { Message } from 'discord.js'
 
 export class CommandNotFound extends Error {

package/src/error/InvalidTargetError.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export class InvalidTargetError extends Error {
   constructor() {
     super('Class does not extend "Module" class.')

package/src/error/ModuleError.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export class ModuleLoadError extends Error {
   constructor(file: string, public error: Error) {
     super('Failed to load module ' + file)

package/src/error/PermissionRequired.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { GuildMember, Permissions } from 'discord.js'
 
 export class UserPermissionRequired extends Error {

package/src/error/checks/DMOnlyCommand.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export class DMOnlyCommandError extends Error {
   constructor() {
     super()

package/src/error/checks/GuildOnlyCommand.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export class GuildOnlyCommandError extends Error {
   constructor() {
     super()

package/src/error/checks/OwnerOnlyCommand.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export class OwnerOnlyCommandError extends Error {
   constructor() {
     super()

package/src/error/checks/SlashCommandGlobalCheckError.ts

@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
+import { CommandInteraction } from 'discord.js'
+
+export class SlashCommandGlobalCheckError extends Error {
+  constructor(public i: CommandInteraction) {
+    super('Slash command before-run check failed.')
+  }
+}

package/src/error/checks/index.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export * from './OwnerOnlyCommand'
 export * from './GuildOnlyCommand'
 export * from './DMOnlyCommand'

package/src/error/index.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export * from './InvalidTargetError'
 export * from './ModuleError'
 export * from './ArgumentNotProvided'

package/src/index.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import 'reflect-metadata'
 import './typings'
 
@@ -7,4 +11,5 @@ export * from './error'
 export * from './command'
 export * from './listener'
 export * from './builtinModules/BuiltInModule'
-export * from './slashCommand'
+export * from './applicationCommand'
+export * from './messageComponents'

package/src/interface/index.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 // export type { HandlerAdapter } from './HandlerAdapter'
 
 export {}

package/src/listener/Listener.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export class Listener {
   constructor(public name: string, public execute: Function) {}
 }

package/src/listener/decorator.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { checkTarget } from '../utils'
 import { KListeners } from '../constants'
 import { Listener } from './Listener'

package/src/listener/index.ts

@@ -1,2 +1,6 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export * from './Listener'
 export * from './decorator'

package/src/messageComponents/base.ts

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
+import { MessageComponentInteraction, MessageComponentType } from 'discord.js'
+import { Module } from '../structures'
+
+export type MessageComponentExecutor = (i: MessageComponentInteraction) => void | Promise<void>
+
+export class MessageComponentHandler {
+  constructor(public componentId: string, public componentType: Exclude<MessageComponentType, 'ACTION_ROW'>, public execute: MessageComponentExecutor) {}
+
+  run(module: Module, i: MessageComponentInteraction) {
+    return this.execute.apply(module, [i])
+  }
+}

package/src/messageComponents/button.ts

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
+import { MessageComponentExecutor, MessageComponentHandler } from './base'
+import { checkTarget } from '../utils'
+import { KMessageComponentHandlers } from '../constants'
+
+export class ButtonInteractionHandler extends MessageComponentHandler {
+  constructor(id: string, execute: MessageComponentExecutor) {
+    super(id, 'BUTTON', execute)
+  }
+}
+
+export const messageButton = (id: string): MethodDecorator => {
+  return (target, propertyKey) => {
+    checkTarget(target)
+
+    const handler = new ButtonInteractionHandler(id, Reflect.get(target, propertyKey))
+
+    let properties: MessageComponentHandler[] = Reflect.getMetadata(KMessageComponentHandlers, target)
+
+    if (properties) {
+      properties.push(handler)
+    } else {
+      properties = [handler]
+      Reflect.defineMetadata(KMessageComponentHandlers, properties, target)
+    }
+  }
+}

package/src/messageComponents/index.ts

@@ -0,0 +1,6 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
+export * from './button'
+export * from './selectMenu'

package/src/messageComponents/selectMenu.ts

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
+import { MessageComponentExecutor, MessageComponentHandler } from './base'
+import { checkTarget } from '../utils'
+import { KMessageComponentHandlers } from '../constants'
+
+export class SelectMenuInteractionHandler extends MessageComponentHandler {
+  constructor(id: string, execute: MessageComponentExecutor) {
+    super(id, 'SELECT_MENU', execute)
+  }
+}
+
+export const messageSelectMenu = (id: string): MethodDecorator => {
+  return (target, propertyKey) => {
+    checkTarget(target)
+
+    const handler = new SelectMenuInteractionHandler(id, Reflect.get(target, propertyKey))
+
+    let properties: MessageComponentHandler[] = Reflect.getMetadata(KMessageComponentHandlers, target)
+
+    if (properties) {
+      properties.push(handler)
+    } else {
+      properties = [handler]
+      Reflect.defineMetadata(KMessageComponentHandlers, properties, target)
+    }
+  }
+}

package/src/structures/CommandClient.ts

@@ -1,31 +1,42 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import _ from 'lodash'
 import { Registry } from './Registry'
-import { Client, Message, Snowflake, User } from 'discord.js'
-import { BuiltinCommandConverters, BuiltinSlashCommandConverters, CommandHandler } from '../builtinModules'
+import { Client, CommandInteraction, Interaction, Message, Snowflake, User } from 'discord.js'
+import { BuiltinCommandConverters, BuiltinApplicationCommandConverters, CommandHandler } from '../builtinModules'
 import { CoolDownAdapter, DefaultCoolDownAdapter } from '../command'
-import { REST } from '@discordjs/rest'
 import { Logger } from 'tslog'
 
 export interface CommandOptions {
   prefix: string | ((msg: any) => string | Promise<string | string[]> | string[]) | string[]
   check: (msg: Message) => boolean | Promise<boolean>
+  globalAliases: (cmd: string, msg: Message) => string[] | Promise<string[]>
 }
 
 export interface SlashCommandOptions {
+  check: (i: CommandInteraction) => boolean | Promise<boolean>
+}
+
+export interface ApplicationCommandOptions {
   guild?: Snowflake | Snowflake[]
   autoSync: boolean
+  beforeRunCheck: (i: Interaction) => void | Promise<void>
 }
 
 export interface CommandClientOptions {
   command: CommandOptions
   owners: 'auto' | Snowflake[]
   slashCommands: SlashCommandOptions
+  applicationCommands: ApplicationCommandOptions
 }
 
 export interface CommandClientOptionsParam {
   command: Partial<CommandOptions>
   owners: 'auto' | string[]
   slashCommands: Partial<SlashCommandOptions>
+  applicationCommands: Partial<ApplicationCommandOptions>
 }
 
 export class CommandClient {
@@ -34,9 +45,6 @@ export class CommandClient {
   registry = new Registry(this)
   client: Client
   coolDownAdapter: CoolDownAdapter
-  rest = new REST({
-    version: '9',
-  })
   logger: Logger
 
   private _isReady = false
@@ -51,13 +59,12 @@ export class CommandClient {
 
   async ready() {
     if (this._isReady) return
-    this.rest.setToken(this.client.token!)
     this._isReady = true
     if (this.options.owners === 'auto') {
       const owners = await this.fetchOwners()
       this.owners.push(...owners)
     }
-    if (this.options.slashCommands.autoSync) {
+    if (this.options.applicationCommands.autoSync) {
       await this.registry.syncCommands()
     }
   }
@@ -70,10 +77,15 @@ export class CommandClient {
         command: {
           prefix: '!',
           check: () => true,
+          globalAliases: () => [],
         },
         owners: 'auto',
         slashCommands: {
-          autoSync: true,
+          check: () => true,
+        },
+        applicationCommands: {
+          autoSync: false,
+          beforeRunCheck: () => {},
         },
       },
       options,
@@ -88,6 +100,6 @@ export class CommandClient {
     this.client.once('ready', () => this.ready())
     this.registry.registerModule(new CommandHandler(this.registry))
     this.registry.registerModule(new BuiltinCommandConverters(this))
-    this.registry.registerModule(new BuiltinSlashCommandConverters(this))
+    this.registry.registerModule(new BuiltinApplicationCommandConverters(this))
   }
 }

package/src/structures/Module.ts

@@ -1,9 +1,14 @@
-import { KArgumentConverters, KCommands, KListeners, KModulePath, KSlashArgumentConverters, KSlashCommands } from '../constants'
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
+import { KArgumentConverters, KCommands, KListeners, KMessageComponentHandlers, KModulePath, KSlashArgumentConverters, KApplicationCommands } from '../constants'
 import type { Command } from '../command'
 import { Listener } from '../listener'
-import { ArgumentConverter, SlashArgumentConverter } from '../command'
-import { SlashCommand } from '../slashCommand'
+import { ArgumentConverter, ApplicationCommandArgumentConverter } from '../command'
+import { AppCommand } from '../applicationCommand'
 import { CommandClient } from './CommandClient'
+import { MessageComponentHandler } from '../messageComponents/base'
 
 export abstract class Module {
   commandClient!: CommandClient
@@ -26,12 +31,16 @@ export abstract class Module {
     return Reflect.getMetadata(KArgumentConverters, this) || []
   }
 
-  get slashArgumentConverters(): SlashArgumentConverter[] {
+  get applicationCommandArgumentConverters(): ApplicationCommandArgumentConverter[] {
     return Reflect.getMetadata(KSlashArgumentConverters, this) || []
   }
 
-  get slashCommands(): SlashCommand[] {
-    return Reflect.getMetadata(KSlashCommands, this) || []
+  get applicationCommands(): AppCommand[] {
+    return Reflect.getMetadata(KApplicationCommands, this) || []
+  }
+
+  get messageComponentHandlers(): MessageComponentHandler[] {
+    return Reflect.getMetadata(KMessageComponentHandlers, this) || []
   }
 
   get path(): string | undefined {

package/src/structures/Registry.ts

@@ -1,15 +1,19 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { CommandClient } from './CommandClient'
 import { Module } from './Module'
-import { Command, SlashArgumentConverter } from '../command'
+import { Command, ApplicationCommandArgumentConverter } from '../command'
 import { KBuiltInModule, KListenerExecuteCache, KModulePath } from '../constants'
 import path from 'path'
 import { InvalidModuleError, InvalidTargetError, ModuleLoadError } from '../error'
 import { Collection, Guild } from 'discord.js'
 import walkSync from 'walk-sync'
 import { ArgumentConverter } from '../command'
-import { SlashCommand } from '../slashCommand'
-import { Routes } from 'discord-api-types/v9'
+import { AppCommand } from '../applicationCommand'
 import * as fs from 'fs'
+import { MessageComponentHandler } from '../messageComponents/base'
 
 type ListenerExecutor = {
   event: string
@@ -47,21 +51,31 @@ export class Registry {
     return result
   }
 
-  get slashArgumentConverters(): SlashArgumentConverter[] {
-    const result: SlashArgumentConverter[] = []
+  get applicationCommandArgumentConverters(): ApplicationCommandArgumentConverter[] {
+    const result: ApplicationCommandArgumentConverter[] = []
 
     for (const [, module] of this.modules) {
-      result.push(...module.slashArgumentConverters)
+      result.push(...module.applicationCommandArgumentConverters)
     }
 
     return result
   }
 
-  get slashCommands(): SlashCommand[] {
-    const result: SlashCommand[] = []
+  get applicationCommands(): AppCommand[] {
+    const result: AppCommand[] = []
 
     for (const [, module] of this.modules) {
-      result.push(...module.slashCommands)
+      result.push(...module.applicationCommands)
+    }
+
+    return result
+  }
+
+  get messageComponentHandlers(): MessageComponentHandler[] {
+    const result: MessageComponentHandler[] = []
+
+    for (const [, module] of this.modules) {
+      result.push(...module.messageComponentHandlers)
     }
 
     return result
@@ -128,34 +142,51 @@ export class Registry {
 
   async syncCommands() {
     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
+    const syncForGuild = async (g: Guild, commands: AppCommand[]) => {
+      this.logger.debug(`Syncing for guild ${g.name}(${g.id})`)
+      const commandsToRegister = [
+        ...commands.map((x) => x.command),
+        ...this.applicationCommands.filter((y) => y.guild === g.id || y.guild?.includes(g.id) || false).map((x) => x.command),
+      ]
+      this.logger.debug(`Command List: ${commandsToRegister.map((x) => x.name).join(', ')}`)
+      await g.commands.set(commandsToRegister)
+    }
     if (guild) {
-      const syncForGuild = async (g: Guild) => {
-        this.logger.debug(`Syncing for guild ${g.name}(${g.id})`)
-        const commandsToRegister = [
-          ...commands.map((x) => x.commandBuilder),
-          ...this.slashCommands.filter((y) => y.guild === g.id || y.guild?.includes(g.id) || false).map((x) => x.commandBuilder),
-        ]
-        this.logger.debug(`Command List: ${commandsToRegister.map((x) => x.name).join(', ')}`)
-        await this.client.rest.put(Routes.applicationGuildCommands(this.client.client.application!.id, g.id) as any, {
-          body: commandsToRegister.map((x) => x.toJSON()),
-        })
-      }
-
       if (typeof guild === 'string') {
-        await syncForGuild(await this.client.client.guilds.fetch(guild))
+        await syncForGuild(await this.client.client.guilds.fetch(guild), commands)
       } else {
         for (const g of guild) {
-          await syncForGuild(await this.client.client.guilds.fetch(g))
+          await syncForGuild(await this.client.client.guilds.fetch(g), commands)
         }
       }
     } else {
       this.logger.debug('Syncing global...')
-      await this.client.rest.put(Routes.applicationCommands(this.client.client.application!.id) as any, {
-        body: commands.map((x) => x.commandBuilder.toJSON()),
-      })
+      await this.client.client.application?.commands.set(commands.map((x) => x.command))
+    }
+    const commandsWithGuild = this.applicationCommands.filter((x) => x.guild)
+
+    const guilds = new Set<string>()
+
+    for (const command of commandsWithGuild) {
+      if (!command.guild) continue
+      if (typeof command.guild === 'string') {
+        guilds.add(command.guild)
+      } else {
+        for (const guild of command.guild) {
+          guilds.add(guild)
+        }
+      }
     }
+
+    for (const guild of guilds) {
+      await syncForGuild(
+        await this.client.client.guilds.fetch(guild),
+        commandsWithGuild.filter((x) => x.guild && (typeof x.guild === 'string' ? guild === x.guild : x.guild.includes(guild))),
+      )
+    }
+
     this.logger.debug('Syncing ended.')
   }
 

package/src/structures/index.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 export * from './Module'
 export * from './CommandClient'
 export * from './Registry'

package/src/typings.ts

@@ -1,6 +1,10 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import type { Command } from './command'
 import { CommandClient } from './structures'
-import { SlashCommand } from './slashCommand'
+import { AppCommand } from './applicationCommand'
 
 declare module 'discord.js' {
   interface Message {
@@ -12,7 +16,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/src/utils.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { Module } from './structures'
 import { InvalidTargetError } from './error'
 

package/test/index.ts

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
 import { Client, Intents, IntentsString } from 'discord.js'
 import { CommandClient } from '../src'
 
@@ -8,12 +12,12 @@ const client = new Client({
 })
 
 const cts = new CommandClient({
-  owners: [],
+  owners: 'auto',
   client,
   command: {
     prefix: '!',
   },
-  slashCommands: {
+  applicationCommands: {
     autoSync: true,
     guild: '832938554438844438',
   },

package/test/modules/dev.ts

@@ -1,6 +1,9 @@
-import { BuiltInModule, CommandClient, ownerOnly, slashCommand, listener, SlashCommandCheckFailed } from '../../src'
+/*
+ * Copyright (c) 2022 pikokr. Licensed under the MIT license
+ */
+
+import { BuiltInModule, CommandClient, ownerOnly, applicationCommand, listener, ApplicationCommandCheckFailed } from '../../src'
 import { CommandInteraction } from 'discord.js'
-import { SlashCommandBuilder } from '@discordjs/builders'
 
 export class Dev extends BuiltInModule {
   constructor(private cts: CommandClient) {
@@ -9,7 +12,7 @@ export class Dev extends BuiltInModule {
 
   @listener('slashCommandError')
   slashError(e: Error, i: CommandInteraction) {
-    if (e instanceof SlashCommandCheckFailed) {
+    if (e instanceof ApplicationCommandCheckFailed) {
       return i.reply({
         content: 'Command before-run check failed',
         ephemeral: true,
@@ -18,8 +21,13 @@ export class Dev extends BuiltInModule {
     console.error(e.message)
   }
 
-  @slashCommand({
-    command: new SlashCommandBuilder().setName('reload').setDescription('리로드 커맨드'),
+  // new SlashCommandBuilder().setName('reload').setDescription('리로드 커맨드')
+  @applicationCommand({
+    command: {
+      name: 'reload',
+      type: 'CHAT_INPUT',
+      description: '리로드 커맨드',
+    },
   })
   @ownerOnly
   async reload(i: CommandInteraction) {