Fix the /mute player parameter parsing

Fixes #599
LVPlayground · May 19, 2020 · b2f3cdf · b2f3cdf
1 parent 2f2c943
commit b2f3cdf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/javascript/base/string_parser.js b/javascript/base/string_parser.js
@@ -177,7 +177,7 @@ class StringParser {
       }
 
       if (!parameter.optional)
-        return parameter.error ?? StringParser.ERROR_MISSING_PARAMETER;
+        return (string.length && parameter.error) ?? StringParser.ERROR_MISSING_PARAMETER;
     }
 
     return values;

diff --git a/javascript/components/command_manager/command_builder.test.js b/javascript/components/command_manager/command_builder.test.js
@@ -458,4 +458,16 @@ describe('CommandBuilder', (it, beforeEach) => {
     assert.isNull(parameterFoo);
   });
 
+  it('should properly check parameter existence for multiple parameters', assert => {
+    let foo, bar = null;
+
+    builder('testcommand')
+        .parameters([
+          { name: 'foo', type: CommandBuilder.PLAYER_PARAMETER },
+          { name: 'bar', type: CommandBuilder.NUMBER_PARAMETER, optional: true }])
+        .build((_, inFoo, inBar) => [foo, bar] = [inFoo, inBar]);
+
+    listener(player, '');
+    assert.equal(Message.filter(lastMessage), 'Usage: /testcommand [foo] [bar]');
+  });
 });