Using proper button factories (CR Tais)

Author: Zabuzard

application/src/main/java/org/togetherjava/tjbot/commands/mathcommands/TeXCommand.java

@@ -4,7 +4,6 @@
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.components.Button;
-import net.dv8tion.jda.api.interactions.components.ButtonStyle;
 import org.jetbrains.annotations.NotNull;
 import org.scilab.forge.jlatexmath.ParseException;
 import org.scilab.forge.jlatexmath.TeXConstants;
@@ -15,7 +14,8 @@
 import org.togetherjava.tjbot.commands.SlashCommandVisibility;
 
 import javax.imageio.ImageIO;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Image;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -88,7 +88,7 @@ public void onSlashCommand(@NotNull final SlashCommandEvent event) {
         }
         event.getHook()
             .editOriginal(renderedTextImageStream.toByteArray(), "tex.png")
-            .setActionRow(Button.of(ButtonStyle.DANGER, generateComponentId(userID), "Delete"))
+            .setActionRow(Button.danger(generateComponentId(userID), "Delete"))
             .queue();
     }
 

application/src/main/java/org/togetherjava/tjbot/commands/moderation/scam/ScamBlocker.java

@@ -261,8 +261,8 @@ If you think this was a mistake (for example, your account was hacked, but you g
                 event.getAuthor().getIdLong(),
                 ScamHistoryStore.hashMessageContent(event.getMessage()));
 
-        return ActionRow.of(Button.of(ButtonStyle.SUCCESS, generateComponentId(args), "Yes"),
-                Button.of(ButtonStyle.DANGER, generateComponentId(args), "No"));
+        return ActionRow.of(Button.success(generateComponentId(args), "Yes"),
+                Button.danger(generateComponentId(args), "No"));
     }
 
     private @NotNull String generateComponentId(@NotNull ComponentIdArguments args) {

application/src/main/java/org/togetherjava/tjbot/commands/system/ReloadCommand.java

@@ -70,8 +70,8 @@ public void onSlashCommand(@NotNull SlashCommandEvent event) {
         event.reply(
                 "Are you sure? You can only reload commands a few times each day, so do not overdo this.")
             .addActionRow(
-                    Button.of(ButtonStyle.SUCCESS, generateComponentId(member.getId()), "Yes"),
-                    Button.of(ButtonStyle.DANGER, generateComponentId(member.getId()), "No"))
+                    Button.success(generateComponentId(member.getId()), "Yes"),
+                    Button.danger(generateComponentId(member.getId()), "No"))
             .queue();
     }
 

application/src/test/java/org/togetherjava/tjbot/jda/ButtonClickEventBuilder.java

@@ -46,11 +46,11 @@
  * {@code
  * // Default message with a delete button
  * jdaTester.createButtonClickEvent()
- *   .setActionRows(ActionRow.of(Button.of(ButtonStyle.DANGER, "1", "Delete"))
+ *   .setActionRows(ActionRow.of(Button.danger("1", "Delete"))
  *   .buildWithSingleButton();
  *
  * // More complex message with a user who clicked the button that is not the message author and multiple buttons
- * Button clickedButton = Button.of(ButtonStyle.PRIMARY, "1", "Next");
+ * Button clickedButton = Button.primary("1", "Next");
  * jdaTester.createButtonClickEvent()
  *   .setMessage(new MessageBuilder()
  *     .setContent("See the following entry")
@@ -61,7 +61,7 @@
  *     .build())
  *   .setUserWhoClicked(jdaTester.createMemberSpy(5))
  *   .setActionRows(
- *     ActionRow.of(Button.of(ButtonStyle.PRIMARY, "1", "Previous"),
+ *     ActionRow.of(Button.primary("1", "Previous"),
  *     clickedButton)
  *   .build(clickedButton);
  * }