Moved Preference#toChoice into PreferencesSetSubcommand

Author: jasonlessenich

src/main/java/net/javadiscord/javabot/systems/user_preferences/UserPreferenceManager.java

@@ -50,7 +50,7 @@ public boolean setOrCreate(long userId, Preference preference, boolean enabled)
 	/**
 	 * Gets a single {@link UserPreference} (or creates a new one if it doesn't exist yet).
 	 *
-	 * @param userId The users' id.
+	 * @param userId     The users' id.
 	 * @param preference The {@link Preference} to get.
 	 * @return The {@link UserPreference}.
 	 */

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

@@ -1,4 +1,3 @@
-
 package net.javadiscord.javabot.systems.user_preferences.commands;
 
 import com.dynxsty.dih4jda.interactions.commands.SlashCommand;

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

@@ -1,8 +1,8 @@
-
 package net.javadiscord.javabot.systems.user_preferences.commands;
 
 import com.dynxsty.dih4jda.interactions.commands.SlashCommand;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+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;
@@ -26,7 +26,7 @@ public PreferencesSetSubcommand() {
 		setSubcommandData(new SubcommandData("set", "Allows you to set your preferences!")
 				.addOptions(
 						new OptionData(OptionType.INTEGER, "preference", "The preference to set.", true)
-								.addChoices(Arrays.stream(Preference.values()).map(Preference::toChoice).toList()),
+								.addChoices(Arrays.stream(Preference.values()).map(this::toChoice).toList()),
 						new OptionData(OptionType.BOOLEAN, "state", "The state of the specified preference.", true)
 				)
 		);
@@ -49,4 +49,9 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
 			Responses.error(event, "Could not %s `%s`.", state ? "enable" : "disable", preference).queue();
 		}
 	}
+
+
+	public Command.Choice toChoice(@NotNull Preference preference) {
+		return new Command.Choice(preference.toString(), String.valueOf(preference.ordinal()));
+	}
 }

src/main/java/net/javadiscord/javabot/systems/user_preferences/dao/UserPreferenceRepository.java

@@ -24,9 +24,9 @@ public class UserPreferenceRepository extends DatabaseRepository<UserPreference>
 	 */
 	public UserPreferenceRepository(Connection con) {
 		super(con, UserPreference.class, "USER_PREFERENCES", List.of(
-				TableProperty.of("user_id", H2Type.BIGINT,  (x, y) -> x.setUserId((Long) y),                                UserPreference::getUserId),
-				TableProperty.of("ordinal", H2Type.INTEGER, (x, y) -> x.setPreference(Preference.values()[(Integer) y]),    p -> p.getPreference().ordinal()),
-				TableProperty.of("enabled", H2Type.BOOLEAN, (x, y) -> x.setEnabled((Boolean) y),                            UserPreference::isEnabled)
+				TableProperty.of("user_id", H2Type.BIGINT, (x, y) -> x.setUserId((Long) y), UserPreference::getUserId),
+				TableProperty.of("ordinal", H2Type.INTEGER, (x, y) -> x.setPreference(Preference.values()[(Integer) y]), p -> p.getPreference().ordinal()),
+				TableProperty.of("enabled", H2Type.BOOLEAN, (x, y) -> x.setEnabled((Boolean) y), UserPreference::isEnabled)
 		));
 	}
 

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

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