reciple 1.4.2 → 1.5.2

package/bin/index.d.ts

@@ -5,7 +5,7 @@ export * from './reciple/classes/Config';
 export * from './reciple/classes/builders/InteractionCommandBuilder';
 export * from './reciple/classes/builders/MessageCommandBuilder';
 export * from './reciple/classes/builders/MessageCommandOptionBuilder';
-export * from './reciple/commandPermissions';
+export * from './reciple/hasPermissions';
 export * from './reciple/flags';
 export * from './reciple/isIgnoredChannel';
 export * from './reciple/logger';

package/bin/index.js

@@ -25,7 +25,7 @@ __exportStar(require("./reciple/classes/Config"), exports);
 __exportStar(require("./reciple/classes/builders/InteractionCommandBuilder"), exports);
 __exportStar(require("./reciple/classes/builders/MessageCommandBuilder"), exports);
 __exportStar(require("./reciple/classes/builders/MessageCommandOptionBuilder"), exports);
-__exportStar(require("./reciple/commandPermissions"), exports);
+__exportStar(require("./reciple/hasPermissions"), exports);
 __exportStar(require("./reciple/flags"), exports);
 __exportStar(require("./reciple/isIgnoredChannel"), exports);
 __exportStar(require("./reciple/logger"), exports);

package/bin/reciple/classes/Client.d.ts

@@ -1,7 +1,7 @@
 import { InteractionCommandBuilder, RecipleInteractionCommandExecute } from './builders/InteractionCommandBuilder';
 import { interactionCommandBuilders } from '../registerInteractionCommands';
 import { MessageCommandBuilder, RecipleMessageCommandExecute } from './builders/MessageCommandBuilder';
-import { Logger as LoggerConstructor } from 'fallout-utility';
+import { Logger as ILogger } from 'fallout-utility';
 import { Config } from './Config';
 import { ApplicationCommandDataResolvable, Awaitable, Client, ClientEvents, ClientOptions, Interaction, Message } from 'discord.js';
 import { recipleCommandBuilders, RecipleScript } from '../modules';
@@ -33,11 +33,11 @@ export interface RecipleClient extends Client {
     removeAllListeners(event?: string | symbol): this;
 }
 export declare class RecipleClient extends Client {
-    config?: Config;
+    config: Config;
     commands: RecipleClientCommands;
     otherApplicationCommandData: (interactionCommandBuilders | ApplicationCommandDataResolvable)[];
     modules: RecipleScript[];
-    logger: LoggerConstructor;
+    logger: ILogger;
     version: string;
     constructor(options: RecipleClientOptions);
     startModules(): Promise<RecipleClient>;
@@ -45,7 +45,8 @@ export declare class RecipleClient extends Client {
     addModule(script: RecipleScript, registerCommands?: boolean): Promise<void>;
     addCommand(command: recipleCommandBuilders): RecipleClient;
     addCommandListeners(): RecipleClient;
-    messageCommandExecute(message: Message): Promise<RecipleClient>;
-    interactionCommandExecute(interaction: Interaction): Promise<RecipleClient>;
+    messageCommandExecute(message: Message): Promise<void>;
+    interactionCommandExecute(interaction: Interaction): Promise<void>;
+    getMessage<T = any>(messageKey: string, defaultMessage?: T): T;
     private _commandExecuteError;
 }

package/bin/reciple/classes/Client.js

@@ -18,8 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RecipleClient = void 0;
 const registerInteractionCommands_1 = require("../registerInteractionCommands");
 const fallout_utility_1 = require("fallout-utility");
-const commandPermissions_1 = require("../commandPermissions");
 const isIgnoredChannel_1 = require("../isIgnoredChannel");
+const hasPermissions_1 = require("../hasPermissions");
 const version_1 = require("../version");
 const logger_1 = require("../logger");
 const discord_js_1 = require("discord.js");
@@ -57,21 +57,20 @@ class RecipleClient extends discord_js_1.Client {
         });
     }
     loadModules() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             for (const module_ of this.modules) {
                 if (typeof (module_ === null || module_ === void 0 ? void 0 : module_.onLoad) === 'function')
                     yield Promise.resolve(module_.onLoad(this));
             }
             this.logger.info(`${this.modules.length} modules loaded.`);
