reciple 1.0.2 → 1.0.5

package/README.md

@@ -55,4 +55,7 @@ To run the bot, run the following command:
 
 ```bash
 reciple
-```
+```
+
+> ## Fun Fact
+> The name reciple is from a minecraft bug. The bug was a misspelling of the word `recipe`. [Mojang Reciple](https://bugs.mojang.com/browse/MC-225837)

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

@@ -31,4 +31,5 @@ export declare class RecipleClient extends Client {
     addCommandListeners(): RecipleClient;
     messageCommandExecute(message: Message): Promise<RecipleClient>;
     interactionCommandExecute(interaction: Interaction): Promise<RecipleClient>;
+    private _commandExecuteError;
 }

package/bin/reciple/classes/Client.js

@@ -17,6 +17,7 @@ const logger_1 = require("../logger");
 const modules_1 = require("../modules");
 const version_1 = require("../version");
 const commandPermissions_1 = require("../commandPermissions");
+const isIgnoredChannel_1 = require("../isIgnoredChannel");
 class RecipleClient extends discord_js_1.Client {
     constructor(options) {
         super(options);
@@ -75,18 +76,18 @@ class RecipleClient extends discord_js_1.Client {
         return this;
     }
     messageCommandExecute(message) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!message.content)
+            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, ((_a = this.config) === null || _a === void 0 ? void 0 : _a.prefix) || '!', ((_b = this.config) === null || _b === void 0 ? void 0 : _b.commands.messageCommand.commandArgumentSeparator) || ' ');
+            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 && (0, commandPermissions_1.commandPermissions)(command.name, ((_c = message.member) === null || _c === void 0 ? void 0 : _c.permissions) || null, (_d = this.config) === null || _d === void 0 ? void 0 : _d.permissions.messageCommands)) {
-                    if (!command.allowExecuteInDM && message.channel.type === 'DM' || !command.allowExecuteByBots && (message.author.bot || message.author.system))
+                if (command && (0, commandPermissions_1.commandPermissions)(command.name, ((_d = message.member) === null || _d === void 0 ? void 0 : _d.permissions) || null, (_e = this.config) === null || _e === void 0 ? void 0 : _e.permissions.messageCommands)) {
+                    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(((_e = this.config) === null || _e === void 0 ? void 0 : _e.messages.notEnoughArguments) || 'Not enough arguments.').catch((err) => this.logger.error(err));
+                        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 = {
@@ -95,7 +96,7 @@ class RecipleClient extends discord_js_1.Client {
                         builder: command,
                         client: this
                     };
-                    yield Promise.resolve(command.execute(options));
+                    yield Promise.resolve(command.execute(options)).catch(err => this._commandExecuteError(err, options));
                     this.emit('recipleMessageCommandCreate', options);
                 }
             }
@@ -103,13 +104,13 @@ class RecipleClient extends discord_js_1.Client {
         });
     }
     interactionCommandExecute(interaction) {
-        var _a;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!interaction || !interaction.isCommand())
+            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 && (0, commandPermissions_1.commandPermissions)(command.name, interaction.memberPermissions, (_a = this.config) === null || _a === void 0 ? void 0 : _a.permissions.interactionCommands)) {
-                if (!command.allowExecuteInDM && interaction.member === null)
+            if (command && (0, commandPermissions_1.commandPermissions)(command.name, interaction.memberPermissions, (_b = this.config) === null || _b === void 0 ? void 0 : _b.permissions.interactionCommands)) {
+                if (!command.allowExecuteInDM && interaction.member === null || (0, isIgnoredChannel_1.isIgnoredChannel)(interaction.channelId, (_c = this.config) === null || _c === void 0 ? void 0 : _c.ignoredChannels))
                     return this;
                 const options = {
                     interaction: interaction,
@@ -117,11 +118,35 @@ class RecipleClient extends discord_js_1.Client {
                     builder: command,
                     client: this
                 };
-                yield Promise.resolve(command.execute(options));
+                yield Promise.resolve(command.execute(options)).catch(err => this._commandExecuteError(err, options));
                 this.emit('recipleInteractionCommandCreate', options);
             }
             return this;
         });
     }
+    _commandExecuteError(err, command) {
+        var _a, _b, _c, _d, _e;
+        return __awaiter(this, void 0, void 0, function* () {
+            this.logger.error(`An error occured executing ${command.builder.type == '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))
+                    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));
+            }
+            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)) {
+                    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.editReply(((_e = this.config) === null || _e === void 0 ? void 0 : _e.messages.error) || 'An error occured.').catch((e) => this.logger.error(e));
+                }
+            }
+        });
+    }
 }
 exports.RecipleClient = RecipleClient;

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

