reciple 1.2.0 → 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/Config.d.ts

@@ -47,6 +47,7 @@ export interface Config {
     messages: {
         [key: string]: any;
     };
+    ignoredFiles: string[];
     modulesFolder: string;
     version: string;
 }

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

@@ -1,5 +1,5 @@
 import { SlashCommandBuilder } from '@discordjs/builders';
-import { CommandInteraction, PermissionFlags } from 'discord.js';
+import { CommandInteraction, PermissionFlags, PermissionString } from 'discord.js';
 import { RecipleClient } from '../Client';
 export interface RecipleInteractionCommandExecute {
     interaction: CommandInteraction;
@@ -9,7 +9,7 @@ export interface RecipleInteractionCommandExecute {
 }
 export declare class InteractionCommandBuilder extends SlashCommandBuilder {
     readonly builder: string;
-    requiredPermissions: (keyof PermissionFlags)[];
+    requiredPermissions: (PermissionFlags | PermissionString)[];
     allowExecuteInDM: boolean;
     execute: (options: RecipleInteractionCommandExecute) => void;
     setRequiredPermissions(requiredPermissions: (keyof PermissionFlags)[]): InteractionCommandBuilder;

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

@@ -8,7 +8,7 @@ class InteractionCommandBuilder extends builders_1.SlashCommandBuilder {
         this.builder = 'INTERACTION_COMMAND';
         this.requiredPermissions = [];
         this.allowExecuteInDM = true;
-        this.execute = (options) => { };
+        this.execute = () => { };
     }
     setRequiredPermissions(requiredPermissions) {
         if (!requiredPermissions || !Array.isArray(requiredPermissions))

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';
@@ -44,58 +12,58 @@ class MessageCommandBuilder {
         this.requiredPermissions = [];
         this.allowExecuteInDM = true;
         this.allowExecuteByBots = false;
-        this.execute = (options) => { };
+        this.execute = () => { };
     }
     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/modules.js

@@ -17,14 +17,17 @@ const fs_1 = require("fs");
 const version_1 = require("./version");
 const path_1 = __importDefault(require("path"));
 function loadModules(client) {
-    var _a, _b;
+    var _a, _b, _c;
     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 logger = client.logger;
         if (!(0, fs_1.existsSync)(modulesDir))
             (0, fs_1.mkdirSync)(modulesDir, { recursive: true });
-        const scripts = (0, fs_1.readdirSync)(modulesDir).filter(file => file.endsWith('.js') && (!file.startsWith('_') && !file.startsWith('.')));
+        const ignoredFiles = (((_b = client.config) === null || _b === void 0 ? void 0 : _b.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.includes(file);
+        });
         for (const script of scripts) {
             const modulePath = path_1.default.resolve(modulesDir, script);
             const commands = [];
@@ -32,7 +35,7 @@ function loadModules(client) {
             try {
                 const reqMod = require(modulePath);
                 module_ = !!(reqMod === null || reqMod === void 0 ? void 0 : reqMod.default) ? reqMod.default : reqMod;
-                if (!((_b = module_.versions) === null || _b === void 0 ? void 0 : _b.length))
+                if (!((_c = module_.versions) === null || _c === void 0 ? void 0 : _c.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

@@ -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(c => c.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/bin/reciple/version.d.ts

@@ -5,4 +5,4 @@ export declare function parseVersion(ver: string): {
     minor: number;
     patch: number;
 };
-export declare function isSupportedVersion(ver: string, supportedVersion?: string): boolean;
+export declare function isSupportedVersion(versionRange: string, supportedVersion?: string): boolean;

package/bin/reciple/version.js

@@ -1,38 +1,29 @@
 "use strict";
+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;
-const fallout_utility_1 = require("fallout-utility");
+const semver_1 = __importDefault(require("semver"));
 exports.version = require('../../package.json').version;
 function validVersion(ver) {
-    if (!ver || typeof ver !== 'string' || ver.split('.').length < 3)
-        return false;
-    const [major, minor, patch] = ver.split('.');
-    if (!(0, fallout_utility_1.isNumber)(major) || !(0, fallout_utility_1.isNumber)(minor) || !(0, fallout_utility_1.isNumber)(patch))
-        return false;
-    return true;
+    return semver_1.default.valid(semver_1.default.coerce(ver)) !== null;
 }
 exports.validVersion = validVersion;
 function parseVersion(ver) {
+    var _a, _b;
     if (!validVersion(ver))
         throw new TypeError(`Invalid version: ${ver}`);
-    const [major, minor, patch] = ver.split('.');
+    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) };
 }
 exports.parseVersion = parseVersion;
-function isSupportedVersion(ver, supportedVersion) {
+function isSupportedVersion(versionRange, supportedVersion) {
     supportedVersion = supportedVersion || exports.version;
-    if (!validVersion(ver))
-        throw new TypeError(`Invalid version: ${ver}`);
+    if (!validVersion(versionRange))
+        throw new TypeError(`Invalid version: ${versionRange}`);
     if (!validVersion(supportedVersion))
         throw new TypeError(`Invalid supported version: ${supportedVersion}`);
-    const { major, minor, patch } = parseVersion(ver);
-    const { major: supportedMajor, minor: supportedMinor, patch: supportedPatch } = parseVersion(supportedVersion);
-    if (major !== supportedMajor)
-        return false;
-    if (minor !== supportedMinor)
-        return false;
-    if (patch > supportedPatch)
-        return false;
-    return true;
+    return semver_1.default.satisfies(supportedVersion, versionRange);
 }
 exports.isSupportedVersion = isSupportedVersion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reciple",
-  "version": "1.2.0",
+  "version": "1.3.2",
   "description": "A Discord.js bot",
   "author": "FalloutStudios",
   "license": "GPL-3.0",
@@ -13,28 +13,27 @@
     "resource",
     "package.json",
     "LICENSE",
-    "README.md",
-    "CHANGELOG.md"
+    "README.md"
   ],
   "scripts": {
     "clean": "rimraf bin",
     "compile": "yarn clean && tsc",
     "build": "yarn compile && npm un reciple -g && npm i ./ -g",
     "build:publish": "yarn run build && yarn run changelog && yarn publish",
-    "changelog": "changelog generate",
     "test": "cd test && reciple",
-    "test:compile": "yarn run build && yarn test:run"
+    "test:build": "yarn run build && yarn test:run"
   },
   "dependencies": {
-    "commander": "^9.2.0",
+    "commander": "^9.3.0",
     "discord.js": "^13.7.0",
     "dotenv": "^16.0.1",
     "fallout-utility": "^1.3.14",
-    "yaml": "^2.1.0"
+    "semver": "^7.3.7",
+    "yaml": "^2.1.1"
   },
   "devDependencies": {
-    "@types/node": "^17.0.35",
-    "generate-changelog": "^1.8.0",
-    "typescript": "^4.6.4"
+    "@types/node": "^17.0.40",
+    "@types/semver": "^7.3.9",
+    "typescript": "^4.7.3"
   }
 }

package/resource/reciple.yml

@@ -85,6 +85,10 @@ messages:
     content: 'An error occurred.'
     ephemeral: true
 
+# Ignored Files
+ignoredFiles:
+  - 'test.js'
+
 
 ###################################################
 #                                                 #

package/CHANGELOG.md

@@ -1,28 +0,0 @@
-#### 1.2.0 (2022-05-21)
-
-##### New Features
-
-* **permissions:**  you can now set required permissions for interaction command (3a80154f)
-
-##### Refactors
-
-* **permissions:**  some changes to message command required permissions (22a01ae3)
-
-#### 1.2.0 (2022-05-21)
-
-##### New Features
-
-* **permissions:**  you can now set required permissions for interaction command (3a80154f)
-
-##### Refactors
-
-* **permissions:**  some changes to message command required permissions (22a01ae3)
-
-#### 1.1.6 (2022-05-21)
-
-##### Bug Fixes
-
-* **interactionCommands:**  Interaction commands error (55a29d74)
-
-#### 1.1.5 (2022-05-21)
-