From ede40ef9e3e1de16e82745d74decc33aa3abfd1d Mon Sep 17 00:00:00 2001 From: Matthew Cech Date: Mon, 17 Jun 2019 22:01:47 -0700 Subject: [PATCH] = Fixed choose to display help when there are no arguments provided --- src/commands/CommandChoose.java | 7 +++++++ src/core/CommandManager.java | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/commands/CommandChoose.java b/src/commands/CommandChoose.java index e68f783..e4ed478 100644 --- a/src/commands/CommandChoose.java +++ b/src/commands/CommandChoose.java @@ -19,7 +19,14 @@ public class CommandChoose extends Command @Override public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { + if(input.args.trim().length() == 0) + { + res.Call(Stats.instance.GetHelpText(input.key)); + return; + } + String [] choices = input.args.split(","); + if(choices.length == 1) { res.Call(LocStrings.Stub("ChooseOne")); diff --git a/src/core/CommandManager.java b/src/core/CommandManager.java index 5e79a7c..9fcddb7 100644 --- a/src/core/CommandManager.java +++ b/src/core/CommandManager.java @@ -111,12 +111,12 @@ public class CommandManager } // Looks up command by name. If it exists, dumps help text, otherwise returns null. - public String GetCommandHelpText(String lookup) + public String GetCommandHelpText(String key) { - Command command = commands.get(lookup); + Command command = commands.get(key); if(command != null) - return command.HelpText(); + return "`" + key + "`: " + command.HelpText(); return null; }