Fix latest channel being null

Author: duncte123

bot/src/main/java/me/duncte123/skybot/audio/GuildMusicManager.java

@@ -23,7 +23,8 @@
 import me.duncte123.skybot.utils.GuildSettingsUtils;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 
-import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 
@@ -64,15 +65,17 @@ public void stopAndClear() {
         this.scheduler.getQueue().clear();
     }
 
-    @Nullable
-    public MessageChannel getLatestChannel() {
+    @Nonnull
+    public Optional<MessageChannel> getLatestChannel() {
         final long last = this.getLatestChannelId();
 
         if (last == -1 || last == 0) {
-            return null;
+            return Optional.empty();
         }
 
-        return SkyBot.getInstance().getShardManager().getChannelById(MessageChannel.class, last);
+        return Optional.ofNullable(
+            SkyBot.getInstance().getShardManager().getChannelById(MessageChannel.class, last)
+        );
     }
 
     public LocalPlayer getPlayer() {

bot/src/main/java/me/duncte123/skybot/audio/TrackScheduler.java

@@ -27,7 +27,6 @@
 import me.duncte123.skybot.extensions.AudioTrackKt;
 import me.duncte123.skybot.objects.TrackUserData;
 import me.duncte123.skybot.utils.Debouncer;
-import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.exceptions.ErrorHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,17 +55,12 @@ public class TrackScheduler {
     /* package */ TrackScheduler(GuildMusicManager guildMusicManager) {
         this.guildMusicManager = guildMusicManager;
         this.messageDebouncer = new Debouncer<>((msg) -> {
-            final MessageChannel latestChannel = guildMusicManager.getLatestChannel();
-
-            if (latestChannel == null) {
-                return;
-            }
-
-            sendMsg(new MessageConfig.Builder()
-                .setChannel(latestChannel)
-                .setMessage(msg)
-                .setFailureAction(new ErrorHandler().ignore(UNKNOWN_CHANNEL, MISSING_PERMISSIONS))
-                .build());
+            guildMusicManager.getLatestChannel()
+                .ifPresent((latestChannel) ->  sendMsg(new MessageConfig.Builder()
+                    .setChannel(latestChannel)
+                    .setMessage(msg)
+                    .setFailureAction(new ErrorHandler().ignore(UNKNOWN_CHANNEL, MISSING_PERMISSIONS))
+                    .build()));
         }, DEBOUNCE_INTERVAL);
     }
 
@@ -92,10 +86,10 @@ public void addToQueue(Track track, boolean isPatron) throws LimitReachedExcepti
 
     /**
      *
-     * @param tracks
-     * @param isPatron
+     * @param tracks The tracks to be added to the queue.
+     * @param isPatron if this user is a supporter of the bot.
      * @return The total amount of tracks that were added to the queue.
-     * @throws LimitReachedException
+     * @throws LimitReachedException When the free limit has been reached.
      */
     public int queuePlaylistTracks(List<Track> tracks, boolean isPatron) throws LimitReachedException {
         final List<Track> tmpQueue = new ArrayList<>();
@@ -136,11 +130,13 @@ public void skipTracks(int count, boolean forceAnnounce) {
 
         if (nextTrack == null) {
             this.guildMusicManager.getPlayer().stopPlayback();
-            sendMsg(
-                new MessageConfig.Builder()
-                    .setChannel(guildMusicManager.getLatestChannel())
-                    .setMessage("Queue concluded")
-            );
+
+            guildMusicManager.getLatestChannel()
+                .ifPresent((channel) -> sendMsg(
+                    new MessageConfig.Builder()
+                        .setChannel(channel)
+                        .setMessage("Queue concluded")
+                ));
         } else {
             // Make sure to cary over the skip state, we want to announce skipped tracks
             getUserData(nextTrack).setForceAnnounce(forceAnnounce);
@@ -158,21 +154,22 @@ public void onTrackStart(Track track) {
                 data.setForceAnnounce(false);
             }
 
-            AudioTrackKt.toEmbed(
-                track,
-                this.guildMusicManager,
-                getInstance().getShardManager(),
-                false,
-                (message) -> {
-                    sendMsg(
-                        new MessageConfig.Builder()
-                            .setChannel(guildMusicManager.getLatestChannel())
-                            .setEmbeds(false, message)
-                    );
-
-                    return null;
-                }
-            );
+            guildMusicManager.getLatestChannel()
+                .ifPresent((latestChannel) -> AudioTrackKt.toEmbed(
+                    track,
+                    this.guildMusicManager,
+                    getInstance().getShardManager(),
+                    false,
+                    (message) -> {
+                        sendMsg(
+                            new MessageConfig.Builder()
+                                .setChannel(latestChannel)
+                                .setEmbeds(false, message)
+                        );
+
+                        return null;
+                    }
+                ));
         }
     }
 

bot/src/main/java/me/duncte123/skybot/listeners/GuildListener.java

@@ -57,18 +57,15 @@ public GuildListener(Variables variables) {
 
     @Override
     public void onEvent(@Nonnull GenericEvent event) {
-        if (event instanceof GuildJoinEvent guildJoin) {
-            this.onGuildJoin(guildJoin);
-        } else if (event instanceof GuildLeaveEvent guildLeave) {
-            this.onGuildLeave(guildLeave);
-        } else if (event instanceof GuildVoiceUpdateEvent guildVoiceMove) {
-            this.onGuildVoiceMove(guildVoiceMove);
-        } else if (event instanceof GuildBanEvent guildBan) {
-            this.onGuildBan(guildBan);
-        } else if (event instanceof GuildUnbanEvent guildUnban) {
-            this.onGuildUnban(guildUnban);
-        } else if (event instanceof GuildReadyEvent guildReady) {
-            this.onGuildReady(guildReady);
+        switch (event) {
+            case GuildJoinEvent guildJoin -> this.onGuildJoin(guildJoin);
+            case GuildLeaveEvent guildLeave -> this.onGuildLeave(guildLeave);
+            case GuildVoiceUpdateEvent guildVoiceMove -> this.onGuildVoiceMove(guildVoiceMove);
+            case GuildBanEvent guildBan -> this.onGuildBan(guildBan);
+            case GuildUnbanEvent guildUnban -> this.onGuildUnban(guildUnban);
+            case GuildReadyEvent guildReady -> this.onGuildReady(guildReady);
+            default -> {
+            }
         }
     }
 
@@ -333,22 +330,18 @@ private void requestToSpeak(Guild guild, Member self, AudioChannel channel) {
             guild.requestToSpeak();
         } else {
             final GuildMusicManager musicManager = this.variables.getAudioUtils().getMusicManager(guild.getIdLong());
-            final MessageChannel textChan = musicManager.getLatestChannel();
-
-            if (textChan == null) {
-                return;
-            }
 
-            sendMsg(
-                new MessageConfig.Builder()
-                    .setChannel(textChan)
-                    .setMessageFormat(
-                        "In order for stage channels to work properly, I need to be able to request to speak.\n" +
-                            "Alternatively, you could give me the %s permission so I can unmute myself or invite me to speak on this stage.",
-                        Permission.VOICE_MUTE_OTHERS.getName()
-                    )
-                    .build()
-            );
+            musicManager.getLatestChannel()
+                .ifPresent((textChan) -> sendMsg(
+                    new MessageConfig.Builder()
+                        .setChannel(textChan)
+                        .setMessageFormat(
+                            "In order for stage channels to work properly, I need to be able to request to speak.\n" +
+                                "Alternatively, you could give me the %s permission so I can unmute myself or invite me to speak on this stage.",
+                            Permission.VOICE_MUTE_OTHERS.getName()
+                        )
+                        .build()
+                ));
         }
     }
 }