Run declaration filters on top-level slash commands if no subcommands

Fixes subcommands being filtered by mistake because they were applied on the top level

Author: freya022

BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/commands/application/autobuilder/MessageContextCommandAutoBuilder.kt

@@ -74,12 +74,16 @@ internal class MessageContextCommandAutoBuilder(
         }
     }
 
+    context(_: SkipLogger)
     private fun processMessageCommand(manager: AbstractApplicationCommandManager, metadata: MessageContextFunctionMetadata) {
         val func = metadata.func
         val instance = metadata.instance
         val path = metadata.path
         val commandId = metadata.commandId
 
+        if (!checkDeclarationFilter(manager, metadata.func, path, metadata.commandId))
+            return // Already logged
+
         val annotation = metadata.annotation
         manager.messageCommand(path.name, func.castFunction()) {
             fillCommandBuilder(func)

BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/commands/application/autobuilder/SlashCommandAutoBuilder.kt

@@ -242,6 +242,11 @@ internal class SlashCommandAutoBuilder(
         val subcommandsMetadata = topLevelMetadata.subcommands
         val subcommandGroupsMetadata = topLevelMetadata.subcommandGroups
         val isTopLevelOnly = subcommandsMetadata.isEmpty() && subcommandGroupsMetadata.isEmpty()
+
+        // Check we don't have subcommands before filtering, else it would filter out all of them
+        if (isTopLevelOnly && !checkDeclarationFilter(manager, metadata.func, path, metadata.commandId))
+            return // Already logged
+
         manager.slashCommand(name, if (isTopLevelOnly) metadata.func.castFunction() else null) {
             contexts = if (forceGuildCommands) {
                 setOf(InteractionContextType.GUILD)

BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/commands/application/autobuilder/UserContextCommandAutoBuilder.kt

@@ -74,12 +74,16 @@ internal class UserContextCommandAutoBuilder(
         }
     }
 
+    context(_: SkipLogger)
     private fun processUserCommand(manager: AbstractApplicationCommandManager, metadata: UserContextFunctionMetadata) {
         val func = metadata.func
         val instance = metadata.instance
         val path = metadata.path
         val commandId = metadata.commandId
 
+        if (!checkDeclarationFilter(manager, metadata.func, path, metadata.commandId))
+            return // Already logged
+
         val annotation = metadata.annotation
         manager.userCommand(path.name, func.castFunction()) {
             fillCommandBuilder(func)

BotCommands-core/src/main/kotlin/io/github/freya022/botcommands/internal/commands/autobuilder/AutoBuilderUtils.kt

@@ -53,7 +53,6 @@ internal fun runFiltered(
     block: () -> Unit
 ) {
     val path = applicationFunctionMetadata.path
-    val commandId = applicationFunctionMetadata.commandId
     val func = applicationFunctionMetadata.func
 
     // On global manager, do not register any command if forceGuildCommands is enabled,
@@ -70,9 +69,6 @@ internal fun runFiltered(
         if (requiredScope != scope) return
     }
 
-    if (!checkDeclarationFilter(manager, func, path, commandId))
-        return // Already logged
-
     val testState = checkTestCommand(manager, func, scope, manager.context)
     if (scope == CommandScope.GLOBAL && testState != TestState.NO_ANNOTATION)
         throwInternal("Test commands on a global scope should have thrown in ${::checkTestCommand.shortSignatureNoSrc}")
@@ -214,4 +210,4 @@ internal fun CommandAutoBuilder.requireServiceOptionOrOptional(func: KFunction<*
                 "if this is a Discord option, use @${optionAnnotation.simpleNestedName}, check @${commandAnnotation.simpleNestedName} for more details\n" +
                 serviceError.toDetailedString()
     )
-}
+}

test-bot/src/test/kotlin/dev/freya02/botcommands/bot/commands/slash/SlashDeclarationFilter.kt

@@ -39,15 +39,15 @@ class SlashDeclarationFilter : ApplicationCommand() {
         event.reply_("Works, guild members: ${event.guild.memberCount}", ephemeral = true).await()
     }
 
+    @DeclarationFilter(ImpossibleDeclarationFilter::class)
     @JDASlashCommand(name = "declaration_filter_subcommand", subcommand = "subcommand")
     @TopLevelSlashCommandData(scope = CommandScope.GUILD)
-    suspend fun onSlashDeclarationFilterSubcommand(event: GuildSlashEvent) {
-        event.reply_("Works", ephemeral = true).await()
+    fun onSlashDeclarationFilterSubcommand(event: GuildSlashEvent) {
+        throw AssertionError("Cannot run")
     }
 
-    @DeclarationFilter(ImpossibleDeclarationFilter::class)
     @JDASlashCommand(name = "declaration_filter_subcommand", group = "group", subcommand = "subcommand")
-    fun onSlashDeclarationFilterSubcommandGroupSubcommand(event: GuildSlashEvent) {
-        throw AssertionError("Cannot run")
+    suspend fun onSlashDeclarationFilterSubcommandGroupSubcommand(event: GuildSlashEvent) {
+        event.reply_("Works", ephemeral = true).await()
     }
 }