@pikokr/command.ts 3.0.6 → 3.0.8-dev.3955b1f

package/.all-contributorsrc

@@ -0,0 +1,33 @@
+{
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "contributorsPerLine": 7,
+  "contributorsSortAlphabetically": false,
+  "badgeTemplate": "[![All Contributors](https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg?style=flat-square)](#contributors)",
+  "contributorTemplate": "<a href=\"<%= contributor.profile %>\"><img src=\"<%= contributor.avatar_url %>\" width=\"<%= options.imageSize %>px;\" alt=\"\"/><br /><sub><b><%= contributor.name %></b></sub></a>",
+  "types": {
+    "custom": {
+      "symbol": "🔭",
+      "description": "A custom contribution type.",
+      "link": "[<%= symbol %>](<%= url %> \"<%= description %>\"),"
+    }
+  },
+  "skipCi": true,
+  "contributors": [
+    {
+      "login": "pikokr",
+      "name": "파링",
+      "avatar_url": "https://avatars.githubusercontent.com/u/68010770?v=4",
+      "profile": "https://pikokr.dev",
+      "contributions": [
+        "code"
+      ]
+    }
+  ],
+  "projectName": "command.ts",
+  "projectOwner": "pikokr",
+  "repoType": "github",
+  "repoHost": "https://github.com"
+}

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 파링
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,7 +1,9 @@
 # Command.TS
 