-            if (!((_a = this.config) === null || _a === void 0 ? void 0 : _a.commands.interactionCommand.registerCommands))
+            if (!this.config.commands.interactionCommand.registerCommands)
                 return this;
             yield (0, registerInteractionCommands_1.registerInteractionCommands)(this, [...Object.values(this.commands.INTERACTION_COMMANDS), ...this.otherApplicationCommandData]);
             return this;
         });
     }
     addModule(script, registerCommands = true) {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             this.modules.push(script);
             if (typeof (script === null || script === void 0 ? void 0 : script.onLoad) === 'function')
@@ -82,7 +81,7 @@ class RecipleClient extends discord_js_1.Client {
                     continue;
                 this.addCommand(command);
             }
-            if (!registerCommands || !((_b = this.config) === null || _b === void 0 ? void 0 : _b.commands.interactionCommand.registerCommands))
+            if (!registerCommands || !this.config.commands.interactionCommand.registerCommands)
                 return;
             yield (0, registerInteractionCommands_1.registerInteractionCommands)(this, [...Object.values(this.commands.INTERACTION_COMMANDS), ...this.otherApplicationCommandData]);
         });
@@ -101,33 +100,43 @@ class RecipleClient extends discord_js_1.Client {
         return this;
     }
     addCommandListeners() {
-        var _a, _b;
-        if ((_a = this.config) === null || _a === void 0 ? void 0 : _a.commands.messageCommand.enabled)
+        if (this.config.commands.messageCommand.enabled)
             this.on('messageCreate', (message) => { this.messageCommandExecute(message); });
-        if ((_b = this.config) === null || _b === void 0 ? void 0 : _b.commands.interactionCommand.enabled)
+        if (this.config.commands.interactionCommand.enabled)
             this.on('interactionCreate', (interaction) => { this.interactionCommandExecute(interaction); });
         return this;
     }
     messageCommandExecute(message) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!message.content || !((_a = this.config) === null || _a === void 0 ? void 0 : _a.commands.messageCommand.enabled))
-                return this;
-            const parseCommand = (0, fallout_utility_1.getCommand)(message.content, ((_b = this.config) === null || _b === void 0 ? void 0 : _b.prefix) || '!', ((_c = this.config) === null || _c === void 0 ? void 0 : _c.commands.messageCommand.commandArgumentSeparator) || ' ');
+            if (!message.content || !this.config.commands.messageCommand.enabled)
+                return;
+            const parseCommand = (0, fallout_utility_1.getCommand)(message.content, this.config.prefix || '!', this.config.commands.messageCommand.commandArgumentSeparator || ' ');
             if (!(parseCommand === null || parseCommand === void 0 ? void 0 : parseCommand.command) || !parseCommand)
-                return this;
+                return;
             const command = this.commands.MESSAGE_COMMANDS[parseCommand.command.toLowerCase()];
             if (!command)
