reciple 1.0.17 → 1.1.0

package/bin/index.d.ts

@@ -1,7 +1,7 @@
 export * from './reciple/classes/Client';
 export * from './reciple/classes/Config';
-export * from './reciple/classes/builders/MessageCommandBuilder';
 export * from './reciple/classes/builders/InteractionCommandBuilder';
+export * from './reciple/classes/builders/MessageCommandBuilder';
 export * from './reciple/commandPermissions';
 export * from './reciple/flags';
 export * from './reciple/isIgnoredChannel';

package/bin/index.js

@@ -16,8 +16,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./reciple/classes/Client"), exports);
 __exportStar(require("./reciple/classes/Config"), exports);
-__exportStar(require("./reciple/classes/builders/MessageCommandBuilder"), exports);
 __exportStar(require("./reciple/classes/builders/InteractionCommandBuilder"), exports);
+__exportStar(require("./reciple/classes/builders/MessageCommandBuilder"), exports);
 __exportStar(require("./reciple/commandPermissions"), exports);
 __exportStar(require("./reciple/flags"), exports);
 __exportStar(require("./reciple/isIgnoredChannel"), exports);

package/bin/reciple/classes/Client.js

@@ -42,10 +42,10 @@ class RecipleClient extends discord_js_1.Client {
             for (const command of modules.commands) {
                 if (!command.name)
                     continue;
-                if (command.type === 'MESSAGE_COMMAND') {
+                if (command.builder === 'MESSAGE_COMMAND') {
                     this.commands.MESSAGE_COMMANDS[command.name] = command;
                 }
-                else if (command.type === 'INTERACTION_COMMAND') {
+                else if (command.builder === 'INTERACTION_COMMAND') {
                     this.commands.INTERACTION_COMMANDS[command.name] = command;
                 }
             }
@@ -85,7 +85,7 @@ class RecipleClient extends discord_js_1.Client {
                 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) || null, (_e = this.config) === null || _e === void 0 ? void 0 : _e.permissions.messageCommands)) {
+                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)) {
@@ -109,13 +109,13 @@ class RecipleClient extends discord_js_1.Client {
         });
     }
     interactionCommandExecute(interaction) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
             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 ((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))
+            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;
                 if (!command)
                     return this;
@@ -129,7 +129,7 @@ class RecipleClient extends discord_js_1.Client {
                 this.emit('recipleInteractionCommandCreate', options);
             }
             else {
-                yield interaction.reply(((_d = this.config) === null || _d === void 0 ? void 0 : _d.messages.noPermissions) || 'You do not have permission to use this command.').catch((err) => this.logger.error(err));
+                yield interaction.reply(((_e = this.config) === null || _e === void 0 ? void 0 : _e.messages.noPermissions) || 'You do not have permission to use this command.').catch((err) => this.logger.error(err));
             }
             return this;
         });
@@ -137,7 +137,7 @@ class RecipleClient extends discord_js_1.Client {
     _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(`An error occured executing ${command.builder.builder == 'MESSAGE_COMMAND' ? 'message' : 'interaction'} command "${command.builder.name}"`);
             this.logger.error(err);
             if (!err || !command)
                 return;
@@ -149,11 +149,11 @@ 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)) {
+                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.editReply(((_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(((_e = this.config) === null || _e === void 0 ? void 0 : _e.messages.error) || 'An error occured.').catch((e) => this.logger.error(e));
                 }
             }
         });

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

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

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

