Update to JDA beta 4

Matyrobbrt · Matyrobbrt · commit 8e26ab0a2bf2 · 2023-02-18T13:21:26.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -148,8 +148,9 @@ dependencies {
   // TODO remove
   watcher libs.nightconfig
 
-  globalCompile libs.annotations
   globalCompile libs.lombok
+  globalCompile libs.jsr305
+  globalCompile libs.annotations
 
   testImplementation libs.junit
   testImplementation libs.mockito
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,10 +6,10 @@ lombok = { id = "io.freefair.lombok", version = "6.5.0.3" }
 launch4j = { id = 'edu.sc.seis.launch4j', version = '2.5.3' }
 
 [versions]
-jda = "5.0.0-alpha.20"
-# https://github.com/Matyrobbrt/JDA-Chewtils/commit/84a2cb70b0b9280de98715f7b218e0eb1bfc0bb6
+jda = "5.0.0-beta.4"
+# https://github.com/Matyrobbrt/JDA-Chewtils/commit/c2bfe64e447817aa5ddac0dab0f12bcede0fe37d
 # chewtils = "2.0-SNAPSHOT"
-chewtils = "84a2cb7"
+chewtils = "c2bfe64"
 guava = "31.1-jre"
 gson = "2.10"
 logback = "1.2.11"
@@ -38,6 +38,7 @@ caffeine = "3.1.1"
 urldetector = "0.1.23"
 mockito = "4.6.1"
 jopt = "6.0-alpha-3"
+jsr305 = "3.0.2"
 
 [libraries]
 jda = { module = "net.dv8tion:JDA", version.ref = "jda" }
@@ -74,3 +75,4 @@ caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "c
 urldetector = { module = "io.github.url-detector:url-detector", version.ref = "urldetector" }
 mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 jopt = { module = "net.sf.jopt-simple:jopt-simple", version.ref = "jopt" }
+jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "jsr305" }
diff --git a/relauncher b/relauncher
@@ -1 +1 @@
-Subproject commit 5dfb4ebac1ce8298ef3015e80f2f572b4a9a9db6
+Subproject commit e3696694282db4fe1e54cb1d18fc025b666b2a17
diff --git a/src/commander/java/com/mcmoddev/mmdbot/commander/TheCommander.java b/src/commander/java/com/mcmoddev/mmdbot/commander/TheCommander.java
@@ -93,7 +93,7 @@
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.Event;
-import net.dv8tion.jda.api.events.ReadyEvent;
+import net.dv8tion.jda.api.events.session.ReadyEvent;
 import net.dv8tion.jda.api.exceptions.InvalidTokenException;
 import net.dv8tion.jda.api.hooks.EventListener;
 import net.dv8tion.jda.api.requests.GatewayIntent;
diff --git a/src/commander/java/com/mcmoddev/mmdbot/commander/commands/EvaluateCommand.java b/src/commander/java/com/mcmoddev/mmdbot/commander/commands/EvaluateCommand.java
@@ -48,9 +48,9 @@
 import net.dv8tion.jda.api.interactions.InteractionHook;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
-import net.dv8tion.jda.api.interactions.components.Modal;
 import net.dv8tion.jda.api.interactions.components.text.TextInput;
 import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
+import net.dv8tion.jda.api.interactions.modals.Modal;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 import net.dv8tion.jda.api.utils.messages.MessageEditBuilder;
diff --git a/src/commander/java/com/mcmoddev/mmdbot/commander/commands/RoleSelectCommand.java b/src/commander/java/com/mcmoddev/mmdbot/commander/commands/RoleSelectCommand.java
@@ -54,6 +54,8 @@
 import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
 import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
 import net.dv8tion.jda.api.interactions.components.selections.SelectOption;
+import net.dv8tion.jda.api.interactions.components.selections.StringSelectInteraction;
+import net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu;
 import net.dv8tion.jda.api.interactions.components.text.TextInput;
 import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
