GH-419 Fix Suggestion#of and number formatting. (#419)

Rollczi · Aug 20, 2024 · ffd2239 · ffd2239
1 parent 06896fd
commit ffd2239
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 22 deletions.
diff --git a/litecommands-core/src/dev/rollczi/litecommands/suggestion/Suggestion.java b/litecommands-core/src/dev/rollczi/litecommands/suggestion/Suggestion.java
@@ -106,13 +106,7 @@ public static Suggestion from(List<String> suggestion) {
     }
 
     public static Suggestion of(String suggestion) {
-        List<String> collected = StringUtil.splitBySpace(suggestion);
-
-        if (suggestion.endsWith(" ") && !collected.get(collected.size() - 1).isEmpty()) {
-            collected.add("");
-        }
-
-        return new Suggestion(suggestion, collected);
+        return new Suggestion(suggestion, StringUtil.splitBySpace(suggestion));
     }
 
     @Override

diff --git a/litecommands-jda/src/dev/rollczi/litecommands/jda/JDAPlatform.java b/litecommands-jda/src/dev/rollczi/litecommands/jda/JDAPlatform.java
@@ -1,6 +1,5 @@
 package dev.rollczi.litecommands.jda;
 
-
 import dev.rollczi.litecommands.command.CommandRoute;
 import dev.rollczi.litecommands.invocation.Invocation;
 import dev.rollczi.litecommands.platform.AbstractPlatform;
@@ -19,7 +18,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 class JDAPlatform extends AbstractPlatform<User, LiteJDASettings> {
 
@@ -115,28 +113,26 @@ public void onCommandAutoCompleteInteraction(CommandAutoCompleteInteractionEvent
             List<Command.Choice> choiceList = result.getSuggestions().stream()
                 .filter(suggestion -> !suggestion.multilevel().isEmpty())
                 .map(suggestion -> choice(event.getFocusedOption().getType(), suggestion))
-                .collect(Collectors.toList());
+                .toList();
 
             event.replyChoices(choiceList).queue();
         }
 
         private Command.Choice choice(OptionType optionType, Suggestion suggestion) {
-            if (optionType == OptionType.INTEGER) {
-                try {
-                    long parsed = Long.parseLong(suggestion.multilevel());
-                    return new Command.Choice(suggestion.multilevel(), parsed);
-                }
-                catch (NumberFormatException e) {
-                    long parsed = (long) Double.parseDouble(suggestion.multilevel());
-                    return new Command.Choice(String.valueOf(parsed), parsed);
+            String multilevel = suggestion.multilevel();
+
+            try {
+                if (optionType == OptionType.INTEGER) {
+                    return new Command.Choice(multilevel, Long.parseLong(multilevel));
                 }
-            }
 
-            if (optionType == OptionType.NUMBER) {
-                return new Command.Choice(suggestion.multilevel(), Double.parseDouble(suggestion.multilevel()));
+                if (optionType == OptionType.NUMBER) {
+                    return new Command.Choice(multilevel, Double.parseDouble(multilevel));
+                }
             }
+            catch (NumberFormatException ignored) {}
 
-            return new Command.Choice(suggestion.multilevel(), suggestion.multilevel());
+            return new Command.Choice(multilevel, multilevel);
         }
 
     }