@@ -5,10 +5,12 @@ export interface Config {
     commands: {
         messageCommand: {
             enabled: boolean;
+            replyOnError: boolean;
             commandArgumentSeparator: string;
         };
         interactionCommand: {
             enabled: boolean;
+            replyOnError: boolean;
             registerCommands: boolean;
             guilds: string[] | string;
         };
@@ -43,6 +45,7 @@ export interface Config {
         [key: string]: MessageOptions | string;
     };
     modulesFolder: string;
+    version?: string;
 }
 export declare class RecipleConfig {
     config?: Config;
@@ -51,5 +54,6 @@ export declare class RecipleConfig {
     parseConfig(): RecipleConfig;
     getConfig(): Config;
     parseToken(askIfNull?: boolean): string | null;
+    private isSupportedConfig;
     private askToken;
 }

package/bin/reciple/classes/Config.js

@@ -9,6 +9,7 @@ const fs_1 = require("fs");
 const flags_1 = require("../flags");
 const path_1 = __importDefault(require("path"));
 const yaml_1 = __importDefault(require("yaml"));
+const version_1 = require("../version");
 class RecipleConfig {
     constructor(configPath) {
         this.configPath = './reciple.yml';
@@ -17,11 +18,12 @@ class RecipleConfig {
         this.configPath = configPath;
     }
     parseConfig() {
+        var _a;
         if (!(0, fs_1.existsSync)(this.configPath)) {
             const defaultConfigPath = path_1.default.join(__dirname, '../../../resource/reciple.yml');
             if (!(0, fs_1.existsSync)(defaultConfigPath))
                 throw new Error('Default Config file not found. Please reinstall Reciple.');
-            const defaultConfig = (0, fs_1.readFileSync)(defaultConfigPath, 'utf-8');
+            const defaultConfig = (0, fallout_utility_1.replaceAll)((0, fs_1.readFileSync)(defaultConfigPath, 'utf-8'), 'VERSION', version_1.version);
             (0, fs_1.writeFileSync)(this.configPath, defaultConfig, 'utf-8');
             if (!(0, fs_1.existsSync)(this.configPath))
                 throw new Error('Failed to create config file.');
@@ -36,6 +38,8 @@ class RecipleConfig {
             throw new Error('Failed to read config file.');
         const config = (0, fs_1.readFileSync)(this.configPath, 'utf-8');
         this.config = yaml_1.default.parse(config);
+        if (!this.isSupportedConfig())
+            throw new Error('Unsupported config version. Your config version: ' + (((_a = this.config) === null || _a === void 0 ? void 0 : _a.version) || 'No version specified.') + ', Reciple version: ' + version_1.version);
         return this;
     }
     getConfig() {
@@ -61,6 +65,10 @@ class RecipleConfig {
         }
         return token || (askIfNull ? this.askToken() : null);
     }
+    isSupportedConfig() {
+        var _a;
+        return (((_a = this.config) === null || _a === void 0 ? void 0 : _a.version) && this.config.version != version_1.version) ? false : true;
+    }
     askToken() {
         return flags_1.token || (0, fallout_utility_1.input)({ 'text': 'Bot Token >>> ', echo: '*', repeatIfEmpty: true, exitStrings: ['exit', 'quit', ''], sigint: true }) || null;
     }

package/bin/reciple/commandPermissions.d.ts

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

package/bin/reciple/commandPermissions.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.commandPermissions = void 0;
-function commandPermissions(commandName, member, permissions) {
-    if (!(permissions === null || permissions === void 0 ? void 0 : permissions.enabled))
+function commandPermissions(commandName, memberPermissions, configConmmandPermissions) {
+    if (!(configConmmandPermissions === null || configConmmandPermissions === void 0 ? void 0 : configConmmandPermissions.enabled))
         return true;
-    const command = permissions.commands.find(c => c.command.toLowerCase() === commandName.toLowerCase());
+    const command = configConmmandPermissions.commands.find(c => c.command.toLowerCase() === commandName.toLowerCase());
     if (!command)
         return true;
     if (!command.permissions.length)
         return true;
-    return member ? member.has(command.permissions) : false;
+    return memberPermissions ? memberPermissions.has(command.permissions) : false;
 }
 exports.commandPermissions = commandPermissions;

package/bin/reciple/flags.d.ts

@@ -1 +1,2 @@
+export declare const flags: import("commander").OptionValues;
 export declare const token: any;

package/bin/reciple/flags.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.token = void 0;
+exports.token = exports.flags = void 0;
 const commander_1 = require("commander");
-const flags = commander_1.program
+exports.flags = commander_1.program
     .option('-t, --token <token>', 'Replace used bot token')
     .parse().opts();
-exports.token = flags.token;
+exports.token = exports.flags.token;

package/bin/reciple/isIgnoredChannel.d.ts

@@ -0,0 +1,2 @@
+import { Config } from './classes/Config';
+export declare function isIgnoredChannel(channelId: string, ignoredChannelsConfig?: Config["ignoredChannels"]): boolean;

package/bin/reciple/isIgnoredChannel.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isIgnoredChannel = void 0;
+function isIgnoredChannel(channelId, ignoredChannelsConfig) {
+    if (!(ignoredChannelsConfig === null || ignoredChannelsConfig === void 0 ? void 0 : ignoredChannelsConfig.enabled))
+        return false;
+    if (ignoredChannelsConfig.channels.includes(channelId) && !ignoredChannelsConfig.convertToAllowList)
+        return false;
+    if (!ignoredChannelsConfig.channels.includes(channelId) && ignoredChannelsConfig.convertToAllowList)
+        return false;
+    return true;
+}
+exports.isIgnoredChannel = isIgnoredChannel;

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;
-    onStart: (reciple: RecipleClient) => boolean;
+    onLoad?: (reciple: RecipleClient) => void | Promise<void>;
+    onStart: (reciple: RecipleClient) => boolean | Promise<boolean>;
 }
 export interface RecipleModule {
     script: RecipleScript;

package/package.json

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

package/resource/reciple.yml

@@ -4,9 +4,11 @@ prefix: '!'
 commands:
   messageCommand:
     enabled: true
+    replyOnError: false
     commandArgumentSeparator: ' '
   interactionCommand:
     enabled: true
+    replyOnError: false
     registerCommands: true
     guilds: []
 
@@ -45,4 +47,6 @@ messages:
   noPermission: 'You do not have permission to use this command.'
   notEnoughArguments: 'Not enough arguments.'
 
-modulesFolder: 'modules'
+modulesFolder: 'modules'
+
+version: VERSION