Update JDA to alpha 5

Author: Tais993

application/build.gradle

@@ -32,7 +32,7 @@ jib {
     }
     container {
         mainClass = 'org.togetherjava.tjbot.BootstrapLauncher'
-        setCreationTime(java.time.Instant.now().toString())
+        setCreationTime(Instant.now().toString())
     }
 }
 
@@ -45,7 +45,7 @@ shadowJar {
 dependencies {
     implementation project(':database')
 
-    implementation 'net.dv8tion:JDA:5.0.0-alpha.4'
+    implementation 'net.dv8tion:JDA:5.0.0-alpha.5'
 
     implementation 'org.apache.logging.log4j:log4j-core:2.16.0'
     runtimeOnly 'org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0'

application/src/main/java/org/togetherjava/tjbot/Application.java

@@ -20,7 +20,7 @@
  * Main class of the application. Use {@link #main(String[])} to start an instance of it.
  * <p>
  * New commands can be created by implementing
- * {@link net.dv8tion.jda.api.events.interaction.SlashCommandEvent} or extending
+ * {@link net.dv8tion.jda.api.events.interaction.SlashCommandInteractionEvent} or extending
  * {@link org.togetherjava.tjbot.commands.SlashCommandAdapter}. They can then be registered in
  * {@link Features}.
  */
@@ -105,4 +105,4 @@ private static void onShutdown() {
         logger.info("Bot has been stopped");
     }
 
-}
+}

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 Feature {
     /**
      * Gets the name 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 name must not change anymore.
@@ -53,7 +55,7 @@ public interface SlashCommand extends Feature {
     /**
      * 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.
@@ -79,7 +81,7 @@ public interface SlashCommand extends Feature {
      * The data can be used to configure the settings for this command, i.e. adding options,
      * subcommands, menus and more.
      * <p>
-     * See {@link CommandData} for details on how to create and configure instances of it.
+     * See {@link SlashCommandData} for details on how to create and configure instances of it.
      * <p>
      * <p>
      * This method may be called multiple times, implementations must not create new data each time
@@ -89,7 +91,7 @@ public interface SlashCommand extends Feature {
      * @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
@@ -104,7 +106,7 @@ public interface SlashCommand extends Feature {
      * <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
+     * {@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>
@@ -115,8 +117,8 @@ public interface SlashCommand extends Feature {
      * 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.
@@ -129,7 +131,7 @@ public interface SlashCommand extends Feature {
      *
      * @param event the event that triggered this
      */
-    void onSlashCommand(@NotNull SlashCommandEvent event);
+    void onSlashCommand(@NotNull SlashCommandInteractionEvent event);
 
     /**
      * Triggered by the core system when a button corresponding to this implementation (based on
@@ -147,9 +149,9 @@ public interface SlashCommand extends Feature {
      *
      * @param event the event that triggered this
      * @param args the arguments transported with the button, see
-     *        {@link #onSlashCommand(SlashCommandEvent)} for details on how these are created
+     *        {@link #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
@@ -167,17 +169,17 @@ public interface SlashCommand extends Feature {
      *
      * @param event the event that triggered this
      * @param args the arguments transported with the selection menu, see
-     *        {@link #onSlashCommand(SlashCommandEvent)} for details on how these are created
+     *        {@link #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 command a component
      * id generator through this method, which can be used to generate component ids, as used for
-     * button or selection menus. See {@link #onSlashCommand(SlashCommandEvent)} for details on how
+     * button or selection menus. See {@link #onSlashCommand(SlashCommandInteractionEvent)} for details on how
      * to use this.
      *
      * @param generator the provided component id generator
      */
     void acceptComponentIdGenerator(@NotNull ComponentIdGenerator generator);
-}
+}

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

@@ -1,9 +1,11 @@
 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.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.commands.build.Commands;
+import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import org.jetbrains.annotations.NotNull;
 import org.togetherjava.tjbot.commands.componentids.ComponentId;
 import org.togetherjava.tjbot.commands.componentids.ComponentIdGenerator;