-                return this;
-            if ((0, commandPermissions_1.commandPermissions)(command.name, (_d = message.member) === null || _d === void 0 ? void 0 : _d.permissions, (_e = this.config) === null || _e === void 0 ? void 0 : _e.permissions.messageCommands, command)) {
-                if (!command.allowExecuteInDM && message.channel.type === 'DM' || !command.allowExecuteByBots && (message.author.bot || message.author.system) || (0, isIgnoredChannel_1.isIgnoredChannel)(message.channelId, (_f = this.config) === null || _f === void 0 ? void 0 : _f.ignoredChannels))
-                    return this;
-                if (command.validateOptions && !command.getCommandOptionValues(parseCommand)) {
-                    yield message.reply(((_g = this.config) === null || _g === void 0 ? void 0 : _g.messages.notEnoughArguments) || 'Not enough arguments.').catch((err) => this.logger.error(err));
-                    return this;
+                return;
+            if ((0, hasPermissions_1.hasPermissions)(command.name, (_a = message.member) === null || _a === void 0 ? void 0 : _a.permissions, this.config.permissions.messageCommands, command)) {
+                if (!command.allowExecuteInDM && message.channel.type === 'DM'
+                    || !command.allowExecuteByBots
+                        && (message.author.bot || message.author.system)
+                    || (0, isIgnoredChannel_1.isIgnoredChannel)(message.channelId, this.config.ignoredChannels))
+                    return;
+                const commandOptions = command.getCommandOptionValues(parseCommand);
+                if (command.validateOptions) {
+                    if (commandOptions.some(o => o.invalid)) {
+                        yield message.reply(this.getMessage('invalidArguments', 'Invalid argument(s) given.'));
+                        return;
+                    }
+                    if (commandOptions.some(o => o.missing)) {
+                        yield message.reply(this.getMessage('notEnoughArguments', 'Not enough arguments.'));
+                        return;
+                    }
                 }
                 const options = {
                     message: message,
+                    options: commandOptions,
                     command: parseCommand,
                     builder: command,
                     client: this
@@ -136,24 +145,23 @@ class RecipleClient extends discord_js_1.Client {
                 this.emit('recipleMessageCommandCreate', options);
             }
             else {
-                yield message.reply(((_h = this.config) === null || _h === void 0 ? void 0 : _h.messages.noPermissions) || 'You do not have permission to use this command.').catch((err) => this.logger.error(err));
+                yield message.reply(this.getMessage('noPermissions', 'You do not have permission to use this command.')).catch((err) => this.logger.error(err));
             }
-            return this;
         });
     }
     interactionCommandExecute(interaction) {
-        var _a, _b, _c, _d, _e;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!interaction || !interaction.isCommand() || !((_a = this.config) === null || _a === void 0 ? void 0 : _a.commands.interactionCommand.enabled))
-                return this;
+            if (!interaction || !interaction.isCommand() || !this.config.commands.interactionCommand.enabled)
+                return;
             const command = this.commands.INTERACTION_COMMANDS[interaction.commandName];
             if (!command)
-                return this;
-            if ((0, commandPermissions_1.commandPermissions)(command.name, (_b = interaction.memberPermissions) !== null && _b !== void 0 ? _b : undefined, (_c = this.config) === null || _c === void 0 ? void 0 : _c.permissions.interactionCommands, command)) {
-                if (!command.allowExecuteInDM && interaction.member === null || (0, isIgnoredChannel_1.isIgnoredChannel)(interaction.channelId, (_d = this.config) === null || _d === void 0 ? void 0 : _d.ignoredChannels))
-                    return this;
+                return;
+            if ((0, hasPermissions_1.hasPermissions)(command.name, (_a = interaction.memberPermissions) !== null && _a !== void 0 ? _a : undefined, this.config.permissions.interactionCommands, command)) {
+                if (!command.allowExecuteInDM && !interaction.inCachedGuild() || (0, isIgnoredChannel_1.isIgnoredChannel)(interaction.channelId, this.config.ignoredChannels))
+                    return;
                 if (!command)
-                    return this;
+                    return;
                 const options = {
                     interaction: interaction,
                     command: command,
@@ -164,27 +172,29 @@ class RecipleClient extends discord_js_1.Client {
                 this.emit('recipleInteractionCommandCreate', options);
             }
             else {
-                yield interaction.reply(((_e = this.config) === null || _e === void 0 ? void 0 : _e.messages.noPermissions) || 'You do not have permission to use this command.').catch((err) => this.logger.error(err));
+                yield interaction.reply(this.getMessage('noPermissions', 'You do not have permission to use this command.')).catch((err) => this.logger.error(err));
             }
-            return this;
         });
     }
+    getMessage(messageKey, defaultMessage) {
+        var _a, _b;
+        return (_b = (_a = this.config.messages[messageKey]) !== null && _a !== void 0 ? _a : defaultMessage) !== null && _b !== void 0 ? _b : messageKey;
+    }
     _commandExecuteError(err, command) {
-        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.error(`An error occured executing ${command.builder.builder == 'MESSAGE_COMMAND' ? 'message' : 'interaction'} command "${command.builder.name}"`);
             this.logger.error(err);
             if (!err || !command)
                 return;
             if (command === null || command === void 0 ? void 0 : command.message) {
-                if (!((_a = this.config) === null || _a === void 0 ? void 0 : _a.commands.messageCommand.replyOnError))
+                if (!this.config.commands.messageCommand.replyOnError)
                     return;
-                yield command.message.reply(((_b = this.config) === null || _b === void 0 ? void 0 : _b.messages.error) || 'An error occured.').catch((e) => this.logger.error(e));
+                yield command.message.reply(this.getMessage('error', 'An error occurred.')).catch((e) => this.logger.error(e));
             }
             else if (command === null || command === void 0 ? void 0 : command.interaction) {
-                if (!((_c = this.config) === null || _c === void 0 ? void 0 : _c.commands.interactionCommand.replyOnError))
+                if (!this.config.commands.interactionCommand.replyOnError)
                     return;
-                yield command.interaction.followUp(((_d = this.config) === null || _d === void 0 ? void 0 : _d.messages.error) || 'An error occured.').catch((e) => this.logger.error(e));
+                yield command.interaction.followUp(this.getMessage('error', 'An error occurred.')).catch((e) => this.logger.error(e));
             }
         });
     }

