Merge remote-tracking branch 'origin/root' into root

Kord-Extensions · Aug 17, 2023 · 671c37d · 671c37d
2 parents c00edf9 + 0e0dbb2
commit 671c37d
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/.../main/kotlin/com/kotlindiscord/kord/extensions/commands/application/slash/SlashCommand.kt b/.../main/kotlin/com/kotlindiscord/kord/extensions/commands/application/slash/SlashCommand.kt
@@ -136,6 +136,21 @@ public abstract class SlashCommand<C : SlashCommandContext<*, A, M>, A : Argumen
             throw InvalidCommandException(name, "No command action or subcommands/groups given.")
         }
 
+        val subCommandWithSubCommand = if (parentCommand != null && subCommands.isNotEmpty()) {
+            this
+        } else {
+            subCommands.firstOrNull { it.subCommands.isNotEmpty() }
+        }
+
+        if (subCommandWithSubCommand != null) {
+            throw InvalidCommandException(
+                parentCommand?.name ?: name,
+
+                "Subcommand ${subCommandWithSubCommand.name} has its own subcommands, but subcommands may not be " +
+                    "nested."
+            )
+        }
+
         if (::body.isInitialized && !(groups.isEmpty() && subCommands.isEmpty())) {
             throw InvalidCommandException(
                 name,