Use cached player instead of fetching it from the node

duncte123 · duncte123 · commit da36944023d4 · 2024-02-08T18:23:59.000+01:00
diff --git a/bot/src/main/java/fredboat/audio/player/LavalinkManager.java b/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
@@ -58,7 +58,6 @@ public void start(DunctebotConfig config, AudioUtils audioUtils) {
 
         lavalink = new LavalinkClient(userId);
 
-        this.registerPlayerUpdateEvent();
         this.registerTrackStartEvent();
         this.registerTrackEndEvent();
         this.registerTrackExceptionEvent();
@@ -138,26 +137,13 @@ private void loadNodes() {
         }
     }
 
-    private void registerPlayerUpdateEvent() {
-        lavalink.on(PlayerUpdateEvent.class).subscribe((event) -> {
-            final long guildIdLong = event.getGuildId();
-            final var mng = audioUtils.getMusicManagers().get(guildIdLong);
-
-            if (mng != null) {
-                mng.getPlayer().updateLocalPlayerState(event.getState());
-            }
-        });
-    }
-
     private void registerTrackStartEvent() {
         lavalink.on(TrackStartEvent.class).subscribe((event) -> {
             final long guildIdLong = event.getGuildId();
             final var mng = audioUtils.getMusicManagers().get(guildIdLong);
 
             if (mng != null) {
-                final Track track = event.getTrack();
-                mng.getPlayer().updateCurrentTrack(track);
-                mng.getScheduler().onTrackStart(track);
+                mng.getScheduler().onTrackStart(event.getTrack());
             }
         });
     }
@@ -168,7 +154,6 @@ private void registerTrackEndEvent() {
             final var mng = audioUtils.getMusicManagers().get(guildIdLong);
 
             if (mng != null) {
-                mng.getPlayer().updateCurrentTrack(null);
                 mng.getScheduler().onTrackEnd(event.getTrack(), event.getEndReason());
             }
         });
@@ -180,7 +165,6 @@ private void registerTrackExceptionEvent() {
             final var mng = audioUtils.getMusicManagers().get(guildIdLong);
 
             if (mng != null) {
-                mng.getPlayer().updateCurrentTrack(null);
                 mng.getScheduler().onTrackException(event.getTrack(), event.getException());
             }
         });
diff --git a/bot/src/main/java/me/duncte123/skybot/audio/LocalPlayer.java b/bot/src/main/java/me/duncte123/skybot/audio/LocalPlayer.java
@@ -21,19 +21,15 @@
 import dev.arbjerg.lavalink.client.IUpdatablePlayer;
 import dev.arbjerg.lavalink.client.LavalinkPlayer;
 import dev.arbjerg.lavalink.client.Link;
-import dev.arbjerg.lavalink.protocol.v4.Filters;
-import dev.arbjerg.lavalink.protocol.v4.PlayerState;
 import dev.arbjerg.lavalink.client.protocol.Track;
+import dev.arbjerg.lavalink.protocol.v4.Filters;
 import fredboat.audio.player.LavalinkManager;