-Command framework for discord.js
+[![.github/workflows/publish.yml](https://github.com/pikokr/command.ts/actions/workflows/publish.yml/badge.svg)](https://github.com/pikokr/command.ts/actions/workflows/publish.yml)
+
+![cts](https://user-images.githubusercontent.com/68010770/145200458-b14c5e4e-6927-4516-8d48-c68a384d2a20.png)
 
-[Discord](https://discord.gg/EEhcPzsGHV) [가이드](https://pikokr.notion.site/a60262db37724fd38e4b7fc83be7e52d)
+Command framework for discord.js
 
-[V2 문서](https://command-ts-docs-ezojnktwv-pikokr.vercel.app/)
+[Discord](https://discord.gg/EEhcPzsGHV) / [문서](https://v3.cts.pikokr.dev) / [V2 문서](https://command-ts-docs-ezojnktwv-pikokr.vercel.app/)

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

@@ -37,24 +37,55 @@ class BuiltinCommandConverters extends BuiltInModule_1.BuiltInModule {
         }
     }
     user(msg, value) {
+        let user = this.client.users.cache.get(value);
+        if (user)
+            return user;
+        user = this.client.users.cache.find(x => x.tag === value);
+        if (user)
+            return user;
         const id = this.getUserIDByMention(value);
         if (!id)
             return null;
-        const user = this.client.users.cache.get(id);
+        user = this.client.users.cache.get(id);
         return user || null;
     }
     member(msg, value) {
-        var _a;
+        var _a, _b, _c;
+        let user = (_a = msg.guild) === null || _a === void 0 ? void 0 : _a.members.cache.get(value);
+        if (!user)
+            return user;
+        user = (_b = msg.guild) === null || _b === void 0 ? void 0 : _b.members.cache.find(x => x.user.tag === value);
+        if (user)
+            return user;
         const id = this.getUserIDByMention(value);
         if (!id)
             return;
-        const user = (_a = msg.guild) === null || _a === void 0 ? void 0 : _a.members.cache.get(id);
+        user = (_c = msg.guild) === null || _c === void 0 ? void 0 : _c.members.cache.get(id);
         return user || undefined;
     }
     number(msg, value) {
         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 +117,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/builtinModules/CommandHandler.js

@@ -32,6 +32,9 @@ class CommandHandler extends BuiltInModule_1.BuiltInModule {
     }
     message(msg) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!(yield this.client.options.command.check(msg))) {
+                return;
+            }
             const error = (error) => this.client.client.emit('commandError', error, msg);
             try {
                 const prefixList = typeof this.client.options.command.prefix === 'string'

package/dist/command/decorator.js

@@ -75,9 +75,33 @@ const rest = (target, propertyKey, parameterIndex) => {
     Reflect.defineMetadata(constants_1.KRest, parameterIndex, target, propertyKey);
 };
 exports.rest = rest;
-exports.ownerOnly = utils_2.createCheckDecorator((msg) => msg.data.cts.owners.includes(msg.author.id), (i) => i.data.cts.owners.includes(i.user.id));
-exports.guildOnly = utils_2.createCheckDecorator((msg) => !!msg.guild, (i) => !!i.guildId);
-exports.dmOnly = utils_2.createCheckDecorator((msg) => !msg.guild, (i) => !i.guildId);
+exports.ownerOnly = utils_2.createCheckDecorator((msg) => {
+    if (msg.data.cts.owners.includes(msg.author.id))
+        return true;
+    throw new error_1.OwnerOnlyCommandError();
+}, (i) => {
+    if (i.data.cts.owners.includes(i.user.id))
+        return true;
+    throw new error_1.OwnerOnlyCommandError();
+});
+exports.guildOnly = utils_2.createCheckDecorator((msg) => {
+    if (!!msg.guild)
+        return true;
+    throw new error_1.GuildOnlyCommandError();
+}, (i) => {
+    if (!!i.guildId)
+        return true;
+    throw new error_1.GuildOnlyCommandError();
+});
+exports.dmOnly = utils_2.createCheckDecorator((msg) => {
+    if (!msg.guild)
+        return true;
+    throw new error_1.DMOnlyCommandError();
+}, (i) => {
+    if (!i.guildId)
+        return true;
+    throw new error_1.DMOnlyCommandError();
+});
 const requireUserPermissions = (permission) => utils_2.createCheckDecorator((msg) => {
     if (!msg.guild || !msg.member)
         throw new Error('This command must be used in guild.');

package/dist/error/ModuleError.d.ts

@@ -1,5 +1,6 @@
 export declare class ModuleLoadError extends Error {
-    constructor(file: string);
+    error: Error;
+    constructor(file: string, error: Error);
 }
 export declare class InvalidModuleError extends Error {
 }

package/dist/error/ModuleError.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvalidModuleError = exports.ModuleLoadError = void 0;
 class ModuleLoadError extends Error {
-    constructor(file) {
+    constructor(file, error) {
         super('Failed to load module ' + file);
+        this.error = error;
     }
 }
 exports.ModuleLoadError = ModuleLoadError;

package/dist/error/checks/DMOnlyCommand.d.ts

@@ -0,0 +1,3 @@
+export declare class DMOnlyCommandError extends Error {
+    constructor();
+}

package/dist/error/checks/DMOnlyCommand.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DMOnlyCommandError = void 0;
+class DMOnlyCommandError extends Error {
+    constructor() {
+        super();
+    }
+}
+exports.DMOnlyCommandError = DMOnlyCommandError;

package/dist/error/checks/GuildOnlyCommand.d.ts

@@ -0,0 +1,3 @@
+export declare class GuildOnlyCommandError extends Error {
+    constructor();
+}

package/dist/error/checks/GuildOnlyCommand.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GuildOnlyCommandError = void 0;
+class GuildOnlyCommandError extends Error {
+    constructor() {
+        super();
+    }
+}
+exports.GuildOnlyCommandError = GuildOnlyCommandError;

package/dist/error/checks/OwnerOnlyCommand.d.ts

@@ -0,0 +1,3 @@
+export declare class OwnerOnlyCommandError extends Error {
+    constructor();
+}

package/dist/error/checks/OwnerOnlyCommand.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OwnerOnlyCommandError = void 0;
+class OwnerOnlyCommandError extends Error {
+    constructor() {
+        super();
+    }
+}
+exports.OwnerOnlyCommandError = OwnerOnlyCommandError;

package/dist/error/checks/index.d.ts

@@ -0,0 +1,3 @@
+export * from './OwnerOnlyCommand';
+export * from './GuildOnlyCommand';
+export * from './DMOnlyCommand';

package/dist/error/checks/index.js

@@ -0,0 +1,15 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./OwnerOnlyCommand"), exports);
+__exportStar(require("./GuildOnlyCommand"), exports);
+__exportStar(require("./DMOnlyCommand"), exports);

package/dist/error/index.d.ts

@@ -4,3 +4,4 @@ export * from './ArgumentNotProvided';
 export * from './ArgumentConverterNotFound';
 export * from './CommandCheckFailed';
 export * from './PermissionRequired';
+export * from './checks';

package/dist/error/index.js

@@ -16,3 +16,4 @@ __exportStar(require("./ArgumentNotProvided"), exports);
 __exportStar(require("./ArgumentConverterNotFound"), exports);
 __exportStar(require("./CommandCheckFailed"), exports);
 __exportStar(require("./PermissionRequired"), exports);
+__exportStar(require("./checks"), exports);

package/dist/structures/CommandClient.d.ts

@@ -1,9 +1,10 @@
 import { Registry } from './Registry';
-import { Client, Snowflake } from 'discord.js';
+import { Client, Message, Snowflake } from 'discord.js';
 import { CoolDownAdapter } from '../command';
 import { REST } from '@discordjs/rest';
 export interface CommandOptions {
     prefix: string | ((msg: any) => string | Promise<string | string[]> | string[]) | string[];
+    check: (msg: Message) => boolean | Promise<boolean>;
 }
 export interface SlashCommandOptions {
     guild?: Snowflake | Snowflake[];

package/dist/structures/CommandClient.js

@@ -44,6 +44,7 @@ class CommandClient {
         this.options = lodash_1.default.merge({
             command: {
                 prefix: '!',
+                check: () => true
             },
             owners: 'auto',
             slashCommands: {

package/dist/structures/Registry.js

@@ -102,7 +102,7 @@ class Registry {
                 m = require(p);
             }
             catch (e) {
-                throw new error_1.ModuleLoadError(p);
+                throw new error_1.ModuleLoadError(p, e);
             }
             if (m.loaded)
                 throw new Error('MODULE_ALREADY_LOADED');
@@ -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",
+  "version": "3.0.8-dev.3955b1f",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",
@@ -31,4 +31,4 @@
     "docs:dev": "typedoc",
     "docs:build": "typedoc"
   }
-}
+}

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 {
@@ -34,17 +34,25 @@ export class BuiltinCommandConverters extends BuiltInModule {
 
   @argumentConverter(User)
   user(msg: Message, value: string): User | null {
+    let user = this.client.users.cache.get(value)
+    if (user) return user
+    user = this.client.users.cache.find(x=>x.tag === value)
+    if (user) return user
     const id = this.getUserIDByMention(value)
     if (!id) return null
-    const user = this.client.users.cache.get(id)
+    user = this.client.users.cache.get(id)
     return user || null
   }
 
   @argumentConverter(GuildMember)
   member(msg: Message, value: string): GuildMember | undefined {
+    let user = msg.guild?.members.cache.get(value)
+    if (!user) return user
+    user = msg.guild?.members.cache.find(x=>x.user.tag===value)
+    if (user) return user
     const id = this.getUserIDByMention(value)
     if (!id) return
-    const user = msg.guild?.members.cache.get(id)
+    user = msg.guild?.members.cache.get(id)
     return user || undefined
   }
 
@@ -53,4 +61,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/builtinModules/CommandHandler.ts

@@ -17,6 +17,10 @@ export class CommandHandler extends BuiltInModule {
 
   @listener('messageCreate')
   async message(msg: Message) {
+    if (!await this.client.options.command.check(msg)) {
+      return
+    }
+
     const error = (error: Error) => this.client.client.emit('commandError', error, msg)
 
     try {

package/src/command/decorator.ts

@@ -5,7 +5,7 @@ import { ArgumentConverter, SlashArgumentConverter } from './ArgumentConverter'
 import { Module } from '../structures'
 import { createCheckDecorator } from './utils'
 import { GuildMember, Message, PermissionResolvable, Permissions, TextChannel } from 'discord.js'
-import { ClientPermissionRequired, UserPermissionRequired } from '../error'
+import { ClientPermissionRequired, DMOnlyCommandError, GuildOnlyCommandError, OwnerOnlyCommandError, UserPermissionRequired } from '../error'
 
 type CommandOptions = {
   name: string
@@ -111,18 +111,36 @@ export const rest: ParameterDecorator = (target, propertyKey, parameterIndex) =>
 }
 
 export const ownerOnly = createCheckDecorator(
-  (msg) => msg.data.cts.owners.includes(msg.author.id),
-  (i) => i.data.cts.owners.includes(i.user.id),
+  (msg) => {
+    if (msg.data.cts.owners.includes(msg.author.id)) return true
+    throw new OwnerOnlyCommandError()
+  },
+  (i) => {
+    if (i.data.cts.owners.includes(i.user.id)) return true
+    throw new OwnerOnlyCommandError()
+  },
 )
 
 export const guildOnly = createCheckDecorator(
-  (msg) => !!msg.guild,
-  (i) => !!i.guildId,
+  (msg) => {
+    if (!!msg.guild) return true
+    throw new GuildOnlyCommandError()
+  },
+  (i) => {
+    if (!!i.guildId) return true
+    throw new GuildOnlyCommandError()
+  },
 )
 
 export const dmOnly = createCheckDecorator(
-  (msg) => !msg.guild,
-  (i) => !i.guildId,
+  (msg) => {
+    if (!msg.guild) return true
+    throw new DMOnlyCommandError()
+  },
+  (i) => {
+    if (!i.guildId) return true
+    throw new DMOnlyCommandError()
+  },
 )
 
 export const requireUserPermissions = (permission: PermissionResolvable) =>

package/src/error/ModuleError.ts

@@ -1,5 +1,5 @@
 export class ModuleLoadError extends Error {
-  constructor(file: string) {
+  constructor(file: string, public error: Error) {
     super('Failed to load module ' + file)
   }
 }

package/src/error/checks/DMOnlyCommand.ts

@@ -0,0 +1,5 @@
+export class DMOnlyCommandError extends Error {
+  constructor() {
+    super()
+  }
+}

package/src/error/checks/GuildOnlyCommand.ts

@@ -0,0 +1,5 @@
+export class GuildOnlyCommandError extends Error {
+  constructor() {
+    super()
+  }
+}

package/src/error/checks/OwnerOnlyCommand.ts

@@ -0,0 +1,5 @@
+export class OwnerOnlyCommandError extends Error {
+  constructor() {
+    super()
+  }
+}

package/src/error/checks/index.ts

@@ -0,0 +1,3 @@
+export * from './OwnerOnlyCommand'
+export * from './GuildOnlyCommand'
+export * from './DMOnlyCommand'

package/src/error/index.ts

@@ -4,3 +4,4 @@ export * from './ArgumentNotProvided'
 export * from './ArgumentConverterNotFound'
 export * from './CommandCheckFailed'
 export * from './PermissionRequired'
+export * from './checks'

package/src/structures/CommandClient.ts

@@ -1,12 +1,13 @@
 import _ from 'lodash'
 import { Registry } from './Registry'
-import { Client, Snowflake, User } from 'discord.js'
+import {Client, Message, Snowflake, User} from 'discord.js'
 import { BuiltinCommandConverters, BuiltinSlashCommandConverters, CommandHandler } from '../builtinModules'
 import { CoolDownAdapter, DefaultCoolDownAdapter } from '../command'
 import { REST } from '@discordjs/rest'
 
 export interface CommandOptions {
   prefix: string | ((msg: any) => string | Promise<string | string[]> | string[]) | string[]
+  check: (msg: Message) => boolean|Promise<boolean>
 }
 
 export interface SlashCommandOptions {
@@ -64,6 +65,7 @@ export class CommandClient {
       {
         command: {
           prefix: '!',
+          check: () => true
         },
         owners: 'auto',
         slashCommands: {

package/src/structures/Registry.ts

@@ -95,7 +95,7 @@ export class Registry {
     try {
       m = require(p)
     } catch (e: any) {
-      throw new ModuleLoadError(p)
+      throw new ModuleLoadError(p, e)
     }
 
     if (m.loaded) throw new Error('MODULE_ALREADY_LOADED')
@@ -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) {