Fixes the Case Sensitivity Bug (#10)

* Fixes the case sensitivity problem and bump the version to 4.2.7 * Case sensitivity for argument handler * Bump the case sensitivity line
koply · Feb 8, 2021 · 1517c9b · 1517c9b
1 parent 119ec3f
commit 1517c9b
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ public class Main extends JDAIntegration {
               .setPackage("com.example.mybot.commands") // command classes package path
               .setPrefix("!")
               .setReadBotMessages(false) // default false
-              .setCaseSensivity(Locale.getDefault()) // Locale to use case sensivity
+              .useCaseSensitivity() // case sensitivity in all commands
               .setDataFile(dataFile) // data file for blacklist and prefix preservence
               .setPluginsPath(new File("./plugins/")) // plugins folder for external plugins
               .build();

diff --git a/all/pom.xml b/all/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>kcommando-root</artifactId>
         <groupId>me.koply</groupId>
-        <version>4.2.6</version>
+        <version>4.2.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>kcommando-root</artifactId>
         <groupId>me.koply</groupId>
-        <version>4.2.6</version>
+        <version>4.2.7</version>
     </parent>
 
     <artifactId>core</artifactId>

diff --git a/core/src/main/java/me/koply/kcommando/CommandHandler.java b/core/src/main/java/me/koply/kcommando/CommandHandler.java
@@ -8,10 +8,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
@@ -197,7 +194,7 @@ public void processCommand(final CProcessParameters<T> params) {
 
         KCommando.logger.info(String.format("Command received | User: %s | Guild: %s | Command: %s", params.getAuthor().getName(), params.getGuildName(), commandRaw));
 
-        final String command = this.params.getCaseSensitivity().isPresent() ? cmdArgs[0] : cmdArgs[0].toLowerCase();
+        final String command = this.params.isCaseSensitivity() ? cmdArgs[0] : cmdArgs[0].toLowerCase(Locale.ROOT);
 
         if (!containsCommand(command)) {
             if (this.params.getIntegration().getSuggestionsCallback() != null) {
@@ -257,8 +254,9 @@ protected void _internalCaller(CommandToRun<T> ctr, T event, String[] args, Comm
             Map<String, CommandToRun.MethodToRun> argumentMethods = ctr.getArgumentMethods();
 
             if (args.length > 1) {
-                if (argumentMethods.containsKey(args[1])) {
-                    CommandToRun.MethodToRun mtr = argumentMethods.get(args[1]);
+                String argument = this.params.isCaseSensitivity() ? args[1] : args[1].toLowerCase(Locale.ROOT);
+                if (argumentMethods.containsKey(argument)) {
+                    CommandToRun.MethodToRun mtr = argumentMethods.get(argument);
                     this.argWrapper(mtr.getType(), mtr.getMethod(), ctr.getClazz(), event, onFalse, args, prefix);
                     return;
 

diff --git a/core/src/main/java/me/koply/kcommando/KCommando.java b/core/src/main/java/me/koply/kcommando/KCommando.java
@@ -11,7 +11,7 @@ public class KCommando<T> {
 
     public Parameters<T> params = new Parameters<>();
     public static final Logger logger = Logger.getLogger("KCommando");
-    public static final String VERSION = "4.2.6";
+    public static final String VERSION = "4.2.7";
 
     public KCommando(final Integration<T> integration) {
         params.setIntegration(integration);
@@ -75,11 +75,7 @@ public KCommando<T> setDataManager(DataManager<T> dataManager) {
     }
 
     public KCommando<T> useCaseSensitivity() {
-        return useCaseSensitivity(Locale.getDefault());
-    }
-
-    public KCommando<T> useCaseSensitivity(Locale locale) {
-        params.setCaseSensitivity(locale);
+        params.useCaseSensitivity();
         return this;
     }
 

diff --git a/core/src/main/java/me/koply/kcommando/KInitializer.java b/core/src/main/java/me/koply/kcommando/KInitializer.java
@@ -261,7 +261,7 @@ public void registerCommand(final Class<? extends Command> clazz, final Map<Stri
             final CommandToRun<T> ctr = new CommandToRun<>(commandInstance, groupName, type, argumentMethods);
 
             for (final String s : commandAnnotation.aliases()) {
-                final String name = params.getCaseSensitivity().map(s::toLowerCase).orElse(s);
+                final String name = params.isCaseSensitivity() ? s : s.toLowerCase(Locale.ROOT);
                 commandMethods.put(name, ctr);
             }
 

diff --git a/core/src/main/java/me/koply/kcommando/Parameters.java b/core/src/main/java/me/koply/kcommando/Parameters.java
@@ -20,7 +20,7 @@ public final class Parameters<T> {
 
     private boolean readBotMessages;
 
-    private Optional<Locale> caseSensitivity = Optional.empty();
+    private boolean useCaseSensitivity = false;
     private Optional<DataManager<T>> dataManager = Optional.empty();
 
     private File pluginsPath;
@@ -97,12 +97,12 @@ public final Parameters<T> setReadBotMessages(boolean readBotMessages) {
         return this;
     }
 
-    public final Optional<Locale> getCaseSensitivity() {
-        return caseSensitivity;
+    public final boolean isCaseSensitivity() {
+        return useCaseSensitivity;
     }
 
-    public final Parameters<T> setCaseSensitivity(Locale caseSensitivity) {
-        this.caseSensitivity = Optional.of(caseSensitivity);
+    public final Parameters<T> useCaseSensitivity() {
+        this.useCaseSensitivity = true;
         return this;
     }
 

diff --git a/internal/pom.xml b/internal/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>kcommando-root</artifactId>
         <groupId>me.koply</groupId>
-        <version>4.2.6</version>
+        <version>4.2.7</version>
     </parent>
 
     <artifactId>internal</artifactId>

diff --git a/javacord-integration/pom.xml b/javacord-integration/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>kcommando-root</artifactId>
         <groupId>me.koply</groupId>
-        <version>4.2.6</version>
+        <version>4.2.7</version>
     </parent>
 
     <artifactId>javacord-integration</artifactId>

diff --git a/jda-integration/pom.xml b/jda-integration/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>kcommando-root</artifactId>
         <groupId>me.koply</groupId>
-        <version>4.2.6</version>
+        <version>4.2.7</version>
     </parent>
 
     <artifactId>jda-integration</artifactId>

diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>kcommando-root</artifactId>
         <groupId>me.koply</groupId>
-        <version>4.2.6</version>
+        <version>4.2.7</version>
     </parent>
 
     <artifactId>plugin</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>me.koply</groupId>
     <artifactId>kcommando-root</artifactId>
     <packaging>pom</packaging>
-    <version>4.2.6</version>
+    <version>4.2.7</version>
 
     <scm>
         <connection>scm:git:git://github.com/MusaBrt/KCommando.git</connection>