@pikokr/command.ts 3.0.6-dev.d6740cf → 3.0.8-dev.00f7d77

package/dist/builtinModules/BuiltinCommandConverters.d.ts

@@ -1,5 +1,5 @@
 import { BuiltInModule } from './BuiltInModule';
-import { Client, GuildMember, Message, User } from 'discord.js';
+import { Client, GuildMember, Message, User, Role } from 'discord.js';
 import { CommandClient } from '../structures';
 export declare class BuiltinCommandConverters extends BuiltInModule {
     private cts;
@@ -11,4 +11,6 @@ export declare class BuiltinCommandConverters extends BuiltInModule {
     user(msg: Message, value: string): User | null;
     member(msg: Message, value: string): GuildMember | undefined;
     number(msg: Message, value: string): number | undefined;
+    getRoleIDByMention(mention: string): `${bigint}` | undefined;
+    role(msg: Message, value: string): Role | undefined;
 }

package/dist/builtinModules/BuiltinCommandConverters.js

@@ -55,6 +55,25 @@ class BuiltinCommandConverters extends BuiltInModule_1.BuiltInModule {
         const n = Number(value);
         return isNaN(n) ? undefined : n;
     }
+    getRoleIDByMention(mention) {
+        if (!mention)
+            return;
+        if (mention.startsWith('<@') && mention.endsWith('>')) {
+            mention = mention.slice(2, -1);
+            if (mention.startsWith('&')) {
+                mention = mention.slice(1);
+            }
+            return mention;
+        }
+    }
+    role(msg, value) {
+        var _a;
+        const id = this.getRoleIDByMention(value);
+        if (!id)
+            return;
+        const role = (_a = msg.guild) === null || _a === void 0 ? void 0 : _a.roles.cache.get(id);
+        return role || undefined;
+    }
 }
 __decorate([
     command_1.argumentConverter(discord_js_1.Message, false),
@@ -86,4 +105,10 @@ __decorate([
     __metadata("design:paramtypes", [discord_js_1.Message, String]),
     __metadata("design:returntype", void 0)
 ], BuiltinCommandConverters.prototype, "number", null);
+__decorate([
+    command_1.argumentConverter(discord_js_1.Role),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [discord_js_1.Message, String]),
+    __metadata("design:returntype", Object)
+], BuiltinCommandConverters.prototype, "role", null);
 exports.BuiltinCommandConverters = BuiltinCommandConverters;

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

@@ -126,9 +126,13 @@ class Registry {
             if (guild) {
                 const syncForGuild = (g) => __awaiter(this, void 0, void 0, function* () {
                     console.log(`Syncing for guild ${g.name}(${g.id})`);
-                    console.log(`Command List: ${commands.map((x) => x.commandBuilder.name)}`);
+                    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') {

package/package.json

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

package/src/builtinModules/BuiltinCommandConverters.ts

@@ -1,6 +1,6 @@
 import { BuiltInModule } from './BuiltInModule'
 import { argumentConverter } from '../command'
-import { Client, GuildMember, Message, User } from 'discord.js'
+import { Client, GuildMember, Message, User, Role } from 'discord.js'
 import { CommandClient } from '../structures'
 
 export class BuiltinCommandConverters extends BuiltInModule {
@@ -53,4 +53,24 @@ export class BuiltinCommandConverters extends BuiltInModule {
     const n = Number(value)
     return isNaN(n) ? undefined : n
   }
+
+  getRoleIDByMention(mention: string): `${bigint}` | undefined {
+    if (!mention) return
+    if (mention.startsWith('<@') && mention.endsWith('>')) {
+        mention = mention.slice(2, -1)
+        if (mention.startsWith('&')) {
+            mention = mention.slice(1)
+        }
+        return mention as `${bigint}`
+    }
+  }
+
+  @argumentConverter(Role)
+  role(msg: Message, value: string): Role | undefined{
+      const id = this.getRoleIDByMention(value)
+      if (!id) return
+      const role = msg.guild?.roles.cache.get(id)
+      return role || undefined
+  }
+
 }

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

@@ -124,9 +124,13 @@ export class Registry {
     if (guild) {
       const syncForGuild = async (g: Guild) => {
         console.log(`Syncing for guild ${g.name}(${g.id})`)
-        console.log(`Command List: ${commands.map((x) => x.commandBuilder.name)}`)
+        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()),
         })
       }