reciple 1.1.6 → 1.2.0

package/CHANGELOG.md

@@ -1,4 +1,24 @@
-#### 1.1.5 (2022-05-21)
+#### 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
 

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)[];
             }[];
         };
     };

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/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(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();
+            }
             return c;
         })) !== null && _a !== void 0 ? _a : [];
         if (!commands || !commands.length) {

package/package.json

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

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: []