Added /preferences list & moved /preferences to /preferences set

Author: jasonlessenich

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

@@ -0,0 +1,19 @@
+package net.javadiscord.javabot.systems.user_preferences.commands;
+
+import com.dynxsty.dih4jda.interactions.commands.SlashCommand;
+import net.dv8tion.jda.api.interactions.commands.build.Commands;
+
+/**
+ * <h3>This class represents the /preferences command.</h3>
+ */
+public class PreferencesCommand extends SlashCommand {
+	/**
+	 * The constructor of this class, which sets the corresponding {@link net.dv8tion.jda.api.interactions.commands.build.SlashCommandData}.
+	 */
+	public PreferencesCommand() {
+		setSlashCommandData(Commands.slash("preferences", "Contains commands for managing user preferences.")
+				.setGuildOnly(true)
+		);
+		addSubcommands(new PreferencesListSubcommand(), new PreferencesSetSubcommand());
+	}
+}

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

@@ -0,0 +1,35 @@
+
+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.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.Arrays;
+import java.util.stream.Collectors;
+
+/**
+ * <h3>This class represents the /preferences list command.</h3>
+ */
+public class PreferencesListSubcommand extends SlashCommand.Subcommand {
+	/**
+	 * The constructor of this class, which sets the corresponding {@link net.dv8tion.jda.api.interactions.commands.build.SlashCommandData}.
+	 */
+	public PreferencesListSubcommand() {
+		setSubcommandData(new SubcommandData("list", "Shows all your preferences."));
+	}
+
+	@Override
+	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"))
+				.collect(Collectors.joining("\n"));
+		Responses.info(event, String.format("%s's Preferences", event.getUser().getName()), preferences).queue();
+	}
+}

…nces/commands/UserPreferenceCommand.java …s/commands/PreferencesSetSubcommand.javasrc/main/java/net/javadiscord/javabot/systems/user_preferences/commands/UserPreferenceCommand.java renamed to src/main/java/net/javadiscord/javabot/systems/user_preferences/commands/PreferencesSetSubcommand.java src/main/java/net/javadiscord/javabot/systems/user_preferences/commands/UserPreferenceCommand.java renamed to src/main/java/net/javadiscord/javabot/systems/user_preferences/commands/PreferencesSetSubcommand.java

@@ -1,3 +1,4 @@
+
 package net.javadiscord.javabot.systems.user_preferences.commands;
 
 import com.dynxsty.dih4jda.interactions.commands.AutoCompletable;
@@ -9,7 +10,7 @@
 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.Commands;
+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;
@@ -20,14 +21,14 @@
 import java.util.List;
 
 /**
- * <h3>This class represents the /preferences command.</h3>
+ * <h3>This class represents the /preferences set command.</h3>
  */
-public class UserPreferenceCommand extends SlashCommand implements AutoCompletable {
+public class PreferencesSetSubcommand extends SlashCommand.Subcommand implements AutoCompletable {
 	/**
 	 * The constructor of this class, which sets the corresponding {@link net.dv8tion.jda.api.interactions.commands.build.SlashCommandData}.
 	 */
-	public UserPreferenceCommand() {
-		setSlashCommandData(Commands.slash("preferences", "Allows you to set some preferences!")
+	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)
 		);
@@ -45,9 +46,9 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
 		boolean state = stateMapping.getAsBoolean();
 		UserPreferenceManager manager = new UserPreferenceManager(Bot.getDataSource());
 		if (manager.setOrCreate(event.getUser().getIdLong(), preference, state)) {
-			Responses.info(event, "Preference Updated", "Successfully set `%s` to `%s`!", preference, state).queue();
+			Responses.info(event, "Preference Updated", "Successfully %s `%s`!", state ? "enabled" : "disabled", preference).queue();
 		} else {
-			Responses.error(event, "Could not update `%s` to `%s`.", preference, state).queue();
+			Responses.error(event, "Could not %s `%s`.", state ? "enable" : "disable", preference).queue();
 		}
 	}