Merge pull request #177 from Garlic-Team/dev

7.0.1

Author: xhyrom

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gcommands",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Powerful and flexible command handler that can do everything!",
   "main": "src/index.js",
   "types": "./typings/index.d.ts",

src/commands/base.js

@@ -54,6 +54,12 @@ class Command {
          */
         this.args = options.args;
 
+        /**
+         * AlwaysObtain
+         * @type {boolean}
+         */
+         this.alwaysObtain = options.alwaysObtain ? Boolean(options.alwaysObtain) : false;
+
         /**
          * MinArgs
          * @type {number}

src/managers/GEventHandling.js

@@ -232,9 +232,10 @@ class GEventHandling {
                 for (let i in cmdArgs) {
                     let arg = new Argument(this.client, cmdArgs[i]);
                     if (arg.type === 'invalid') continue;
+                    const rawArg = cmdArgs[1] ? args[i] : args.join(' ');
 
-                    if (args[i]) {
-                        let argInvalid = await arg.argument.validate(arg, { content: args[i], guild: message.guild });
+                    if (rawArg && !commandos.alwaysObtain) {
+                        let argInvalid = await arg.argument.validate(arg, { content: rawArg, guild: message.guild });
                         if (argInvalid) {
                             let argInput = await arg.obtain(message, argInvalid);
                             if (!argInput.valid) argInput = await validArg(arg, argInput.prompt);
@@ -254,13 +255,13 @@ class GEventHandling {
                                 }
                             }
                         } else {
-                            finalArgs.push(args[i]);
+                            finalArgs.push(rawArg);
 
-                            if (ifNotSubOrGroup) objectArgs.push({ name: arg.name, value: args[i], type: arg.type });
+                            if (ifNotSubOrGroup) objectArgs.push({ name: arg.name, value: rawArg, type: arg.type });
 
                             for (const input of missingInput) {
                                 if (input.name === arg.name) {
-                                    input.value = args[i];
+                                    input.value = rawArg;
                                 }
                             }
                         }