Merge pull request #1 from Vylpes/develop

VylBot Core 1.0.1

.gitignore

@@ -108,3 +108,6 @@ commands/
 events/
 bot.js
 config.json
+
+# Linux Environment Files
+*.swp

README.md

@@ -12,15 +12,19 @@ Copy the config template file and fill in the strings.
 {
     "token": "",
     "prefix": "",
-    "commands": "",
+    "commands": [
-    "events": ""
+        ""
+    ],
+    "events": [
+        ""
+    ]
 }
 ```
 
 * **Token:** Your bot's token
 * **Prefix** The command prefix
-* **Commands:** The folder name containing your commands
+* **Commands:** An array of the folders which contain your commands
-* **Events:** The folder name containing your events
+* **Events:** An array of the folders which contain your events
 
 ## Usage
 

docs/index.md

@@ -40,8 +40,12 @@ An example configuration:
 {
     "token": "<YOUR-BOT-TOKEN>",
     "prefix": "!",
-    "commands": "commands",
+    "commands": [
-    "events": "events"
+        "commands"
+    ],
+    "events": [
+        "events"
+    ]
 }
 ```
 

src/client/client.js

@@ -33,10 +33,10 @@ 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;

src/client/util.js

@@ -7,6 +7,9 @@ class util {
     }
 
     loadCommand(name, args, message) {
+        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`);
@@ -40,6 +43,7 @@ class util {
                  }
             });
         }
+    }
 
     loadEvents() {
         let eventFiles = readdirSync(`${process.cwd()}/${this._client.config.events}/`);

src/type/command.js

@@ -1,6 +1,9 @@
 class command {
     constructor(run) {
         this.run = run;
+
+        this._roles = [];
+        this._requiredConfigs = [];
     }
 
     // Description
@@ -31,8 +34,6 @@ class command {
     }
 
     // Roles
-    _roles = [];
-
     get roles() {
         return this._roles;
     }
@@ -42,8 +43,6 @@ class command {
     }
 
     // Config
-    _requiredConfigs = [];
-
     get requiredConfigs() {
         return this._requiredConfigs;
     }