reciple 1.3.1 → 1.3.2

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

@@ -10,10 +10,10 @@ export interface RecipleClientOptions extends ClientOptions {
 }
 export interface RecipleClientCommands {
     MESSAGE_COMMANDS: {
-        [key: string]: MessageCommandBuilder;
+        [commandName: string]: MessageCommandBuilder;
     };
     INTERACTION_COMMANDS: {
-        [key: string]: InteractionCommandBuilder;
+        [commandName: string]: InteractionCommandBuilder;
     };
 }
 export interface RecipleClientEvents extends ClientEvents {

package/bin/reciple/classes/Client.js

@@ -90,7 +90,7 @@ class RecipleClient extends discord_js_1.Client {
             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 (!(parseCommand === null || parseCommand === void 0 ? void 0 : parseCommand.command) || !parseCommand)
                 return this;
-            const command = this.commands.MESSAGE_COMMANDS[parseCommand.command];
+            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)) {
@@ -144,7 +144,7 @@ class RecipleClient extends discord_js_1.Client {
         });
     }
     _commandExecuteError(err, command) {
-        var _a, _b, _c, _d, _e;
+        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);
@@ -158,12 +158,7 @@ class RecipleClient extends discord_js_1.Client {
             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))
                     return;
-                if (!(command === null || command === void 0 ? void 0 : command.interaction.deferred) && !(command === null || command === void 0 ? void 0 : command.interaction.replied)) {
-                    yield command.interaction.reply(((_d = this.config) === null || _d === void 0 ? void 0 : _d.messages.error) || 'An error occured.').catch((e) => this.logger.error(e));
-                }
-                else {
-                    yield command.interaction.followUp(((_e = this.config) === null || _e === void 0 ? void 0 : _e.messages.error) || 'An error occured.').catch((e) => this.logger.error(e));
-                }
+                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));
             }
         });
     }

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

@@ -1,6 +1,7 @@
 import { Message, PermissionFlags, PermissionString } from 'discord.js';
 import { Command } from 'fallout-utility';
 import { RecipleClient } from '../Client';
