reciple 1.1.5 → 1.3.0

package/bin/reciple/classes/Client.js

@@ -88,29 +88,29 @@ class RecipleClient extends discord_js_1.Client {
             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 (parseCommand && parseCommand.command) {
-                const command = this.commands.MESSAGE_COMMANDS[parseCommand.command];
-                if (!command)
+            if (!(parseCommand === null || parseCommand === void 0 ? void 0 : parseCommand.command) || !parseCommand)
+                return this;
+            const command = this.commands.MESSAGE_COMMANDS[parseCommand.command];
+            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;
-                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;
-                    }
-                    const options = {
-                        message: message,
-                        command: parseCommand,
-                        builder: command,
-                        client: this
-                    };
-                    yield Promise.resolve(command.execute(options)).catch(err => this._commandExecuteError(err, options));
-                    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));
                 }
+                const options = {
+                    message: message,
+                    command: parseCommand,
+                    builder: command,
+                    client: this
+                };
+                yield Promise.resolve(command.execute(options)).catch(err => this._commandExecuteError(err, options));
+                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));
             }
             return this;
         });
@@ -121,6 +121,8 @@ class RecipleClient extends discord_js_1.Client {
             if (!interaction || !interaction.isCommand() || !((_a = this.config) === null || _a === void 0 ? void 0 : _a.commands.interactionCommand.enabled))
                 return this;
             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;

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

@@ -1,4 +1,4 @@
-import { ClientOptions, PermissionResolvable } from 'discord.js';
+import { ClientOptions, PermissionFlags, PermissionString } from 'discord.js';
 export interface Config {
     token: string;
     prefix: string;
@@ -12,6 +12,7 @@ export interface Config {
             enabled: boolean;
             replyOnError: boolean;
             registerCommands: boolean;
+            setRequiredPermissions: boolean;
             guilds: string[] | string;
         };
     };
@@ -20,14 +21,14 @@ export interface Config {
             enabled: boolean;
             commands: {
                 command: string;
-                permissions: PermissionResolvable[];
+                permissions: (PermissionFlags | PermissionString)[];
             }[];
         };
         interactionCommands: {
             enabled: boolean;
             commands: {
                 command: string;
-                permissions: PermissionResolvable[];
+                permissions: (PermissionFlags | PermissionString)[];
             }[];
         };
     };
@@ -46,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,4 +1,4 @@
-import { Message, PermissionFlags } from 'discord.js';
+import { Message, PermissionFlags, PermissionString } from 'discord.js';
 import { Command } from 'fallout-utility';
 import { RecipleClient } from '../Client';
 export declare type CommandMessage = Command;
@@ -29,12 +29,12 @@ export declare class MessageCommandBuilder {
     description: string;
     options: MessageOption[];
     validateOptions: boolean;
-    requiredPermissions: (keyof PermissionFlags)[];
+    requiredPermissions: (PermissionFlags | PermissionString)[];
     allowExecuteInDM: boolean;
     allowExecuteByBots: boolean;
     execute: (options: RecipleMessageCommandExecute) => void;
     setName(name: string): MessageCommandBuilder;
-    setRequiredPermissions(permissions: (keyof PermissionFlags)[]): MessageCommandBuilder;
+    setRequiredPermissions(permissions: (PermissionFlags | PermissionString)[]): MessageCommandBuilder;
     setAllowExecuteInDM(allowExecuteInDM: boolean): MessageCommandBuilder;
     setAllowExecuteByBots(allowExecuteByBots: boolean): MessageCommandBuilder;
     setDescription(description: string): MessageCommandBuilder;

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

@@ -44,7 +44,7 @@ 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}$/))

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

