Only store one hashmap for subcommands

devoxin · Feb 17, 2024 · 08a1b73 · 08a1b73
1 parent 0f62baa
commit 08a1b73
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/main/kotlin/me/devoxin/flight/api/CommandClient.kt b/src/main/kotlin/me/devoxin/flight/api/CommandClient.kt
@@ -82,7 +82,7 @@ class CommandClient(
             ?: commands.values.firstOrNull { it.properties.aliases.contains(command) }
             ?: return dispatchSafely { it.onUnknownCommand(event, command, args) }
 
-        val subcommand = args.firstOrNull()?.lowercase().let { cmd.subcommands[it] ?: cmd.subcommandAliases[it] }
+        val subcommand = args.firstOrNull()?.lowercase().let { cmd.subcommands[it] }
         val invoked = subcommand ?: cmd
 
         if (subcommand != null) {

diff --git a/src/main/kotlin/me/devoxin/flight/api/CommandFunction.kt b/src/main/kotlin/me/devoxin/flight/api/CommandFunction.kt
@@ -29,7 +29,11 @@ class CommandFunction(
 ) : Executable(name, method, cog, arguments, contextParameter) {
     val contextType: ContextType
     val subcommands = hashMapOf<String, SubCommandFunction>()
-    val subcommandAliases = hashMapOf<String, SubCommandFunction>()
+
+    @Deprecated("Use #subcommands with a mapping/filter function.")
+    val subcommandAliases: Map<String, SubCommandFunction>
+        get() = subcommands.values.flatMap { it.properties.aliases.map { a -> a to it } }
+            .associateBy({ it.first }) { it.second }
 
     init {
         val jvmCtx = contextParameter.type
@@ -44,13 +48,13 @@ class CommandFunction(
             subcommands[sc.name] = sc
 
             for (trigger in sc.properties.aliases) {
-                val existing = subcommandAliases[trigger]
+                val existing = subcommands[trigger]
 
                 if (existing != null) {
                     throw IllegalStateException("The trigger '$trigger' for sub-command '${sc.name}' within command '$name' is already assigned to '${existing.name}'!")
                 }
 
-                subcommandAliases[trigger] = sc
+                subcommands[trigger] = sc
             }
         }
     }

diff --git a/src/main/kotlin/me/devoxin/flight/api/entities/CommandRegistry.kt b/src/main/kotlin/me/devoxin/flight/api/entities/CommandRegistry.kt
@@ -23,7 +23,7 @@ class CommandRegistry : HashMap<String, CommandFunction>() {
                 .setNSFW(command.properties.nsfw)
 
             if (command.subcommands.isNotEmpty()) {
-                for (sc in command.subcommands.values) {
+                for (sc in command.subcommands.values.toSet()) {
                     val scData = SubcommandData(sc.name, sc.properties.description)
 
                     if (sc.arguments.isNotEmpty()) {