From bf09d9bed00abadc0ec626f6d4e6eec71a9ddb75 Mon Sep 17 00:00:00 2001
From: Vylpes <vylpes@vylpespc>
Date: Fri, 23 Oct 2020 18:17:28 +0100
Subject: [PATCH] Changed commands and events to be an array, allowing multiple
 folders

---
 README.md            | 12 ++++++---
 src/client/client.js |  6 ++---
 src/client/util.js   | 60 +++++++++++++++++++++++---------------------
 3 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index b22bceb..168c922 100644
--- a/README.md
+++ b/README.md
@@ -12,15 +12,19 @@ Copy the config template file and fill in the strings.
 {
     "token": "",
     "prefix": "",
-    "commands": "",
-    "events": ""
+    "commands": [
+        ""
+    ],
+    "events": [
+        ""
+    ]
 }
 ```
 
 * **Token:** Your bot's token
 * **Prefix** The command prefix
-* **Commands:** The folder name containing your commands
-* **Events:** The folder name containing your events
+* **Commands:** An array of the folders which contain your commands
+* **Events:** An array of the folders which contain your events
 
 ## Usage
 
diff --git a/src/client/client.js b/src/client/client.js
index 30f1a2d..74e75f4 100644
--- a/src/client/client.js
+++ b/src/client/client.js
@@ -33,14 +33,14 @@ class client extends Client {
         if (typeof config.token != "string") throw "Token is not a string";
         if (typeof config.prefix != "string") throw "Prefix is not a string";
 
-        if (typeof config.commands != "string") throw "Commands is not a string";
+        if (typeof config.commands != "object") throw "Commands is not a string";
         if (!existsSync(`${process.cwd()}/${config.commands}`)) throw "Commands folder doesn't exist";
 
-        if (typeof config.events != "string") throw "Events is not a string";
+        if (typeof config.events != "object") throw "Events is not a string";
         if (!existsSync(`${process.cwd()}/${config.events}`)) throw "Events folder doesn't exist";
 
         this._config = config;
     }
 }
 
-module.exports = client;
\ No newline at end of file
+module.exports = client;
diff --git a/src/client/util.js b/src/client/util.js
index 53a9a15..25d0540 100644
--- a/src/client/util.js
+++ b/src/client/util.js
@@ -7,38 +7,42 @@ class util {
     }
 
     loadCommand(name, args, message) {
-        stat(`${process.cwd()}/${this._client.config.commands}/${name}.js`, (err, stat) => {
-            if (err == null) {
-                let commandFile = require(`${process.cwd()}/${this._client.config.commands}/${name}.js`);
-                let command = new commandFile();
+        for (let c = 0; c < this._client.config.commands.length; c++) {
+            let folder = this._client.config.commands[c];
+            
+            stat(`${process.cwd()}/${this._client.config.commands}/${name}.js`, (err, stat) => {
+                if (err == null) {
+                    let commandFile = require(`${process.cwd()}/${this._client.config.commands}/${name}.js`);
+                    let command = new commandFile();
                 
-                let requiredConfigs = command.requiredConfigs;
+                    let requiredConfigs = command.requiredConfigs;
                 
-                for (let i = 0; i < requiredConfigs.length; i++) {
-                    if (!this._client.config[name]) throw `${commandFile.name} requires ${requiredConfigs[i]} in it's configuration`;
-                    if (!this._client.config[name][requiredConfigs[i]]) throw `${commandFile.name} requires ${requiredConfigs[i]} in it's configuration`;
-                }
+                    for (let i = 0; i < requiredConfigs.length; i++) {
+                         if (!this._client.config[name]) throw `${commandFile.name} requires ${requiredConfigs[i]} in it's configuration`;
+                             if (!this._client.config[name][requiredConfigs[i]]) throw `${commandFile.name} requires ${requiredConfigs[i]} in it's configuration`;
+                         }
 
-                let requiredRoles = command.roles;
+                        let requiredRoles = command.roles;
 
-                for (let i = 0; i < requiredRoles.length; i++) {
-                    if (!message.member.roles.cache.find(role => role.name == requiredRoles[i])) {
-                        message.reply(`You require the \`${requiredRoles[i]}\` role to run this command`);
-                        return;
-                    }
-                }
+                        for (let i = 0; i < requiredRoles.length; i++) {
+                            if (!message.member.roles.cache.find(role => role.name == requiredRoles[i])) {
+                                message.reply(`You require the \`${requiredRoles[i]}\` role to run this command`);
+                                return;
+                            }
+                        }
                 
-                command[command.run]({
-                    "command": name,
-                    "arguments": args,
-                    "client": this._client,
-                    "message": message,
-                    "config": config
-                });
-            } else if (err.code === 'ENOENT') {
-                // FILE DOESN'T EXIST
-            }
-        });
+                     command[command.run]({
+                         "command": name,
+                         "arguments": args,
+                         "client": this._client,
+                         "message": message,
+                         "config": config
+                    });
+                 } else if (err.code === 'ENOENT') {
+                    // FILE DOESN'T EXIST
+                 }
+            });
+        }
     }
 
     loadEvents() {
@@ -55,4 +59,4 @@ class util {
     }
 }
 
-module.exports = util;
\ No newline at end of file
+module.exports = util;