reciple 1.0.3 → 1.0.6

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)).catch(err => { this.logger.error(`An error occured executing "${command.name}"`); this.logger.error(err); });
+                    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)).catch(err => { this.logger.error(`An error occured executing "${command.name}"`); this.logger.error(err); });
+                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

@@ -1,14 +1,16 @@
-import { ClientOptions, MessageOptions, PermissionResolvable } from 'discord.js';
+import { ClientOptions, InteractionReplyOptions, MessageOptions, PermissionResolvable } from 'discord.js';
 export interface Config {
     token: string;
     prefix: string;
     commands: {
         messageCommand: {
             enabled: boolean;
+            replyOnError: boolean;
             commandArgumentSeparator: string;
         };
         interactionCommand: {
             enabled: boolean;
+            replyOnError: boolean;
             registerCommands: boolean;
             guilds: string[] | string;
         };
@@ -40,7 +42,7 @@ export interface Config {
     };
     client: ClientOptions;
     messages: {
-        [key: string]: MessageOptions | string;
+        [key: string]: MessageOptions | InteractionReplyOptions | string;
     };
     modulesFolder: string;
     version?: string;

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reciple",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "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: []
 
@@ -42,8 +44,13 @@ client:
     - 'GUILD_MESSAGE_REACTIONS'
 
 messages:
-  noPermission: 'You do not have permission to use this command.'
   notEnoughArguments: 'Not enough arguments.'
+  noPermission:
+    content: 'You do not have permission to use this command.'
+    ephemeral: true
+  error:
+    content: 'An error occurred.'
+    ephemeral: true
 
 modulesFolder: 'modules'