-import reactor.core.publisher.Mono;
 
 import javax.annotation.Nullable;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.Optional;
 
 public class LocalPlayer {
     private final long guildId;
-    private final AtomicReference<Track> currentTrack = new AtomicReference<>(null);
-    private final AtomicReference<PlayerState> state = new AtomicReference<>(null);
 
     public LocalPlayer(long guildId) {
         this.guildId = guildId;
@@ -47,8 +43,10 @@ public IUpdatablePlayer update() {
         return this.getLink().createOrUpdatePlayer();
     }
 
-    public Mono<LavalinkPlayer> getLavalinkPlayer() {
-        return this.getLink().getPlayer();
+    public Optional<LavalinkPlayer> getLavalinkPlayer() {
+        return Optional.ofNullable(
+            this.getLink().getCachedPlayer()
+        );
     }
 
     public void stopPlayback() {
@@ -72,30 +70,22 @@ public void seekTo(long position) {
 
     @Nullable
     public Track getCurrentTrack() {
-        return this.currentTrack.get();
-    }
-
-    public long getPosition() {
-        final var currentState = this.state.get();
-
-        if (currentState == null) {
-            final Track currentTrack = getCurrentTrack();
+        final LavalinkPlayer player = this.getLink().getCachedPlayer();
 
-            if (currentTrack == null) {
-                return 0;
-            }
-
-            return currentTrack.getInfo().getPosition();
+        if (player == null) {
+            return null;
         }
 
-        return currentState.getPosition();
+        return player.getTrack();
     }
 
-    public void updateLocalPlayerState(PlayerState state) {
-        this.state.set(state);
-    }
+    public long getPosition() {
+        final LavalinkPlayer player = this.getLink().getCachedPlayer();
+
+        if (player == null) {
+            return -1;
+        }
 
-    public void updateCurrentTrack(Track track) {
-        this.currentTrack.set(track);
+        return player.getPosition();
     }
 }
diff --git a/bot/src/main/java/me/duncte123/skybot/utils/MusicEmbedUtils.java b/bot/src/main/java/me/duncte123/skybot/utils/MusicEmbedUtils.java
@@ -37,7 +37,7 @@ public class MusicEmbedUtils {
     private MusicEmbedUtils() {}
 
     public static void createPlayerString(GuildMusicManager mng, Consumer<String> callback) {
-        mng.getPlayer().getLavalinkPlayer().subscribe((player) -> {
+        mng.getPlayer().getLavalinkPlayer().ifPresentOrElse((player) -> {
             final TrackInfo trackInfo = player.getTrack().getInfo();
             final long position = player.getPosition();
             final long duration = trackInfo.getLength();
@@ -51,7 +51,7 @@ public static void createPlayerString(GuildMusicManager mng, Consumer<String> ca
                     getVolumeIcon(player.getVolume())
                 )
             );
-        });
+        }, () -> callback.accept("Not playing anything."));
     }
 
     private static String generateProgressBar(double percent) {
diff --git a/bot/src/main/kotlin/me/duncte123/skybot/commands/music/PauseCommand.kt b/bot/src/main/kotlin/me/duncte123/skybot/commands/music/PauseCommand.kt
@@ -34,30 +34,36 @@ class PauseCommand : MusicCommand() {
     override fun run(ctx: CommandContext) {
         val mng = ctx.audioUtils.getMusicManager(ctx.guildId)
         val localPlayer = mng.player
-        val player = localPlayer.lavalinkPlayer.block()!!
 
-        if (player.track == null) {
-            sendMsg(ctx, "Cannot pause or resume player because no track is loaded for playing.")
-            return
-        }
+        localPlayer.lavalinkPlayer.ifPresentOrElse({ player ->
+            if (player.track == null) {
+                sendMsg(ctx, "Cannot pause or resume player because no track is loaded for playing.")
+                return@ifPresentOrElse
+            }
 
-        player.setPaused(!player.paused).asMono().subscribe {
-            sendMsg(ctx, "The player has ${if (it.paused) "been paused" else "resumed playing"}.")
+            player.setPaused(!player.paused).subscribe {
+                sendMsg(ctx, "The player has ${if (it.paused) "been paused" else "resumed playing"}.")
+            }
+        }) {
+            sendMsg(ctx, "Cannot pause or resume player because no track is loaded for playing.")
         }
     }
 
     override fun handleEvent(event: SlashCommandInteractionEvent, variables: Variables) {
         val mng = variables.audioUtils.getMusicManager(event.guild!!.idLong)
         val localPlayer = mng.player
-        val player = localPlayer.lavalinkPlayer.block()!!
 
-        if (player.track == null) {
-            event.reply("Cannot pause or resume player because no track is loaded for playing.").queue()
-            return
-        }
+        localPlayer.lavalinkPlayer.ifPresentOrElse({player ->
+            if (player.track == null) {
+                event.reply("Cannot pause or resume player because no track is loaded for playing.").queue()
+                return@ifPresentOrElse
+            }
 
-        player.setPaused(!player.paused).asMono().subscribe {
-            event.reply("The player has ${if (it.paused) "been paused" else "resumed playing"}.").queue()
+            player.setPaused(!player.paused).subscribe {
+                event.reply("The player has ${if (it.paused) "been paused" else "resumed playing"}.").queue()
+            }
+        }) {
+            event.reply("Cannot pause or resume player because no track is loaded for playing.").queue()
         }
     }
 }
diff --git a/bot/src/main/kotlin/me/duncte123/skybot/commands/music/PlayCommand.kt b/bot/src/main/kotlin/me/duncte123/skybot/commands/music/PlayCommand.kt
@@ -30,6 +30,7 @@ import me.duncte123.skybot.utils.CommandUtils
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent
 import net.dv8tion.jda.api.interactions.commands.OptionType
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData
+import kotlin.jvm.optionals.getOrNull
 
 open class PlayCommand(private val skipParsing: Boolean = false) : MusicCommand() {
     private val pornhubRegex = "https?://([a-z]+\\.)?pornhub\\.(com|net|org)"
@@ -50,23 +51,28 @@ open class PlayCommand(private val skipParsing: Boolean = false) : MusicCommand(
             }
 
             val mng = ctx.audioUtils.getMusicManager(ctx.guildId)
-            val player = mng.player.lavalinkPlayer.block()!!
-            val scheduler = mng.scheduler
+            val player = mng.player.lavalinkPlayer.getOrNull()
 
-            when {
-                player.paused -> {
-                    player.setPaused(false).asMono().subscribe()
+            if (player == null) {
+                sendMsg(ctx, "Nothing is playing currently, add an argument to play something.")
+            } else {
+                val scheduler = mng.scheduler
 
-                    sendMsg(ctx, "Playback has been resumed.")
-                }
+                when {
+                    player.paused -> {
+                        player.setPaused(false).subscribe()
+
+                        sendMsg(ctx, "Playback has been resumed.")
+                    }
 
-                player.track != null -> sendMsg(ctx, "Player is already playing!")
+                    player.track != null -> sendMsg(ctx, "Player is already playing!")
 
-                scheduler.queue.isEmpty() -> sendMsg(
-                    ctx,
-                    "The current audio queue is empty! Add something to the queue first!\n" +
-                        "For example `${ctx.prefix}play https://www.youtube.com/watch?v=KKOBXrRzZwA`"
-                )
+                    scheduler.queue.isEmpty() -> sendMsg(
+                        ctx,
+                        "The current audio queue is empty! Add something to the queue first!\n" +
+                            "For example `${ctx.prefix}play https://www.youtube.com/watch?v=KKOBXrRzZwA`"
+                    )
+                }
             }
 
             return
@@ -75,7 +81,10 @@ open class PlayCommand(private val skipParsing: Boolean = false) : MusicCommand(
         var toPlay = ctx.argsRaw
 
         if (toPlay.contains(pornhubRegex.toRegex()) && !ctx.isChannelNSFW) {
-            sendMsg(ctx, "Because of thumbnails being loaded you can only use PornHub links in channels that are marked as NSFW")
+            sendMsg(
+                ctx,
+                "Because of thumbnails being loaded you can only use PornHub links in channels that are marked as NSFW"
+            )
             return
         }
 
@@ -164,7 +173,8 @@ open class PlayCommand(private val skipParsing: Boolean = false) : MusicCommand(
         var toPlay = event.getOption("item")!!.asString
 
         if (toPlay.contains(pornhubRegex.toRegex()) && !event.channel.isNSFW) {
-            event.reply("Because of thumbnails being loaded you can only use PornHub links in channels that are marked as NSFW").queue()
+            event.reply("Because of thumbnails being loaded you can only use PornHub links in channels that are marked as NSFW")
+                .queue()
             return
         }
 
diff --git a/bot/src/main/kotlin/me/duncte123/skybot/commands/music/VolumeCommand.kt b/bot/src/main/kotlin/me/duncte123/skybot/commands/music/VolumeCommand.kt
@@ -27,6 +27,7 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEve
 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 kotlin.jvm.optionals.getOrNull
 import kotlin.math.max
 import kotlin.math.min
 
@@ -43,24 +44,28 @@ class VolumeCommand : MusicCommand() {
         }
 
         val mng = ctx.audioUtils.getMusicManager(ctx.guildId)
-        val player = mng.player.lavalinkPlayer.block()!!
-        val args = ctx.args
 
-        if (args.isEmpty()) {
-            sendMsg(ctx, "The current volume is **${player.volume}%**")
-            return
-        }
+        mng.player.lavalinkPlayer.ifPresentOrElse({ player ->
+            val args = ctx.args
+
+            if (args.isEmpty()) {
+                sendMsg(ctx, "The current volume is **${player.volume}%**")
+                return@ifPresentOrElse
+            }
 
-        try {
-            val userInput = args[0].toInt()
-            val newVolume = max(0, min(1000, userInput))
-            val oldVolume = player.volume
+            try {
+                val userInput = args[0].toInt()
+                val newVolume = max(0, min(1000, userInput))
+                val oldVolume = player.volume
 
-            player.setVolume(newVolume).asMono().subscribe()
+                player.setVolume(newVolume).subscribe()
 
-            sendMsg(ctx, "Player volume changed from **$oldVolume%** to **$newVolume%**")
-        } catch (e: NumberFormatException) {
-            sendMsg(ctx, "**${args[0]}** is not a valid integer. (0 - 1000)")
+                sendMsg(ctx, "Player volume changed from **$oldVolume%** to **$newVolume%**")
+            } catch (e: NumberFormatException) {
+                sendMsg(ctx, "**${args[0]}** is not a valid integer. (0 - 1000)")
+            }
+        }) {
+            sendMsg(ctx, "There is no player connected to this guild")
         }
     }
 
@@ -84,24 +89,28 @@ class VolumeCommand : MusicCommand() {
         }
 
         val mng = variables.audioUtils.getMusicManager(event.guild!!.idLong)
-        val player = mng.player.lavalinkPlayer.block()!!
-        val volumeOpt = event.getOption("volume")
 
-        if (volumeOpt == null) {
-            event.reply("The current volume is **${player.volume}%**").queue()
-            return
-        }
+        mng.player.lavalinkPlayer.ifPresentOrElse({ player ->
+            val volumeOpt = event.getOption("volume")
+
+            if (volumeOpt == null) {
+                event.reply("The current volume is **${player.volume}%**").queue()
+                return@ifPresentOrElse
+            }
 
-        try {
-            val userInput = volumeOpt.asInt
-            val newVolume = max(0, min(1000, userInput))
-            val oldVolume = player.volume
+            try {
+                val userInput = volumeOpt.asInt
+                val newVolume = max(0, min(1000, userInput))
+                val oldVolume = player.volume
 
-            player.setVolume(newVolume).asMono().subscribe()
+                player.setVolume(newVolume).subscribe()
 
-            event.reply("Player volume changed from **$oldVolume%** to **$newVolume%**").queue()
-        } catch (e: NumberFormatException) {
-            event.reply("**${volumeOpt.asString}** is not a valid integer. (0 - 1000)").queue()
+                event.reply("Player volume changed from **$oldVolume%** to **$newVolume%**").queue()
+            } catch (e: NumberFormatException) {
+                event.reply("**${volumeOpt.asString}** is not a valid integer. (0 - 1000)").queue()
+            }
+        }) {
+            event.reply("There is no player connected to this guild").queue()
         }
     }
 }
