Fixed issues after rebase

Author: Zabuzard

application/src/main/java/org/togetherjava/tjbot/commands/SlashCommand.java

@@ -1,12 +1,14 @@
 package org.togetherjava.tjbot.commands;
 
 import net.dv8tion.jda.api.entities.Emoji;
-import net.dv8tion.jda.api.events.interaction.ButtonClickEvent;
-import net.dv8tion.jda.api.events.interaction.SelectionMenuEvent;
-import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
-import net.dv8tion.jda.api.interactions.components.ButtonStyle;
+import net.dv8tion.jda.api.interactions.commands.build.Commands;
+import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import net.dv8tion.jda.api.interactions.components.ComponentInteraction;
+import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
 import org.jetbrains.annotations.NotNull;
 import org.togetherjava.tjbot.commands.componentids.ComponentId;
 import org.togetherjava.tjbot.commands.componentids.ComponentIdGenerator;
@@ -28,9 +30,9 @@
  * is then to be returned by {@link #getData()} where the system will then pick it up from.
  * <p>
  * After registration, the system will notify a command whenever one of its corresponding slash
- * commands ({@link #onSlashCommand(SlashCommandEvent)}), buttons
- * ({@link #onButtonClick(ButtonClickEvent, List)}) or menus
- * ({@link #onSelectionMenu(SelectionMenuEvent, List)}) have been triggered.
+ * commands ({@link #onSlashCommand(SlashCommandInteractionEvent)}), buttons
+ * ({@link #onButtonClick(ButtonInteractionEvent, List)}) or menus
+ * ({@link #onSelectionMenu(SelectMenuInteractionEvent, List)}) have been triggered.
  * <p>
  * <p>
  * Some example commands are available in {@link org.togetherjava.tjbot.commands.basic}.
@@ -40,7 +42,7 @@ public interface SlashCommand extends UserInteractor {
     /**
      * Gets the description of the command.
      * <p>
-     * Requirements for this are documented in {@link CommandData#CommandData(String, String)}.
+     * Requirements for this are documented in {@link Commands#slash(String, String)}.
      * <p>
      * <p>
      * After registration of the command, the description must not change anymore.
@@ -76,7 +78,7 @@ public interface SlashCommand extends UserInteractor {
      * @return the command data of this command
      */
     @NotNull
-    CommandData getData();
+    SlashCommandData getData();
 
     /**
      * Triggered by the core system when a slash command corresponding to this implementation (based
@@ -91,8 +93,8 @@ public interface SlashCommand extends UserInteractor {
      * <p>
      * Buttons or menus have to be created with a component ID (see
      * {@link ComponentInteraction#getComponentId()},
-     * {@link net.dv8tion.jda.api.interactions.components.Button#of(ButtonStyle, String, Emoji)}) in
-     * a very specific format, otherwise the core system will fail to identify the command that
+     * {@link net.dv8tion.jda.api.interactions.components.buttons.Button#of(ButtonStyle, String, Emoji)})
+     * in a very specific format, otherwise the core system will fail to identify the command that
      * corresponded to the button or menu click event and is unable to route it back.
      * <p>
      * The component ID has to be a UUID-string (see {@link java.util.UUID}), which is associated to
@@ -102,8 +104,8 @@ public interface SlashCommand extends UserInteractor {
      * given to {@link #acceptComponentIdGenerator(ComponentIdGenerator)} during system setup. The
      * required {@link ComponentId} instance accepts optional extra arguments, which, if provided,
      * can be picked up during the corresponding event (see
-     * {@link #onButtonClick(ButtonClickEvent, List)},
-     * {@link #onSelectionMenu(SelectionMenuEvent, List)}).
+     * {@link #onButtonClick(ButtonInteractionEvent, List)},
+     * {@link #onSelectionMenu(SelectMenuInteractionEvent, List)}).
      * <p>
      * Alternatively, if {@link SlashCommandAdapter} has been extended, it also offers a handy
      * {@link SlashCommandAdapter#generateComponentId(String...)} method to ease the flow.
@@ -116,5 +118,5 @@ public interface SlashCommand extends UserInteractor {
      *
      * @param event the event that triggered this
      */
-    void onSlashCommand(@NotNull SlashCommandEvent event);
+    void onSlashCommand(@NotNull SlashCommandInteractionEvent event);
 }

application/src/main/java/org/togetherjava/tjbot/commands/UserInteractor.java

@@ -1,9 +1,8 @@
 package org.togetherjava.tjbot.commands;
 
-import net.dv8tion.jda.api.events.interaction.ButtonClickEvent;
-import net.dv8tion.jda.api.events.interaction.SelectionMenuEvent;
-import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
-import net.dv8tion.jda.api.interactions.commands.build.CommandData;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
 import org.jetbrains.annotations.NotNull;
 import org.togetherjava.tjbot.commands.componentids.ComponentIdGenerator;
 
@@ -20,7 +19,8 @@ public interface UserInteractor extends Feature {
     /**
      * Gets the name of the interactor.
      * <p>
-     * Requirements for this are documented in {@link CommandData#CommandData(String, String)}.
+     * Requirements for this are documented in
+     * {@link net.dv8tion.jda.api.interactions.commands.build.Commands#slash(String, String)}.
      * <p>
      * <p>
      * After registration of the interactor, the name must not change anymore.
@@ -46,10 +46,10 @@ public interface UserInteractor extends Feature {
      *
      * @param event the event that triggered this
      * @param args the arguments transported with the button, see
-     *        {@link SlashCommand#onSlashCommand(SlashCommandEvent)} for details on how these are
-     *        created
+     *        {@link SlashCommand#onSlashCommand(SlashCommandInteractionEvent)} for details on how
+     *        these are created
      */
-    void onButtonClick(@NotNull ButtonClickEvent event, @NotNull List<String> args);
+    void onButtonClick(@NotNull ButtonInteractionEvent event, @NotNull List<String> args);
 
     /**
      * Triggered by the core system when a selection menu corresponding to this implementation
@@ -67,16 +67,17 @@ public interface UserInteractor extends Feature {
      *
      * @param event the event that triggered this
      * @param args the arguments transported with the selection menu, see
-     *        {@link SlashCommand#onSlashCommand(SlashCommandEvent)} for details on how these are
-     *        created
+     *        {@link SlashCommand#onSlashCommand(SlashCommandInteractionEvent)} for details on how
+     *        these are created
      */
-    void onSelectionMenu(@NotNull SelectionMenuEvent event, @NotNull List<String> args);
+    void onSelectionMenu(@NotNull SelectMenuInteractionEvent event, @NotNull List<String> args);
 
     /**
      * Triggered by the core system during its setup phase. It will provide the interactor a
      * component id generator through this method, which can be used to generate component ids, as
      * used for button or selection menus. See
-     * {@link SlashCommand#onSlashCommand(SlashCommandEvent)} for details on how to use this.
+     * {@link SlashCommand#onSlashCommand(SlashCommandInteractionEvent)} for details on how to use
+     * this.
      *
      * @param generator the provided component id generator
      */

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

@@ -3,7 +3,7 @@
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
-import net.dv8tion.jda.api.interactions.components.Button;
+import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import org.jetbrains.annotations.NotNull;
 import org.scilab.forge.jlatexmath.ParseException;
 import org.scilab.forge.jlatexmath.TeXConstants;

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

@@ -4,13 +4,13 @@
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.MessageBuilder;
 import net.dv8tion.jda.api.entities.*;
-import net.dv8tion.jda.api.events.interaction.ButtonClickEvent;
-import net.dv8tion.jda.api.events.interaction.SelectionMenuEvent;
-import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
+import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.exceptions.ErrorHandler;
 import net.dv8tion.jda.api.interactions.components.ActionRow;
-import net.dv8tion.jda.api.interactions.components.Button;
-import net.dv8tion.jda.api.interactions.components.ButtonStyle;
+import net.dv8tion.jda.api.interactions.components.buttons.Button;
+import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
 import net.dv8tion.jda.api.requests.ErrorResponse;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -89,7 +89,8 @@ public ScamBlocker(@NotNull ModerationActionsStore actionsStore,
     }
 
     @Override
-    public void onSelectionMenu(@NotNull SelectionMenuEvent event, @NotNull List<String> args) {
+    public void onSelectionMenu(@NotNull SelectMenuInteractionEvent event,
+            @NotNull List<String> args) {
         throw new UnsupportedOperationException("Not used");
     }
 
@@ -99,7 +100,7 @@ public void acceptComponentIdGenerator(@NotNull ComponentIdGenerator generator)
     }
 
     @Override
-    public void onMessageReceived(@NotNull GuildMessageReceivedEvent event) {
+    public void onMessageReceived(@NotNull MessageReceivedEvent event) {
         if (event.getAuthor().isBot() || event.isWebhookMessage()) {
             return;
         }
@@ -122,7 +123,7 @@ public void onMessageReceived(@NotNull GuildMessageReceivedEvent event) {
         takeAction(event);
     }
 
-    private void takeActionWasAlreadyReported(@NotNull GuildMessageReceivedEvent event) {
+    private void takeActionWasAlreadyReported(@NotNull MessageReceivedEvent event) {
         // The user recently send the same scam already, and that was already reported and handled
         addScamToHistory(event);
 
@@ -132,7 +133,7 @@ private void takeActionWasAlreadyReported(@NotNull GuildMessageReceivedEvent eve
         }
     }
 
-    private void takeAction(@NotNull GuildMessageReceivedEvent event) {
+    private void takeAction(@NotNull MessageReceivedEvent event) {
         switch (mode) {
             case OFF -> throw new AssertionError(
                     "The OFF-mode should be detected earlier already to prevent expensive computation");
@@ -145,26 +146,25 @@ private void takeAction(@NotNull GuildMessageReceivedEvent event) {
         }
     }
 
-    private void takeActionLogOnly(@NotNull GuildMessageReceivedEvent event) {
+    private void takeActionLogOnly(@NotNull MessageReceivedEvent event) {
         addScamToHistory(event);
         logScamMessage(event);
     }
 
-    private void takeActionApproveFirst(@NotNull GuildMessageReceivedEvent event) {
+    private void takeActionApproveFirst(@NotNull MessageReceivedEvent event) {
         addScamToHistory(event);
         logScamMessage(event);
         reportScamMessage(event, "Is this scam?", createConfirmDialog(event));
     }
 
-    private void takeActionAutoDeleteButApproveQuarantine(
-            @NotNull GuildMessageReceivedEvent event) {
+    private void takeActionAutoDeleteButApproveQuarantine(@NotNull MessageReceivedEvent event) {
         addScamToHistory(event);
         logScamMessage(event);
         deleteMessage(event);
         reportScamMessage(event, "Is this scam? (already deleted)", createConfirmDialog(event));
     }
 
-    private void takeActionAutoDeleteAndQuarantine(@NotNull GuildMessageReceivedEvent event) {
+    private void takeActionAutoDeleteAndQuarantine(@NotNull MessageReceivedEvent event) {
         addScamToHistory(event);
         logScamMessage(event);
         deleteMessage(event);
@@ -173,21 +173,21 @@ private void takeActionAutoDeleteAndQuarantine(@NotNull GuildMessageReceivedEven
         reportScamMessage(event, "Detected and handled scam", null);
     }
 
-    private void addScamToHistory(@NotNull GuildMessageReceivedEvent event) {
+    private void addScamToHistory(@NotNull MessageReceivedEvent event) {
         scamHistoryStore.addScam(event.getMessage(), MODES_WITH_IMMEDIATE_DELETION.contains(mode));
     }
 
-    private void logScamMessage(@NotNull GuildMessageReceivedEvent event) {
+    private void logScamMessage(@NotNull MessageReceivedEvent event) {
         logger.warn("Detected a scam message ('{}') from user '{}' in channel '{}' of guild '{}'.",
                 event.getMessageId(), event.getAuthor().getId(), event.getChannel().getId(),
                 event.getGuild().getId());
     }
 
-    private void deleteMessage(@NotNull GuildMessageReceivedEvent event) {
+    private void deleteMessage(@NotNull MessageReceivedEvent event) {
         event.getMessage().delete().queue();
     }
 
-    private void quarantineAuthor(@NotNull GuildMessageReceivedEvent event) {
+    private void quarantineAuthor(@NotNull MessageReceivedEvent event) {
         quarantineAuthor(event.getGuild(), event.getMember(), event.getJDA().getSelfUser());
     }
 
@@ -205,8 +205,8 @@ private void quarantineAuthor(@NotNull Guild guild, @NotNull Member author,
             .queue();
     }
 
-    private void reportScamMessage(@NotNull GuildMessageReceivedEvent event,
-            @NotNull String reportTitle, @Nullable ActionRow confirmDialog) {
+    private void reportScamMessage(@NotNull MessageReceivedEvent event, @NotNull String reportTitle,
+            @Nullable ActionRow confirmDialog) {
         Guild guild = event.getGuild();
         Optional<TextChannel> reportChannel = getReportChannel(guild);
         if (reportChannel.isEmpty()) {
@@ -231,7 +231,7 @@ private void reportScamMessage(@NotNull GuildMessageReceivedEvent event,
         reportChannel.orElseThrow().sendMessage(message).queue();
     }
 
-    private void dmUser(@NotNull GuildMessageReceivedEvent event) {
+    private void dmUser(@NotNull MessageReceivedEvent event) {
         dmUser(event.getGuild(), event.getAuthor().getIdLong(), event.getJDA());
     }
 
@@ -255,7 +255,7 @@ If you think this was a mistake (for example, your account was hacked, but you g
         return guild.getTextChannelCache().stream().filter(isReportChannel).findAny();
     }
 
-    private @NotNull ActionRow createConfirmDialog(@NotNull GuildMessageReceivedEvent event) {
+    private @NotNull ActionRow createConfirmDialog(@NotNull MessageReceivedEvent event) {
         ComponentIdArguments args = new ComponentIdArguments(mode, event.getGuild().getIdLong(),
                 event.getChannel().getIdLong(), event.getMessageIdLong(),
                 event.getAuthor().getIdLong(),
@@ -271,7 +271,8 @@ If you think this was a mistake (for example, your account was hacked, but you g
     }
 
     @Override
-    public void onButtonClick(@NotNull ButtonClickEvent event, @NotNull List<String> argsRaw) {
+    public void onButtonClick(@NotNull ButtonInteractionEvent event,
+            @NotNull List<String> argsRaw) {
         ComponentIdArguments args = ComponentIdArguments.fromList(argsRaw);
         if (event.getMember().getRoles().stream().map(Role::getName).noneMatch(hasRequiredRole)) {
             event.reply(

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

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