@@ -15,11 +17,11 @@
 
 /**
  * Adapter implementation of a {@link SlashCommand}. The minimal setup only requires implementation
- * of {@link #onSlashCommand(SlashCommandEvent)}. A new command can then be registered by adding it
+ * of {@link #onSlashCommand(SlashCommandInteractionEvent)}. A new command can then be registered by adding it
  * to {@link Features}.
  * <p>
- * Further, {@link #onButtonClick(ButtonClickEvent, List)} and
- * {@link #onSelectionMenu(SelectionMenuEvent, List)} can be overridden if desired. The default
+ * Further, {@link #onButtonClick(ButtonInteractionEvent, List)} and
+ * {@link #onSelectionMenu(SelectMenuInteractionEvent, List)} can be overridden if desired. The default
  * implementation is empty, the adapter will not react to such events.
  * <p>
  * <p>
@@ -31,7 +33,7 @@
  * <p>
  * If implementations want to add buttons or selection menus, it is highly advised to use component
  * IDs generated by {@link #generateComponentId(String...)}, which will automatically create IDs
- * that are valid per {@link SlashCommand#onSlashCommand(SlashCommandEvent)}.
+ * that are valid per {@link SlashCommand#onSlashCommand(SlashCommandInteractionEvent)}.
  * <p>
  * <p>
  * Some example commands are available in {@link org.togetherjava.tjbot.commands.basic}. A minimal
@@ -46,7 +48,7 @@
  *         }
  *
  *         &#64;Override
- *         public void onSlashCommand(@NotNull SlashCommandEvent event) {
+ *         public void onSlashCommand(@NotNull SlashCommandInteractionEvent event) {
  *             event.reply("Pong!").queue();
  *         }
  *     }
@@ -59,16 +61,16 @@ public abstract class SlashCommandAdapter implements SlashCommand {
     private final String name;
     private final String description;
     private final SlashCommandVisibility visibility;
-    private final CommandData data;
+    private final SlashCommandData data;
     private ComponentIdGenerator componentIdGenerator;
 
     /**
      * Creates a new adapter with the given data.
      *
      * @param name the name of this command, requirements for this are documented in
-     *        {@link CommandData#CommandData(String, String)}
+     *        {@link Commands#slash(String, String)}
      * @param description the description of this command, requirements for this are documented in
-     *        {@link CommandData#CommandData(String, String)}
+     *        {@link Commands#slash(String, String)}
      * @param visibility the visibility of the command
      */
     protected SlashCommandAdapter(@NotNull String name, @NotNull String description,
@@ -77,7 +79,8 @@ protected SlashCommandAdapter(@NotNull String name, @NotNull String description,
         this.description = description;
         this.visibility = visibility;
 
-        data = new CommandData(name, description);
+
+        data = Commands.slash(name, description);
     }
 
     @Override
@@ -96,7 +99,7 @@ protected SlashCommandAdapter(@NotNull String name, @NotNull String description,
     }
 
     @Override
-    public final @NotNull CommandData getData() {
+    public final @NotNull SlashCommandData getData() {
         return data;
     }
 
@@ -107,19 +110,19 @@ public final void acceptComponentIdGenerator(@NotNull ComponentIdGenerator gener
 
     @SuppressWarnings("NoopMethodInAbstractClass")
     @Override
-    public void onButtonClick(@NotNull ButtonClickEvent event, @NotNull List<String> args) {
+    public void onButtonClick(@NotNull ButtonInteractionEvent event, @NotNull List<String> args) {
         // Adapter does not react by default, subclasses may change this behavior
     }
 
     @SuppressWarnings("NoopMethodInAbstractClass")
     @Override
-    public void onSelectionMenu(@NotNull SelectionMenuEvent event, @NotNull List<String> args) {
+    public void onSelectionMenu(@NotNull SelectMenuInteractionEvent event, @NotNull List<String> args) {
         // Adapter does not react by default, subclasses may change this behavior
     }
 
     /**
      * Helper method to generate component IDs that are considered valid per
-     * {@link SlashCommand#onSlashCommand(SlashCommandEvent)}.
+     * {@link SlashCommand#onSlashCommand(SlashCommandInteractionEvent)}.
      * <p>
      * They can be used to create buttons or selection menus and transport additional data
      * throughout the event (e.g. the user id who created the button dialog).
@@ -138,7 +141,7 @@ public void onSelectionMenu(@NotNull SelectionMenuEvent event, @NotNull List<Str
 
     /**
      * Helper method to generate component IDs that are considered valid per
-     * {@link SlashCommand#onSlashCommand(SlashCommandEvent)}.
+     * {@link SlashCommand#onSlashCommand(SlashCommandInteractionEvent)}.
      * <p>
      * They can be used to create buttons or selection menus and transport additional data
      * throughout the event (e.g. the user id who created the button dialog).
@@ -154,4 +157,4 @@ public void onSelectionMenu(@NotNull SelectionMenuEvent event, @NotNull List<Str
         return Objects.requireNonNull(componentIdGenerator)
             .generate(new ComponentId(getName(), Arrays.asList(args)), lifespan);
     }
-}
+}

application/src/main/java/org/togetherjava/tjbot/commands/basic/PingCommand.java

@@ -1,6 +1,6 @@
 package org.togetherjava.tjbot.commands.basic;
 
-import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import org.jetbrains.annotations.NotNull;
 import org.togetherjava.tjbot.commands.SlashCommandAdapter;
 import org.togetherjava.tjbot.commands.SlashCommandVisibility;
@@ -24,7 +24,7 @@ public PingCommand() {
      * @param event the corresponding event
      */
     @Override
-    public void onSlashCommand(@NotNull SlashCommandEvent event) {
+    public void onSlashCommand(@NotNull SlashCommandInteractionEvent event) {
         event.reply("Pong!").queue();
     }
-}
+}

application/src/main/java/org/togetherjava/tjbot/commands/basic/VcActivityCommand.java

@@ -2,13 +2,13 @@
 
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.*;
-import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 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.OptionData;
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
-import net.dv8tion.jda.api.requests.restaction.interactions.ReplyAction;
+import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -121,7 +121,7 @@ public VcActivityCommand() {
 
 
     @Override
-    public void onSlashCommand(@NotNull SlashCommandEvent event) {
+    public void onSlashCommand(@NotNull SlashCommandInteractionEvent event) {
         Member member = Objects.requireNonNull(event.getMember(), "member is null");
         GuildVoiceState voiceState = Objects.requireNonNull(member.getVoiceState(),
                 "Voicestates aren't being cached, check the JDABuilder");
@@ -188,7 +188,7 @@ public void onSlashCommand(@NotNull SlashCommandEvent event) {
         return Optional.empty();
     }
 
-    private static void handleSubcommand(@NotNull SlashCommandEvent event,
+    private static void handleSubcommand(@NotNull SlashCommandInteractionEvent event,
             @NotNull VoiceChannel voiceChannel, @NotNull String applicationId,
             @Nullable Integer maxUses, @Nullable Integer maxAgeDays,
             @NotNull String applicationName) {
@@ -204,16 +204,16 @@ private static void handleSubcommand(@NotNull SlashCommandEvent event,
 
     }
 
-    private static @NotNull ReplyAction replyInvite(@NotNull SlashCommandEvent event,
-            @NotNull Invite invite, @NotNull String applicationName) {
+    private static @NotNull ReplyCallbackAction replyInvite(@NotNull SlashCommandInteractionEvent event,
+                                                            @NotNull Invite invite, @NotNull String applicationName) {
         return event.reply("""
                 %s wants to start %s.
                 Feel free to join by clicking %s , enjoy!
                 If it says the activity ended, click on the URL instead.
                  """.formatted(event.getUser().getAsTag(), applicationName, invite.getUrl()));
     }
 
-    private static void handleErrors(@NotNull SlashCommandEvent event,
+    private static void handleErrors(@NotNull SlashCommandInteractionEvent event,
             @Nullable Throwable throwable) {
         event.reply("Something went wrong :/").queue();
         logger.warn("Something went wrong in the VcActivityCommand", throwable);

application/src/main/java/org/togetherjava/tjbot/commands/componentids/ComponentId.java

@@ -1,18 +1,18 @@
 package org.togetherjava.tjbot.commands.componentids;
 
-import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
 /**
  * Payload carried by component IDs. See
- * {@link org.togetherjava.tjbot.commands.SlashCommand#onSlashCommand(SlashCommandEvent)} for its
+ * {@link org.togetherjava.tjbot.commands.SlashCommand#onSlashCommand(SlashCommandInteractionEvent)} for its
  * usages.
  *
  * @param commandName the name of the command that handles the event associated to this component
  *        ID, when triggered
  * @param elements the additional elements to carry along this component ID, empty if not desired
  */
 public record ComponentId(@NotNull String commandName, @NotNull List<String> elements) {
-}
+}