@@ -232,7 +234,8 @@ public void onModalInteraction(final ModalInteractionContext context) {
     }
 
     protected void onSelectMenu(final SelectMenuInteractionContext context) {
-        final var event = context.getEvent();
+        final var gev = context.getEvent();
+        if (!(gev.getInteraction() instanceof StringSelectInteraction event)) return;
         final var guild = Objects.requireNonNull(event.getGuild());
         final var selfMember = guild.getSelfMember();
         final var selectedRoles = event.getSelectedOptions()
@@ -287,7 +290,7 @@ private static Button createButtonForRole(final String id, final Role role) {
     }
 
     private static void handleDropdownCreation(final @NonNull ModalInteractionContext context, final MessageCreateBuilder message, final List<Role> selectedRoles) {
-        SelectMenu.Builder menu = COMPONENT_LISTENER.createMenu(Component.Lifespan.PERMANENT)
+        StringSelectMenu.Builder menu = COMPONENT_LISTENER.createMenu(Component.Lifespan.PERMANENT)
             .setPlaceholder("Select your roles")
             .setMaxValues(selectedRoles.size())
             .setMinValues(0);
@@ -307,7 +310,7 @@ private static void handleRoleSelection(final @NonNull SelectMenuInteractionCont
         final var toAdd = new ArrayList<Role>(selectedRoles.size());
         final var toRemove = new ArrayList<Role>(selectedRoles.size());
 
-        context.getEvent().getInteraction()
+        ((StringSelectInteraction)context.getEvent().getInteraction())
             .getComponent()
             .getOptions()
             .stream()
diff --git a/src/commander/java/com/mcmoddev/mmdbot/commander/commands/tricks/AddTrickCommand.java b/src/commander/java/com/mcmoddev/mmdbot/commander/commands/tricks/AddTrickCommand.java
@@ -37,7 +37,7 @@
 import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandGroupData;
-import net.dv8tion.jda.api.interactions.components.Modal;
+import net.dv8tion.jda.api.interactions.modals.Modal;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -97,7 +97,7 @@ protected void execute(final SlashCommandEvent event) {
         }
 
         final var modal = Modal.create(ModalListener.MODAL_ID_PREFIX + trickTypeName, "Create %s %s trick".formatted(StringUtilities.startWithVowel(trickTypeName) ? "an" : "a", trickTypeName))
-            .addActionRows(trickType.getModalArguments())
+            .addComponents(trickType.getModalArguments())
             .build();
         event.replyModal(modal).queue();
     }
diff --git a/src/commander/java/com/mcmoddev/mmdbot/commander/commands/tricks/EditTrickCommand.java b/src/commander/java/com/mcmoddev/mmdbot/commander/commands/tricks/EditTrickCommand.java
@@ -34,7 +34,7 @@
 import com.mcmoddev.mmdbot.core.util.gist.GistUtils;
 import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import net.dv8tion.jda.api.interactions.components.Modal;
+import net.dv8tion.jda.api.interactions.modals.Modal;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -97,7 +97,7 @@ public SubCommand(String name, Trick.TrickType<?> trickType) {
         @Override
         protected void execute(final SlashCommandEvent event) {
             final var modal = Modal.create(ModalListener.MODAL_ID_PREFIX + trickTypeName, "Edit %s %s trick".formatted(StringUtilities.startWithVowel(trickTypeName) ? "an" : "a", trickTypeName))
-                .addActionRows(trickType.getModalArguments())
+                .addComponents(trickType.getModalArguments())
                 .build();
             event.replyModal(modal).queue();
         }
diff --git a/src/commander/java/com/mcmoddev/mmdbot/commander/docs/DocsCommand.java b/src/commander/java/com/mcmoddev/mmdbot/commander/docs/DocsCommand.java
@@ -42,6 +42,7 @@
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.interactions.components.ActionRow;
+import net.dv8tion.jda.api.interactions.components.selections.StringSelectInteraction;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 import net.dv8tion.jda.api.utils.messages.MessageEditBuilder;
@@ -101,7 +102,7 @@ public DocsCommand(final QueryApi<FuzzyQueryResult> queryApi, final ElementLoade
     }
 
     protected void onSelectMenuInteraction(final SelectMenuInteractionContext context) {
-        final var event = context.getEvent();
+        if (!(context.getEvent().getInteraction() instanceof StringSelectInteraction event)) return;
         final var data = MultipleResultsButtonData.fromArguments(context.getArguments());
         context.getEvent().deferEdit().queue();
         if (event.getUser().getIdLong() != data.userId()) return;
diff --git a/src/commander/java/com/mcmoddev/mmdbot/commander/docs/NormalDocsSender.java b/src/commander/java/com/mcmoddev/mmdbot/commander/docs/NormalDocsSender.java
@@ -37,6 +37,7 @@
 import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
 import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
 import net.dv8tion.jda.api.interactions.components.selections.SelectOption;
+import net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.utils.messages.MessageEditBuilder;
 import net.dv8tion.jda.api.utils.messages.MessageEditData;
@@ -208,7 +209,7 @@ private List<ActionRow> buildRowsMenu(List<IndexedPair<String, FuzzyQueryResult>
         return grouped.entrySet().stream()
             .limit(5)
             .map(it ->
-                SelectMenu.create(id.toString())
+                StringSelectMenu.create(id.toString())
                     .addOptions(it.getValue().stream().limit(25).collect(toList()))
                     .setPlaceholder(StringUtils.capitalize(it.getKey().name().toLowerCase(Locale.ROOT)))
                     .build()
diff --git a/src/core/java/com/mcmoddev/mmdbot/core/commands/CommandUpserter.java b/src/core/java/com/mcmoddev/mmdbot/core/commands/CommandUpserter.java
@@ -30,7 +30,7 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.events.GenericEvent;
-import net.dv8tion.jda.api.events.ReadyEvent;
+import net.dv8tion.jda.api.events.session.ReadyEvent;
 import net.dv8tion.jda.api.exceptions.ErrorHandler;
 import net.dv8tion.jda.api.hooks.EventListener;
 import net.dv8tion.jda.api.requests.ErrorResponse;
diff --git a/src/core/java/com/mcmoddev/mmdbot/core/commands/component/ComponentListener.java b/src/core/java/com/mcmoddev/mmdbot/core/commands/component/ComponentListener.java
@@ -26,10 +26,12 @@
 import com.mcmoddev.mmdbot.core.commands.component.context.SelectMenuInteractionContext;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
-import net.dv8tion.jda.api.interactions.components.Modal;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
 import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
+import net.dv8tion.jda.api.interactions.components.selections.StringSelectInteraction;
+import net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu;
+import net.dv8tion.jda.api.interactions.modals.Modal;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -59,10 +61,10 @@ public Button createButton(@Nonnull ButtonStyle style, @Nullable Emoji emoji, @N
     }
 
     @NonNull
-    public SelectMenu.Builder createMenu(@NonNull Component.Lifespan lifespan, final String... args) {
+    public StringSelectMenu.Builder createMenu(@NonNull Component.Lifespan lifespan, final String... args) {
         final var comp = new Component(name, UUID.randomUUID(), Arrays.asList(args), lifespan);
         insertComponent(comp);
-        return SelectMenu.create(comp.uuid().toString());
+        return StringSelectMenu.create(comp.uuid().toString());
     }
 
     @NonNull
@@ -137,7 +139,7 @@ public Builder onSelectMenuInteraction(final Consumer<? super SelectMenuInteract
         }
 
         /**
-         * Sets the action that should be executed on {@link net.dv8tion.jda.api.interactions.components.Modal} interaction.
+         * Sets the action that should be executed on {@link Modal} interaction.
          *
          * @param onModal the action that should be executed on modal interaction
          * @return the builder instance
diff --git a/src/core/java/com/mcmoddev/mmdbot/core/commands/component/ComponentManager.java b/src/core/java/com/mcmoddev/mmdbot/core/commands/component/ComponentManager.java
@@ -28,7 +28,8 @@
 import net.dv8tion.jda.api.events.GenericEvent;
 import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.GenericSelectMenuInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent;
 import net.dv8tion.jda.api.hooks.EventListener;
 import net.dv8tion.jda.api.hooks.SubscribeEvent;
 import org.jetbrains.annotations.NotNull;
@@ -93,7 +94,7 @@ public void addListener(final ComponentListener listener) {
     public void onEvent(@NotNull final GenericEvent event) {
         if (event instanceof ButtonInteractionEvent btn) {
             onButtonInteraction(btn);
-        } else if (event instanceof SelectMenuInteractionEvent sEvent) {
+        } else if (event instanceof GenericSelectMenuInteractionEvent sEvent) {
             onSelectMenuInteraction(sEvent);
         } else if (event instanceof ModalInteractionEvent mEvent) {
             onModalInteraction(mEvent);
@@ -149,7 +150,8 @@ public UUID getComponentId() {
         }
     }
 
-    public void onSelectMenuInteraction(@NotNull final SelectMenuInteractionEvent event) {
+    // TODO - fix the generics
+    public void onSelectMenuInteraction(@NotNull final GenericSelectMenuInteractionEvent event) {
         try {
             if (event.getSelectMenu().getId() != null) {
                 final var buttonArguments = event.getSelectMenu().getId().split(ID_SPLITTER);
@@ -163,7 +165,7 @@ public void onSelectMenuInteraction(@NotNull final SelectMenuInteractionEvent ev
                         listener.onSelectMenuInteraction(new SelectMenuInteractionContext() {
                             @NotNull
                             @Override
-                            public SelectMenuInteractionEvent getEvent() {
+                            public GenericSelectMenuInteractionEvent getEvent() {
                                 return event;
                             }
 
diff --git a/src/core/java/com/mcmoddev/mmdbot/core/commands/component/context/SelectMenuInteractionContext.java b/src/core/java/com/mcmoddev/mmdbot/core/commands/component/context/SelectMenuInteractionContext.java
@@ -20,11 +20,12 @@
  */
 package com.mcmoddev.mmdbot.core.commands.component.context;
 
-import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.GenericSelectMenuInteractionEvent;
+import net.dv8tion.jda.api.interactions.components.selections.SelectMenuInteraction;
 
 /**
  * A class representing the context in a {@link net.dv8tion.jda.api.interactions.components.selections.SelectMenu} interaction.
  */
-public interface SelectMenuInteractionContext extends BaseItemComponentInteractionContext<SelectMenuInteractionEvent> {
+public interface SelectMenuInteractionContext extends BaseItemComponentInteractionContext<GenericSelectMenuInteractionEvent<?, ?>> {
 
 }
diff --git a/src/test/java/com/mcmoddev/mmdbot/tests/jda/PunishmentTests.java b/src/test/java/com/mcmoddev/mmdbot/tests/jda/PunishmentTests.java
@@ -35,6 +35,7 @@
 import net.dv8tion.jda.api.events.GenericEvent;
 import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.interactions.commands.SlashCommandReference;
 import net.dv8tion.jda.internal.entities.MemberImpl;
 import net.dv8tion.jda.internal.entities.ReceivedMessage;
 import net.dv8tion.jda.internal.entities.UserImpl;
@@ -200,6 +201,18 @@ public List<IMentionable> getMentions(@NotNull final Message.MentionType @NotNul
             public boolean isMentioned(@NotNull final IMentionable mentionable, @NotNull final Message.MentionType @NotNull ... types) {
                 return false;
             }
+
+            @NotNull
+            @Override
+            public Bag<SlashCommandReference> getSlashCommandsBag() {
+                return bag;
+            }
+
+            @NotNull
+            @Override
+            public List<SlashCommandReference> getSlashCommands() {
+                return List.of();
+            }
         };
 
         when(message.getMentions()).thenReturn(mentions);
