Update JDA to alpha 4

Author: Tais993

application/build.gradle

@@ -45,7 +45,7 @@ shadowJar {
 dependencies {
     implementation project(':database')
 
-    implementation 'net.dv8tion:JDA:4.4.0_352'
+    implementation 'net.dv8tion:JDA:5.0.0-alpha.4'
 
     implementation 'org.apache.logging.log4j:log4j-core:2.16.0'
     runtimeOnly 'org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0'
@@ -71,4 +71,4 @@ dependencies {
 
 application {
     mainClass = 'org.togetherjava.tjbot.BootstrapLauncher'
-}
+}

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

@@ -1,7 +1,7 @@
 package org.togetherjava.tjbot.commands;
 
-import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
-import net.dv8tion.jda.api.events.message.guild.GuildMessageUpdateEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageUpdateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.regex.Pattern;
@@ -38,7 +38,7 @@ public interface MessageReceiver extends Feature {
      * @param event the event that triggered this, containing information about the corresponding
      *        message that was sent and received
      */
-    void onMessageReceived(@NotNull GuildMessageReceivedEvent event);
+    void onMessageReceived(@NotNull MessageReceivedEvent event);
 
     /**
      * Triggered by the core system whenever an existing message was edited in a text channel of a
@@ -47,5 +47,5 @@ public interface MessageReceiver extends Feature {
      * @param event the event that triggered this, containing information about the corresponding
      *        message that was edited
      */
-    void onMessageUpdated(@NotNull GuildMessageUpdateEvent event);
-}
+    void onMessageUpdated(@NotNull MessageUpdateEvent event);
+}

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

@@ -1,7 +1,7 @@
 package org.togetherjava.tjbot.commands;
 
-import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
-import net.dv8tion.jda.api.events.message.guild.GuildMessageUpdateEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageUpdateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.regex.Pattern;
@@ -10,8 +10,8 @@
  * Adapter implementation of a {@link MessageReceiver}. A new receiver can then be registered by
  * adding it to {@link Features}.
  * <p>
- * {@link #onMessageReceived(GuildMessageReceivedEvent)} and
- * {@link #onMessageUpdated(GuildMessageUpdateEvent)} can be overridden if desired. The default
+ * {@link #onMessageReceived(MessageReceivedEvent)} and
+ * {@link #onMessageUpdated(MessageUpdateEvent)} can be overridden if desired. The default
  * implementation is empty, the adapter will not react to such events.
  */
 public abstract class MessageReceiverAdapter implements MessageReceiver {
@@ -35,13 +35,13 @@ protected MessageReceiverAdapter(@NotNull Pattern channelNamePattern) {
 
     @SuppressWarnings("NoopMethodInAbstractClass")
     @Override
-    public void onMessageReceived(@NotNull GuildMessageReceivedEvent event) {
+    public void onMessageReceived(@NotNull MessageReceivedEvent event) {
         // Adapter does not react by default, subclasses may change this behavior
     }
 
     @SuppressWarnings("NoopMethodInAbstractClass")
     @Override
-    public void onMessageUpdated(@NotNull GuildMessageUpdateEvent event) {
+    public void onMessageUpdated(@NotNull MessageUpdateEvent event) {
         // Adapter does not react by default, subclasses may change this behavior
     }
-}
+}

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

@@ -1,10 +1,7 @@
 package org.togetherjava.tjbot.commands.basic;
 
 import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.GuildVoiceState;
-import net.dv8tion.jda.api.entities.Invite;
-import net.dv8tion.jda.api.entities.Member;
-import net.dv8tion.jda.api.entities.VoiceChannel;
+import net.dv8tion.jda.api.entities.*;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
@@ -129,15 +126,22 @@ public void onSlashCommand(@NotNull SlashCommandEvent event) {
         GuildVoiceState voiceState = Objects.requireNonNull(member.getVoiceState(),
                 "Voicestates aren't being cached, check the JDABuilder");
 
-        if (!voiceState.inVoiceChannel()) {
+        if (!voiceState.inAudioChannel()) {
             event.reply("You need to be in a voicechannel to run this command!")
                 .setEphemeral(true)
                 .queue();
 
             return;
         }
 
-        VoiceChannel voiceChannel = Objects.requireNonNull(voiceState.getChannel());
+        AudioChannel audioChannel = Objects.requireNonNull(voiceState.getChannel());
+
+        if (!(audioChannel instanceof VoiceChannel voiceChannel)) {
+            event.reply("You've to be in a voicechannel, not a stage channel!")
+                    .setEphemeral(true)
+                    .queue();
+            return;
+        }
 
         Member selfMember = Objects.requireNonNull(event.getGuild()).getSelfMember();
         if (!selfMember.hasPermission(Permission.CREATE_INSTANT_INVITE)) {
@@ -217,7 +221,7 @@ private static void handleErrors(@NotNull SlashCommandEvent event,
 
     /**
      * Interprets the given option as integer. Throws if the option is not an integer.
-     * 
+     *
      * @param option the option that contains the integer to extract, or null if not present
      * @return the extracted integer if present, null otherwise
      **/
@@ -227,4 +231,4 @@ private static void handleErrors(@NotNull SlashCommandEvent event,
         return option == null ? null : Math.toIntExact(option.getAsLong());
 
     }
-}
+}

application/src/main/java/org/togetherjava/tjbot/commands/free/ChannelMonitor.java

@@ -64,7 +64,7 @@ public void addChannelForStatus(@NotNull final TextChannel channel) {
      * This method tests whether a guild id is configured for monitoring in the free command system.
      * To add a guild for monitoring see {@link org.togetherjava.tjbot.config.FreeCommandConfig} or
      * {@link #addChannelForStatus(TextChannel)}.
-     * 
+     *
      * @param guildId the id of the guild to test.
      * @return whether the guild is configured in the free command system or not.
      */
@@ -77,7 +77,7 @@ public boolean isMonitoringGuild(final long guildId) {
      * system. To add a channel for monitoring see
      * {@link org.togetherjava.tjbot.config.FreeCommandConfig} or
      * {@link #addChannelToMonitor(long)}.
-     * 
+     *
      * @param channelId the id of the channel to test.
      * @return {@code true} if the channel is configured in the system, {@code false} otherwise.
      */
@@ -136,7 +136,7 @@ public boolean isChannelInactive(@NotNull final TextChannel channel) {
     /**
      * This method sets the channel's status to 'busy' see {@link ChannelStatus#setBusy(long)} for
      * details.
-     * 
+     *
      * @param channelId the id for the channel status to modify.
      * @param userId the id of the user changing the status to busy.
      * @throws IllegalArgumentException if the channel passed is not monitored. See
@@ -149,7 +149,7 @@ public void setChannelBusy(final long channelId, final long userId) {
     /**
      * This method sets the channel's status to 'free', see {@link ChannelStatus#setFree()} for
      * details.
-     * 
+     *
      * @param channelId the id for the channel status to modify.
      * @throws IllegalArgumentException if the channel passed is not monitored. See
      *         {@link #addChannelToMonitor(long)}
@@ -171,7 +171,7 @@ public void setChannelFree(final long channelId) {
     /**
      * This method provides a stream of the id's for channels where statuses are displayed. This is
      * streamed purely as a simple method of encapsulation.
-     * 
+     *
      * @return a stream of channel id's
      */
     public @NotNull Stream<Long> statusIds() {
@@ -194,7 +194,7 @@ public void setChannelFree(final long channelId) {
      * It first updates the channel names, order and grouping(categories) according to
      * {@link net.dv8tion.jda.api.JDA} for the monitored channels. So that the output is always
      * consistent with remote changes.
-     * 
+     *
      * @param guild the guild the message is intended for.
      * @return a string representing the busy/free status of channels in this guild. The String
      *         includes emojis and other discord specific markup. Attempting to display this
@@ -215,7 +215,7 @@ public String statusMessage(@NotNull final Guild guild) {
                 // pointless ... added to remove warnings
                 continue;
             }
-            Category category = channel.getParent();
+            Category category = channel.getParentCategory();
             if (category != null && !category.getName().equals(categoryName)) {
                 categoryName = category.getName();
                 // append the category name on a new line with markup for underlining
@@ -239,7 +239,7 @@ public String statusMessage(@NotNull final Guild guild) {
      * This method is run automatically during startup and should be run on a set schedule, as
      * defined in {@link org.togetherjava.tjbot.config.FreeCommandConfig}. The scheduled execution
      * is not currently implemented
-     * 
+     *
      * @param guild the guild for which to test the channel statuses of.
      */
     public void updateStatusFor(@NotNull Guild guild) {
@@ -284,7 +284,7 @@ public void updateStatusFor(@NotNull Guild guild) {
     /**
      * The toString method for this class, it generates a human-readable text string of the
      * currently monitored channels and the channels the status are printed in.
-     * 
+     *
      * @return the human-readable text string that describes this class.
      */
     @Override
@@ -293,4 +293,4 @@ public String toString() {
         return "Monitoring Channels: %s%nDisplaying on Channels: %s"
             .formatted(channelsToMonitorById, guildIdToStatusChannel);
     }
-}
+}

application/src/main/java/org/togetherjava/tjbot/commands/free/FreeCommand.java

@@ -9,7 +9,7 @@
 import net.dv8tion.jda.api.events.GenericEvent;
 import net.dv8tion.jda.api.events.ReadyEvent;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
-import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.requests.RestAction;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
@@ -119,7 +119,7 @@ public void onReady(@NotNull final ReadyEvent event) {
      * <p>
      * If this is called on from a channel that was not configured for monitoring (see
      * {@link FreeCommandConfig}) the user will receive an ephemeral message stating such.
-     * 
+     *
      * @param event the event that triggered this
      * @throws IllegalStateException if this method is called for a Global Slash Command
      */
@@ -289,26 +289,30 @@ private void checkBusyStatusAllChannels(@NotNull JDA jda) {
     public void onEvent(@NotNull GenericEvent event) {
         if (event instanceof ReadyEvent readyEvent) {
             onReady(readyEvent);
-        } else if (event instanceof GuildMessageReceivedEvent guildEvent) {
-            if (guildEvent.isWebhookMessage() || guildEvent.getAuthor().isBot()) {
+        } else if (event instanceof MessageReceivedEvent messageEvent) {
+            if (!messageEvent.isFromGuild()) {
+                return;
+            }
+
+            if (messageEvent.isWebhookMessage() || messageEvent.getAuthor().isBot()) {
                 return;
             }
-            if (!channelMonitor.isMonitoringChannel(guildEvent.getChannel().getIdLong())) {
+            if (!channelMonitor.isMonitoringChannel(messageEvent.getChannel().getIdLong())) {
                 logger.debug(
                         "Channel is not being monitored, ignoring message received in {} from {}",
-                        guildEvent.getChannel().getName(), guildEvent.getAuthor());
+                        messageEvent.getChannel().getName(), messageEvent.getAuthor());
                 return;
             }
-            if (channelMonitor.isChannelBusy(guildEvent.getChannel().getIdLong())) {
+            if (channelMonitor.isChannelBusy(messageEvent.getChannel().getIdLong())) {
                 logger.debug(
                         "Channel status is currently busy, ignoring message received in {} from {}",
-                        guildEvent.getChannel().getName(), guildEvent.getAuthor());
+                        messageEvent.getChannel().getName(), messageEvent.getAuthor());
                 return;
             }
-            channelMonitor.setChannelBusy(guildEvent.getChannel().getIdLong(),
-                    guildEvent.getAuthor().getIdLong());
-            displayStatus(channelMonitor.getStatusChannelFor(guildEvent.getGuild()));
-            guildEvent.getMessage().reply(UserStrings.NEW_QUESTION.message()).queue();
+            channelMonitor.setChannelBusy(messageEvent.getChannel().getIdLong(),
+                    messageEvent.getAuthor().getIdLong());
+            displayStatus(channelMonitor.getStatusChannelFor(messageEvent.getGuild()));
+            messageEvent.getMessage().reply(UserStrings.NEW_QUESTION.message()).queue();
         }
     }
 
@@ -366,4 +370,4 @@ private void initStatusMessageChannels(@NotNull final JDA jda) {
         }
         return channel;
     }
-}
+}

application/src/main/java/org/togetherjava/tjbot/commands/moderation/BanCommand.java

@@ -230,4 +230,4 @@ public void onSlashCommand(@NotNull SlashCommandEvent event) {
                                 reason, deleteHistoryDays, guild, event));
         }).queue();
     }
-}
+}

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

@@ -2,15 +2,15 @@
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.AbstractChannel;
+import net.dv8tion.jda.api.entities.Channel;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.TextChannel;
 import net.dv8tion.jda.api.events.ReadyEvent;
 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.message.guild.GuildMessageReceivedEvent;
-import net.dv8tion.jda.api.events.message.guild.GuildMessageUpdateEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageUpdateEvent;
 import net.dv8tion.jda.api.exceptions.ErrorHandler;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.dv8tion.jda.api.interactions.commands.Command;
@@ -152,19 +152,21 @@ public void onReady(@NotNull ReadyEvent event) {
     }
 
     @Override
-    public void onGuildMessageReceived(@NotNull GuildMessageReceivedEvent event) {
+    public void onMessageReceived(@NotNull MessageReceivedEvent event) {
         getMessageReceiversSubscribedTo(event.getChannel())
-            .forEach(messageReceiver -> messageReceiver.onMessageReceived(event));
+                .forEach(messageReceiver -> messageReceiver.onMessageReceived(event));
     }
 
     @Override
-    public void onGuildMessageUpdate(@NotNull GuildMessageUpdateEvent event) {
+    public void onMessageUpdate(@NotNull MessageUpdateEvent event) {
         getMessageReceiversSubscribedTo(event.getChannel())
-            .forEach(messageReceiver -> messageReceiver.onMessageUpdated(event));
+                .forEach(messageReceiver -> messageReceiver.onMessageUpdated(event));
     }
 
+
+
     private @NotNull Stream<MessageReceiver> getMessageReceiversSubscribedTo(
-            @NotNull AbstractChannel channel) {
+            @NotNull Channel channel) {
         String channelName = channel.getName();
         return channelNameToMessageReceiver.entrySet()
             .stream()
@@ -279,7 +281,7 @@ private static void handleRegisterErrors(Throwable ex, Guild guild) {
             Optional<TextChannel> channelToReportTo = guild.getTextChannelCache()
                 .stream()
                 .filter(channel -> guild.getPublicRole()
-                    .hasPermission(channel, Permission.MESSAGE_WRITE))
+                    .hasPermission(channel, Permission.MESSAGE_SEND))
                 .findAny();
 
             // Report the problem to the guild
@@ -328,4 +330,4 @@ private interface TriConsumer<A, B, C> {
          */
         void accept(A first, B second, C third);
     }
-}
+}

application/src/main/java/org/togetherjava/tjbot/commands/tophelper/TopHelpersMessageListener.java

@@ -1,6 +1,6 @@
 package org.togetherjava.tjbot.commands.tophelper;
 
-import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.jetbrains.annotations.NotNull;
 import org.togetherjava.tjbot.commands.MessageReceiverAdapter;
 import org.togetherjava.tjbot.config.Config;
@@ -28,15 +28,15 @@ public TopHelpersMessageListener(@NotNull Database database) {
     }
 
     @Override
-    public void onMessageReceived(@NotNull GuildMessageReceivedEvent event) {
+    public void onMessageReceived(@NotNull MessageReceivedEvent event) {
         if (event.getAuthor().isBot() || event.isWebhookMessage()) {
             return;
         }
 
         addMessageRecord(event);
     }
 
-    private void addMessageRecord(@NotNull GuildMessageReceivedEvent event) {
+    private void addMessageRecord(@NotNull MessageReceivedEvent event) {
         database.write(context -> context.newRecord(HELP_CHANNEL_MESSAGES)
             .setMessageId(event.getMessage().getIdLong())
             .setGuildId(event.getGuild().getIdLong())
@@ -45,4 +45,4 @@ private void addMessageRecord(@NotNull GuildMessageReceivedEvent event) {
             .setSentAt(event.getMessage().getTimeCreated().toInstant())
             .insert());
     }
-}
+}