From 490ec6fe189c64e136ef01096940b7acf55885ae Mon Sep 17 00:00:00 2001 From: Tijs Date: Fri, 30 Sep 2022 23:48:57 +0200 Subject: [PATCH 1/3] Bugfix In BotCore: Added onCommandAutoCompleteInteraction listener, this way autocompletion events will actually get forwarded. Funny, didnt think of this during the previous PR, was probably too hasty. --- .../togetherjava/tjbot/commands/system/BotCore.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java b/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java index f4b1d6d1ba..fb9b9b4b51 100644 --- a/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java +++ b/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java @@ -2,6 +2,7 @@ import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Channel; +import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent; import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.events.interaction.command.UserContextInteractionEvent; @@ -241,6 +242,18 @@ public void onSlashCommandInteraction(SlashCommandInteractionEvent event) { .onSlashCommand(event)); } + @Override + public void onCommandAutoCompleteInteraction( + @NotNull final CommandAutoCompleteInteractionEvent event) { + String name = event.getName(); + + logger.debug("Received auto completion from command-subcommand '{}-{}' (#{}) on guild '{}'", + name, event.getSubcommandName(), event.getId(), event.getGuild()); + COMMAND_SERVICE.execute(() -> requireUserInteractor( + UserInteractorPrefix.SLASH_COMMAND.getPrefixedName(name), SlashCommand.class) + .onAutoComplete(event)); + } + @Override public void onButtonInteraction(ButtonInteractionEvent event) { logger.debug("Received button click '{}' (#{}) on guild '{}'", event.getComponentId(), From aa58c07cab3c648c04034e00a85fcf7b29aa3c07 Mon Sep 17 00:00:00 2001 From: Tais993 <49957334+Tais993@users.noreply.github.com> Date: Sat, 1 Oct 2022 07:55:20 +0200 Subject: [PATCH 2/3] Update application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java Co-authored-by: Tanish Azad <73871477+Taz03@users.noreply.github.com> --- .../java/org/togetherjava/tjbot/commands/system/BotCore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java b/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java index fb9b9b4b51..077d347670 100644 --- a/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java +++ b/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java @@ -244,7 +244,7 @@ public void onSlashCommandInteraction(SlashCommandInteractionEvent event) { @Override public void onCommandAutoCompleteInteraction( - @NotNull final CommandAutoCompleteInteractionEvent event) { + final CommandAutoCompleteInteractionEvent event) { String name = event.getName(); logger.debug("Received auto completion from command-subcommand '{}-{}' (#{}) on guild '{}'", From 5f574d3cdb2825881a4f8ce561429339a8bd6c33 Mon Sep 17 00:00:00 2001 From: Taz03 Date: Sat, 1 Oct 2022 11:31:03 +0530 Subject: [PATCH 3/3] fixed debug message --- .../org/togetherjava/tjbot/commands/system/BotCore.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java b/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java index 077d347670..8cc95de6f1 100644 --- a/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java +++ b/application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java @@ -243,12 +243,11 @@ public void onSlashCommandInteraction(SlashCommandInteractionEvent event) { } @Override - public void onCommandAutoCompleteInteraction( - final CommandAutoCompleteInteractionEvent event) { + public void onCommandAutoCompleteInteraction(final CommandAutoCompleteInteractionEvent event) { String name = event.getName(); - logger.debug("Received auto completion from command-subcommand '{}-{}' (#{}) on guild '{}'", - name, event.getSubcommandName(), event.getId(), event.getGuild()); + logger.debug("Received auto completion from command '{}' (#{}) on guild '{}'", + event.getCommandPath(), event.getId(), event.getGuild()); COMMAND_SERVICE.execute(() -> requireUserInteractor( UserInteractorPrefix.SLASH_COMMAND.getPrefixedName(name), SlashCommand.class) .onAutoComplete(event));