+import { MessageCommandOptionBuilder } from './MessageCommandOptionBuilder';
 export declare type CommandMessage = Command;
 export interface RecipleMessageCommandExecute {
     message: Message;
@@ -13,21 +14,11 @@ export interface MessageCommandValidatedOption {
     value: string;
     required: boolean;
 }
-export declare class MessageOption {
-    name: string;
-    description: string;
-    required: boolean;
-    validate: (value: string) => boolean;
-    setName(name: string): MessageOption;
-    setDescription(description: string): MessageOption;
-    setRequired(required: boolean): MessageOption;
-    setValidator(validator: (value: string) => boolean): MessageOption;
-}
 export declare class MessageCommandBuilder {
     readonly builder: string;
     name: string;
     description: string;
-    options: MessageOption[];
+    options: MessageCommandOptionBuilder[];
     validateOptions: boolean;
     requiredPermissions: (PermissionFlags | PermissionString)[];
     allowExecuteInDM: boolean;
@@ -39,7 +30,7 @@ export declare class MessageCommandBuilder {
     setAllowExecuteByBots(allowExecuteByBots: boolean): MessageCommandBuilder;
     setDescription(description: string): MessageCommandBuilder;
     setExecute(execute: (options: RecipleMessageCommandExecute) => void): MessageCommandBuilder;
-    addOption(option: MessageOption | ((constructor: MessageOption) => MessageOption)): MessageCommandBuilder;
+    addOption(option: MessageCommandOptionBuilder | ((constructor: MessageCommandOptionBuilder) => MessageCommandOptionBuilder)): MessageCommandBuilder;
     setValidateOptions(validateOptions: boolean): MessageCommandBuilder;
     getCommandOptionValues(options: CommandMessage): undefined | MessageCommandValidatedOption[];
 }

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

@@ -1,39 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MessageCommandBuilder = exports.MessageOption = void 0;
-class MessageOption {
-    constructor() {
-        this.name = '';
-        this.description = '';
-        this.required = true;
-        this.validate = () => true;
-    }
-    setName(name) {
-        if (typeof name !== 'string' || !name.match(/^[\w-]{1,32}$/))
-            throw new Error('name must be a string and match the regex /^[\\w-]{1,32}$/.');
-        this.name = name;
-        return this;
-    }
-    setDescription(description) {
-        if (!description || typeof description !== 'string')
-            throw new Error('description must be a string.');
-        this.description = description;
-        return this;
-    }
-    setRequired(required) {
-        if (typeof required !== 'boolean')
-            throw new Error('required must be a boolean.');
-        this.required = required;
-        return this;
-    }
-    setValidator(validator) {
-        if (!validator || typeof validator !== 'function')
-            throw new Error('validator must be a function.');
-        this.validate = validator;
-        return this;
-    }
-}
-exports.MessageOption = MessageOption;
+exports.MessageCommandBuilder = void 0;
+const MessageCommandOptionBuilder_1 = require("./MessageCommandOptionBuilder");
 class MessageCommandBuilder {
     constructor() {
         this.builder = 'MESSAGE_COMMAND';
@@ -48,54 +16,54 @@ class MessageCommandBuilder {
     }
     setName(name) {
         if (!name || typeof name !== 'string' || !name.match(/^[\w-]{1,32}$/))
-            throw new Error('name must be a string and match the regex /^[\\w-]{1,32}$/');
+            throw new TypeError('name must be a string and match the regex /^[\\w-]{1,32}$/');
         this.name = name;
         return this;
     }
     setRequiredPermissions(permissions) {
         if (!permissions || !Array.isArray(permissions))
-            throw new Error('permissions must be an array.');
+            throw new TypeError('permissions must be an array.');
         this.requiredPermissions = permissions;
         return this;
     }
     setAllowExecuteInDM(allowExecuteInDM) {
         if (typeof allowExecuteInDM !== 'boolean')
-            throw new Error('allowExecuteInDM must be a boolean.');
+            throw new TypeError('allowExecuteInDM must be a boolean.');
         this.allowExecuteInDM = allowExecuteInDM;
         return this;
     }
     setAllowExecuteByBots(allowExecuteByBots) {
         if (typeof allowExecuteByBots !== 'boolean')
-            throw new Error('allowExecuteByBots must be a boolean.');
+            throw new TypeError('allowExecuteByBots must be a boolean.');
         this.allowExecuteByBots = allowExecuteByBots;
         return this;
     }
     setDescription(description) {
         if (!description || typeof description !== 'string')
-            throw new Error('description must be a string.');
+            throw new TypeError('description must be a string.');
         this.description = description;
         return this;
     }
     setExecute(execute) {
         if (!execute || typeof execute !== 'function')
-            throw new Error('execute must be a function.');
+            throw new TypeError('execute must be a function.');
         this.execute = execute;
         return this;
     }
     addOption(option) {
         if (!option)
-            throw new Error('option must be a MessageOption.');
-        option = typeof option === 'function' ? option(new MessageOption()) : option;
+            throw new TypeError('option must be a MessageOption.');
+        option = typeof option === 'function' ? option(new MessageCommandOptionBuilder_1.MessageCommandOptionBuilder()) : option;
         if (this.options.find(o => o.name === option.name))
-            throw new Error('option with name "' + option.name + '" already exists.');
+            throw new TypeError('option with name "' + option.name + '" already exists.');
         if (this.options.length > 0 && !this.options[this.options.length - 1 < 0 ? 0 : this.options.length - 1].required && option.required)
-            throw new Error('All required options must be before optional options.');
+            throw new TypeError('All required options must be before optional options.');
         this.options = [...this.options, option];
         return this;
     }
     setValidateOptions(validateOptions) {
         if (typeof validateOptions !== 'boolean')
-            throw new Error('validateOptions must be a boolean.');
+            throw new TypeError('validateOptions must be a boolean.');
         this.validateOptions = validateOptions;
         return this;
     }

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

@@ -0,0 +1,10 @@
+export declare class MessageCommandOptionBuilder {
+    name: string;
+    description: string;
+    required: boolean;
+    validate: (value: string) => boolean;
+    setName(name: string): MessageCommandOptionBuilder;
+    setDescription(description: string): MessageCommandOptionBuilder;
+    setRequired(required: boolean): MessageCommandOptionBuilder;
+    setValidator(validator: (value: string) => boolean): MessageCommandOptionBuilder;
+}

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

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MessageCommandOptionBuilder = void 0;
+class MessageCommandOptionBuilder {
+    constructor() {
+        this.name = '';
+        this.description = '';
+        this.required = true;
+        this.validate = () => true;
+    }
+    setName(name) {
+        if (typeof name !== 'string' || !name.match(/^[\w-]{1,32}$/))
+            throw new TypeError('name must be a string and match the regex /^[\\w-]{1,32}$/.');
+        this.name = name;
+        return this;
+    }
+    setDescription(description) {
+        if (!description || typeof description !== 'string')
+            throw new TypeError('description must be a string.');
+        this.description = description;
+        return this;
+    }
+    setRequired(required) {
+        if (typeof required !== 'boolean')
+            throw new TypeError('required must be a boolean.');
+        this.required = required;
+        return this;
+    }
+    setValidator(validator) {
+        if (!validator || typeof validator !== 'function')
+            throw new TypeError('validator must be a function.');
+        this.validate = validator;
+        return this;
+    }
+}
+exports.MessageCommandOptionBuilder = MessageCommandOptionBuilder;

package/bin/reciple/modules.d.ts

@@ -9,8 +9,8 @@ export declare type loadedModules = {
 export interface RecipleScript {
     versions: string | string[];
     commands?: (MessageCommandBuilder | InteractionCommandBuilder)[];
-    onLoad?: (reciple: RecipleClient) => (void | Promise<void>);
-    onStart: (reciple: RecipleClient) => (boolean | Promise<boolean>);
+    onLoad?(reciple: RecipleClient): void | Promise<void>;
+    onStart(reciple: RecipleClient): boolean | Promise<boolean>;
 }
 export interface RecipleModule {
     script: RecipleScript;

package/bin/reciple/registerInteractionCommands.js

@@ -15,20 +15,19 @@ function registerInteractionCommands(client, cmds, overwriteGuilds) {
     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;
-            if (typeof c.toJSON !== 'undefined') {
-                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;
-                    cmd.setRequiredPermissions(permissions);
-                    client.commands.INTERACTION_COMMANDS[cmd.name] = cmd;
-                    client.logger.debug(`Set required permissions for ${cmd.name} to ${permissions.join(', ')}`);
-                    return cmd.toJSON();
-                }
-                return c.toJSON();
+            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;
+                cmd.setRequiredPermissions(permissions);
+                client.commands.INTERACTION_COMMANDS[cmd.name] = cmd;
+                client.logger.debug(`Set required permissions for ${cmd.name} to ${permissions.join(', ')}`);
+                return cmd.toJSON();
             }
-            return c;
+            return c.toJSON();
         })) !== null && _a !== void 0 ? _a : [];
         if (!commands || !commands.length) {
             client.logger.warn('No interaction commands found.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reciple",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "A Discord.js bot",
   "author": "FalloutStudios",
   "license": "GPL-3.0",