[BUGFIXES] More Bugfixes

CHANGELOG.md

@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - New Download Command
 
 ### Fixed
+- Bunch of fixes for Inhibitors/Commands
 - Fixed Typo in disable
 - Fixed Help Command sending extra message when DMed
 - New Configuration system fixed and outputs files correctly now.

app.js

@@ -93,15 +93,17 @@ exports.start = async (config) => {
       cmd = client.commands.get(client.aliases.get(command));
     }
     if (!cmd) return;
-    const params = await client.funcs.runCommandInhibitors(client, msg, cmd)
+    client.funcs.runCommandInhibitors(client, msg, cmd).then((params) => {
+      console.log(params);
+      client.funcs.log(commandLog);
+      cmd.run(client, msg, params);
+    })
     .catch((reason) => {
       if (reason) {
         if (reason.stack) client.funcs.log(reason.stack, "error");
         msg.channel.sendCode("", reason).catch(console.error);
       }
     });
-    client.funcs.log(commandLog);
-    if (params || cmd.help.usage.length === 0) cmd.run(client, msg, params);
   });
 
   client.login(client.config.botToken);

commands/System/help.js

@@ -58,11 +58,14 @@ const buildHelp = (client, msg) => new Promise((resolve) => {
     mps.push(new Promise((res) => {
       client.funcs.runCommandInhibitors(client, msg, command, [], true)
           .then(() => {
-            const cat = command.help.category;
-            const subcat = command.help.subCategory;
-            if (!help.hasOwnProperty(cat)) help[cat] = {};
-            if (!help[cat].hasOwnProperty(subcat)) help[cat][subcat] = [];
-            help[cat][subcat].push(`${msg.guildConf.prefix}${command.help.name}${" ".repeat(longest - command.help.name.length)} :: ${command.help.description}`);
+            if (command.conf.permLevel <= msg.author.permLevel) {
+              const cat = command.help.category;
+              const subcat = command.help.subCategory;
+              if (!help.hasOwnProperty(cat)) help[cat] = {};
+              if (!help[cat].hasOwnProperty(subcat)) help[cat][subcat] = [];
+              help[cat][subcat].push(`${msg.guildConf.prefix}${command.help.name}${" ".repeat(longest - command.help.name.length)} :: ${command.help.description}`);
+              res();
+            }
             res();
           })
           .catch(() => {

functions/loadCommandInhibitors.js

@@ -7,7 +7,7 @@ const loadCommandInhibitors = (client, baseDir) => new Promise(async (resolve, r
   const files = await client.funcs.getFileListing(client, baseDir, "inhibitors").catch(err => client.funcs.log(err, "error"));
   try {
     files.forEach((f) => {
-      const props = require(`${f.path}/${f.base}`);
+      const props = require(`${f.path}${path.sep}${f.base}`);
       client.commandInhibitors.set(f.name, props);
     });
     resolve();

functions/loadFunctions.js

@@ -10,7 +10,7 @@ const loadFunctions = (client, baseDir) => new Promise(async (resolve, reject) =
     files.forEach((f) => {
       const file = f.split(".");
       if (file[0] === "loadFunctions") return;
-      client.funcs[file[0]] = require(`${dir}/${f}`);
+      client.funcs[file[0]] = require(`${dir}${path.sep}${f}`);
     });
     resolve();
   } catch (e) {

functions/loadMessageMonitors.js

@@ -7,7 +7,7 @@ const loadMessageMonitors = (client, baseDir) => new Promise(async (resolve, rej
   const files = await client.funcs.getFileListing(client, baseDir, "monitors").catch(err => client.funcs.log(err, "error"));
   try {
     files.forEach((f) => {
-      const props = require(`${f.path}/${f.base}`);
+      const props = require(`${f.path}${path.sep}${f.base}`);
       client.messageMonitors.set(f.name, props);
     });
     resolve();

functions/loadProviders.js

@@ -7,7 +7,7 @@ const loadProviders = (client, baseDir) => new Promise(async (resolve, reject) =
   const files = await client.funcs.getFileListing(client, baseDir, "providers").catch(err => client.funcs.log(err, "error"));
   try {
     files.forEach((f) => {
-      const props = require(`${dir}/${f}`);
+      const props = require(`${dir}${path.sep}${f}`);
       client.providers.set(f.name, props);
     });
     resolve();

functions/loadSingleCommand.js

@@ -19,6 +19,9 @@ module.exports = (client, command, reload = false, loadPath = null) => new Promi
       });
       delete require.cache[require.resolve(loadPath)];
       cmd = require(loadPath);
+      if (cmd.init) {
+        cmd.init(client);
+      }
     } catch (e) {
       reject(`Could not load existing command data: ${e.stack}`);
     }
@@ -28,9 +31,6 @@ module.exports = (client, command, reload = false, loadPath = null) => new Promi
       if (cmd.conf.selfbot && !client.config.selfbot) {
         return reject(`The command \`${cmd.help.name}\` is only usable in selfbots!`);
       }
-      if (cmd.init) {
-        cmd.init(client);
-      }
       let pathParts = loadPath.split(path.sep);
       pathParts = pathParts.slice(pathParts.indexOf("commands") + 1);
       category = client.funcs.toTitleCase(cmd.help.category ? cmd.help.category : (pathParts[0] && pathParts[0].length > 0 && pathParts[0].indexOf(".") === -1 ? pathParts[0] : "General"));

functions/runCommandInhibitors.js

@@ -1,15 +1,17 @@
-module.exports = (client, msg, cmd) => new Promise((resolve, reject) => {
+module.exports = (client, msg, cmd, args, selective = false) => new Promise((resolve, reject) => {
   let usage;
   const priority = client.commandInhibitors.array();
   const sorted = priority.sort((a, b) => a.conf.priority > b.conf.priority);
   sorted.forEach((inhib) => {
-    inhib.run(client, msg, cmd)
+    if (!cmd.conf.spamProtection && !selective) {
+      inhib.run(client, msg, cmd, args)
       .then((value) => {
         if (value) usage = value;
       })
       .catch((error) => {
         reject(error);
       });
+    }
   });
-  resolve(usage);
+  setTimeout(() => { resolve(usage); }, 1);
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "komada",
-  "version": "0.14.2",
+  "version": "0.14.3",
   "author": "Evelyne Lachance",
   "description": "Komada: Croatian for 'pieces', is a modular bot system including reloading modules and easy to use custom commands.",
   "main": "app.js",