Removed autocomplete and replaced with dynamic choices

Author: jasonlessenich

src/main/java/net/javadiscord/javabot/systems/user_preferences/commands/PreferencesListSubcommand.java

@@ -28,7 +28,7 @@ public PreferencesListSubcommand() {
 	public void execute(@NotNull SlashCommandInteractionEvent event) {
 		UserPreferenceManager manager = new UserPreferenceManager(Bot.getDataSource());
 		String preferences = Arrays.stream(Preference.values())
-				.map(p -> String.format("%s (%s)", p, manager.getOrCreate(event.getUser().getIdLong(), p).isEnabled() ? "Enabled" : "Disabled"))
+				.map(p -> String.format("`%s` %s", manager.getOrCreate(event.getUser().getIdLong(), p).isEnabled() ? "\uD83D\uDFE2" : "\uD83D\uDD34", p))
 				.collect(Collectors.joining("\n"));
 		Responses.info(event, String.format("%s's Preferences", event.getUser().getName()), preferences).queue();
 	}

src/main/java/net/javadiscord/javabot/systems/user_preferences/commands/PreferencesSetSubcommand.java

@@ -1,36 +1,34 @@
 
 package net.javadiscord.javabot.systems.user_preferences.commands;
 
-import com.dynxsty.dih4jda.interactions.commands.AutoCompletable;
 import com.dynxsty.dih4jda.interactions.commands.SlashCommand;
-import com.dynxsty.dih4jda.util.AutoCompleteUtils;
-import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
-import net.dv8tion.jda.api.interactions.AutoCompleteQuery;
-import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
+import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
 import net.javadiscord.javabot.Bot;
 import net.javadiscord.javabot.systems.user_preferences.UserPreferenceManager;
 import net.javadiscord.javabot.systems.user_preferences.model.Preference;
 import net.javadiscord.javabot.util.Responses;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Arrays;
 
 /**
  * <h3>This class represents the /preferences set command.</h3>
  */
-public class PreferencesSetSubcommand extends SlashCommand.Subcommand implements AutoCompletable {
+public class PreferencesSetSubcommand extends SlashCommand.Subcommand {
 	/**
 	 * The constructor of this class, which sets the corresponding {@link net.dv8tion.jda.api.interactions.commands.build.SlashCommandData}.
 	 */
 	public PreferencesSetSubcommand() {
 		setSubcommandData(new SubcommandData("set", "Allows you to set your preferences!")
-				.addOption(OptionType.INTEGER, "preference", "The preference to set.", true, true)
-				.addOption(OptionType.BOOLEAN, "state", "The state of the specified preference.", true)
+				.addOptions(
+						new OptionData(OptionType.INTEGER, "preference", "The preference to set.", true)
+								.addChoices(Arrays.stream(Preference.values()).map(Preference::toChoice).toList()),
+						new OptionData(OptionType.BOOLEAN, "state", "The state of the specified preference.", true)
+				)
 		);
 	}
 
@@ -51,18 +49,4 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
 			Responses.error(event, "Could not %s `%s`.", state ? "enable" : "disable", preference).queue();
 		}
 	}
-
-	private @NotNull List<Command.Choice> getPreferenceChoices(long userId) {
-		List<Command.Choice> choices = new ArrayList<>(Preference.values().length);
-		UserPreferenceManager manager = new UserPreferenceManager(Bot.getDataSource());
-		for (Preference p : Preference.values()) {
-			choices.add(new Command.Choice(String.format("%s (%s)", p, manager.getOrCreate(userId, p).isEnabled() ? "Enabled" : "Disabled"), p.ordinal()));
-		}
-		return choices;
-	}
-
-	@Override
-	public void handleAutoComplete(@NotNull CommandAutoCompleteInteractionEvent event, @NotNull AutoCompleteQuery target) {
-		event.replyChoices(AutoCompleteUtils.handleChoices(event, e -> getPreferenceChoices(e.getUser().getIdLong()))).queue();
-	}
 }

src/main/java/net/javadiscord/javabot/systems/user_preferences/model/Preference.java

@@ -1,5 +1,7 @@
 package net.javadiscord.javabot.systems.user_preferences.model;
 
+import net.dv8tion.jda.api.interactions.commands.Command;
+
 /**
  * Contains all preferences users can set.
  */
@@ -25,4 +27,8 @@ public String toString() {
 	public boolean getDefaultState() {
 		return defaultState;
 	}
+
+	public Command.Choice toChoice() {
+		return new Command.Choice(name, String.valueOf(ordinal()));
+	}
 }