Remove local player

Author: duncte123

bot/src/main/java/fredboat/audio/player/LavalinkManager.java

@@ -19,7 +19,6 @@
 package fredboat.audio.player;
 
 import dev.arbjerg.lavalink.client.*;
-import dev.arbjerg.lavalink.client.protocol.Track;
 import me.duncte123.skybot.objects.config.DunctebotConfig;
 import me.duncte123.skybot.utils.AirUtils;
 import me.duncte123.skybot.utils.AudioUtils;

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

@@ -18,6 +18,9 @@
 
 package me.duncte123.skybot.audio;
 
+import dev.arbjerg.lavalink.client.LavalinkPlayer;
+import dev.arbjerg.lavalink.client.Link;
+import fredboat.audio.player.LavalinkManager;
 import me.duncte123.skybot.SkyBot;
 import me.duncte123.skybot.Variables;
 import me.duncte123.skybot.utils.GuildSettingsUtils;
@@ -29,15 +32,13 @@
 import java.util.function.Supplier;
 
 public class GuildMusicManager {
-    private final LocalPlayer player;
     private final long guildId;
     private final TrackScheduler scheduler;
     private final AtomicLong latestChannel = new AtomicLong(-1);
     private final Supplier<Boolean> announceTracksSupplier;
 
     public GuildMusicManager(long guildId, Variables variables) {
         this.guildId = guildId;
-        player = new LocalPlayer(guildId);
         this.scheduler = new TrackScheduler(this);
         this.announceTracksSupplier = () -> GuildSettingsUtils.getGuild(guildId, variables).isAnnounceTracks();
     }
@@ -60,7 +61,9 @@ public TrackScheduler getScheduler() {
     }
 
     public void stopAndClear() {
-        this.player.stopPlayback();
+        this.getPlayer().ifPresent(
+            (player) -> player.setPaused(false).setEncodedTrack(null).subscribe()
+        );
 
         this.scheduler.getQueue().clear();
     }
@@ -78,8 +81,14 @@ public Optional<MessageChannel> getLatestChannel() {
         );
     }
 
