@pikokr/command.ts 3.0.6-dev.92a9148 → 3.0.6-dev.be7b9e0

package/dist/builtinModules/BuiltinSlashCommandConverters.d.ts

@@ -1,9 +1,10 @@
 import { BuiltInModule } from './BuiltInModule';
-import { Client, CommandInteraction } from 'discord.js';
+import { Client, CommandInteraction, CommandInteractionOptionResolver } from 'discord.js';
 import { CommandClient } from '../structures';
 export declare class BuiltinSlashCommandConverters extends BuiltInModule {
     private cts;
     client: Client;
     constructor(cts: CommandClient);
     message(interaction: CommandInteraction): CommandInteraction;
+    optionResolver(interaction: CommandInteraction): CommandInteractionOptionResolver;
 }

package/dist/builtinModules/BuiltinSlashCommandConverters.js

@@ -22,6 +22,9 @@ class BuiltinSlashCommandConverters extends BuiltInModule_1.BuiltInModule {
     message(interaction) {
         return interaction;
     }
+    optionResolver(interaction) {
+        return interaction.options;
+    }
 }
 __decorate([
     command_1.slashArgumentConverter(discord_js_1.CommandInteraction),
@@ -29,4 +32,10 @@ __decorate([
     __metadata("design:paramtypes", [discord_js_1.CommandInteraction]),
     __metadata("design:returntype", void 0)
 ], BuiltinSlashCommandConverters.prototype, "message", null);
+__decorate([
+    command_1.slashArgumentConverter(discord_js_1.CommandInteractionOptionResolver),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [discord_js_1.CommandInteraction]),
+    __metadata("design:returntype", discord_js_1.CommandInteractionOptionResolver)
+], BuiltinSlashCommandConverters.prototype, "optionResolver", null);
 exports.BuiltinSlashCommandConverters = BuiltinSlashCommandConverters;

package/dist/structures/Registry.js

@@ -120,12 +120,19 @@ class Registry {
     }
     syncCommands() {
         return __awaiter(this, void 0, void 0, function* () {
+            console.log(`[Command.TS] Syncing commands...`);
             const commands = this.slashCommands.filter((x) => !x.guild);
             const guild = this.client.options.slashCommands.guild;
             if (guild) {
                 const syncForGuild = (g) => __awaiter(this, void 0, void 0, function* () {
+                    console.log(`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),
+                    ];
+                    console.log(`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: commands.map((x) => x.commandBuilder.toJSON()),
+                        body: commandsToRegister.map((x) => x.toJSON()),
                     });
                 });
                 if (typeof guild === 'string') {
@@ -138,10 +145,12 @@ class Registry {
                 }
             }
             else {
+                console.log('Syncing global...');
                 yield this.client.rest.put(v9_1.Routes.applicationCommands(this.client.client.application.id), {
                     body: commands.map((x) => x.commandBuilder.toJSON()),
                 });
             }
+            console.log('Syncing ended.');
         });
     }
     unregisterModule(module) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pikokr/command.ts",
   "description": "Discord.js command framework for typescript.",
-  "version": "3.0.6-dev.92a9148",
+  "version": "3.0.6-dev.be7b9e0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",

package/src/builtinModules/BuiltinSlashCommandConverters.ts

@@ -1,6 +1,6 @@
 import { BuiltInModule } from './BuiltInModule'
 import { slashArgumentConverter } from '../command'
-import { Client, CommandInteraction } from 'discord.js'
+import { Client, CommandInteraction, CommandInteractionOptionResolver } from 'discord.js'
 import { CommandClient } from '../structures'
 
 export class BuiltinSlashCommandConverters extends BuiltInModule {
@@ -15,4 +15,9 @@ export class BuiltinSlashCommandConverters extends BuiltInModule {
   message(interaction: CommandInteraction) {
     return interaction
   }
+
+  @slashArgumentConverter(CommandInteractionOptionResolver)
+  optionResolver(interaction: CommandInteraction): CommandInteractionOptionResolver {
+    return interaction.options
+  }
 }

package/src/structures/Registry.ts

@@ -118,12 +118,19 @@ export class Registry {
   }
 
   async syncCommands() {
+    console.log(`[Command.TS] Syncing commands...`)
     const commands = this.slashCommands.filter((x) => !x.guild)
     const guild = this.client.options.slashCommands.guild
     if (guild) {
       const syncForGuild = async (g: Guild) => {
+        console.log(`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),
+        ]
+        console.log(`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: commands.map((x) => x.commandBuilder.toJSON()),
+          body: commandsToRegister.map((x) => x.toJSON()),
         })
       }
 
@@ -135,10 +142,12 @@ export class Registry {
         }
       }
     } else {
+      console.log('Syncing global...')
       await this.client.rest.put(Routes.applicationCommands(this.client.client.application!.id) as any, {
         body: commands.map((x) => x.commandBuilder.toJSON()),
       })
     }
+    console.log('Syncing ended.')
   }
 
   async unregisterModule(module: Module) {