reciple 1.6.0 → 1.6.1

package/bin/reciple/classes/RecipleClient.js

@@ -51,15 +51,25 @@ class RecipleClient extends discord_js_1.Client {
         });
     }
     loadModules() {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            for (const module_ of this.modules.map(m => m.script)) {
-                if (typeof (module_ === null || module_ === void 0 ? void 0 : module_.onLoad) === 'function')
-                    yield Promise.resolve(module_.onLoad(this));
+            for (let 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 => {
+                        var _a;
+                        this.logger.error(`Error loading ${(_a = module_.info.filename) !== null && _a !== void 0 ? _a : 'unknown module'}:`);
+                        this.logger.error(err);
+                        this.modules = this.modules.filter((r, i) => i.toString() !== m.toString());
+                    });
+                }
+                if (typeof ((_b = module_.script) === null || _b === void 0 ? void 0 : _b.commands) !== 'undefined') {
+                    for (const command of module_.script.commands) {
+                        this.addCommand(command);
+                    }
+                }
             }
             this.logger.info(`${this.modules.length} modules loaded.`);
-            for (const command of this.modules.map(m => { var _a; return (_a = m.script.commands) !== null && _a !== void 0 ? _a : []; })[0]) {
-                this.addCommand(command);
-            }
             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)
@@ -198,12 +208,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(err => this.logger.debug(err));
+                yield command.message.reply(this.getMessage('error', 'An error occurred.')).catch(e => this.logger.debug(e));
             }
             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(err => this.logger.debug(err));
+                yield command.interaction.followUp(this.getMessage('error', 'An error occurred.')).catch(e => this.logger.debug(e));
             }
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reciple",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "A Discord.js bot",
   "author": "FalloutStudios",
   "license": "GPL-3.0",
@@ -22,7 +22,7 @@
     "clean": "rm -rf bin",
     "build": "yarn clean && npx tsc && npm un reciple -g && npm i ./ -g",
     "build:publish": "yarn run build && yarn publish",
-    "test": "yarn run build && yarn test:run",
+    "test": "yarn run build && yarn test:start",
     "test:start": "cd test && npx reciple"
   },
   "dependencies": {