-    public LocalPlayer getPlayer() {
-        return this.player;
+    public Link getLink() {
+        return LavalinkManager.INS.getLavalink().getLink(this.guildId);
+    }
+
+    public Optional<LavalinkPlayer> getPlayer() {
+        return Optional.ofNullable(
+            this.getLink().getCachedPlayer()
+        );
     }
 
     public long getGuildId() {

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

@@ -77,11 +77,14 @@ public void addToQueue(Track track, boolean isPatron) throws LimitReachedExcepti
             throw new LimitReachedException("The queue is full", MAX_QUEUE_SIZE);
         }
 
-        if (this.guildMusicManager.getPlayer().getCurrentTrack() == null) {
-            this.play(track);
-        } else {
-            queue.offer(track);
-        }
+        this.guildMusicManager.getPlayer()
+            .ifPresentOrElse((player) -> {
+                if (player.getTrack() == null) {
+                    this.play(track);
+                } else {
+                    queue.offer(track);
+                }
+            }, () -> this.play(track));
     }
 
     /**
@@ -100,9 +103,12 @@ public int queuePlaylistTracks(List<Track> tracks, boolean isPatron) throws Limi
 
         final int tracksAdded = tmpQueue.size();
 
-        if (this.guildMusicManager.getPlayer().getCurrentTrack() == null) {
-            this.play(tmpQueue.removeFirst());
-        }
+        this.guildMusicManager.getPlayer()
+            .ifPresentOrElse((player) -> {
+                if (player.getTrack() == null) {
+                    this.play(tmpQueue.removeFirst());
+                }
+            }, () -> this.play(tmpQueue.removeFirst()));
 
         queue.addAll(tmpQueue);
 
@@ -129,7 +135,9 @@ public void skipTracks(int count, boolean forceAnnounce) {
         }
 
         if (nextTrack == null) {
-            this.guildMusicManager.getPlayer().stopPlayback();
+            this.guildMusicManager.getPlayer().ifPresent((player) ->
+                player.setPaused(false).setEncodedTrack(null).subscribe()
+            );
 
             guildMusicManager.getLatestChannel()
                 .ifPresent((channel) -> sendMsg(
@@ -285,8 +293,8 @@ public void removeUserData(Track track) {
     }
 
     private void play(Track track) {
-        this.guildMusicManager.getPlayer()
-            .update()
+        this.guildMusicManager.getLink()
+            .createOrUpdatePlayer()
             .setTrack(track)
             .subscribe();
     }

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

@@ -18,9 +18,9 @@
 
 package me.duncte123.skybot.commands.music;
 
+import dev.arbjerg.lavalink.client.LavalinkPlayer;
 import dev.arbjerg.lavalink.client.protocol.Track;
 import me.duncte123.skybot.Variables;
-import me.duncte123.skybot.audio.LocalPlayer;
 import me.duncte123.skybot.objects.command.CommandContext;
 import me.duncte123.skybot.objects.command.MusicCommand;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
@@ -61,13 +61,19 @@ public void run(@NotNull CommandContext ctx) {
         try {
             this.run0(ctx);
         } catch (NumberFormatException e) {
-            sendMsg(ctx, "Your input \"" + ctx.getArgs().get(0) + "\" is not a valid number.");
+            sendMsg(ctx, "Your input \"" + ctx.getArgs().getFirst() + "\" is not a valid number.");
         }
     }
 
     public void run0(@Nonnull CommandContext ctx) throws NumberFormatException {
-        final var player = ctx.getAudioUtils().getMusicManager(ctx.getGuildId()).getPlayer();
-        final Track currentTrack = player.getCurrentTrack();
+        final var optionalPlayer = ctx.getAudioUtils().getMusicManager(ctx.getGuildId()).getPlayer();
+
+        if (optionalPlayer.isEmpty()) {
+            return;
+        }
+
+        final var player = optionalPlayer.get();
+        final Track currentTrack = player.getTrack();
 
         if (currentTrack == null) {
             sendMsg(ctx, "The player is currently not playing anything");
@@ -80,7 +86,7 @@ public void run0(@Nonnull CommandContext ctx) throws NumberFormatException {
         }
 
         final List<String> args = ctx.getArgs();
-        final String arg0 = args.get(0);
+        final String arg0 = args.getFirst();
         final String seekTime = arg0.replaceFirst("-", "");
         final Matcher matcher = TIME_REGEX.matcher(seekTime);
 
@@ -95,7 +101,7 @@ public void run0(@Nonnull CommandContext ctx) throws NumberFormatException {
         }
 
         // To hopefully prevent race conditions
-        final Supplier<Long> trackDuration = () -> player.getCurrentTrack().getInfo().getLength();
+        final Supplier<Long> trackDuration = () -> player.getTrack().getInfo().getLength();
 
         int seconds = Integer.parseInt(seekTime) * 1000;
 
@@ -118,11 +124,11 @@ public void run0(@Nonnull CommandContext ctx) throws NumberFormatException {
             return;
         }
 
-        player.seekTo(newPosition);
-
-        if (newPosition < trackDuration.get()) {
-            sendNowPlaying(ctx);
-        }
+        player.setPosition(newPosition).subscribe((p) -> {
+            if (newPosition < trackDuration.get()) {
+                sendNowPlaying(ctx);
+            }
+        });
 
     }
 
@@ -131,29 +137,28 @@ public void handleEvent(@NotNull SlashCommandInteractionEvent event, @NotNull Va
         event.reply("Slash command not supported yet, sorry. Please report this issue.").queue();
     }
 
-    private void handleOverSkip(@NotNull CommandContext ctx, LocalPlayer player, String arg0, Supplier<Long> trackDuration) {
+    private void handleOverSkip(@NotNull CommandContext ctx, LavalinkPlayer player, String arg0, Supplier<Long> trackDuration) {
         if (arg0.charAt(0) == '-') {
             sendMsg(ctx, "You're trying to skip more than the length of the track into the negatives?");
             return;
         }
 
         // No need to announce as we just skip to the end
-        player.seekTo(trackDuration.get());
+        player.setPosition(trackDuration.get()).subscribe();
     }
 
-    private void handleTimeSkip(@NotNull CommandContext ctx, LocalPlayer player, Matcher matcher) {
+    private void handleTimeSkip(@NotNull CommandContext ctx, LavalinkPlayer player, Matcher matcher) {
         final long minutes = Long.parseLong(matcher.group(1)) * 60 * 1000;
         final long seconds = Long.parseLong(matcher.group(2)) * 1000;
 
         final long finalTime = minutes + seconds;
 
-        player.seekTo(finalTime);
-        sendNowPlaying(ctx);
+        player.setPosition(finalTime).subscribe((p) -> sendNowPlaying(ctx));
     }
 
     private void sendNowPlaying(CommandContext ctx) {
         try {
-            // Race condition
+            // TODO: is this still needed?
             Thread.sleep(700);
         }
         catch (InterruptedException ignored) {

bot/src/main/java/me/duncte123/skybot/commands/music/SeekCommand.java

@@ -37,7 +37,7 @@ public class MusicEmbedUtils {
     private MusicEmbedUtils() {}
 
     public static void createPlayerString(GuildMusicManager mng, Consumer<String> callback) {
-        mng.getPlayer().getLavalinkPlayer().ifPresentOrElse((player) -> {
+        mng.getPlayer().ifPresentOrElse((player) -> {
             final TrackInfo trackInfo = player.getTrack().getInfo();
             final long position = player.getPosition();
             final long duration = trackInfo.getLength();

bot/src/main/java/me/duncte123/skybot/utils/MusicEmbedUtils.java

@@ -80,17 +80,20 @@ class BassBoostCommand : MusicCommand() {
 
     private fun setLavalinkEQ(gain: Float, variable: Variables, guildId: Long) {
         val player = variable.audioUtils.getMusicManager(guildId).player
-        val bands = mutableListOf<Band>()
 
-        for (i in 0..2) {
-            bands.add(Band(i, gain))
-        }
+        player.ifPresent {
+            val bands = mutableListOf<Band>()
 
-        player.setFilters(
-            Filters(
-                equalizer = bands.toOmissible()
-            )
-        )
+            for (i in 0..2) {
+                bands.add(Band(i, gain))
+            }
+
+            it.setFilters(
+                Filters(
+                    equalizer = bands.toOmissible()
+                )
+            ).subscribe()
+        }
     }
 
     override fun getSubData(): SubcommandData {