package/bin/reciple/classes/Config.d.ts

@@ -1,4 +1,8 @@
 import { ClientOptions, PermissionFlags, PermissionString } from 'discord.js';
+export interface ConfigCommandPermissions {
+    command: string;
+    permissions: (PermissionFlags | PermissionString)[];
+}
 export interface Config {
     token: string;
     prefix: string;
@@ -19,17 +23,11 @@ export interface Config {
     permissions: {
         messageCommands: {
             enabled: boolean;
-            commands: {
-                command: string;
-                permissions: (PermissionFlags | PermissionString)[];
-            }[];
+            commands: ConfigCommandPermissions[];
         };
         interactionCommands: {
             enabled: boolean;
-            commands: {
-                command: string;
-                permissions: (PermissionFlags | PermissionString)[];
-            }[];
+            commands: ConfigCommandPermissions[];
         };
     };
     ignoredChannels: {
@@ -45,7 +43,7 @@ export interface Config {
     };
     client: ClientOptions;
     messages: {
-        [key: string]: any;
+        [messageKey: string]: any;
     };
     ignoredFiles: string[];
     modulesFolder: string;

package/bin/reciple/classes/builders/MessageCommandBuilder.d.ts

@@ -5,14 +5,17 @@ import { RecipleClient } from '../Client';
 export declare type CommandMessage = Command;
 export interface RecipleMessageCommandExecute {
     message: Message;
+    options: MessageCommandValidatedOption[];
     command: CommandMessage;
     builder: MessageCommandBuilder;
     client: RecipleClient;
 }
 export interface MessageCommandValidatedOption {
     name: string;
-    value: string;
+    value: string | undefined;
     required: boolean;
+    invalid: boolean;
+    missing: boolean;
 }
 export declare class MessageCommandBuilder {
     readonly builder: string;
@@ -32,5 +35,5 @@ export declare class MessageCommandBuilder {
     setExecute(execute: (options: RecipleMessageCommandExecute) => void): MessageCommandBuilder;
     addOption(option: MessageCommandOptionBuilder | ((constructor: MessageCommandOptionBuilder) => MessageCommandOptionBuilder)): MessageCommandBuilder;
     setValidateOptions(validateOptions: boolean): MessageCommandBuilder;
-    getCommandOptionValues(options: CommandMessage): undefined | MessageCommandValidatedOption[];
+    getCommandOptionValues(options: CommandMessage): MessageCommandValidatedOption[];
 }

package/bin/reciple/classes/builders/MessageCommandBuilder.js

@@ -71,17 +71,31 @@ class MessageCommandBuilder {
         const args = options.args || [];
         const required = this.options.filter(o => o.required);
         const optional = this.options.filter(o => !o.required);
-        if (required.length > args.length)
-            return;
-        let i = 0;
+        const allOptions = [...required, ...optional];
         let result = [];
-        for (const option of [...required, ...optional]) {
+        let i = 0;
+        for (const option of allOptions) {
             const arg = args[i];
-            if (!arg && option.required)
-                return;
-            if (typeof arg !== 'undefined' && !option.validate(arg))
-                return;
-            result = [...result, { name: option.name, value: arg, required: option.required }];
+            const value = {
+                name: option.name,
+                value: arg !== null && arg !== void 0 ? arg : undefined,
+                required: option.required,
+                invalid: false,
+                missing: false
+            };
+            if (arg == undefined && option.required) {
+                value.missing = true;
+                result.push(value);
+                continue;
+            }
+            if (arg == undefined && !option.required) {
+                result.push(value);
+                continue;
+            }
+            const validate = option.validator ? option.validator(arg) : true;
+            if (!validate)
+                value.invalid = true;
+            result.push(value);
             i++;
         }
         return result;

package/bin/reciple/classes/builders/MessageCommandOptionBuilder.d.ts

@@ -2,7 +2,7 @@ export declare class MessageCommandOptionBuilder {
     name: string;
     description: string;
     required: boolean;
-    validate: (value: string) => boolean;
+    validator: (value: string) => boolean;
     setName(name: string): MessageCommandOptionBuilder;
     setDescription(description: string): MessageCommandOptionBuilder;
     setRequired(required: boolean): MessageCommandOptionBuilder;

package/bin/reciple/classes/builders/MessageCommandOptionBuilder.js

@@ -5,8 +5,8 @@ class MessageCommandOptionBuilder {
     constructor() {
         this.name = '';
         this.description = '';
-        this.required = true;
-        this.validate = () => true;
+        this.required = false;
+        this.validator = () => true;
     }
     setName(name) {
         if (typeof name !== 'string' || !name.match(/^[\w-]{1,32}$/))
@@ -29,7 +29,7 @@ class MessageCommandOptionBuilder {
     setValidator(validator) {
         if (!validator || typeof validator !== 'function')
             throw new TypeError('validator must be a function.');
-        this.validate = validator;
+        this.validator = validator;
         return this;
     }
 }

package/bin/reciple/hasPermissions.d.ts

@@ -0,0 +1,4 @@
+import { Permissions } from 'discord.js';
+import { recipleCommandBuilders } from './modules';
+import { Config } from './classes/Config';
+export declare function hasPermissions(commandName: string, memberPermissions?: Permissions, configConmmandPermissions?: Config['permissions']['messageCommands'] | Config['permissions']['interactionCommands'], builder?: recipleCommandBuilders): boolean;

package/bin/reciple/{commandPermissions.js → hasPermissions.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.commandPermissions = void 0;
-function commandPermissions(commandName, memberPermissions, configConmmandPermissions, builder) {
+exports.hasPermissions = void 0;
+function hasPermissions(commandName, memberPermissions, configConmmandPermissions, builder) {
     var _a, _b;
     if (!(configConmmandPermissions === null || configConmmandPermissions === void 0 ? void 0 : configConmmandPermissions.enabled))
         return true;
@@ -10,4 +10,4 @@ function commandPermissions(commandName, memberPermissions, configConmmandPermis
         return true;
     return memberPermissions ? memberPermissions.has(command.permissions) : false;
 }
-exports.commandPermissions = commandPermissions;
+exports.hasPermissions = hasPermissions;

package/bin/reciple/modules.js

@@ -18,14 +18,14 @@ const version_1 = require("./version");
 const wildcard_match_1 = __importDefault(require("wildcard-match"));
 const path_1 = __importDefault(require("path"));
 function loadModules(client) {
-    var _a, _b, _c;
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const response = { commands: [], modules: [] };
-        const modulesDir = ((_a = client.config) === null || _a === void 0 ? void 0 : _a.modulesFolder) || './modules';
+        const modulesDir = client.config.modulesFolder || './modules';
         const logger = client.logger;
         if (!(0, fs_1.existsSync)(modulesDir))
             (0, fs_1.mkdirSync)(modulesDir, { recursive: true });
-        const ignoredFiles = (((_b = client.config) === null || _b === void 0 ? void 0 : _b.ignoredFiles) || []).map(file => file.endsWith('.js') ? file : `${file}.js`);
+        const ignoredFiles = (client.config.ignoredFiles || []).map(file => file.endsWith('.js') ? file : `${file}.js`);
         const scripts = (0, fs_1.readdirSync)(modulesDir).filter(file => {
             return file.endsWith('.js') && (!file.startsWith('_') && !file.startsWith('.')) && !ignoredFiles.some(f => (0, wildcard_match_1.default)(f)(file));
         });
@@ -36,7 +36,7 @@ function loadModules(client) {
             try {
                 const reqMod = require(modulePath);
                 module_ = !!(reqMod === null || reqMod === void 0 ? void 0 : reqMod.default) ? reqMod.default : reqMod;
-                if (!((_c = module_.versions) === null || _c === void 0 ? void 0 : _c.length))
+                if (!((_a = module_.versions) === null || _a === void 0 ? void 0 : _a.length))
                     throw new Error('Module does not have supported versions.');
                 const versions = typeof module_.versions === 'object' ? module_.versions : [module_.versions];
                 if (!versions.some(v => (0, version_1.isSupportedVersion)(v, version_1.version)))

package/bin/reciple/registerInteractionCommands.js

@@ -11,17 +11,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerInteractionCommands = void 0;
 function registerInteractionCommands(client, cmds, overwriteGuilds) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
-        let commands = (_a = Object.values(cmds !== null && cmds !== void 0 ? cmds : client.commands.INTERACTION_COMMANDS).map(c => {
-            var _a, _b, _c, _d, _e, _f, _g;
+        const commands = (_a = Object.values(cmds !== null && cmds !== void 0 ? cmds : client.commands.INTERACTION_COMMANDS).map(c => {
+            var _a, _b, _c, _d;
             if (typeof c.toJSON == 'undefined')
                 return c;
             const cmd = c;
-            if ((cmd === null || cmd === void 0 ? void 0 : cmd.builder) === 'INTERACTION_COMMAND' && ((_a = client.config) === null || _a === void 0 ? void 0 : _a.commands.interactionCommand.setRequiredPermissions)) {
-                const permissions = (_g = (((_c = (_b = client.config) === null || _b === void 0 ? void 0 : _b.permissions) === null || _c === void 0 ? void 0 : _c.interactionCommands.enabled) ?
-                    (_f = (_e = (_d = client.config) === null || _d === void 0 ? void 0 : _d.permissions) === null || _e === void 0 ? void 0 : _e.interactionCommands.commands.find(cmd_ => cmd_.command.toLowerCase() === cmd.name.toLowerCase())) === null || _f === void 0 ? void 0 : _f.permissions :
-                    undefined)) !== null && _g !== void 0 ? _g : cmd.requiredPermissions;
+            if ((cmd === null || cmd === void 0 ? void 0 : cmd.builder) === 'INTERACTION_COMMAND' && client.config.commands.interactionCommand.setRequiredPermissions) {
+                const permissions = (_d = (((_a = client.config.permissions) === null || _a === void 0 ? void 0 : _a.interactionCommands.enabled) ?
+                    (_c = (_b = client.config.permissions) === null || _b === void 0 ? void 0 : _b.interactionCommands.commands.find(cmd_ => cmd_.command.toLowerCase() === cmd.name.toLowerCase())) === null || _c === void 0 ? void 0 : _c.permissions :
+                    undefined)) !== null && _d !== void 0 ? _d : cmd.requiredPermissions;
                 cmd.setRequiredPermissions(permissions);
                 client.commands.INTERACTION_COMMANDS[cmd.name] = cmd;
                 client.logger.debug(`Set required permissions for ${cmd.name} to ${permissions.join(', ')}`);
@@ -29,24 +29,20 @@ function registerInteractionCommands(client, cmds, overwriteGuilds) {
             }
             return c.toJSON();
         })) !== null && _a !== void 0 ? _a : [];
-        if (!commands || !commands.length) {
-            client.logger.warn('No interaction commands found.');
-            return;
-        }
-        const configGuilds = overwriteGuilds !== null && overwriteGuilds !== void 0 ? overwriteGuilds : (_b = client.config) === null || _b === void 0 ? void 0 : _b.commands.interactionCommand.guilds;
+        const configGuilds = overwriteGuilds !== null && overwriteGuilds !== void 0 ? overwriteGuilds : client.config.commands.interactionCommand.guilds;
         const guilds = typeof configGuilds === 'object' ? configGuilds : [configGuilds];
         if (!guilds || !(guilds === null || guilds === void 0 ? void 0 : guilds.length)) {
-            (_c = client.application) === null || _c === void 0 ? void 0 : _c.commands.set(commands).then(() => {
+            (_b = client.application) === null || _b === void 0 ? void 0 : _b.commands.set(commands).then(() => {
                 client.logger.warn('No guilds were specified for interaction commands. Registered commands for all guilds.');
             }).catch(e => client.logger.error(e));
         }
         else {
-            client.logger.warn(`Registering ${commands.length} interaction commands for ${guilds.length} guild(s).`);
+            client.logger.warn(`Registering ${commands.length} interaction commands to ${guilds.length} guild(s).`);
             for (const guild of guilds) {
                 if (!guild)
                     continue;
-                (_d = client.application) === null || _d === void 0 ? void 0 : _d.commands.set(commands, guild).then(() => {
-                    client.logger.warn(`Registered ${commands.length} interaction commands for ${guild}.`);
+                (_c = client.application) === null || _c === void 0 ? void 0 : _c.commands.set(commands, guild).then(() => {
+                    client.logger.warn(`Registered ${commands.length} interaction command(s) for ${guild}.`);
                 }).catch(e => client.logger.error(e));
             }
         }

package/bin/reciple/version.d.ts

@@ -1,5 +1,5 @@
 export declare const version: string;
-export declare function validVersion(ver: string): boolean;
+export declare function isValidVersion(ver: string): boolean;
 export declare function parseVersion(ver: string): {
     major: number;
     minor: number;

package/bin/reciple/version.js

@@ -3,16 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSupportedVersion = exports.parseVersion = exports.validVersion = exports.version = void 0;
+exports.isSupportedVersion = exports.parseVersion = exports.isValidVersion = exports.version = void 0;
 const semver_1 = __importDefault(require("semver"));
 exports.version = require('../../package.json').version;
-function validVersion(ver) {
+function isValidVersion(ver) {
     return semver_1.default.valid(semver_1.default.coerce(ver)) !== null;
 }
-exports.validVersion = validVersion;
+exports.isValidVersion = isValidVersion;
 function parseVersion(ver) {
     var _a, _b;
-    if (!validVersion(ver))
+    if (!isValidVersion(ver))
         throw new TypeError(`Invalid version: ${ver}`);
     const [major, minor, patch] = (_b = (_a = `${semver_1.default.coerce(ver)}`) === null || _a === void 0 ? void 0 : _a.split('.')) !== null && _b !== void 0 ? _b : [];
     return { major: parseInt(major), minor: parseInt(minor), patch: parseInt(patch) };
@@ -20,9 +20,9 @@ function parseVersion(ver) {
 exports.parseVersion = parseVersion;
 function isSupportedVersion(versionRange, supportedVersion) {
     supportedVersion = supportedVersion || exports.version;
-    if (!validVersion(versionRange))
+    if (!isValidVersion(versionRange))
         throw new TypeError(`Invalid version: ${versionRange}`);
-    if (!validVersion(supportedVersion))
+    if (!isValidVersion(supportedVersion))
         throw new TypeError(`Invalid supported version: ${supportedVersion}`);
     return semver_1.default.satisfies(supportedVersion, versionRange);
 }

package/package.json

@@ -1,40 +1,40 @@
 {
-    "name": "reciple",
-    "version": "1.4.2",
-    "description": "A Discord.js bot",
-    "author": "FalloutStudios",
-    "license": "GPL-3.0",
-    "main": "bin/index.js",
-    "bin": {
-        "reciple": "bin/bin.js"
-    },
-    "files": [
-        "bin",
-        "resource",
-        "package.json",
-        "LICENSE",
-        "README.md"
-    ],
-    "scripts": {
-        "clean": "rimraf bin",
-        "compile": "yarn clean && npx tsc",
-        "build": "yarn compile && npm un reciple -g && npm i ./ -g",
-        "build:publish": "yarn run build && yarn run changelog && yarn publish",
-        "test": "cd test && npx reciple",
-        "test:build": "yarn run build && yarn test:run"
-    },
-    "dependencies": {
-        "commander": "^9.3.0",
-        "discord.js": "^13.8.1",
-        "dotenv": "^16.0.1",
-        "fallout-utility": "^1.3.14",
-        "semver": "^7.3.7",
-        "wildcard-match": "^5.1.2",
-        "yaml": "^2.1.1"
-    },
-    "devDependencies": {
-        "@types/node": "^18.0.0",
-        "@types/semver": "^7.3.10",
-        "typescript": "^4.7.4"
-    }
+  "name": "reciple",
+  "version": "1.5.2",
+  "description": "A Discord.js bot",
+  "author": "FalloutStudios",
+  "license": "GPL-3.0",
+  "main": "bin/index.js",
+  "bin": {
+    "reciple": "bin/bin.js"
+  },
+  "files": [
+    "bin",
+    "resource",
+    "package.json",
+    "LICENSE",
+    "README.md"
+  ],
+  "scripts": {
+    "clean": "rimraf bin",
+    "compile": "yarn clean && npx tsc",
+    "build": "yarn compile && npm un reciple -g && npm i ./ -g",
+    "build:publish": "yarn run build && yarn run changelog && yarn publish",
+    "test": "cd test && npx reciple",
+    "test:build": "yarn run build && yarn test:run"
+  },
+  "dependencies": {
+    "commander": "^9.3.0",
+    "discord.js": "^13.8.1",
+    "dotenv": "^16.0.1",
+    "fallout-utility": "^1.3.14",
+    "semver": "^7.3.7",
+    "wildcard-match": "^5.1.2",
+    "yaml": "^2.1.1"
+  },
+  "devDependencies": {
+    "@types/node": "^18.0.0",
+    "@types/semver": "^7.3.10",
+    "typescript": "^4.7.4"
+  }
 }

package/resource/reciple.yml

@@ -75,6 +75,7 @@ client:
 # Bot replies
 messages:
   notEnoughArguments: 'Not enough arguments.'
+  invalidArguments: 'Invalid argument(s) given.'
   noPermissions:
     content: 'You do not have permission to use this command.'
     ephemeral: true

package/bin/reciple/commandPermissions.d.ts

@@ -1,4 +0,0 @@
-import { Permissions } from 'discord.js';
-import { recipleCommandBuilders } from './modules';
-import { Config } from './classes/Config';
-export declare function commandPermissions(commandName: string, memberPermissions?: Permissions, configConmmandPermissions?: Config['permissions']['messageCommands'] | Config['permissions']['interactionCommands'], builder?: recipleCommandBuilders): boolean;