@@ -5,10 +5,17 @@ const builders_1 = require("@discordjs/builders");
 class InteractionCommandBuilder extends builders_1.SlashCommandBuilder {
     constructor() {
         super(...arguments);
-        this.type = 'INTERACTION_COMMAND';
+        this.builder = 'INTERACTION_COMMAND';
+        this.requiredPermissions = [];
         this.allowExecuteInDM = true;
         this.execute = (options) => { };
     }
+    setRequiredPermissions(requiredPermissions) {
+        if (!requiredPermissions || !Array.isArray(requiredPermissions))
+            throw new Error('requiredPermissions must be an array.');
+        this.requiredPermissions = requiredPermissions;
+        return this;
+    }
     setAllowExecuteInDM(allowExecuteInDM) {
         if (typeof allowExecuteInDM !== 'boolean')
             throw new Error('allowExecuteInDM must be a boolean.');

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

@@ -1,4 +1,4 @@
-import { Message } from 'discord.js';
+import { Message, PermissionFlags } from 'discord.js';
 import { Command } from 'fallout-utility';
 import { RecipleClient } from '../Client';
 export interface CommandMessage extends Command {
@@ -30,15 +30,17 @@ export declare class MessageOption {
     setValidator(validator: (value: string) => boolean): MessageOption;
 }
 export declare class MessageCommandBuilder {
-    readonly type: string;
+    readonly builder: string;
     name: string;
     description: string;
     options: MessageOption[];
     validateOptions: boolean;
+    requiredPermissions: (keyof PermissionFlags)[];
     allowExecuteInDM: boolean;
     allowExecuteByBots: boolean;
     execute: (options: RecipleMessageCommandExecute) => void;
     setName(name: string): MessageCommandBuilder;
+    setRequiredPermissions(permissions: (keyof PermissionFlags)[]): MessageCommandBuilder;
     setAllowExecuteInDM(allowExecuteInDM: boolean): MessageCommandBuilder;
     setAllowExecuteByBots(allowExecuteByBots: boolean): MessageCommandBuilder;
     setDescription(description: string): MessageCommandBuilder;

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

@@ -36,11 +36,12 @@ class MessageOption {
 exports.MessageOption = MessageOption;
 class MessageCommandBuilder {
     constructor() {
-        this.type = 'MESSAGE_COMMAND';
+        this.builder = 'MESSAGE_COMMAND';
         this.name = '';
         this.description = '';
         this.options = [];
         this.validateOptions = false;
+        this.requiredPermissions = [];
         this.allowExecuteInDM = true;
         this.allowExecuteByBots = false;
         this.execute = (options) => { };
@@ -51,6 +52,12 @@ class MessageCommandBuilder {
         this.name = name;
         return this;
     }
+    setRequiredPermissions(permissions) {
+        if (!permissions || !Array.isArray(permissions))
+            throw new Error('permissions must be an array.');
+        this.requiredPermissions = permissions;
+        return this;
+    }
     setAllowExecuteInDM(allowExecuteInDM) {
         if (typeof allowExecuteInDM !== 'boolean')
             throw new Error('allowExecuteInDM must be a boolean.');

package/bin/reciple/commandPermissions.d.ts

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

package/bin/reciple/commandPermissions.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.commandPermissions = void 0;
-function commandPermissions(commandName, memberPermissions, configConmmandPermissions) {
+function commandPermissions(commandName, memberPermissions, configConmmandPermissions, builder) {
+    var _a, _b;
     if (!(configConmmandPermissions === null || configConmmandPermissions === void 0 ? void 0 : configConmmandPermissions.enabled))
         return true;
-    const command = configConmmandPermissions.commands.find(c => c.command.toLowerCase() === commandName.toLowerCase());
-    if (!command)
-        return true;
+    const command = (_a = configConmmandPermissions.commands.find(c => c.command.toLowerCase() === commandName.toLowerCase())) !== null && _a !== void 0 ? _a : { permissions: (_b = builder === null || builder === void 0 ? void 0 : builder.requiredPermissions) !== null && _b !== void 0 ? _b : [] };
     if (!command.permissions.length)
         return true;
     return memberPermissions ? memberPermissions.has(command.permissions) : false;

package/bin/reciple/flags.js

@@ -4,5 +4,6 @@ exports.token = exports.flags = void 0;
 const commander_1 = require("commander");
 exports.flags = commander_1.program
     .option('-t, --token <token>', 'Replace used bot token')
+    .option('-D, --debugmode', 'Enabled debug mode')
     .parse().opts();
 exports.token = exports.flags.token;

package/bin/reciple/logger.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logger = void 0;
 const fallout_utility_1 = require("fallout-utility");
+const flags_1 = require("./flags");
 function logger(stringifyJSON, debugmode = false) {
     return new fallout_utility_1.Logger("Main", {
         addPrefixToEveryJsonNewLines: stringifyJSON,
         stringifyJSON: stringifyJSON,
-        setDebugging: debugmode
+        setDebugging: flags_1.flags.debugmode || debugmode
     });
 }
 exports.logger = logger;

package/bin/reciple/modules.js

@@ -36,7 +36,7 @@ function loadModules(client) {
                     throw new Error(script + ' onStart is not defined or returned false.');
                 if (module_.commands) {
                     for (const command of module_.commands) {
-                        if (command.type === 'MESSAGE_COMMAND' || command.type === 'INTERACTION_COMMAND')
+                        if (command.builder === 'MESSAGE_COMMAND' || command.builder === 'INTERACTION_COMMAND')
                             commands.push(command);
                     }
                 }
@@ -51,7 +51,7 @@ function loadModules(client) {
                     logger.error(`A message command name is not defined in ${script}`);
                     return false;
                 }
-                if (c.type === 'MESSAGE_COMMAND' && c.options.length && c.options.some(o => !o.name)) {
+                if (c.builder === 'MESSAGE_COMMAND' && c.options.length && c.options.some(o => !o.name)) {
                     logger.error(`A message command option name is not defined in ${script}`);
                     return false;
                 }

package/bin/reciple/registerInteractionCommands.d.ts

@@ -1,2 +1,5 @@
+import { InteractionCommandBuilder } from './classes/builders/InteractionCommandBuilder';
+import { SlashCommandBuilder } from '@discordjs/builders';
 import { RecipleClient } from "./classes/Client";
-export declare function registerInteractionCommands(client: RecipleClient): Promise<void>;
+import { ApplicationCommandData } from 'discord.js';
+export declare function registerInteractionCommands(client: RecipleClient, cmds?: (InteractionCommandBuilder | SlashCommandBuilder | ApplicationCommandData)[]): Promise<void>;

package/bin/reciple/registerInteractionCommands.js

@@ -10,23 +10,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerInteractionCommands = void 0;
-function registerInteractionCommands(client) {
-    var _a, _b, _c;
+function registerInteractionCommands(client, cmds) {
+    var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
-        const commands = Object.values(client.commands.INTERACTION_COMMANDS).map(c => c.toJSON());
+        const commands = (_a = Object.values(cmds !== null && cmds !== void 0 ? cmds : client.commands.INTERACTION_COMMANDS).map(c => {
+            if (typeof c.toJSON !== 'undefined')
+                return c.toJSON();
+            return c;
+        })) !== null && _a !== void 0 ? _a : [];
         if (!commands.length) {
             client.logger.warn('No interaction commands found.');
             return;
         }
-        if (!((_a = client.config) === null || _a === void 0 ? void 0 : _a.commands.interactionCommand.guilds.length)) {
-            yield ((_b = client.application) === null || _b === void 0 ? void 0 : _b.commands.set(commands).catch(e => client.logger.error(e)));
+        if (!((_b = client.config) === null || _b === void 0 ? void 0 : _b.commands.interactionCommand.guilds.length)) {
+            yield ((_c = client.application) === null || _c === void 0 ? void 0 : _c.commands.set(commands).catch(e => client.logger.error(e)));
             client.logger.warn('No guilds were specified for interaction commands. Registered commands for all guilds.');
         }
         else {
             const guilds = typeof client.config.commands.interactionCommand.guilds === 'string' ? [client.config.commands.interactionCommand.guilds] : client.config.commands.interactionCommand.guilds;
             client.logger.warn(`Registering ${commands.length} interaction commands for ${guilds.length} guild(s).`);
             for (const guild of guilds) {
-                yield ((_c = client.application) === null || _c === void 0 ? void 0 : _c.commands.set(commands, guild).catch(e => client.logger.error(e)));
+                yield ((_d = client.application) === null || _d === void 0 ? void 0 : _d.commands.set(commands, guild).catch(e => client.logger.error(e)));
                 client.logger.warn(`Registered ${commands.length} interaction commands for ${guild}.`);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reciple",
-  "version": "1.0.17",
+  "version": "1.1.0",
   "description": "A Discord.js bot",
   "author": "FalloutStudios",
   "license": "GPL-3.0",
@@ -17,11 +17,11 @@
   ],
   "scripts": {
     "clean": "rimraf bin",
-    "compile": "npm run clean && tsc",
-    "build": "npm run compile && npm un reciple -g && npm i ./ -g",
-    "build:publish": "npm run build && npm publish",
+    "compile": "yarn clean && tsc",
+    "build": "yarn compile && npm un reciple -g && npm i ./ -g",
+    "build:publish": "yarn run build && npm publish",
     "test": "cd test && reciple",
-    "test:compile": "npm run build && npm run test:run"
+    "test:compile": "yarn run build && yarn test:run"
   },
   "dependencies": {
     "commander": "^9.2.0",