@pikokr/command.ts 3.2.3 → 3.2.4-dev.535de3c

package/test/modules/dev.ts

@@ -1,6 +1,5 @@
-import { BuiltInModule, CommandClient, ownerOnly, slashCommand, listener, SlashCommandCheckFailed } from '../../src'
+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 +8,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 +17,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) {

package/test/modules/test.ts

@@ -1,12 +1,23 @@
-import { command, CommandClient, coolDown, CoolDownError, CoolDownType, listener, Module, option, rest, slashCommand } from '../../src'
-import { CommandInteraction, Message } from 'discord.js'
-import { SlashCommandBuilder } from '@discordjs/builders'
+import { command, CommandClient, coolDown, CoolDownError, CoolDownType, listener, messageButton, messageSelectMenu, Module, option, rest, applicationCommand } from '../../src'
+import {
+  ButtonInteraction,
+  CommandInteraction,
+  ContextMenuInteraction,
+  Message,
+  MessageActionRow,
+  MessageButton,
+  MessageContextMenuInteraction,
+  MessageSelectMenu,
+  SelectMenuInteraction,
+  UserContextMenuInteraction,
+} from 'discord.js'
 
 class Test extends Module {
   constructor(private client: CommandClient) {
     super()
   }
 
+  // region lifetime method
   load() {
     console.log('load')
   }
@@ -22,6 +33,7 @@ class Test extends Module {
   afterReload() {
     console.log('after reload')
   }
+  // endregion
 
   @listener('ready')
   ready() {
@@ -35,8 +47,8 @@ class Test extends Module {
     }
     console.error(err)
   }
-  @listener('slashCommandError')
-  slashCommandError(err: Error, msg: CommandInteraction) {
+  @listener('applicationCommandError')
+  slashCommandError(err: Error, msg: CommandInteraction | ContextMenuInteraction) {
     if (err instanceof CoolDownError) {
       return msg.reply({
         content: `쿨다운: <t:${(err.endsAt.getTime() / 1000).toFixed(0)}:R>`,
@@ -46,22 +58,83 @@ class Test extends Module {
     console.error(err)
   }
 
-  @command()
+  @applicationCommand({
+    command: {
+      type: 'CHAT_INPUT',
+      name: 'test',
+      description: 'test',
+      options: [
+        {
+          type: 'STRING',
+          name: 'asdf',
+          description: 'test',
+        },
+      ],
+    },
+  })
   @coolDown(CoolDownType.USER, 10)
-  test(msg: Message, @rest asdf: string = 'wa sans') {
-    msg.reply(asdf)
+  coolDownSlash(i: CommandInteraction, @option('asdf') asdf: string = 'wa sans') {
+    i.reply({
+      content: asdf,
+      components: [
+        new MessageActionRow().addComponents(new MessageButton().setLabel('test').setCustomId('testButton').setStyle('PRIMARY')),
+        new MessageActionRow().addComponents(
+          new MessageSelectMenu()
+            .setCustomId('testSelectMenu')
+            .setPlaceholder('test')
+            .setMinValues(1)
+            .setOptions(
+              new Array(10).fill(1).map((_, i) => ({
+                label: `${i}`,
+                value: `${i}`,
+              })),
+            ),
+        ),
+      ],
+    })
+  }
+
+  @applicationCommand({
+    command: {
+      type: 'MESSAGE',
+      name: 'contextMenuTest',
+      defaultPermission: true,
+    },
+  })
+  @coolDown(CoolDownType.USER, 10)
+  async contextMenuMessage(i: MessageContextMenuInteraction) {
+    return i.reply({
+      content: `message id: ${i.targetMessage.id}`,
+    })
   }
 
-  @slashCommand({
-    command: new SlashCommandBuilder()
-      .setName('test')
-      .setDescription('test command')
-      .addStringOption((builder) => builder.setName('test').setDescription('test option').setRequired(false)),
+  @applicationCommand({
+    command: {
+      type: 'USER',
+      name: 'contextMenuTest',
+      defaultPermission: true,
+    },
   })
   @coolDown(CoolDownType.USER, 10)
-  async testSlash(i: CommandInteraction, @option('test') test: string = 'wa sans') {
+  async contextMenuUser(i: UserContextMenuInteraction) {
     return i.reply({
-      content: test,
+      content: `user id: ${i.targetUser.id}`,
+    })
+  }
+
+  @messageButton('testButton')
+  async testButton(i: ButtonInteraction) {
+    await i.update({
+      content: 'test',
+      components: [],
+    })
+  }
+
+  @messageSelectMenu('testSelectMenu')
+  async testSelectMenu(i: SelectMenuInteraction) {
+    await i.update({
+      content: i.values.join(', '),
+      components: [],
     })
   }
 }

package/dist/slashCommand/SlashCommand.d.ts

@@ -1,19 +0,0 @@
-import { SlashCommandBuilder } from '@discordjs/builders';
-import { Module } from '../structures';
-import { Snowflake } from 'discord.js';
-import { SlashCheckFunction } from '../command';
-export declare type SlashArgument = {
-    type: any;
-    name?: string;
-};
-export declare class SlashCommand {
-    commandBuilder: SlashCommandBuilder | Omit<SlashCommandBuilder, 'addSubcommand' | 'addSubcommandGroup'>;
-    private run;
-    module: Module;
-    params: SlashArgument[];
-    guild: Snowflake | Snowflake[] | undefined;
-    private key;
-    get checks(): SlashCheckFunction[];
-    execute(module: Module, args: any[]): any;
-    constructor(commandBuilder: SlashCommandBuilder | Omit<SlashCommandBuilder, 'addSubcommand' | 'addSubcommandGroup'>, run: Function, module: Module, params: SlashArgument[], guild: Snowflake | Snowflake[] | undefined, key: string | symbol);
-}

package/dist/slashCommand/SlashCommand.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SlashCommand.js","sourceRoot":"","sources":["../../src/slashCommand/SlashCommand.ts"],"names":[],"mappings":";;;AAGA,4CAAkD;AAQlD,MAAa,YAAY;IASvB,YACS,cAAuG,EACtG,GAAa,EACd,MAAc,EACd,MAAuB,EACvB,KAA0C,EACzC,GAAoB;QALrB,mBAAc,GAAd,cAAc,CAAyF;QACtG,QAAG,GAAH,GAAG,CAAU;QACd,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAiB;QACvB,UAAK,GAAL,KAAK,CAAqC;QACzC,QAAG,GAAH,GAAG,CAAiB;IAC3B,CAAC;IAfJ,IAAI,MAAM;QACR,OAAO,OAAO,CAAC,WAAW,CAAC,+BAAmB,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAA;IAC9E,CAAC;IAED,OAAO,CAAC,MAAc,EAAE,IAAW;QACjC,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACrC,CAAC;CAUF;AAjBD,oCAiBC"}

package/dist/slashCommand/decorator.d.ts

@@ -1,10 +0,0 @@
-import { Snowflake } from 'discord.js';
-import { SlashCommandBuilder } from '@discordjs/builders';
-declare type SlashOptions = {
-    guild: Snowflake | Snowflake[];
-};
-export declare const slashCommand: (opt: Partial<SlashOptions> & {
-    command: SlashCommandBuilder | Omit<SlashCommandBuilder, 'addSubcommand' | 'addSubcommandGroup'>;
-}) => (target: Object, propertyKey: string) => void;
-export declare const option: (key: string) => ParameterDecorator;
-export {};

package/dist/slashCommand/decorator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"decorator.js","sourceRoot":"","sources":["../../src/slashCommand/decorator.ts"],"names":[],"mappings":";;;AAAA,2CAAkD;AAClD,oCAAsC;AACtC,4CAAmE;AAEnE,iDAA6C;AAOtC,MAAM,YAAY,GAAG,CAAC,GAAiI,EAAE,EAAE;IAChK,OAAO,CACL,MAAc,EACd,WAAmB,EAEnB,EAAE;QACF,mBAAW,CAAC,MAAM,CAAC,CAAA;QAEnB,IAAI,UAAU,GAAmB,OAAO,CAAC,WAAW,CAAC,0BAAc,EAAE,MAAM,CAAC,CAAA;QAE5E,MAAM,MAAM,GAAU,OAAO,CAAC,WAAW,CAAC,mBAAmB,EAAE,MAAM,EAAE,WAAW,CAAC,CAAA;QAEnF,MAAM,OAAO,GAA+B,OAAO,CAAC,WAAW,CAAC,gCAAoB,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,IAAI,uBAAU,EAAkB,CAAA;QAE9I,MAAM,OAAO,GAAG,IAAI,2BAAY,CAC9B,GAAG,CAAC,OAAO,EACX,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,EAChC,MAAgB,EAChB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACpB,IAAI,EAAE,CAAC;YACP,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;SACrB,CAAC,CAAC,EACH,GAAG,CAAC,KAAK,EACT,WAAW,CACZ,CAAA;QAED,IAAI,UAAU,EAAE;YACd,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SACzB;aAAM;YACL,UAAU,GAAG,CAAC,OAAO,CAAC,CAAA;YACtB,OAAO,CAAC,cAAc,CAAC,0BAAc,EAAE,UAAU,EAAE,MAAM,CAAC,CAAA;SAC3D;IACH,CAAC,CAAA;AACH,CAAC,CAAA;AAjCY,QAAA,YAAY,gBAiCxB;AAEM,MAAM,MAAM,GAAG,CAAC,GAAW,EAAsB,EAAE,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE;IACjG,mBAAW,CAAC,MAAM,CAAC,CAAA;IAEnB,IAAI,UAAU,GAA+B,OAAO,CAAC,WAAW,CAAC,gCAAoB,EAAE,MAAM,EAAE,WAAW,CAAC,CAAA;IAE3G,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,IAAI,uBAAU,EAAkB,CAAA;QAC7C,OAAO,CAAC,cAAc,CAAC,gCAAoB,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,CAAC,CAAA;KAC9E;IAED,UAAU,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,CAAC,CAAA;AACrC,CAAC,CAAA;AAXY,QAAA,MAAM,UAWlB"}

package/dist/slashCommand/index.d.ts

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

package/dist/slashCommand/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/slashCommand/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA2B;AAC3B,iDAA8B"}

package/src/slashCommand/SlashCommand.ts

@@ -1,29 +0,0 @@
-import { SlashCommandBuilder } from '@discordjs/builders'
-import { Module } from '../structures'
-import { Snowflake } from 'discord.js'
-import { KSlashCommandChecks } from '../constants'
-import { SlashCheckFunction } from '../command'
-
-export type SlashArgument = {
-  type: any
-  name?: string
-}
-
-export class SlashCommand {
-  get checks(): SlashCheckFunction[] {
-    return Reflect.getMetadata(KSlashCommandChecks, this.module, this.key) || []
-  }
-
-  execute(module: Module, args: any[]) {
-    return this.run.apply(module, args)
-  }
-
-  constructor(
-    public commandBuilder: SlashCommandBuilder | Omit<SlashCommandBuilder, 'addSubcommand' | 'addSubcommandGroup'>,
-    private run: Function,
-    public module: Module,
-    public params: SlashArgument[],
-    public guild: Snowflake | Snowflake[] | undefined,
-    private key: string | symbol,
-  ) {}
-}

package/src/slashCommand/index.ts

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