fix: custom commands not being accessible

WFCD · Sep 16, 2018 · 504c48e · 504c48e
1 parent e9b6cf8
commit 504c48e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/src/CommandManager.js b/src/CommandManager.js
@@ -4,6 +4,8 @@ const fs = require('fs');
 const path = require('path');
 const decache = require('decache');
 
+const BaseCommand = require('./models/Command');
+
 const commandDir = path.join(__dirname, 'commands');
 
 /**
@@ -48,6 +50,10 @@ class CommandManager {
       return this.commandCache[manifest.id];
     }
 
+    if (manifest instanceof BaseCommand) {
+      return manifest;
+    }
+
     // eslint-disable-next-line global-require, import/no-dynamic-require
     const Command = require(path.join(commandDir, manifest.path));
     const command = new Command(this.bot);

diff --git a/src/commands/CustomCommands/AddCustomCommand.js b/src/commands/CustomCommands/AddCustomCommand.js
@@ -28,7 +28,7 @@ class AddCustomCommand extends Command {
       return this.messageManager.statuses.FAILURE;
     }
     await this.settings.addCustomCommand(message, params[1], encodeURIComponent(params[2]));
-    await this.commandHandler.loadCustomCommands();
+    await this.commandManager.loadCustomCommands();
     await this.messageManager.notifySettingsChange(message, true, true);
     return this.messageManager.statuses.SUCCESS;
   }

diff --git a/src/commands/CustomCommands/ListCustomCommand.js b/src/commands/CustomCommands/ListCustomCommand.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const Command = require('../../models/Command.js');
-const { createGroupedArray } = require('../../CommonFunctions.js');
+const { createGroupedArray, createPageCollector } = require('../../CommonFunctions.js');
 
 class ListCustomCommand extends Command {
   constructor(bot) {
@@ -22,9 +22,16 @@ class ListCustomCommand extends Command {
       }
     });
     const metaGroups = createGroupedArray(ccs, 10);
+    const pages = [];
     metaGroups.forEach((metaGroup) => {
-      this.messageManager.embed(message, { color: 0x301934, fields: metaGroup }, true, false);
+      pages.push({ color: 0x301934, fields: metaGroup, title: 'Custom Commands' });
     });
+    if (pages.length) {
+      const msg = await this.messageManager.embed(message, pages[0], false, false);
+      await createPageCollector(msg, pages, message.author);
+    } else {
+      await this.messageManager.embed(message, { color: 0x301934, description: 'No Custom Commands', title: 'Custom Commands' }, true, true);
+    }
 
     return this.messageManager.statuses.SUCCESS;
   }

diff --git a/src/eventHandlers/CommandHandler.js b/src/eventHandlers/CommandHandler.js
@@ -27,6 +27,7 @@ class CommandHandler extends Handler {
 
     this.statuses = this.bot.messageManager.statuses;
     this.commandManager = this.bot.commandManager;
+    this.logger = bot.logger;
   }
 
   /**
@@ -69,10 +70,11 @@ class CommandHandler extends Handler {
     if (checkOnlyInlines) {
       commands = this.commandManager.inlineCommands;
     } else if (ctx.allowCustom) {
-      commands = this.commandManager.commands.concat(this.customCommands);
+      commands = this.commandManager.commands.concat(this.commandManager.customCommands);
     } else {
       ({ commands } = this.commandManager);
     }
+    commands = commands.filter(command => command);
 
     if (content.startsWith(ctx.prefix)) {
       content = content.replace(ctx.prefix, '');