Fix an issue where subcommand aliases could trip up toDiscordCommands()

Author: devoxin

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'me.devoxin'
-version '4.1.0'
+version '4.1.1'
 
 repositories {
     maven {

src/main/kotlin/me/devoxin/flight/api/CommandClient.kt

@@ -83,7 +83,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] }
+        val subcommand = args.firstOrNull()?.lowercase().let { cmd.subcommands[it] ?: cmd.subcommandAliases[it] }
         val invoked = subcommand ?: cmd
 
         if (subcommand != null) {
@@ -128,7 +128,7 @@ class CommandClient(
 
     private fun onSlashCommand(event: SlashCommandInteractionEvent) {
         val cmd = commands[event.name] ?: return
-        val subcommand = event.subcommandName?.let { cmd.subcommands[it] ?: return }
+        val subcommand = event.subcommandName?.let { cmd.subcommands[it] ?: cmd.subcommandAliases[it] ?: return }
         val invoked = subcommand ?: cmd
         val ctx = SlashContext(this, event, invoked)
 

src/main/kotlin/me/devoxin/flight/api/CommandFunction.kt

@@ -30,6 +30,7 @@ class CommandFunction(
 ) : Executable(name, method, cog, arguments, contextParameter) {
     val contextType: ContextType
     val subcommands = hashMapOf<String, SubCommandFunction>()
+    val subcommandAliases = hashMapOf<String, SubCommandFunction>()
 
     init {
         val jvmCtx = contextParameter.type
@@ -41,14 +42,14 @@ class CommandFunction(
         }
 
         for (sc in subCmds) {
-            val triggers = listOf(sc.name, *sc.properties.aliases)
+            subcommands[sc.name] = sc
 
-            for (trigger in triggers) {
-                if (subcommands.containsKey(trigger)) {
+            for (trigger in sc.properties.aliases) {
+                if (subcommandAliases.containsKey(trigger)) {
                     throw IllegalStateException("The sub-command trigger $trigger already exists!")
                 }
 
-                subcommands[trigger] = sc
+                subcommandAliases[trigger] = sc
             }
         }
     }

src/main/kotlin/me/devoxin/flight/api/entities/CommandRegistry.kt

@@ -82,7 +82,7 @@ class CommandRegistry : HashMap<String, CommandFunction>() {
     }
 
     fun findCommandByAlias(alias: String): CommandFunction? {
-        return this.values.firstOrNull { it.properties.aliases.contains(alias) }
+        return this.values.firstOrNull { alias in it.properties.aliases }
     }
 
     fun findCogByName(name: String): Cog? {