@@ -13,9 +13,21 @@ exports.registerInteractionCommands = void 0;
 function registerInteractionCommands(client, cmds, overwriteGuilds) {
     var _a, _b, _c, _d, _e, _f;
     return __awaiter(this, void 0, void 0, function* () {
-        const commands = (_a = Object.values(cmds !== null && cmds !== void 0 ? cmds : client.commands.INTERACTION_COMMANDS).map(c => {
-            if (typeof c.toJSON !== 'undefined')
+        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();
+            }
             return c;
         })) !== null && _a !== void 0 ? _a : [];
         if (!commands || !commands.length) {

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.1.5",
+  "version": "1.3.0",
   "description": "A Discord.js bot",
   "author": "FalloutStudios",
   "license": "GPL-3.0",
@@ -21,20 +21,20 @@
     "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",
     "discord.js": "^13.7.0",
     "dotenv": "^16.0.1",
     "fallout-utility": "^1.3.14",
+    "semver": "^7.3.7",
     "yaml": "^2.1.0"
   },
   "devDependencies": {
     "@types/node": "^17.0.35",
-    "generate-changelog": "^1.8.0",
+    "@types/semver": "^7.3.9",
     "typescript": "^4.6.4"
   }
 }

package/resource/reciple.yml

@@ -22,6 +22,8 @@ commands:
     replyOnError: false
     # register interaction commands on bot ready
     registerCommands: true
+    # set required permissions for interaction commands
+    setRequiredPermissions: true
     # register commands to specific guild(s) empty to make it global
     guilds: []
 
@@ -83,6 +85,10 @@ messages:
     content: 'An error occurred.'
     ephemeral: true
 
+# Ignored Files
+ignoredFiles:
+  - 'test.js'
+
 
 ###################################################
 #                                                 #

package/CHANGELOG.md

@@ -1,71 +0,0 @@
-#### 1.1.4 (2022-05-21)
-
-##### New Features
-
-* **version.ts:**  Version checking functions (491b97b2)
-* **registerinteractions:**  You can now overwrite guilds in register interactions (422fe8ad)
-
-##### Bug Fixes
-
-* **modules:**  fix module loading version check (c3c2ad94)
-* **versions:**  Fixed checking supported version (4220ea96)
-* **scripts:**  Fixed changelog when deleting non existing file (cafdfe47)
-
-##### Other Changes
-
-* **changelog:**  Don't delete current changelog (29c49362)
-* **dependencies:**  Updated dev dependency (8b4a131c)
-
-##### Refactors
-
-* **versions:**  supported versions made backwards compatible (addf514a)
-* **modules:**  Check if module is supported (d79fbd49)
-* **Config.ts:**  Checks if version is supported (83bae35b)
-* **modules.ts:**  import default when available (cdad52e9)
-* **ignoredfiles:**  Ignore rmm files (55760c0e)
-
-#### 1.1.4 (2022-05-21)
-
-##### New Features
-
-* **version.ts:**  Version checking functions (491b97b2)
-* **registerinteractions:**  You can now overwrite guilds in register interactions (422fe8ad)
-
-##### Bug Fixes
-
-* **modules:**  fix module loading version check (c3c2ad94)
-* **versions:**  Fixed checking supported version (4220ea96)
-* **scripts:**  Fixed changelog when deleting non existing file (cafdfe47)
-
-##### Other Changes
-
-* **changelog:**  Don't delete current changelog (29c49362)
-* **dependencies:**  Updated dev dependency (8b4a131c)
-
-##### Refactors
-
-* **modules:**  Check if module is supported (d79fbd49)
-* **Config.ts:**  Checks if version is supported (83bae35b)
-* **modules.ts:**  import default when available (cdad52e9)
-* **ignoredfiles:**  Ignore rmm files (55760c0e)
-
-#### 1.1.4 (2022-05-20)
-
-##### New Features
-
-* **version.ts:**  Version checking functions (491b97b2)
-* **registerinteractions:**  You can now overwrite guilds in register interactions (422fe8ad)
-
-##### Bug Fixes
-
-* **scripts:**  Fixed changelog when deleting non existing file (cafdfe47)
-
-##### Other Changes
-
-* **dependencies:**  Updated dev dependency (8b4a131c)
-
-##### Refactors
-
-* **modules.ts:**  import default when available (cdad52e9)
-* **ignoredfiles:**  Ignore rmm files (55760c0e)
-