reciple 1.7.0 → 1.7.1-pre.0

package/README.md

@@ -1,5 +1,5 @@
 <h1 align="center">
-    <img src="https://i.imgur.com/8pYGOWW.png" width="50%">
+    <img src="https://i.imgur.com/DWM0tJL.png" width="50%">
     <br>
     <img alt="Lines of code" src="https://img.shields.io/tokei/lines/github/FalloutStudios/Reciple">
     <img alt="GitHub" src="https://img.shields.io/github/license/FalloutStudios/Reciple">

package/bin/index.d.ts

@@ -1,5 +1,3 @@
-import discord from 'discord.js';
-export declare const discordjs: typeof discord;
 export * from './reciple/classes/RecipleClient';
 export * from './reciple/classes/RecipleConfig';
 export * from './reciple/classes/builders/InteractionCommandBuilder';

package/bin/index.js

@@ -13,13 +13,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.discordjs = void 0;
-const discord_js_1 = __importDefault(require("discord.js"));
-exports.discordjs = discord_js_1.default;
 __exportStar(require("./reciple/classes/RecipleClient"), exports);
 __exportStar(require("./reciple/classes/RecipleConfig"), exports);
 __exportStar(require("./reciple/classes/builders/InteractionCommandBuilder"), exports);

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

@@ -19,7 +19,7 @@ export interface RecipleClientCommands {
 export interface RecipleClientEvents extends ClientEvents {
     recipleMessageCommandCreate: [command: RecipleMessageCommandExecute];
     recipleInteractionCommandCreate: [command: RecipleInteractionCommandExecute];
-    recipleReplyError: [error: any];
+    recipleReplyError: [error: unknown];
 }
 export interface RecipleClient<Ready extends boolean = boolean> extends Client<Ready> {
     on<E extends keyof RecipleClientEvents>(event: E, listener: (...args: RecipleClientEvents[E]) => Awaitable<void>): this;
@@ -74,11 +74,19 @@ export declare class RecipleClient<Ready extends boolean = boolean> extends Clie
      * Get a message from config
      */
     getMessage<T = unknown>(messageKey: string, defaultMessage?: T): T;
+    /**
+     * Get command builder by name or alias if it's a message command
+     */
+    findCommand(command: string, type: MessageCommandBuilder["builder"]): MessageCommandBuilder | undefined;
+    findCommand(command: string, type: InteractionCommandBuilder["builder"]): InteractionCommandBuilder | undefined;
     /**
      * Returns true if client logs is enabled
      */
     isClientLogsEnabled(): boolean;
-    private replpyError;
+    /**
+     * Emits the "recipleReplyError" event
+     */
+    private replyError;
     /**
      * Error message when a command fails to execute
      */

package/bin/reciple/classes/RecipleClient.js

@@ -62,7 +62,7 @@ class RecipleClient extends discord_js_1.Client {
     loadModules() {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            for (let m in this.modules) {
+            for (const m in this.modules) {
                 const module_ = this.modules[m];
                 if (typeof ((_a = module_.script) === null || _a === void 0 ? void 0 : _a.onLoad) === 'function') {
                     yield Promise.resolve(module_.script.onLoad(this)).catch(err => {
@@ -85,9 +85,9 @@ class RecipleClient extends discord_js_1.Client {
                 this.logger.info(`${Object.keys(this.commands.MESSAGE_COMMANDS).length} message commands loaded.`);
                 this.logger.info(`${Object.keys(this.commands.INTERACTION_COMMANDS).length} interaction commands loaded.`);
             }
-            if (!this.config.commands.interactionCommand.registerCommands)
-                return this;
-            yield (0, registerInteractionCommands_1.registerInteractionCommands)(this, [...Object.values(this.commands.INTERACTION_COMMANDS), ...this.otherApplicationCommandData]);
+            if (this.config.commands.interactionCommand.registerCommands) {
+                yield (0, registerInteractionCommands_1.registerInteractionCommands)(this, [...Object.values(this.commands.INTERACTION_COMMANDS), ...this.otherApplicationCommandData]);
+            }
             return this;
         });
     }
@@ -145,19 +145,17 @@ class RecipleClient extends discord_js_1.Client {
      * Execute a Message command
      */
     messageCommandExecute(message, prefix) {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!message.content || !this.isReady())
                 return;
             const parseCommand = (0, fallout_utility_1.getCommand)(message.content, prefix || this.config.prefix || '!', this.config.commands.messageCommand.commandArgumentSeparator || ' ');
             if (!parseCommand || !(parseCommand === null || parseCommand === void 0 ? void 0 : parseCommand.command))
                 return;
-            const command = (_a = this.commands.MESSAGE_COMMANDS[parseCommand.command.toLowerCase()]) !== null && _a !== void 0 ? _a : (this.config.commands.messageCommand.allowCommandAlias
-                ? Object.values(this.commands.MESSAGE_COMMANDS).find(c => c.aliases.some(a => { var _a; return a == ((_a = parseCommand.command) === null || _a === void 0 ? void 0 : _a.toLowerCase()); }))
-                : undefined);
+            const command = this.findCommand(parseCommand.command, 'MESSAGE_COMMAND');
             if (!command)
                 return;
-            if ((0, hasPermissions_1.hasPermissions)(command.name, (_b = message.member) === null || _b === void 0 ? void 0 : _b.permissions, this.config.permissions.messageCommands, command)) {
+            if ((0, hasPermissions_1.hasPermissions)(command.name, (_a = message.member) === null || _a === void 0 ? void 0 : _a.permissions, this.config.permissions.messageCommands, command)) {
                 if (!command.allowExecuteInDM && message.channel.type === 'DM'
                     || !command.allowExecuteByBots
                         && (message.author.bot || message.author.system)
@@ -166,11 +164,11 @@ class RecipleClient extends discord_js_1.Client {
                 const commandOptions = command.getCommandOptionValues(parseCommand);
                 if (command.validateOptions) {
                     if (commandOptions.some(o => o.invalid)) {
-                        yield message.reply(this.getMessage('invalidArguments', 'Invalid argument(s) given.')).catch(er => this.replpyError(er));
+                        yield message.reply(this.getMessage('invalidArguments', 'Invalid argument(s) given.')).catch(er => this.replyError(er));
                         return;
                     }
                     if (commandOptions.some(o => o.missing)) {
-                        yield message.reply(this.getMessage('notEnoughArguments', 'Not enough arguments.')).catch(er => this.replpyError(er));
+                        yield message.reply(this.getMessage('notEnoughArguments', 'Not enough arguments.')).catch(er => this.replyError(er));
                         return;
                     }
                 }
@@ -186,7 +184,7 @@ class RecipleClient extends discord_js_1.Client {
                 return options;
             }
             else {
-                yield message.reply(this.getMessage('noPermissions', 'You do not have permission to use this command.')).catch(er => this.replpyError(er));
+                yield message.reply(this.getMessage('noPermissions', 'You do not have permission to use this command.')).catch(er => this.replyError(er));
             }
         });
     }
@@ -198,7 +196,7 @@ class RecipleClient extends discord_js_1.Client {
         return __awaiter(this, void 0, void 0, function* () {
             if (!interaction || !interaction.isCommand() || !this.isReady())
                 return;
-            const command = this.commands.INTERACTION_COMMANDS[interaction.commandName];
+            const command = this.findCommand(interaction.commandName, 'INTERACTION_COMMAND');
             if (!command)
                 return;
             if ((0, hasPermissions_1.hasPermissions)(command.name, (_a = interaction.memberPermissions) !== null && _a !== void 0 ? _a : undefined, this.config.permissions.interactionCommands, command)) {
@@ -215,7 +213,7 @@ class RecipleClient extends discord_js_1.Client {
                 return options;
             }
             else {
-                yield interaction.reply(this.getMessage('noPermissions', 'You do not have permission to use this command.')).catch(er => this.replpyError(er));
+                yield interaction.reply(this.getMessage('noPermissions', 'You do not have permission to use this command.')).catch(er => this.replyError(er));
             }
         });
     }
@@ -226,13 +224,29 @@ class RecipleClient extends discord_js_1.Client {
         var _a, _b;
         return (_b = (_a = this.config.messages[messageKey]) !== null && _a !== void 0 ? _a : defaultMessage) !== null && _b !== void 0 ? _b : messageKey;
     }
+    findCommand(command, type) {
+        var _a;
+        switch (type) {
+            case 'INTERACTION_COMMAND':
+                return this.commands.INTERACTION_COMMANDS[command];
+            case 'MESSAGE_COMMAND':
+                return (_a = this.commands.MESSAGE_COMMANDS[command.toLowerCase()]) !== null && _a !== void 0 ? _a : (this.config.commands.messageCommand.allowCommandAlias
+                    ? Object.values(this.commands.MESSAGE_COMMANDS).find(c => c.aliases.some(a => a == (command === null || command === void 0 ? void 0 : command.toLowerCase())))
+                    : undefined);
+            default:
+                throw new TypeError('Unknown command type');
+        }
+    }
     /**
      * Returns true if client logs is enabled
      */
     isClientLogsEnabled() {
         return !!this.config.fileLogging.clientLogs;
     }
-    replpyError(error) {
+    /**
+     * Emits the "recipleReplyError" event
+     */
+    replyError(error) {
         this.emit('recipleReplyError', error);
     }
     /**
@@ -249,12 +263,12 @@ class RecipleClient extends discord_js_1.Client {
             if (command === null || command === void 0 ? void 0 : command.message) {
                 if (!this.config.commands.messageCommand.replyOnError)
                     return;
-                yield command.message.reply(this.getMessage('error', 'An error occurred.')).catch(er => this.replpyError(er));
+                yield command.message.reply(this.getMessage('error', 'An error occurred.')).catch(er => this.replyError(er));
             }
             else if (command === null || command === void 0 ? void 0 : command.interaction) {
                 if (!this.config.commands.interactionCommand.replyOnError)
                     return;
-                yield command.interaction.followUp(this.getMessage('error', 'An error occurred.')).catch(er => this.replpyError(er));
+                yield command.interaction.followUp(this.getMessage('error', 'An error occurred.')).catch(er => this.replyError(er));
             }
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reciple",
-  "version": "1.7.0",
+  "version": "1.7.1-pre.0",
   "description": "A Discord.js bot",
   "author": "FalloutStudios",
   "homepage": "https://falloutstudios.github.io/Reciple",
@@ -21,13 +21,15 @@
   ],
   "scripts": {
     "clean": "rm -rf bin",
-    "build": "yarn clean && npx tsc && npm un reciple -g && npm i ./ -g",
+    "build": "yarn run clean && npx tsc && yarn run reinstall && yarn run build:docs",
     "build:publish": "yarn run build && yarn publish",
-    "test": "yarn run build && yarn test:start",
+    "build:pub-prerelease": "yarn run build && yarn publish --tag beta",
+    "reinstall": "npm un reciple -g && npm i ./ -g",
+    "postpublish": "yarn run build:docs && yarn run update:docs",
+    "test": "yarn run build && yarn run test:start",
     "test:start": "cd test && npx reciple",
-    "postpublish": "yarn build:docs && yarn update:docs",
-    "build:docs": "cd docs && yarn build",
-    "update:docs": "cd docs && yarn update"
+    "build:docs": "cd docs && yarn run build",
+    "update:docs": "cd docs && yarn run update"
   },
   "dependencies": {
     "chalk": "4.1.2",
@@ -39,7 +41,7 @@
     "yaml": "^2.1.1"
   },
   "devDependencies": {
-    "@types/node": "^18.0.0",
+    "@types/node": "^18.0.3",
     "@types/semver": "^7.3.10",
     "discord.js": "^13.8.1",
     "typescript": "^4.7.4"