fixed autocomplete listener

ZrdJ · Apr 28, 2024 · 66b0850 · 66b0850
1 parent 788d254
commit 66b0850
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Release artifact
 <dependency>
     <groupId>com.github.zrdj</groupId>
     <artifactId>javachord</artifactId>
-    <version>3.8.0.8</version>
+    <version>3.8.0.9</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.zrdj</groupId>
     <artifactId>javachord</artifactId>
-    <version>3.8.0.8</version>
+    <version>3.8.0.9</version>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>

diff --git a/src/main/java/com/github/zrdj/javachord/Javachord.java b/src/main/java/com/github/zrdj/javachord/Javachord.java
@@ -102,8 +102,8 @@ interface Command {
         interface Option {
             interface Autocomplete {
                 interface Optional {
-                    static OptionalOption<String> stringOption(final String name, final String description, final Function<java.util.Optional<String>, List<Choice<String>>> autocomplete) {
-                        return new StringAutocompleteOptionalOption(name, description) {
+                    static OptionalOption<String> stringOption(final String name, final String description, final ApplicationCommand parent,final Function<java.util.Optional<String>, List<Choice<String>>> autocomplete) {
+                        return new StringAutocompleteOptionalOption(name, description, parent) {
 
                             @Override
                             protected List<Choice<String>> onAutocompleteChoice(final java.util.Optional<String> option) {
@@ -112,8 +112,8 @@ protected List<Choice<String>> onAutocompleteChoice(final java.util.Optional<Str
                         };
                     }
 
-                    static OptionalOption<Long> longOption(final String name, final String description, final Function<java.util.Optional<Long>, List<Choice<Long>>> autocomplete) {
-                        return new LongAutocompleteOptionalOption(name, description) {
+                    static OptionalOption<Long> longOption(final String name, final String description, final ApplicationCommand parent, final Function<java.util.Optional<Long>, List<Choice<Long>>> autocomplete) {
+                        return new LongAutocompleteOptionalOption(name, description, parent) {
                             @Override
                             protected List<Choice<Long>> onAutocompleteChoice(final java.util.Optional<Long> option) {
                                 return autocomplete.apply(option);
@@ -123,17 +123,17 @@ protected List<Choice<Long>> onAutocompleteChoice(final java.util.Optional<Long>
 
                 }
                 interface Required {
-                    static RequiredOption<String> stringOption(final String name, final String description, final Function<java.util.Optional<String>, List<Choice<String>>> autocomplete) {
-                        return new StringAutocompleteRequiredOption(name, description) {
+                    static RequiredOption<String> stringOption(final String name, final String description, final ApplicationCommand parent, final Function<java.util.Optional<String>, List<Choice<String>>> autocomplete) {
+                        return new StringAutocompleteRequiredOption(name, description, parent) {
                             @Override
                             protected List<Choice<String>> onAutocompleteChoice(final java.util.Optional<String> option) {
                                 return autocomplete.apply(option);
                             }
                         };
                     }
 
-                    static RequiredOption<Long> longOption(final String name, final String description, final Function<java.util.Optional<Long>, List<Choice<Long>>> autocomplete) {
-                        return new LongAutocompleteRequiredOption(name, description) {
+                    static RequiredOption<Long> longOption(final String name, final String description, final ApplicationCommand parent,final Function<java.util.Optional<Long>, List<Choice<Long>>> autocomplete) {
+                        return new LongAutocompleteRequiredOption(name, description, parent) {
                             @Override
                             protected List<Choice<Long>> onAutocompleteChoice(final java.util.Optional<Long> option) {
                                 return autocomplete.apply(option);

diff --git a/...ava/com/github/zrdj/javachord/command/option/autocomplete/AutocompleteOptionalOption.java b/...ava/com/github/zrdj/javachord/command/option/autocomplete/AutocompleteOptionalOption.java
@@ -1,6 +1,7 @@
 package com.github.zrdj.javachord.command.option.autocomplete;
 
 import com.github.zrdj.javachord.Javachord;
+import com.github.zrdj.javachord.command.ApplicationCommand;
 import com.github.zrdj.javachord.command.option.OptionalOption;
 import org.javacord.api.event.interaction.AutocompleteCreateEvent;
 import org.javacord.api.interaction.*;
@@ -12,8 +13,12 @@
 import java.util.function.BiFunction;
 
 abstract class AutocompleteOptionalOption<E> extends OptionalOption<E> implements AutocompleteCreateListener {
-    public AutocompleteOptionalOption(final String name, final String description, final SlashCommandOptionType type, final BiFunction<String, SlashCommandInteraction, Optional<E>> mapper) {
+    private final ApplicationCommand _parent;
+
+    public AutocompleteOptionalOption(final String name, final String description, final SlashCommandOptionType type,
+                                      final ApplicationCommand parent, final BiFunction<String, SlashCommandInteraction, Optional<E>> mapper) {
         super(name, description, type, mapper);
+        this._parent = parent;
         Javachord.Instance.Get.addListener(this);
     }
 
@@ -24,6 +29,9 @@ protected final SlashCommandOptionBuilder buildSlashCommandOption(final SlashCom
 
     @Override
     public final void onAutocompleteCreate(final AutocompleteCreateEvent event) {
+        if (!_parent.fqdn().equalsIgnoreCase(event.getAutocompleteInteraction().getFullCommandName())) {
+            return;
+        }
         var choices = onAutocomplete(event.getAutocompleteInteraction().getArgumentByName(_name));
         event.getAutocompleteInteraction()
                 .respondWithChoices(choices)

diff --git a/...ava/com/github/zrdj/javachord/command/option/autocomplete/AutocompleteRequiredOption.java b/...ava/com/github/zrdj/javachord/command/option/autocomplete/AutocompleteRequiredOption.java
@@ -1,6 +1,7 @@
 package com.github.zrdj.javachord.command.option.autocomplete;
 
 import com.github.zrdj.javachord.Javachord;
+import com.github.zrdj.javachord.command.ApplicationCommand;
 import com.github.zrdj.javachord.command.option.RequiredOption;
 import org.javacord.api.event.interaction.AutocompleteCreateEvent;
 import org.javacord.api.interaction.*;
@@ -12,8 +13,12 @@
 import java.util.function.BiFunction;
 
 abstract class AutocompleteRequiredOption<E> extends RequiredOption<E> implements AutocompleteCreateListener {
-    public AutocompleteRequiredOption(final String name, final String description, final SlashCommandOptionType type, final BiFunction<String, SlashCommandInteraction, E> mapper) {
+    private final ApplicationCommand _parent;
+
+    public AutocompleteRequiredOption(final String name, final String description, final SlashCommandOptionType type,
+                                      final ApplicationCommand parent, final BiFunction<String, SlashCommandInteraction, E> mapper) {
         super(name, description, type, mapper);
+        this._parent = parent;
         Javachord.Instance.Get.addListener(this);
     }
 
@@ -24,6 +29,9 @@ protected final SlashCommandOptionBuilder buildSlashCommandOption(final SlashCom
 
     @Override
     public final void onAutocompleteCreate(final AutocompleteCreateEvent event) {
+        if (!_parent.fqdn().equalsIgnoreCase(event.getAutocompleteInteraction().getFullCommandName())) {
+            return;
+        }
         var choices = onAutocomplete(event.getAutocompleteInteraction().getArgumentByName(_name));
         event.getAutocompleteInteraction()
                 .respondWithChoices(choices)

diff --git a/...com/github/zrdj/javachord/command/option/autocomplete/LongAutocompleteOptionalOption.java b/...com/github/zrdj/javachord/command/option/autocomplete/LongAutocompleteOptionalOption.java
@@ -1,5 +1,6 @@
 package com.github.zrdj.javachord.command.option.autocomplete;
 
+import com.github.zrdj.javachord.command.ApplicationCommand;
 import com.github.zrdj.javachord.command.option.choice.Choice;
 import org.javacord.api.interaction.SlashCommandInteractionOption;
 import org.javacord.api.interaction.SlashCommandOptionChoice;
@@ -10,8 +11,8 @@
 import java.util.stream.Collectors;
 
 public abstract class LongAutocompleteOptionalOption  extends AutocompleteOptionalOption<Long>{
-    public LongAutocompleteOptionalOption(final String name, final String description) {
-        super(name, description, SlashCommandOptionType.LONG, (id, interaction) -> interaction.getArgumentLongValueByName(id));
+    public LongAutocompleteOptionalOption(final String name, final String description, final ApplicationCommand parent) {
+        super(name, description, SlashCommandOptionType.LONG, parent,(id, interaction) -> interaction.getArgumentLongValueByName(id));
     }
 
     @Override

diff --git a/...com/github/zrdj/javachord/command/option/autocomplete/LongAutocompleteRequiredOption.java b/...com/github/zrdj/javachord/command/option/autocomplete/LongAutocompleteRequiredOption.java
@@ -1,5 +1,6 @@
 package com.github.zrdj.javachord.command.option.autocomplete;
 
+import com.github.zrdj.javachord.command.ApplicationCommand;
 import com.github.zrdj.javachord.command.option.choice.Choice;
 import org.javacord.api.interaction.SlashCommandInteractionOption;
 import org.javacord.api.interaction.SlashCommandOptionChoice;
@@ -10,8 +11,8 @@
 import java.util.stream.Collectors;
 
 public abstract class LongAutocompleteRequiredOption extends AutocompleteRequiredOption<Long> {
-    public LongAutocompleteRequiredOption(final String name, final String description) {
-        super(name, description, SlashCommandOptionType.LONG, (id, interaction) -> interaction.getArgumentLongValueByName(id).orElseThrow());
+    public LongAutocompleteRequiredOption(final String name, final String description, final ApplicationCommand parent) {
+        super(name, description, SlashCommandOptionType.LONG, parent,(id, interaction) -> interaction.getArgumentLongValueByName(id).orElseThrow());
     }
 
     @Override

diff --git a/...m/github/zrdj/javachord/command/option/autocomplete/StringAutocompleteOptionalOption.java b/...m/github/zrdj/javachord/command/option/autocomplete/StringAutocompleteOptionalOption.java
@@ -1,5 +1,6 @@
 package com.github.zrdj.javachord.command.option.autocomplete;
 
+import com.github.zrdj.javachord.command.ApplicationCommand;
 import com.github.zrdj.javachord.command.option.choice.Choice;
 import org.javacord.api.interaction.SlashCommandInteractionOption;
 import org.javacord.api.interaction.SlashCommandOptionChoice;
@@ -10,8 +11,8 @@
 import java.util.stream.Collectors;
 
 public abstract class StringAutocompleteOptionalOption  extends AutocompleteOptionalOption<String> {
-    public StringAutocompleteOptionalOption(final String name, final String description) {
-        super(name, description, SlashCommandOptionType.STRING, (id, interaction) -> interaction.getArgumentStringValueByName(id));
+    public StringAutocompleteOptionalOption(final String name, final String description, final ApplicationCommand parent) {
+        super(name, description, SlashCommandOptionType.STRING, parent, (id, interaction) -> interaction.getArgumentStringValueByName(id));
     }
 
     @Override

diff --git a/...m/github/zrdj/javachord/command/option/autocomplete/StringAutocompleteRequiredOption.java b/...m/github/zrdj/javachord/command/option/autocomplete/StringAutocompleteRequiredOption.java
@@ -1,5 +1,6 @@
 package com.github.zrdj.javachord.command.option.autocomplete;
 
+import com.github.zrdj.javachord.command.ApplicationCommand;
 import com.github.zrdj.javachord.command.option.choice.Choice;
 import org.javacord.api.interaction.SlashCommandInteractionOption;
 import org.javacord.api.interaction.SlashCommandOptionChoice;
@@ -10,8 +11,8 @@
 import java.util.stream.Collectors;
 
 public abstract class StringAutocompleteRequiredOption extends AutocompleteRequiredOption<String> {
-    public StringAutocompleteRequiredOption(final String name, final String description) {
-        super(name, description, SlashCommandOptionType.STRING, (id, interaction) -> interaction.getArgumentStringValueByName(id).orElseThrow());
+    public StringAutocompleteRequiredOption(final String name, final String description, final ApplicationCommand parent) {
+        super(name, description, SlashCommandOptionType.STRING, parent,(id, interaction) -> interaction.getArgumentStringValueByName(id).orElseThrow());
     }
 
     @Override