added /tags list & /tags view

Author: jasonlessenich

src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/CustomTagManager.java

@@ -92,13 +92,13 @@ public CustomTagManager(@NotNull JDA jda, @NotNull DataSource dataSource) {
 		boolean embed = tag.isEmbed();
 		if (embed) {
 			if (reply) {
-				actions.add(event.replyEmbeds(tag.toEmbed()));
+				actions.add(event.getHook().sendMessageEmbeds(tag.toEmbed()));
 			} else {
 				actions.add(event.getChannel().sendMessageEmbeds(tag.toEmbed()));
 			}
 		} else {
 			if (reply) {
-				actions.add(event.reply(tag.getResponse()).allowedMentions(List.of()));
+				actions.add(event.getHook().sendMessage(tag.getResponse()).allowedMentions(List.of()));
 			} else {
 				actions.add(event.getChannel().sendMessage(tag.getResponse()).allowedMentions(List.of()));
 			}

src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/CreateCustomTagSubcommand.java

@@ -27,7 +27,7 @@
 /**
  * Administrative Subcommand that allows to create {@link CustomTag}s.
  */
-public class CreateCustomTagSubcommand extends CustomTagsSubcommand implements ModalHandler {
+public class CreateCustomTagSubcommand extends TagsSubcommand implements ModalHandler {
 	/**
 	 * The constructor of this class, which sets the corresponding {@link SubcommandData}.
 	 */

src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/DeleteCustomTagSubcommand.java

@@ -25,7 +25,7 @@
 /**
  * <h3>This class represents the /tag-admin delete command.</h3>
  */
-public class DeleteCustomTagSubcommand extends CustomTagsSubcommand implements AutoCompletable {
+public class DeleteCustomTagSubcommand extends TagsSubcommand implements AutoCompletable {
 	/**
 	 * The constructor of this class, which sets the corresponding {@link SubcommandData}.
 	 */

src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/EditCustomTagSubcommand.java

@@ -35,7 +35,7 @@
 /**
  * <h3>This class represents the /tag-admin edit command.</h3>
  */
-public class EditCustomTagSubcommand extends CustomTagsSubcommand implements AutoCompletable, ModalHandler {
+public class EditCustomTagSubcommand extends TagsSubcommand implements AutoCompletable, ModalHandler {
 	/**
 	 * The constructor of this class, which sets the corresponding {@link SubcommandData}.
 	 */

src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/ListCustomTagsCommand.java renamed to src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/TagListSubcommand.java

@@ -3,6 +3,8 @@
 import com.dynxsty.dih4jda.interactions.commands.SlashCommand;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
+import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
+import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
 import net.dv8tion.jda.api.utils.MarkdownUtil;
 import net.javadiscord.javabot.data.h2db.DbHelper;
 import net.javadiscord.javabot.systems.staff_commands.tags.dao.CustomTagRepository;
@@ -16,24 +18,22 @@
 /**
  * <h3>This class represents the /tags command.</h3>
  */
-public class ListCustomTagsCommand extends SlashCommand {
+public class TagListSubcommand extends TagsSubcommand {
 	/**
 	 * The constructor of this class, which sets the corresponding {@link net.dv8tion.jda.api.interactions.commands.build.SlashCommandData}.
 	 */
-	public ListCustomTagsCommand() {
-		setSlashCommandData(Commands.slash("tags", "Lists all custom tags")
-				.setGuildOnly(true)
-		);
+	public TagListSubcommand() {
+		setSubcommandData(new SubcommandData("list", "Lists all custom tags"));
 	}
 
 	@Override
-	public void execute(@NotNull SlashCommandInteractionEvent event) {
-		event.deferReply(false).queue();
+	public ReplyCallbackAction handleCustomTagsSubcommand(@NotNull SlashCommandInteractionEvent event) {
 		DbHelper.doDaoAction(CustomTagRepository::new, dao -> {
 			List<CustomTag> tags = dao.getCustomTagsByGuildId(event.getGuild().getIdLong());
 			String tagList = tags.stream().map(CustomTag::getName).map(MarkdownUtil::monospace).collect(Collectors.joining(", "));
 			Responses.info(event.getHook(), "Custom Tag List",
 							String.format(tagList.length() > 0 ? tagList : "No Custom Tags created yet.")).queue();
 		});
+		return event.deferReply(false);
 	}
 }

src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/TagCommand.java renamed to src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/TagViewSubcommand.java

@@ -8,6 +8,8 @@
 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.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
 import net.javadiscord.javabot.Bot;
 import net.javadiscord.javabot.systems.staff_commands.tags.CustomTagManager;
 import net.javadiscord.javabot.systems.staff_commands.tags.model.CustomTag;
@@ -19,29 +21,29 @@
 /**
  * <h3>This class represents the /tag command.</h3>
  */
-public class TagCommand extends SlashCommand implements AutoCompletable {
+public class TagViewSubcommand extends TagsSubcommand implements AutoCompletable {
 	/**
 	 * The constructor of this class, which sets the corresponding {@link net.dv8tion.jda.api.interactions.commands.build.SlashCommandData}.
 	 */
-	public TagCommand() {
-		setSlashCommandData(Commands.slash("tag-view", "Allows to view a tag.")
+	public TagViewSubcommand() {
+		setSubcommandData(new SubcommandData("view", "Allows to view a tag.")
 				.addOption(OptionType.STRING, "name", "The tag's name.", true, true)
 		);
 	}
 
 	@Override
-	public void execute(@NotNull SlashCommandInteractionEvent event) {
+	public ReplyCallbackAction handleCustomTagsSubcommand(@NotNull SlashCommandInteractionEvent event) {
 		OptionMapping nameMapping = event.getOption("name");
 		if (nameMapping == null) {
-			Responses.replyMissingArguments(event);
-			return;
+			return Responses.replyMissingArguments(event);
 		}
 		Optional<CustomTag> tagOptional = Bot.customTagManager.getByName(event.getGuild().getIdLong(), nameMapping.getAsString());
 		if (tagOptional.isPresent()) {
 			CustomTagManager.handleCustomTag(event, tagOptional.get()).queue();
 		} else {
-			Responses.error(event.getHook(), "Could not find Custom Tag with name `%s`.", nameMapping.getAsString()).queue();
+			Responses.error(event.getHook(), "Could not find Custom Tag with name `%s`.", nameMapping.getAsString());
 		}
+		return event.deferReply(false);
 	}
 
 	@Override

src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/CustomTagsAdminCommand.java renamed to src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/TagsAdminCommand.java

@@ -7,12 +7,12 @@
 /**
  * Represents the `/tag-admin` command. This holds administrative commands for managing "Custom Tags".
  */
-public class CustomTagsAdminCommand extends SlashCommand implements CommandModerationPermissions {
+public class TagsAdminCommand extends SlashCommand implements CommandModerationPermissions {
 	/**
 	 * This classes constructor which sets the {@link net.dv8tion.jda.api.interactions.commands.build.SlashCommandData} and
 	 * adds the corresponding {@link net.dv8tion.jda.api.interactions.commands.Command.Subcommand}s.
 	 */
-	public CustomTagsAdminCommand() {
+	public TagsAdminCommand() {
 		setModerationSlashCommandData(Commands.slash("tag-admin", "Administrative commands for managing \"Custom Tags\"."));
 		addSubcommands(new CreateCustomTagSubcommand(), new DeleteCustomTagSubcommand(), new EditCustomTagSubcommand());
 	}

src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/TagsCommand.java

@@ -0,0 +1,19 @@
+package net.javadiscord.javabot.systems.staff_commands.tags.commands;
+
+import com.dynxsty.dih4jda.interactions.commands.SlashCommand;
+import net.dv8tion.jda.api.interactions.commands.build.Commands;
+import net.javadiscord.javabot.systems.moderation.CommandModerationPermissions;
+
+/**
+ * Represents the `/tag` command. This holds commands for interacting with "Custom Tags".
+ */
+public class TagsCommand extends SlashCommand implements CommandModerationPermissions {
+	/**
+	 * This classes constructor which sets the {@link net.dv8tion.jda.api.interactions.commands.build.SlashCommandData} and
+	 * adds the corresponding {@link net.dv8tion.jda.api.interactions.commands.Command.Subcommand}s.
+	 */
+	public TagsCommand() {
+		setModerationSlashCommandData(Commands.slash("tags", "Commands for interacting with Custom Tags."));
+		addSubcommands(new TagViewSubcommand(), new TagListSubcommand());
+	}
+}

src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/CustomTagsSubcommand.java renamed to src/main/java/net/javadiscord/javabot/systems/staff_commands/tags/commands/TagsSubcommand.java

@@ -4,6 +4,7 @@
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.requests.restaction.interactions.InteractionCallbackAction;
+import net.javadiscord.javabot.util.Checks;
 import net.javadiscord.javabot.util.ExceptionLogger;
 import net.javadiscord.javabot.util.Responses;
 import org.jetbrains.annotations.NotNull;
@@ -15,13 +16,19 @@
  * custom-tag-related commands.
  */
 @Slf4j
-public abstract class CustomTagsSubcommand extends SlashCommand.Subcommand {
+public abstract class TagsSubcommand extends SlashCommand.Subcommand {
+	private boolean requireStaff = true;
+
 	@Override
 	public void execute(@NotNull SlashCommandInteractionEvent event) {
-		if (event.getGuild() == null) {
+		if (event.getGuild() == null || event.getMember() == null) {
 			Responses.replyGuildOnly(event).queue();
 			return;
 		}
+		if (requireStaff && !Checks.hasStaffRole(event.getGuild(), event.getMember())) {
+			Responses.replyStaffOnly(event, event.getGuild()).queue();
+			return;
+		}
 		try {
 			handleCustomTagsSubcommand(event).queue();
 		} catch (SQLException e) {
@@ -30,5 +37,9 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
 		}
 	}
 
+	protected void setRequiredStaff(boolean requireStaff) {
+		this.requireStaff = requireStaff;
+	}
+
 	protected abstract InteractionCallbackAction<?> handleCustomTagsSubcommand(@NotNull SlashCommandInteractionEvent event) throws SQLException;
 }