Fixed HelpChannelInteractionManager#handleHelpThankButton not getting executed

Author: jasonlessenich

src/main/java/net/javadiscord/javabot/systems/help/HelpChannelInteractionManager.java

@@ -35,7 +35,7 @@ public class HelpChannelInteractionManager implements ButtonHandler {
 	 * @param reservationId The help channel's reservation id.
 	 * @param action        The data extracted from the button's id.
 	 */
-	private void handleHelpThank(@NotNull ButtonInteractionEvent event, String reservationId, String action) {
+	private void handleHelpThankButton(@NotNull ButtonInteractionEvent event, String reservationId, String action) {
 		event.deferEdit().queue();
 		HelpConfig config = Bot.config.get(event.getGuild()).getHelpConfig();
 		HelpChannelManager channelManager = new HelpChannelManager(config);
@@ -143,11 +143,7 @@ private void thankHelper(@NotNull ButtonInteractionEvent event, TextChannel chan
 		}
 	}
 
-	@Override
-	public void handleButton(@NotNull ButtonInteractionEvent event, @NotNull Button button) {
-		String[] id = ComponentIdBuilder.split(event.getComponentId());
-		String reservationId = id[2];
-		String action = id[3];
+	private void handleHelpChannelButton(@NotNull ButtonInteractionEvent event, String reservationId, String action) {
 		event.deferEdit().queue();
 		HelpConfig config = Bot.config.get(event.getGuild()).getHelpConfig();
 		HelpChannelManager channelManager = new HelpChannelManager(config);
@@ -212,4 +208,14 @@ public void handleButton(@NotNull ButtonInteractionEvent event, @NotNull Button
 					.setEphemeral(true).queue();
 		}
 	}
+
+	@Override
+	public void handleButton(@NotNull ButtonInteractionEvent event, @NotNull Button button) {
+		if (event.getUser().isBot()) return;
+		String[] id = ComponentIdBuilder.split(event.getComponentId());
+		switch (id[0]) {
+			case "help-channel" -> handleHelpChannelButton(event, id[1], id[2]);
+			case "help-thank" -> handleHelpThankButton(event, id[1], id[2]);
+		}
+	}
 }

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

@@ -89,8 +89,8 @@ public CustomTagManager(@NotNull JDA jda, @NotNull DataSource dataSource) {
 	 */
 	public static @NotNull RestAction<?> handleCustomTag(@NotNull SlashCommandInteractionEvent event, @NotNull CustomTag tag) {
 		Set<RestAction<?>> actions = new HashSet<>();
-		boolean reply = event.getOption("reply", tag.isReply(), OptionMapping::getAsBoolean);
-		boolean embed = event.getOption("embed", tag.isEmbed(), OptionMapping::getAsBoolean);
+		boolean reply = tag.isReply();
+		boolean embed = tag.isEmbed();
 		if (embed) {
 			if (reply) {
 				actions.add(event.replyEmbeds(tag.toEmbed()));