Merge pull request #256 from Garlic-Team/dev

Dev
Garlic-Team · Nov 21, 2021 · de42187 · de42187
2 parents 33dc6b3 + 01f1aca
commit de42187
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gcommands",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "description": "Powerful and flexible command handler that can do everything!",
   "main": "src/index.js",
   "types": "./typings/index.d.ts",

diff --git a/src/managers/GEventHandling.js b/src/managers/GEventHandling.js
@@ -350,7 +350,7 @@ class GEventHandling {
         const args = {};
 
         for (const o of options) {
-          if ([1, 2].includes(o.type)) {
+          if (['SUB_COMMAND', 'SUB_COMMAND_GROUP'].includes(o.type)) {
             args[o.name] = this.argsToObject(o.options);
           } else {
             args[o.name] = o.value;

diff --git a/src/structures/ArgumentsCollector.js b/src/structures/ArgumentsCollector.js
@@ -84,7 +84,7 @@ class ArgumentsCollector {
             if ([1, 2].includes(arg.type)) arg.subcommands = this.cmdArgs.filter(sc => [1, 2].includes(sc.type));
             const argument = new Argument(this.client, arg, this.isNotDm, this.language);
             let result;
-            if (this.args[0]) {
+            if (this.args[0] && !this.commandos.alwaysObtain) {
                 const invalid = argument.argument.validate(argument, { content: this.args[0], guild: this.message.guild }, this.language);
                 if (invalid) {
                     result = await argument.obtain(this.message, this.language, invalid);