From a274bbd351ae3750b511420f3dc96c9614047d72 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Wed, 22 Nov 2023 22:40:22 +0100
Subject: [PATCH 01/17] Start working on moving to lavalink v4

---
 .idea/jarRepositories.xml                     |  5 ++
 .../audio/player/LavalinkManager.java         | 66 +++++++-------
 .../ml/duncte123/skybot/EventManager.java     |  5 --
 .../main/java/ml/duncte123/skybot/SkyBot.java |  5 +-
 .../duncte123/skybot/audio/AudioLoader.java   | 87 ++++++++++---------
 .../skybot/audio/GuildMusicManager.java       | 29 ++++---
 .../duncte123/skybot/audio/LocalPlayer.java   | 49 +++++++++++
 .../skybot/audio/TrackScheduler.java          | 77 +++++++---------
 .../listeners/ReadyShutdownListener.java      |  1 +
 .../objects/config/DunctebotConfig.java       | 11 ++-
 .../ml/duncte123/skybot/utils/AirUtils.java   |  7 --
 .../skybot/commands/music/SkipCommand.kt      | 17 ++--
 .../duncte123/skybot/extensions/AudioTrack.kt | 33 +++++++
 build.gradle.kts                              |  1 +
 settings.gradle.kts                           |  3 +-
 15 files changed, 242 insertions(+), 154 deletions(-)
 create mode 100644 bot/src/main/java/ml/duncte123/skybot/audio/LocalPlayer.java

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 2afaf9d78..5413c531c 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -46,5 +46,10 @@
       <option name="name" value="maven4" />
       <option name="url" value="https://m2.duncte123.dev/snapshots" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="https://maven.arbjerg.dev/releases" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/bot/src/main/java/fredboat/audio/player/LavalinkManager.java b/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
index 55f2a6d1e..8440ef8a2 100644
--- a/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
+++ b/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
@@ -18,10 +18,9 @@
 
 package fredboat.audio.player;
 
-import lavalink.client.io.Link;
-import lavalink.client.io.jda.JdaLavalink;
-import lavalink.client.player.LavalinkPlayer;
+import dev.arbjerg.lavalink.client.*;
 import ml.duncte123.skybot.SkyBot;
+import ml.duncte123.skybot.audio.GuildMusicManager;
 import ml.duncte123.skybot.objects.config.DunctebotConfig;
 import ml.duncte123.skybot.utils.AirUtils;
 import ml.duncte123.skybot.utils.AudioUtils;
@@ -29,10 +28,10 @@
 import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel;
 import net.dv8tion.jda.api.entities.channel.unions.AudioChannelUnion;
 import net.dv8tion.jda.api.managers.AudioManager;
+import reactor.core.publisher.Mono;
 
 import javax.annotation.Nonnull;
 import java.net.URI;
-import java.util.Base64;
 
 /**
  * This class has been taken from
@@ -41,7 +40,7 @@
  */
 public final class LavalinkManager {
     public static final LavalinkManager INS = new LavalinkManager();
-    private JdaLavalink lavalink = null;
+    private LavalinkClient lavalink = null;
     private DunctebotConfig config = null;
     private AudioUtils audioUtils;
     private boolean enabledOverride = true;
@@ -57,13 +56,19 @@ public void start(SkyBot skybot, DunctebotConfig config, AudioUtils audioUtils)
             return;
         }
 
-        final String userId = getIdFromToken(this.config.discord.token);
+        final long userId = Helpers.getUserIdFromToken(this.config.discord.token);
 
-        lavalink = new JdaLavalink(
-            userId,
-            this.config.discord.totalShards,
-            shardId -> skybot.getShardManager().getShardById(shardId)
-        );
+        lavalink = new LavalinkClient(userId);
+
+        lavalink.on(PlayerUpdateEvent.class).subscribe((stats) -> {
+            // TODO extract method
+            final long guildIdLong = Long.parseUnsignedLong(stats.getEvent().getGuildId());
+            final var mng = audioUtils.getMusicManagers().get(guildIdLong);
+
+            if (mng != null) {
+                mng.getPlayer().updatePlayerState(stats.getEvent().getState());
+            }
+        });
 
         loadNodes();
     }
@@ -75,6 +80,7 @@ public void forceEnable(boolean enabled) {
         } else {
             AirUtils.stopMusic(this.audioUtils);
 
+            // TODO: fix
             // disconnect all links
             this.lavalink.getLinks().forEach(Link::destroy);
             // close all connections to all nodes
@@ -91,12 +97,12 @@ public boolean isEnabled() {
         return this.enabledOverride && config.lavalink.enable;
     }
 
-    public LavalinkPlayer createPlayer(long guildId) {
+    public Mono<LavalinkPlayer> createPlayer(long guildId) {
         if (!isEnabled()) {
             throw new IllegalStateException("Music is not enabled right now");
         }
 
-        return lavalink.getLink(String.valueOf(guildId)).getPlayer();
+        return lavalink.getLink(guildId).getPlayer();
     }
 
     public void openConnection(AudioChannel channel) {
@@ -106,30 +112,31 @@ public void openConnection(AudioChannel channel) {
             // Turn on the deafen icon for the bot
             audioManager.setSelfDeafened(true);
 
-            lavalink.getLink(channel.getGuild()).connect(channel);
+            channel.getJDA().getDirectAudioController().connect(channel);
         }
     }
 
     public void closeConnection(Guild guild) {
-        closeConnection(guild.getId());
+        if (isEnabled()) {
+            guild.getJDA().getDirectAudioController().disconnect(guild);
+        }
     }
 
+    @Deprecated
     public void closeConnection(String guildId) {
-        if (isEnabled()) {
-            lavalink.getLink(guildId).destroy();
-        }
+        throw new UnsupportedOperationException();
     }
 
     public boolean isConnected(Guild guild) {
-        return isConnected(guild.getId());
+        return isConnected(guild.getIdLong());
     }
 
-    public boolean isConnected(String guildId) {
+    public boolean isConnected(long guildId) {
         if (!isEnabled()) {
             return false;
         }
 
-        return lavalink.getLink(guildId).getState() == Link.State.CONNECTED;
+        return lavalink.getLink(guildId).getState() == LinkState.CONNECTED;
     }
 
     @SuppressWarnings("ConstantConditions") // cache is enabled
@@ -143,27 +150,20 @@ public AudioChannelUnion getConnectedChannel(@Nonnull Guild guild) {
 
     public void shutdown() {
         if (isEnabled()) {
-            this.lavalink.shutdown();
+            this.lavalink.close();
         }
     }
 
-    public JdaLavalink getLavalink() {
+    public LavalinkClient getLavalink() {
         return lavalink;
     }
 
     private void loadNodes() {
-        final JdaLavalink lavalink = getLavalink();
+        final LavalinkClient lavalink = getLavalink();
 
         for (final DunctebotConfig.Lavalink.LavalinkNode node : config.lavalink.nodes) {
-            lavalink.addNode(URI.create(node.wsurl), node.pass);
+            // TODO: region filter mapping
+            lavalink.addNode(node.name, URI.create(node.wsurl), node.pass);
         }
     }
-
-    private String getIdFromToken(String token) {
-        return new String(
-            Base64.getDecoder().decode(
-                token.split("\\.")[0]
-            )
-        );
-    }
 }
diff --git a/bot/src/main/java/ml/duncte123/skybot/EventManager.java b/bot/src/main/java/ml/duncte123/skybot/EventManager.java
index b265a83a6..580d16119 100644
--- a/bot/src/main/java/ml/duncte123/skybot/EventManager.java
+++ b/bot/src/main/java/ml/duncte123/skybot/EventManager.java
@@ -18,7 +18,6 @@
 
 package ml.duncte123.skybot;
 
-import fredboat.audio.player.LavalinkManager;
 import io.sentry.Sentry;
 import me.duncte123.botcommons.text.TextColor;
 import ml.duncte123.skybot.commands.mod.DeHoistListener;
@@ -71,10 +70,6 @@ public class EventManager implements IEventManager {
         this.listeners.add(reactionHandler);
         this.listeners.add(shardWatcher);
         this.listeners.add(inviteTracker);
-
-        if (LavalinkManager.INS.isEnabled()) {
-            this.listeners.add(LavalinkManager.INS.getLavalink());
-        }
     }
 
     @Override
diff --git a/bot/src/main/java/ml/duncte123/skybot/SkyBot.java b/bot/src/main/java/ml/duncte123/skybot/SkyBot.java
index 7ebd53d60..e637fcfa1 100644
--- a/bot/src/main/java/ml/duncte123/skybot/SkyBot.java
+++ b/bot/src/main/java/ml/duncte123/skybot/SkyBot.java
@@ -18,6 +18,7 @@
 
 package ml.duncte123.skybot;
 
+import dev.arbjerg.lavalink.libraries.jda.JDAVoiceUpdateListener;
 import fredboat.audio.player.LavalinkManager;
 import me.duncte123.botcommons.messaging.EmbedUtils;
 import me.duncte123.botcommons.messaging.MessageConfig;
@@ -133,7 +134,9 @@ private SkyBot() throws LoginException {
 
         // If lavalink is enabled we will hook it into jda
         if (LavalinkManager.INS.isEnabled()) {
-            builder.setVoiceDispatchInterceptor(LavalinkManager.INS.getLavalink().getVoiceInterceptor());
+            builder.setVoiceDispatchInterceptor(
+                new JDAVoiceUpdateListener(LavalinkManager.INS.getLavalink())
+            );
         }
 
         this.shardManager = builder.build();
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java b/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java
index 01bf9efef..7392d7569 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java
@@ -18,17 +18,12 @@
 
 package ml.duncte123.skybot.audio;
 
-import com.dunctebot.sourcemanagers.IWillUseIdentifierInstead;
-import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
+import dev.arbjerg.lavalink.protocol.v4.*;
+import dev.arbjerg.lavalink.protocol.v4.Exception;
 import me.duncte123.botcommons.messaging.MessageConfig;
 import ml.duncte123.skybot.CommandManager;
 import ml.duncte123.skybot.commands.music.RadioCommand;
 import ml.duncte123.skybot.exceptions.LimitReachedException;
-import ml.duncte123.skybot.extensions.AudioTrackKt;
 import ml.duncte123.skybot.extensions.StringKt;
 import ml.duncte123.skybot.objects.AudioData;
 import ml.duncte123.skybot.objects.RadioStream;
@@ -39,11 +34,12 @@
 import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Consumer;
 
 import static me.duncte123.botcommons.messaging.EmbedUtils.embedMessage;
 import static me.duncte123.botcommons.messaging.MessageUtils.sendMsg;
 
-public class AudioLoader implements AudioLoadResultHandler {
+public class AudioLoader implements Consumer<LoadResult> {
 
     private final AudioData data;
     private final long requester;
@@ -62,7 +58,24 @@ public AudioLoader(AudioData data, GuildMusicManager mng, boolean announce, Stri
     }
 
     @Override
-    public void trackLoaded(AudioTrack track) {
+    public void accept(LoadResult loadResult) {
+        if (loadResult instanceof LoadResult.TrackLoaded trackLoaded) {
+            this.trackLoaded(trackLoaded);
+        } else if (loadResult instanceof LoadResult.PlaylistLoaded playlistLoaded) {
+            this.playlistLoaded(playlistLoaded);
+        } else if (loadResult instanceof LoadResult.SearchResult searchResult) {
+            this.searchLoaded(searchResult);
+        } else if (loadResult instanceof LoadResult.NoMatches) {
+            this.noMatches();
+        } else if (loadResult instanceof LoadResult.LoadFailed loadFailed) {
+            this.loadFailed(loadFailed.getData());
+        }
+    }
+
+    private void trackLoaded(LoadResult.TrackLoaded data) {
+        final Track track = data.getData();
+
+        // TODO: Find a way to keep track of user-data
         track.setUserData(new TrackUserData(this.requester));
 
         final TrackScheduler scheduler = this.mng.getScheduler();
@@ -81,15 +94,10 @@ public void trackLoaded(AudioTrack track) {
             scheduler.addToQueue(track, this.isPatron);
 
             if (this.announce) {
-                final AudioTrackInfo info = track.getInfo();
-                final String uri;
-                if (track instanceof IWillUseIdentifierInstead) {
-                    uri = info.identifier;
-                } else {
-                    uri = info.uri;
-                }
+                final TrackInfo info = track.getInfo();
+                final String uri = info.getUri();
 
-                final String title = getSteamTitle(track, info.title, this.data.getVariables().getCommandManager());
+                final String title = getSteamTitle(track, info.getTitle(), this.data.getVariables().getCommandManager());
                 final String msg = "Adding to queue: [" + StringKt.abbreviate(title, 500) + "](" + uri + ')';
 
                 sendMsg(
@@ -97,7 +105,7 @@ public void trackLoaded(AudioTrack track) {
                         .setChannel(this.data.getChannel())
                         .replyTo(this.data.getReplyToMessage())
                         .setEmbeds(embedMessage(msg)
-                            .setThumbnail(AudioTrackKt.getImageUrl(track, true)))
+                            .setThumbnail(track.getInfo().getArtworkUrl()))
                         .build()
                 );
             }
@@ -113,8 +121,9 @@ public void trackLoaded(AudioTrack track) {
         }
     }
 
-    @Override
-    public void playlistLoaded(AudioPlaylist playlist) {
+    private void playlistLoaded(LoadResult.PlaylistLoaded playlistLoaded) {
+        Playlist playlist = playlistLoaded.getData();
+
         if (playlist.getTracks().isEmpty()) {
             sendMsg(
                 new MessageConfig.Builder()
@@ -127,26 +136,24 @@ public void playlistLoaded(AudioPlaylist playlist) {
             return;
         }
 
+        final PlaylistInfo playlistInfo = playlist.getInfo();
+
         try {
             final TrackScheduler trackScheduler = this.mng.getScheduler();
 
-            List<AudioTrack> tracksRaw = playlist.getTracks();
-            final AudioTrack selectedTrack = playlist.getSelectedTrack();
-
-            if (selectedTrack != null) {
-                final int index = tracksRaw.indexOf(selectedTrack);
+            List<Track> tracksRaw = playlist.getTracks();
+            final int selectedTrackIndex = playlistInfo.getSelectedTrack();
 
-                if (index > -1) {
-                    tracksRaw = tracksRaw.subList(index, tracksRaw.size());
-                }
+            if (selectedTrackIndex > -1) {
+                tracksRaw = tracksRaw.subList(selectedTrackIndex, tracksRaw.size());
             }
 
-            final List<AudioTrack> tracks = tracksRaw.stream().peek((track) -> {
+            final List<Track> tracks = tracksRaw.stream().peek((track) -> {
                 // don't store this externally since it will cause issues
                 track.setUserData(new TrackUserData(this.requester));
             }).toList();
 
-            for (final AudioTrack track : tracks) {
+            for (final Track track : tracks) {
                 trackScheduler.addToQueue(track, this.isPatron);
             }
 
@@ -162,7 +169,7 @@ public void playlistLoaded(AudioPlaylist playlist) {
                 final String msg = String.format(
                     "Adding **%s** tracks to the queue from **%s**",
                     sizeMsg,
-                    playlist.getName()
+                    playlistInfo.getName()
                 );
 
                 sendMsg(
@@ -181,7 +188,7 @@ public void playlistLoaded(AudioPlaylist playlist) {
                         .setChannel(this.data.getChannel())
                         .replyTo(this.data.getReplyToMessage())
                         .setMessage(String.format("The first %s tracks from %s have been queued up\n" +
-                            "Consider supporting us on patreon to queue up unlimited songs.", e.getSize(), playlist.getName()))
+                            "Consider supporting us on patreon to queue up unlimited songs.", e.getSize(), playlistInfo.getName()))
                         .build()
                 );
             }
@@ -189,8 +196,11 @@ public void playlistLoaded(AudioPlaylist playlist) {
         }
     }
 
-    @Override
-    public void noMatches() {
+    private void searchLoaded(LoadResult.SearchResult searchResult) {
+        // TODO: common method for handling playlists
+    }
+
+    private void noMatches() {
         if (this.announce) {
             sendMsg(
                 new MessageConfig.Builder()
@@ -202,8 +212,7 @@ public void noMatches() {
         }
     }
 
-    @Override
-    public void loadFailed(FriendlyException exception) {
+    private void loadFailed(Exception exception) {
         if (exception.getCause() != null && exception.getCause() instanceof final LimitReachedException cause) {
             sendMsg(
                 new MessageConfig.Builder()
@@ -255,14 +264,14 @@ public void loadFailed(FriendlyException exception) {
 
     }
 
-    private static String getSteamTitle(AudioTrack track, String rawTitle, CommandManager commandManager) {
+    private static String getSteamTitle(Track track, String rawTitle, CommandManager commandManager) {
         String title = rawTitle;
 
-        if (track.getInfo().isStream) {
+        if (track.getInfo().isStream()) {
             final Optional<RadioStream> stream = ((RadioCommand) commandManager.getCommand("radio"))
                 .getRadioStreams()
                 .stream()
-                .filter(s -> s.getUrl().equals(track.getInfo().uri)).findFirst();
+                .filter(s -> s.getUrl().equals(track.getInfo().getUri())).findFirst();
 
             if (stream.isPresent()) {
                 title = stream.get().getName();
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/GuildMusicManager.java b/bot/src/main/java/ml/duncte123/skybot/audio/GuildMusicManager.java
index 47bffa9b5..04e1d624e 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/GuildMusicManager.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/GuildMusicManager.java
@@ -19,7 +19,6 @@
 package ml.duncte123.skybot.audio;
 
 import fredboat.audio.player.LavalinkManager;
-import lavalink.client.player.LavalinkPlayer;
 import ml.duncte123.skybot.SkyBot;
 import ml.duncte123.skybot.Variables;
 import ml.duncte123.skybot.utils.GuildSettingsUtils;
@@ -30,15 +29,15 @@
 import java.util.function.Supplier;
 
 public class GuildMusicManager {
-    public final LavalinkPlayer player;
+    private final LocalPlayer player = new LocalPlayer();
+    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.player = LavalinkManager.INS.createPlayer(guildId);
-        this.scheduler = new TrackScheduler(this.player, this);
-        this.player.addListener(this.scheduler);
+        this.guildId = guildId;
+        this.scheduler = new TrackScheduler(this);
         this.announceTracksSupplier = () -> GuildSettingsUtils.getGuild(guildId, variables).isAnnounceTracks();
     }
 
@@ -60,15 +59,15 @@ public TrackScheduler getScheduler() {
     }
 
     public void stopAndClear() {
-        final TrackScheduler scheduler = this.getScheduler();
-        this.player.removeListener(scheduler);
-        this.player.setPaused(false);
+        LavalinkManager.INS.getLavalink()
+            .getLink(this.guildId)
+            .updatePlayer(
+                (player) -> player.setPaused(false)
+                    .setEncodedTrack(null)
+            )
+            .subscribe();
 
-        if (this.player.getPlayingTrack() != null) {
-            this.player.stopTrack();
-        }
-
-        scheduler.queue.clear();
+        this.scheduler.getQueue().clear();
     }
 
     @Nullable
@@ -81,4 +80,8 @@ public MessageChannel getLatestChannel() {
 
         return SkyBot.getInstance().getShardManager().getChannelById(MessageChannel.class, last);
     }
+
+    public LocalPlayer getPlayer() {
+        return this.player;
+    }
 }
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/LocalPlayer.java b/bot/src/main/java/ml/duncte123/skybot/audio/LocalPlayer.java
new file mode 100644
index 000000000..a71a0154d
--- /dev/null
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/LocalPlayer.java
@@ -0,0 +1,49 @@
+/*
+ * Skybot, a multipurpose discord bot
+ *      Copyright (C) 2017  Duncan "duncte123" Sterken & Ramid "ramidzkh" Khan & Maurice R S "Sanduhr32"
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package ml.duncte123.skybot.audio;
+
+import dev.arbjerg.lavalink.protocol.v4.PlayerState;
+import dev.arbjerg.lavalink.protocol.v4.Track;
+
+import javax.annotation.Nullable;
+import java.util.concurrent.atomic.AtomicReference;
+
+public class LocalPlayer {
+    private final AtomicReference<Track> currentTrack = new AtomicReference<>(null);
+    private final AtomicReference<PlayerState> state = new AtomicReference<>(null);
+
+    @Nullable
+    public Track getCurrentTrack() {
+        return this.currentTrack.get();
+    }
+
+    public long getPosition() {
+        final var currentState = this.state.get();
+
+        if (currentState == null) {
+            return 0;
+        }
+
+        return currentState.getPosition();
+    }
+
+    public void updatePlayerState(PlayerState state) {
+        this.state.set(state);
+    }
+}
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
index 70e71b0f9..316e5ac99 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
@@ -23,8 +23,9 @@
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import lavalink.client.player.LavalinkPlayer;
-import lavalink.client.player.event.AudioEventAdapterWrapped;
+import dev.arbjerg.lavalink.protocol.v4.PlayerState;
+import dev.arbjerg.lavalink.protocol.v4.Track;
+import dev.arbjerg.lavalink.protocol.v4.TrackInfo;
 import me.duncte123.botcommons.messaging.MessageConfig;
 import ml.duncte123.skybot.audio.sourcemanagers.spotify.SpotifyAudioTrack;
 import ml.duncte123.skybot.exceptions.LimitReachedException;
@@ -43,26 +44,28 @@
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 
 import static me.duncte123.botcommons.messaging.MessageUtils.sendMsg;
 import static ml.duncte123.skybot.SkyBot.getInstance;
 import static net.dv8tion.jda.api.requests.ErrorResponse.MISSING_PERMISSIONS;
 import static net.dv8tion.jda.api.requests.ErrorResponse.UNKNOWN_CHANNEL;
 
-public class TrackScheduler extends AudioEventAdapterWrapped {
+// TODO: player events
+public class TrackScheduler {
 
+    // TODO: keep track of user-data per track identifier
     public static final int MAX_QUEUE_SIZE = 100;
-    public final Queue<AudioTrack> queue;
+    private final Queue<Track> queue;
+
     private static final long DEBOUNCE_INTERVAL = TimeUnit.SECONDS.toMillis(5);
     private static final Logger LOGGER = LoggerFactory.getLogger(TrackScheduler.class);
-    private final LavalinkPlayer player;
     private final GuildMusicManager guildMusicManager;
     private final Debouncer<String> messageDebouncer;
     private boolean looping = false;
     private boolean loopingQueue = false;
 
-    /* package */ TrackScheduler(LavalinkPlayer player, GuildMusicManager guildMusicManager) {
-        this.player = player;
+    /* package */ TrackScheduler(GuildMusicManager guildMusicManager) {
         this.queue = new LinkedList<>();
         this.guildMusicManager = guildMusicManager;
         this.messageDebouncer = new Debouncer<>((msg) -> {
@@ -84,12 +87,16 @@ public boolean canQueue() {
         return this.queue.size() < MAX_QUEUE_SIZE;
     }
 
-    public void addToQueue(AudioTrack track, boolean isPatron) throws LimitReachedException {
+    public Queue<Track> getQueue() {
+        return queue;
+    }
+
+    public void addToQueue(Track track, boolean isPatron) throws LimitReachedException {
         if (queue.size() + 1 >= MAX_QUEUE_SIZE && !isPatron) {
             throw new LimitReachedException("The queue is full", MAX_QUEUE_SIZE);
         }
 
-        if (player.getPlayingTrack() == null) {
+        if (this.guildMusicManager.getPlayer().getCurrentTrack() == null) {
             this.play(track);
         } else {
             queue.offer(track);
@@ -102,13 +109,17 @@ public void addToQueue(AudioTrack track, boolean isPatron) throws LimitReachedEx
      */
     public void specialSkipCase() {
         // Get the currently playing track
-        final AudioTrack playingTrack = this.player.getPlayingTrack();
+        final Track playingTrack = this.guildMusicManager.getPlayer().getCurrentTrack();
         // Set in the data that it was from a skip
         playingTrack.getUserData(TrackUserData.class).setWasFromSkip(true);
 
         // We trigger a fake on track end here to make it adhere to the normal loop flow
         // and inject a boolean for forcing the announcement on skip
-        this.onTrackEnd(null, playingTrack, AudioTrackEndReason.FINISHED);
+        this.onTrackEnd(playingTrack, AudioTrackEndReason.FINISHED);
+    }
+
+    public void skipCurrentTrack() {
+        // TODO: update player with the next track.
     }
 
     private void skipTrack(boolean wasFromSkip) {
@@ -116,7 +127,7 @@ private void skipTrack(boolean wasFromSkip) {
     }
 
     public void skipTracks(int count, boolean wasFromSkip) {
-        AudioTrack nextTrack = null;
+        Track nextTrack = null;
 
         for (int i = 0; i < count; i++) {
             nextTrack = queue.poll();
@@ -137,8 +148,7 @@ public void skipTracks(int count, boolean wasFromSkip) {
         }
     }
 
-    @Override
-    public void onTrackStart(AudioPlayer player, AudioTrack track) {
+    public void onTrackStart(Track track) {
         final TrackUserData data = track.getUserData(TrackUserData.class);
 
         // If the track was a skipped track, or we announce tracks
@@ -164,8 +174,7 @@ public void onTrackStart(AudioPlayer player, AudioTrack track) {
         }
     }
 
-    @Override
-    public void onTrackEnd(AudioPlayer player, AudioTrack lastTrack, AudioTrackEndReason endReason) {
+    public void onTrackEnd(Track lastTrack, AudioTrackEndReason endReason) {
         LOGGER.debug("track ended");
 
         if (!endReason.mayStartNext) {
@@ -241,14 +250,13 @@ private TrackUserData createNewTrackData(AudioTrack track, boolean wasFromSkip)
         return newData;
     }
 
-    @Override
-    public void onTrackException(AudioPlayer player, AudioTrack track, FriendlyException exception) {
+    public void onTrackException(Track track, FriendlyException exception) {
         final Throwable rootCause = ExceptionUtils.getRootCause(exception);
         final Throwable finalCause = rootCause == null ? exception : rootCause;
-        final AudioTrackInfo info = track.getInfo();
+        final TrackInfo info = track.getInfo();
 
         if (finalCause == null || finalCause.getMessage() == null) {
-            this.messageDebouncer.accept("Something went terribly wrong when playing track with identifier `" + info.identifier +
+            this.messageDebouncer.accept("Something went terribly wrong when playing track with identifier `" + info.getIdentifier() +
                 "`\nPlease contact the developers asap with the identifier in the message above");
             return;
         }
@@ -258,39 +266,18 @@ public void onTrackException(AudioPlayer player, AudioTrack track, FriendlyExcep
         }
 
         if (finalCause.getMessage().contains("age-restricted")) {
-            this.messageDebouncer.accept("Cannot play `" + info.title + "` because it is age-restricted");
+            this.messageDebouncer.accept("Cannot play `" + info.getTitle() + "` because it is age-restricted");
             return;
         }
 
         this.messageDebouncer.accept("Something went wrong while playing track with identifier `" +
-            info.identifier
+            info.getIdentifier()
             + "`, please contact the devs if this happens a lot.\n" +
             "Details: " + finalCause);
-
-        // old shit
-        /*if (exception.severity != FriendlyException.Severity.COMMON) {
-            final TextChannel tc = guildMusicManager.getLatestChannel();
-            final Guild g = tc == null ? null : tc.getGuild();
-
-            if (g != null) {
-                final AudioTrackInfo info = track.getInfo();
-                final String error = String.format(
-                    "Guild %s (%s) had an FriendlyException on track \"%s\" by \"%s\" (source %s) (%s)",
-                    g.getName(),
-                    g.getId(),
-                    info.title,
-                    info.author,
-                    track.getSourceManager().getSourceName(),
-                    info.identifier
-                );
-
-                logger.error(TextColor.RED + error + TextColor.RESET, exception);
-            }
-
-        }*/
     }
 
-    public void play(AudioTrack track) {
+    @Deprecated
+    private void play(Track track) {
         // load the youtube identifier before we play the track
         if (track instanceof SpotifyAudioTrack) {
             track.getIdentifier();
diff --git a/bot/src/main/java/ml/duncte123/skybot/listeners/ReadyShutdownListener.java b/bot/src/main/java/ml/duncte123/skybot/listeners/ReadyShutdownListener.java
index 6b6061c59..7eec0de07 100644
--- a/bot/src/main/java/ml/duncte123/skybot/listeners/ReadyShutdownListener.java
+++ b/bot/src/main/java/ml/duncte123/skybot/listeners/ReadyShutdownListener.java
@@ -108,6 +108,7 @@ private void onReady(ReadyEvent event) {
         }
     }
 
+    // TODO: get access to JDA, somehow
     private void onShutdown() {
         if (!arePoolsRunning.get()) {
             return;
diff --git a/bot/src/main/java/ml/duncte123/skybot/objects/config/DunctebotConfig.java b/bot/src/main/java/ml/duncte123/skybot/objects/config/DunctebotConfig.java
index 90dc325fb..93835769e 100644
--- a/bot/src/main/java/ml/duncte123/skybot/objects/config/DunctebotConfig.java
+++ b/bot/src/main/java/ml/duncte123/skybot/objects/config/DunctebotConfig.java
@@ -117,11 +117,13 @@ public Lavalink(boolean enable, LavalinkNode[] nodes) {
         }
 
         public static class LavalinkNode {
+            public final String name;
             public final String wsurl;
             public final String pass;
             public final String region;
 
-            public LavalinkNode(String wsurl, String pass, String region) {
+            public LavalinkNode(String name, String wsurl, String pass, String region) {
+                this.name = name;
                 this.wsurl = wsurl;
                 this.pass = pass;
                 this.region = region;
@@ -202,7 +204,14 @@ public static DunctebotConfig fromEnv() {
                     throw new IllegalArgumentException("Missing configuration for LAVALINK_NODE_"+i+". Please check the config");
                 }
 
+                final String name = System.getenv("LAVALINK_NODE_" + i + "_NAME");
+
+                if (name == null) {
+                    throw new IllegalArgumentException("Missing name for LAVALINK_NODE_"+i+". Please check the config");
+                }
+
                 nodes[i] = new Lavalink.LavalinkNode(
+                    name,
                     host,
                     System.getenv("LAVALINK_NODE_"+i+"_PASS"),
                     System.getenv("LAVALINK_NODE_"+i+"_REGION")
diff --git a/bot/src/main/java/ml/duncte123/skybot/utils/AirUtils.java b/bot/src/main/java/ml/duncte123/skybot/utils/AirUtils.java
index bdd289e2f..cb54bd4f0 100644
--- a/bot/src/main/java/ml/duncte123/skybot/utils/AirUtils.java
+++ b/bot/src/main/java/ml/duncte123/skybot/utils/AirUtils.java
@@ -166,13 +166,6 @@ public static void stopMusic(long guildId, AudioUtils audioUtils) {
         }
 
         mng.stopAndClear();
-
-        final LavalinkManager lavalinkManager = LavalinkManager.INS;
-        final String guildIdString = Long.toString(guildId);
-
-        if (lavalinkManager.isConnected(guildIdString)) {
-            lavalinkManager.closeConnection(guildIdString);
-        }
     }
 
     @Nullable
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SkipCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SkipCommand.kt
index deeb55c9e..1296e3f4b 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SkipCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SkipCommand.kt
@@ -52,26 +52,27 @@ class SkipCommand : MusicCommand() {
     private fun skipHandler(variables: Variables, guild: Guild, user: User, sendMessage: (String) -> Unit) {
         val mng = variables.audioUtils.getMusicManager(guild.idLong)
         val player = mng.player
+        val currentTrack = player.currentTrack
 
-        if (player.playingTrack == null) {
+        if (currentTrack == null) {
             sendMessage("The player is not playing.")
             return
         }
 
-        if (!player.playingTrack.isSeekable) {
+        if (!currentTrack.info.isSeekable) {
             sendMessage("This track is not seekable")
             return
         }
 
-        val trackData = player.playingTrack.getUserData(TrackUserData::class.java)
+        val trackData = currentTrack.getUserData(TrackUserData::class.java)
 
         if (trackData.requester == user.idLong) {
             doSkip(mng, sendMessage)
             return
         }
-		
+
         val vc = getLavalinkManager().getConnectedChannel(guild)
-		
+
         if (vc == null) {
             sendMessage("Somehow I am not connected to a voice channel? Probably a bug, please report this!")
             return
@@ -104,11 +105,11 @@ class SkipCommand : MusicCommand() {
     }
 
     private fun doSkip(mng: GuildMusicManager, sendMessage: (String) -> Unit) {
-        val player = mng.player
+        val nextTrack = mng.scheduler.queue.peek()
 
-        mng.scheduler.specialSkipCase()
+        mng.scheduler.skipCurrentTrack()
 
-        if (player.playingTrack == null) {
+        if (nextTrack == null) {
             sendMessage(
                 "Successfully skipped the track.\n" +
                     "Queue is now empty."
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt b/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt
index 78e1925f9..d17c03aec 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt
@@ -28,6 +28,7 @@ import com.sedmelluq.discord.lavaplayer.source.twitch.TwitchStreamAudioTrack
 import com.sedmelluq.discord.lavaplayer.source.vimeo.VimeoAudioTrack
 import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioTrack
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack
+import dev.arbjerg.lavalink.protocol.v4.Track
 import io.sentry.Sentry
 import me.duncte123.botcommons.messaging.EmbedUtils.embedMessage
 import me.duncte123.botcommons.web.WebUtils
@@ -38,6 +39,38 @@ import ml.duncte123.skybot.utils.YoutubeUtils
 import net.dv8tion.jda.api.EmbedBuilder
 import net.dv8tion.jda.api.sharding.ShardManager
 
+fun Track.toEmbed(mng: GuildMusicManager, shardManager: ShardManager, withPlayer: Boolean = true): EmbedBuilder {
+    val userData: TrackUserData? = this.getUserData(TrackUserData::class.java)
+    var requester = "Unknown"
+
+    if (userData != null) {
+        val userId = userData.requester
+        val user = shardManager.getUserById(userId)
+
+        if (user != null) {
+            requester = user.asTag
+        }
+    }
+
+    val uri = this.info.uri
+
+    if (this.info.isStream) {
+        return embedMessage(
+            """**Currently playing** [${this.info.title}]($uri) by ${this.info.author}
+            |**Requester:** $requester
+            """.trimMargin()
+        )
+            .setThumbnail(this.info.artworkUrl)
+    }
+
+    return embedMessage(
+        """**Currently playing** [${this.info.title}]($uri) by ${this.info.author}
+            |**Requester:** $requester${if (withPlayer) "\n" + playerEmbed(mng) else ""}
+        """.trimMargin()
+    )
+        .setThumbnail(this.info.artworkUrl)
+}
+
 fun AudioTrack.toEmbed(mng: GuildMusicManager, shardManager: ShardManager, withPlayer: Boolean = true): EmbedBuilder {
     val userData = this.getUserData(TrackUserData::class.java)
     var requester = "Unknown"
diff --git a/build.gradle.kts b/build.gradle.kts
index 8bfa1092a..5c2127bf5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -37,6 +37,7 @@ allprojects {
 
         maven("https://m2.dv8tion.net/releases")
         maven("https://m2.duncte123.dev/releases")
+        maven("https://maven.arbjerg.dev/releases")
         maven("https://repo.jenkins-ci.org/releases")
         maven("https://m2.duncte123.dev/snapshots")
         maven("https://jitpack.io")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 77db538b0..359148258 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -94,8 +94,7 @@ fun VersionCatalogBuilder.voice() {
     library("sourceManagers", "com.dunctebot", "sourcemanagers").version("1.8.5")
 //    implementation(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.78")
     library("lavaplayer", "com.github.walkyst", "lavaplayer-fork").version("1.4.2")
-//    library("lavalink-client", "com.github.DuncteBot", "Lavalink-Client").version("c1d8b73")
-    library("lavalink-client", "com.github.freyacodes", "Lavalink-Client").version("cde746afc")
+    library("lavalink-client", "dev.arbjerg", "lavalink-client").version("0.0.1")
 }
 
 fun VersionCatalogBuilder.dashboard() {

From bf696381e1ce7ee81d94ba0158aaace313cfaed1 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Thu, 23 Nov 2023 09:24:00 +0100
Subject: [PATCH 02/17] Getting closer to being able to remove lavaplayer

---
 .../audio/player/LavalinkManager.java         |  3 +-
 .../audio/AbstractPlayerEventListener.java    | 32 ++++++++
 .../skybot/audio/GuildMusicManager.java       | 12 +--
 .../duncte123/skybot/audio/LocalPlayer.java   | 30 ++++++-
 .../skybot/audio/TrackScheduler.java          | 82 +++++++++----------
 .../ml/duncte123/skybot/audio/TrackUtils.kt   | 25 ++++++
 6 files changed, 130 insertions(+), 54 deletions(-)
 create mode 100644 bot/src/main/java/ml/duncte123/skybot/audio/AbstractPlayerEventListener.java
 create mode 100644 bot/src/main/kotlin/ml/duncte123/skybot/audio/TrackUtils.kt

diff --git a/bot/src/main/java/fredboat/audio/player/LavalinkManager.java b/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
index 8440ef8a2..7c3cf36a2 100644
--- a/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
+++ b/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
@@ -20,7 +20,6 @@
 
 import dev.arbjerg.lavalink.client.*;
 import ml.duncte123.skybot.SkyBot;
-import ml.duncte123.skybot.audio.GuildMusicManager;
 import ml.duncte123.skybot.objects.config.DunctebotConfig;
 import ml.duncte123.skybot.utils.AirUtils;
 import ml.duncte123.skybot.utils.AudioUtils;
@@ -66,7 +65,7 @@ public void start(SkyBot skybot, DunctebotConfig config, AudioUtils audioUtils)
             final var mng = audioUtils.getMusicManagers().get(guildIdLong);
 
             if (mng != null) {
-                mng.getPlayer().updatePlayerState(stats.getEvent().getState());
+                mng.getPlayer().updateLocalPlayerState(stats.getEvent().getState());
             }
         });
 
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/AbstractPlayerEventListener.java b/bot/src/main/java/ml/duncte123/skybot/audio/AbstractPlayerEventListener.java
new file mode 100644
index 000000000..2c8eebdd3
--- /dev/null
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/AbstractPlayerEventListener.java
@@ -0,0 +1,32 @@
+/*
+ * Skybot, a multipurpose discord bot
+ *      Copyright (C) 2017  Duncan "duncte123" Sterken & Ramid "ramidzkh" Khan & Maurice R S "Sanduhr32"
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package ml.duncte123.skybot.audio;
+
+import dev.arbjerg.lavalink.client.*;
+
+public abstract class AbstractPlayerEventListener {
+
+    public abstract void onTrackStart(TrackStartEvent event);
+
+    public abstract void onTrackEnd(TrackEndEvent event);
+
+    public abstract void onTrackException(TrackExceptionEvent event);
+
+    public abstract void onTrackStuck(TrackStuckEvent event);
+}
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/GuildMusicManager.java b/bot/src/main/java/ml/duncte123/skybot/audio/GuildMusicManager.java
index 04e1d624e..d818f375a 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/GuildMusicManager.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/GuildMusicManager.java
@@ -18,7 +18,6 @@
 
 package ml.duncte123.skybot.audio;
 
-import fredboat.audio.player.LavalinkManager;
 import ml.duncte123.skybot.SkyBot;
 import ml.duncte123.skybot.Variables;
 import ml.duncte123.skybot.utils.GuildSettingsUtils;
@@ -29,7 +28,7 @@
 import java.util.function.Supplier;
 
 public class GuildMusicManager {
-    private final LocalPlayer player = new LocalPlayer();
+    private final LocalPlayer player;
     private final long guildId;
     private final TrackScheduler scheduler;
     private final AtomicLong latestChannel = new AtomicLong(-1);
@@ -37,6 +36,7 @@ public class GuildMusicManager {
 
     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();
     }
@@ -59,13 +59,7 @@ public TrackScheduler getScheduler() {
     }
 
     public void stopAndClear() {
-        LavalinkManager.INS.getLavalink()
-            .getLink(this.guildId)
-            .updatePlayer(
-                (player) -> player.setPaused(false)
-                    .setEncodedTrack(null)
-            )
-            .subscribe();
+        this.player.stopPlayback();
 
         this.scheduler.getQueue().clear();
     }
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/LocalPlayer.java b/bot/src/main/java/ml/duncte123/skybot/audio/LocalPlayer.java
index a71a0154d..55a71d1cd 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/LocalPlayer.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/LocalPlayer.java
@@ -18,16 +18,36 @@
 
 package ml.duncte123.skybot.audio;
 
+import dev.arbjerg.lavalink.client.Link;
 import dev.arbjerg.lavalink.protocol.v4.PlayerState;
 import dev.arbjerg.lavalink.protocol.v4.Track;
+import fredboat.audio.player.LavalinkManager;
 
 import javax.annotation.Nullable;
 import java.util.concurrent.atomic.AtomicReference;
 
 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;
+    }
+
+    public Link getLink() {
+        return LavalinkManager.INS.getLavalink().getLink(this.guildId);
+    }
+
+    public void stopPlayback() {
+        this.getLink()
+            .updatePlayer(
+                (player) -> player.setPaused(false)
+                    .setEncodedTrack(null)
+            )
+            .subscribe();
+    }
+
     @Nullable
     public Track getCurrentTrack() {
         return this.currentTrack.get();
@@ -37,13 +57,19 @@ public long getPosition() {
         final var currentState = this.state.get();
 
         if (currentState == null) {
-            return 0;
+            final Track currentTrack = getCurrentTrack();
+
+            if (currentTrack == null) {
+                return 0;
+            }
+
+            return currentTrack.getInfo().getPosition();
         }
 
         return currentState.getPosition();
     }
 
-    public void updatePlayerState(PlayerState state) {
+    public void updateLocalPlayerState(PlayerState state) {
         this.state.set(state);
     }
 }
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
index 316e5ac99..3cca52c50 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
@@ -18,16 +18,11 @@
 
 package ml.duncte123.skybot.audio;
 
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import dev.arbjerg.lavalink.protocol.v4.PlayerState;
+import dev.arbjerg.lavalink.protocol.v4.Message.EmittedEvent.TrackEndEvent.AudioTrackEndReason;
 import dev.arbjerg.lavalink.protocol.v4.Track;
 import dev.arbjerg.lavalink.protocol.v4.TrackInfo;
 import me.duncte123.botcommons.messaging.MessageConfig;
-import ml.duncte123.skybot.audio.sourcemanagers.spotify.SpotifyAudioTrack;
 import ml.duncte123.skybot.exceptions.LimitReachedException;
 import ml.duncte123.skybot.extensions.AudioTrackKt;
 import ml.duncte123.skybot.objects.TrackUserData;
@@ -39,12 +34,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
 
 import static me.duncte123.botcommons.messaging.MessageUtils.sendMsg;
 import static ml.duncte123.skybot.SkyBot.getInstance;
@@ -54,9 +45,10 @@
 // TODO: player events
 public class TrackScheduler {
 
-    // TODO: keep track of user-data per track identifier
+    // TODO: keep track of user-data per track (need something unique)
     public static final int MAX_QUEUE_SIZE = 100;
-    private final Queue<Track> queue;
+    private final Queue<Track> queue = new LinkedList<>();
+    private final Map<String, TrackUserData> userData = new HashMap<>();
 
     private static final long DEBOUNCE_INTERVAL = TimeUnit.SECONDS.toMillis(5);
     private static final Logger LOGGER = LoggerFactory.getLogger(TrackScheduler.class);
@@ -66,7 +58,6 @@ public class TrackScheduler {
     private boolean loopingQueue = false;
 
     /* package */ TrackScheduler(GuildMusicManager guildMusicManager) {
-        this.queue = new LinkedList<>();
         this.guildMusicManager = guildMusicManager;
         this.messageDebouncer = new Debouncer<>((msg) -> {
             final MessageChannel latestChannel = guildMusicManager.getLatestChannel();
@@ -111,7 +102,7 @@ public void specialSkipCase() {
         // Get the currently playing track
         final Track playingTrack = this.guildMusicManager.getPlayer().getCurrentTrack();
         // Set in the data that it was from a skip
-        playingTrack.getUserData(TrackUserData.class).setWasFromSkip(true);
+        getUserData(playingTrack).setWasFromSkip(true);
 
         // We trigger a fake on track end here to make it adhere to the normal loop flow
         // and inject a boolean for forcing the announcement on skip
@@ -119,7 +110,7 @@ public void specialSkipCase() {
     }
 
     public void skipCurrentTrack() {
-        // TODO: update player with the next track.
+        this.skipTrack(true);
     }
 
     private void skipTrack(boolean wasFromSkip) {
@@ -134,7 +125,7 @@ public void skipTracks(int count, boolean wasFromSkip) {
         }
 
         if (nextTrack == null) {
-            player.stopTrack();
+            this.guildMusicManager.getPlayer().stopPlayback();
             sendMsg(
                 new MessageConfig.Builder()
                     .setChannel(guildMusicManager.getLatestChannel())
@@ -142,15 +133,16 @@ public void skipTracks(int count, boolean wasFromSkip) {
             );
         } else {
             // Make sure to cary over the skip state, we want to announce skipped tracks
-            nextTrack.getUserData(TrackUserData.class).setWasFromSkip(wasFromSkip);
+            getUserData(nextTrack).setWasFromSkip(wasFromSkip);
 
             this.play(nextTrack);
         }
     }
 
     public void onTrackStart(Track track) {
-        final TrackUserData data = track.getUserData(TrackUserData.class);
+        final TrackUserData data = getUserData(track);
 
+        // TODO: do I still need "wasFromSkip" status tracking?
         // If the track was a skipped track, or we announce tracks
         if (data != null && data.getWasFromSkip() || this.guildMusicManager.isAnnounceTracks()) {
             // Reset the was from skip status
@@ -177,37 +169,34 @@ public void onTrackStart(Track track) {
     public void onTrackEnd(Track lastTrack, AudioTrackEndReason endReason) {
         LOGGER.debug("track ended");
 
-        if (!endReason.mayStartNext) {
+        if (!endReason.getMayStartNext()) {
             LOGGER.debug("Cannot start next");
             return;
         }
 
         // Get if the track was from a skip event
-        final Object userData = lastTrack.getUserData();
-        final boolean wasFromSkip;
-
-        if (userData instanceof TrackUserData data) {
-            wasFromSkip = data.getWasFromSkip();
-        } else {
-            wasFromSkip = false;
-        }
+        final TrackUserData userData = getUserData(lastTrack);
+        final boolean wasFromSkip = userData.getWasFromSkip();
 
         if (this.looping) {
             LOGGER.debug("repeating the current song");
 
-            final AudioTrack clone = lastTrack.makeClone();
-            clone.setUserData(createNewTrackData(lastTrack, wasFromSkip));
+            final Track clone = TrackUtilsKt.makeClone(lastTrack);
+            storeUserData(clone, createNewTrackData(lastTrack, wasFromSkip));
             this.play(clone);
 
             return;
         } else if (this.loopingQueue) {
             LOGGER.debug("repeating the queue");
             //Offer it to the queue to prevent the player from playing it
-            final AudioTrack clone = lastTrack.makeClone();
-            clone.setUserData(createNewTrackData(lastTrack, wasFromSkip));
+            final Track clone = TrackUtilsKt.makeClone(lastTrack);
+            storeUserData(clone, createNewTrackData(lastTrack, wasFromSkip));
             queue.offer(clone);
         }
 
+        // clean up the old track's userdata
+        removeUserData(lastTrack);
+
         LOGGER.debug("can start next track");
 
         skipTrack(wasFromSkip);
@@ -233,8 +222,8 @@ public void shuffle() {
         Collections.shuffle((List<?>) queue);
     }
 
-    private TrackUserData createNewTrackData(AudioTrack track, boolean wasFromSkip) {
-        final TrackUserData oldData = track.getUserData(TrackUserData.class);
+    private TrackUserData createNewTrackData(Track track, boolean wasFromSkip) {
+        final TrackUserData oldData = getUserData(track);
         final TrackUserData newData;
 
         // If we did not have old data (unlikely) we will create it
@@ -276,13 +265,24 @@ public void onTrackException(Track track, FriendlyException exception) {
             "Details: " + finalCause);
     }
 
-    @Deprecated
-    private void play(Track track) {
-        // load the youtube identifier before we play the track
-        if (track instanceof SpotifyAudioTrack) {
-            track.getIdentifier();
-        }
+    public TrackUserData getUserData(Track track) {
+        throw new UnsupportedOperationException("TODO: implement this method");
+    }
+
+    public void storeUserData(Track track, TrackUserData data) {
+        throw new UnsupportedOperationException("TODO: implement this method");
+    }
 
-        this.player.playTrack(track);
+    public void removeUserData(Track track) {
+        throw new UnsupportedOperationException("TODO: implement this method");
+    }
+
+    private void play(Track track) {
+        this.guildMusicManager.getPlayer()
+            .getLink()
+            .updatePlayer(
+                (builder) -> builder.setEncodedTrack(track.getEncoded())
+            )
+            .subscribe();
     }
 }
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/audio/TrackUtils.kt b/bot/src/main/kotlin/ml/duncte123/skybot/audio/TrackUtils.kt
new file mode 100644
index 000000000..363da14c2
--- /dev/null
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/audio/TrackUtils.kt
@@ -0,0 +1,25 @@
+/*
+ * Skybot, a multipurpose discord bot
+ *      Copyright (C) 2017  Duncan "duncte123" Sterken & Ramid "ramidzkh" Khan & Maurice R S "Sanduhr32"
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package ml.duncte123.skybot.audio
+
+import dev.arbjerg.lavalink.protocol.v4.Track
+
+fun Track.makeClone() = this.copy(
+    info = this.info.copy(position = 0L)
+)

From 11e286780dc2b30a64a9dcbc09457ae988f10a94 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sat, 25 Nov 2023 10:16:08 +0100
Subject: [PATCH 03/17] Temp sollution for testing

---
 .../java/ml/duncte123/skybot/audio/TrackScheduler.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
index 3cca52c50..a577cb878 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
@@ -34,6 +34,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nullable;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -265,16 +266,18 @@ public void onTrackException(Track track, FriendlyException exception) {
             "Details: " + finalCause);
     }
 
+    // TODO: these use the identifier for now, we need to use something more unique
+    @Nullable
     public TrackUserData getUserData(Track track) {
-        throw new UnsupportedOperationException("TODO: implement this method");
+        return this.userData.get(track.getInfo().getIdentifier());
     }
 
     public void storeUserData(Track track, TrackUserData data) {
-        throw new UnsupportedOperationException("TODO: implement this method");
+        this.userData.put(track.getInfo().getIdentifier(), data);
     }
 
     public void removeUserData(Track track) {
-        throw new UnsupportedOperationException("TODO: implement this method");
+        this.userData.remove(track.getInfo().getIdentifier());
     }
 
     private void play(Track track) {

From 6341f8d3ea7fd757817afc083b73cd0f5fae95d7 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sat, 25 Nov 2023 11:09:57 +0100
Subject: [PATCH 04/17] Disable kotlin linter until bug is fixed

---
 .editorconfig                                 | 12 ++-
 .idea/kotlinc.xml                             |  2 +-
 bot/.editorconfig                             |  9 +++
 bot/build.gradle.kts                          | 20 ++---
 .../audio/player/LavalinkManager.java         | 76 ++++++++++++++-----
 .../main/java/ml/duncte123/skybot/SkyBot.java |  2 +-
 .../audio/AbstractPlayerEventListener.java    | 32 --------
 .../skybot/audio/TrackScheduler.java          | 25 +++---
 build.gradle.kts                              |  4 +-
 9 files changed, 97 insertions(+), 85 deletions(-)
 create mode 100644 bot/.editorconfig
 delete mode 100644 bot/src/main/java/ml/duncte123/skybot/audio/AbstractPlayerEventListener.java

diff --git a/.editorconfig b/.editorconfig
index b1a76627e..9348afb4b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,4 +9,14 @@ indent_style = space
 indent_size = 4
 
 [gradlew]
-end_of_line = lf
\ No newline at end of file
+end_of_line = lf
+
+[*.{kt,kts}]
+# ktlint_code_style = ktlint_official
+ktlint_standard = disabled # Disable all rules from the `standard` rule set provided by KtLint
+ktlint_experimental = disabled # Enable all `experimental` rules from all rule sets provided by KtLint or other rule providers
+ktlint_custom-rule-set = disabled # Enable all rules in the `custom-rule-set` rule set (not provided by KtLint)
+klint_standard_no-wildcard-imports = disabled
+klint_standard_function-signature = disabled
+klint_standard_trailing-comma-on-call-site = disabled
+klint_standard_multiline-expression-wrapping = disabled
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index e1eea1d6b..ae3f30ae1 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.7.20" />
+    <option name="version" value="1.9.21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/bot/.editorconfig b/bot/.editorconfig
new file mode 100644
index 000000000..a7f517798
--- /dev/null
+++ b/bot/.editorconfig
@@ -0,0 +1,9 @@
+[*.{kt,kts}]
+# ktlint_code_style = ktlint_official
+ktlint_standard = enabled # Disable all rules from the `standard` rule set provided by KtLint
+ktlint_experimental = disabled # Enable all `experimental` rules from all rule sets provided by KtLint or other rule providers
+ktlint_custom-rule-set = disabled # Enable all rules in the `custom-rule-set` rule set (not provided by KtLint)
+klint_standard_no-wildcard-imports = disabled
+klint_standard_function-signature = disabled
+klint_standard_trailing-comma-on-call-site = disabled
+klint_standard_multiline-expression-wrapping = disabled
diff --git a/bot/build.gradle.kts b/bot/build.gradle.kts
index 70c7e1437..c49b0fdcb 100644
--- a/bot/build.gradle.kts
+++ b/bot/build.gradle.kts
@@ -29,7 +29,7 @@ plugins {
 
     kotlin("jvm")
     id("org.liquibase.gradle")
-    id("org.jmailen.kotlinter")
+    // id("org.jmailen.kotlinter")
     id("com.github.johnrengelman.shadow")
     id("com.github.breadmoirai.github-release")
 }
@@ -178,18 +178,10 @@ shadowJar.apply {
     archiveClassifier.set("prod")
 }
 
-kotlinter {
-    ignoreFailures = false
-    reporters = arrayOf("checkstyle", "plain")
-    experimentalRules = true
-    disabledRules = arrayOf(
-        "filename", "no-wildcard-imports", "experimental:indent",
-        "argument-list-wrapping",
-        "experimental:spacing-between-declarations-with-annotations",
-        "experimental:spacing-between-declarations-with-comments",
-        "experimental:comment-wrapping"
-    )
-}
+//kotlinter {
+//    ignoreFailures = false
+//    reporters = arrayOf("checkstyle", "plain")
+//}
 
 pmd {
     isConsoleOutput = true
@@ -200,7 +192,7 @@ pmd {
 }
 
 task<Task>("lintAll") {
-    dependsOn(tasks.lintKotlin)
+//    dependsOn(tasks.lintKotlin)
     dependsOn(tasks.pmdMain)
 }
 
diff --git a/bot/src/main/java/fredboat/audio/player/LavalinkManager.java b/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
index 7c3cf36a2..d1a12ff3f 100644
--- a/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
+++ b/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
@@ -19,6 +19,7 @@
 package fredboat.audio.player;
 
 import dev.arbjerg.lavalink.client.*;
+import dev.arbjerg.lavalink.protocol.v4.Message;
 import ml.duncte123.skybot.SkyBot;
 import ml.duncte123.skybot.objects.config.DunctebotConfig;
 import ml.duncte123.skybot.utils.AirUtils;
@@ -47,7 +48,7 @@ public final class LavalinkManager {
     private LavalinkManager() {
     }
 
-    public void start(SkyBot skybot, DunctebotConfig config, AudioUtils audioUtils) {
+    public void start(DunctebotConfig config, AudioUtils audioUtils) {
         this.config = config;
         this.audioUtils = audioUtils;
 
@@ -59,15 +60,11 @@ public void start(SkyBot skybot, DunctebotConfig config, AudioUtils audioUtils)
 
         lavalink = new LavalinkClient(userId);
 
-        lavalink.on(PlayerUpdateEvent.class).subscribe((stats) -> {
-            // TODO extract method
-            final long guildIdLong = Long.parseUnsignedLong(stats.getEvent().getGuildId());
-            final var mng = audioUtils.getMusicManagers().get(guildIdLong);
-
-            if (mng != null) {
-                mng.getPlayer().updateLocalPlayerState(stats.getEvent().getState());
-            }
-        });
+        this.registerPlayerUpdateEvent();
+        this.registerTrackStartEvent();
+        this.registerTrackEndEvent();
+        this.registerTrackExceptionEvent();
+        this.registerTrackStuckEvent();
 
         loadNodes();
     }
@@ -75,17 +72,11 @@ public void start(SkyBot skybot, DunctebotConfig config, AudioUtils audioUtils)
     @SuppressWarnings("unused") // we need it from eval
     public void forceEnable(boolean enabled) {
         if (enabled) {
-            this.loadNodes();
+            this.start(this.config, this.audioUtils);
         } else {
             AirUtils.stopMusic(this.audioUtils);
 
-            // TODO: fix
-            // disconnect all links
-            this.lavalink.getLinks().forEach(Link::destroy);
-            // close all connections to all nodes
-            for (int i = 0; i < this.lavalink.getNodes().size(); i++) {
-                this.lavalink.removeNode(i);
-            }
+            this.lavalink.close();
         }
 
         // Do this last, otherwise we can't disconnect
@@ -165,4 +156,53 @@ private void loadNodes() {
             lavalink.addNode(node.name, URI.create(node.wsurl), node.pass);
         }
     }
+
+    private void registerPlayerUpdateEvent() {
+        lavalink.on(PlayerUpdateEvent.class).subscribe((stats) -> {
+            final long guildIdLong = Long.parseUnsignedLong(stats.getEvent().getGuildId());
+            final var mng = audioUtils.getMusicManagers().get(guildIdLong);
+
+            if (mng != null) {
+                mng.getPlayer().updateLocalPlayerState(stats.getEvent().getState());
+            }
+        });
+    }
+
+    private void registerTrackStartEvent() {
+        lavalink.on(TrackStartEvent.class).subscribe((data) -> {
+            final var event = data.getEvent();
+            final long guildIdLong = Long.parseUnsignedLong(event.getGuildId());
+            final var mng = audioUtils.getMusicManagers().get(guildIdLong);
+
+            if (mng != null) {
+                mng.getScheduler().onTrackStart(event.getTrack());
+            }
+        });
+    }
+
+    private void registerTrackEndEvent() {
+        lavalink.on(TrackEndEvent.class).subscribe((data) -> {
+            final var event = data.getEvent();
+            final long guildIdLong = Long.parseUnsignedLong(event.getGuildId());
+            final var mng = audioUtils.getMusicManagers().get(guildIdLong);
+
+            if (mng != null) {
+                mng.getScheduler().onTrackEnd(event.getTrack(), event.getReason());
+            }
+        });
+    }
+
+    private void registerTrackExceptionEvent() {
+        lavalink.on(TrackExceptionEvent.class).subscribe((data) -> {
+            final var event = data.getEvent();
+            final long guildIdLong = Long.parseUnsignedLong(event.getGuildId());
+            final var mng = audioUtils.getMusicManagers().get(guildIdLong);
+
+            if (mng != null) {
+                mng.getScheduler().onTrackException(event.getTrack(), event.getException());
+            }
+        });
+    }
+
+    private void registerTrackStuckEvent() {}
 }
diff --git a/bot/src/main/java/ml/duncte123/skybot/SkyBot.java b/bot/src/main/java/ml/duncte123/skybot/SkyBot.java
index e637fcfa1..9c3176a98 100644
--- a/bot/src/main/java/ml/duncte123/skybot/SkyBot.java
+++ b/bot/src/main/java/ml/duncte123/skybot/SkyBot.java
@@ -98,7 +98,7 @@ private SkyBot() throws LoginException {
         final LongLongPair commandCount = commandManager.getCommandCount();
 
         logger.info("{} commands with {} aliases loaded.", commandCount.getFirst(), commandCount.getSecond());
-        LavalinkManager.INS.start(this, config, variables.getAudioUtils());
+        LavalinkManager.INS.start(config, variables.getAudioUtils());
 
         final EventManager eventManager = new EventManager(variables);
         // Build our shard manager
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/AbstractPlayerEventListener.java b/bot/src/main/java/ml/duncte123/skybot/audio/AbstractPlayerEventListener.java
deleted file mode 100644
index 2c8eebdd3..000000000
--- a/bot/src/main/java/ml/duncte123/skybot/audio/AbstractPlayerEventListener.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Skybot, a multipurpose discord bot
- *      Copyright (C) 2017  Duncan "duncte123" Sterken & Ramid "ramidzkh" Khan & Maurice R S "Sanduhr32"
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package ml.duncte123.skybot.audio;
-
-import dev.arbjerg.lavalink.client.*;
-
-public abstract class AbstractPlayerEventListener {
-
-    public abstract void onTrackStart(TrackStartEvent event);
-
-    public abstract void onTrackEnd(TrackEndEvent event);
-
-    public abstract void onTrackException(TrackExceptionEvent event);
-
-    public abstract void onTrackStuck(TrackStuckEvent event);
-}
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
index a577cb878..02647cac7 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
@@ -18,7 +18,7 @@
 
 package ml.duncte123.skybot.audio;
 
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
+import dev.arbjerg.lavalink.protocol.v4.Exception;
 import dev.arbjerg.lavalink.protocol.v4.Message.EmittedEvent.TrackEndEvent.AudioTrackEndReason;
 import dev.arbjerg.lavalink.protocol.v4.Track;
 import dev.arbjerg.lavalink.protocol.v4.TrackInfo;
@@ -30,11 +30,9 @@
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.exceptions.ErrorHandler;
-import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -240,22 +238,15 @@ private TrackUserData createNewTrackData(Track track, boolean wasFromSkip) {
         return newData;
     }
 
-    public void onTrackException(Track track, FriendlyException exception) {
-        final Throwable rootCause = ExceptionUtils.getRootCause(exception);
-        final Throwable finalCause = rootCause == null ? exception : rootCause;
+    public void onTrackException(Track track, Exception exception) {
+        final String finalCause = Objects.requireNonNullElse(exception.getMessage(), exception.getCause());
         final TrackInfo info = track.getInfo();
 
-        if (finalCause == null || finalCause.getMessage() == null) {
-            this.messageDebouncer.accept("Something went terribly wrong when playing track with identifier `" + info.getIdentifier() +
-                "`\nPlease contact the developers asap with the identifier in the message above");
+        if (finalCause.contains("Something went wrong when decoding the track.")) {
             return;
         }
 
-        if (finalCause.getMessage().contains("Something went wrong when decoding the track.")) {
-            return;
-        }
-
-        if (finalCause.getMessage().contains("age-restricted")) {
+        if (finalCause.contains("age-restricted")) {
             this.messageDebouncer.accept("Cannot play `" + info.getTitle() + "` because it is age-restricted");
             return;
         }
@@ -267,9 +258,11 @@ public void onTrackException(Track track, FriendlyException exception) {
     }
 
     // TODO: these use the identifier for now, we need to use something more unique
-    @Nullable
     public TrackUserData getUserData(Track track) {
-        return this.userData.get(track.getInfo().getIdentifier());
+        return Objects.requireNonNull(
+            this.userData.get(track.getInfo().getIdentifier()),
+            "Somehow, userdata was null for " + track.getInfo()
+        );
     }
 
     public void storeUserData(Track track, TrackUserData data) {
diff --git a/build.gradle.kts b/build.gradle.kts
index 5c2127bf5..82c065c76 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,9 +22,9 @@ plugins {
     java
     idea
 
-    kotlin("jvm") version "1.7.20" apply false
+    kotlin("jvm") version "1.9.21" apply false
     id("org.liquibase.gradle") version "2.0.4" apply false
-    id("org.jmailen.kotlinter") version "3.13.0" apply false
+    id("org.jmailen.kotlinter") version "4.1.0" apply false
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
     id("com.github.breadmoirai.github-release") version "2.2.12" apply false
 }

From 60b46ddcdf9053d0edf30f53a9b8aae7debd79a2 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 26 Nov 2023 12:19:22 +0100
Subject: [PATCH 05/17] V4 works!

---
 .../audio/player/LavalinkManager.java         |  8 ++-
 .../duncte123/skybot/audio/AudioLoader.java   | 53 +++++++-------
 .../duncte123/skybot/audio/LocalPlayer.java   | 27 +++++++
 .../skybot/audio/TrackScheduler.java          | 31 +++-----
 .../skybot/commands/music/SeekCommand.java    | 18 ++---
 .../ml/duncte123/skybot/utils/AudioUtils.java | 19 +++--
 .../skybot/utils/MusicEmbedUtils.java         | 58 ++++++++++-----
 .../commands/essentials/StatsCommand.kt       | 10 +--
 .../skybot/commands/music/BassBoostCommand.kt | 11 ++-
 .../skybot/commands/music/ForceSkip.kt        | 11 ++-
 .../skybot/commands/music/JoinCommand.kt      |  4 +-
 .../skybot/commands/music/LyricsCommand.kt    |  4 +-
 .../commands/music/NowPlayingCommand.kt       | 34 +++++----
 .../skybot/commands/music/PauseCommand.kt     | 20 +++---
 .../skybot/commands/music/PlayCommand.kt      |  8 +--
 .../skybot/commands/music/QueueCommand.kt     |  9 +--
 .../skybot/commands/music/RadioCommand.kt     |  3 +-
 .../skybot/commands/music/ReaddCommand.kt     |  7 +-
 .../skybot/commands/music/RestartCommand.kt   |  5 +-
 .../skybot/commands/music/SaveCommand.kt      | 13 ++--
 .../skybot/commands/music/SkipCommand.kt      |  3 +-
 .../skybot/commands/music/StopCommand.kt      | 20 +++---
 .../commands/music/TestFilterCommand.kt       | 49 -------------
 .../skybot/commands/music/VolumeCommand.kt    |  8 +--
 .../duncte123/skybot/extensions/AudioTrack.kt | 71 +++++++------------
 25 files changed, 253 insertions(+), 251 deletions(-)
 delete mode 100644 bot/src/main/kotlin/ml/duncte123/skybot/commands/music/TestFilterCommand.kt

diff --git a/bot/src/main/java/fredboat/audio/player/LavalinkManager.java b/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
index d1a12ff3f..969032194 100644
--- a/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
+++ b/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
@@ -20,6 +20,7 @@
 
 import dev.arbjerg.lavalink.client.*;
 import dev.arbjerg.lavalink.protocol.v4.Message;
+import dev.arbjerg.lavalink.protocol.v4.Track;
 import ml.duncte123.skybot.SkyBot;
 import ml.duncte123.skybot.objects.config.DunctebotConfig;
 import ml.duncte123.skybot.utils.AirUtils;
@@ -170,12 +171,15 @@ private void registerPlayerUpdateEvent() {
 
     private void registerTrackStartEvent() {
         lavalink.on(TrackStartEvent.class).subscribe((data) -> {
+            System.out.println("Track start event: " + data);
             final var event = data.getEvent();
             final long guildIdLong = Long.parseUnsignedLong(event.getGuildId());
             final var mng = audioUtils.getMusicManagers().get(guildIdLong);
 
             if (mng != null) {
-                mng.getScheduler().onTrackStart(event.getTrack());
+                final Track track = event.getTrack();
+                mng.getPlayer().updateCurrentTrack(track);
+                mng.getScheduler().onTrackStart(track);
             }
         });
     }
@@ -187,6 +191,7 @@ private void registerTrackEndEvent() {
             final var mng = audioUtils.getMusicManagers().get(guildIdLong);
 
             if (mng != null) {
+                mng.getPlayer().updateCurrentTrack(null);
                 mng.getScheduler().onTrackEnd(event.getTrack(), event.getReason());
             }
         });
@@ -199,6 +204,7 @@ 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/ml/duncte123/skybot/audio/AudioLoader.java b/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java
index 7392d7569..7b72b189b 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java
@@ -33,6 +33,7 @@
 
 import javax.annotation.Nullable;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 
@@ -75,8 +76,7 @@ public void accept(LoadResult loadResult) {
     private void trackLoaded(LoadResult.TrackLoaded data) {
         final Track track = data.getData();
 
-        // TODO: Find a way to keep track of user-data
-        track.setUserData(new TrackUserData(this.requester));
+        mng.getScheduler().storeUserData(track, new TrackUserData(this.requester));
 
         final TrackScheduler scheduler = this.mng.getScheduler();
 
@@ -150,7 +150,7 @@ private void playlistLoaded(LoadResult.PlaylistLoaded playlistLoaded) {
 
             final List<Track> tracks = tracksRaw.stream().peek((track) -> {
                 // don't store this externally since it will cause issues
-                track.setUserData(new TrackUserData(this.requester));
+                mng.getScheduler().storeUserData(track, new TrackUserData(this.requester));
             }).toList();
 
             for (final Track track : tracks) {
@@ -158,19 +158,8 @@ private void playlistLoaded(LoadResult.PlaylistLoaded playlistLoaded) {
             }
 
             if (this.announce) {
-                final String sizeMsg;
-
-                if (playlist instanceof BigChungusPlaylist bigBoi && bigBoi.isBig()) {
-                    sizeMsg = tracks.size() + "/" + bigBoi.getOriginalSize();
-                } else {
-                    sizeMsg = String.valueOf(tracks.size());
-                }
-
-                final String msg = String.format(
-                    "Adding **%s** tracks to the queue from **%s**",
-                    sizeMsg,
-                    playlistInfo.getName()
-                );
+                // TODO: find a way to fix up BigChungusPlaylist
+                final String msg = getPlaylistMsg(tracks, playlistInfo);
 
                 sendMsg(
                     new MessageConfig.Builder()
@@ -196,6 +185,22 @@ private void playlistLoaded(LoadResult.PlaylistLoaded playlistLoaded) {
         }
     }
 
+    private String getPlaylistMsg(List<Track> tracks, PlaylistInfo playlistInfo) {
+        final String sizeMsg = String.valueOf(tracks.size());
+
+        /*if (playlist instanceof BigChungusPlaylist bigBoi && bigBoi.isBig()) {
+            sizeMsg = tracks.size() + "/" + bigBoi.getOriginalSize();
+        } else {
+            sizeMsg = String.valueOf(tracks.size());
+        }*/
+
+        return String.format(
+            "Adding **%s** tracks to the queue from **%s**",
+            sizeMsg,
+            playlistInfo.getName()
+        );
+    }
+
     private void searchLoaded(LoadResult.SearchResult searchResult) {
         // TODO: common method for handling playlists
     }
@@ -213,7 +218,7 @@ private void noMatches() {
     }
 
     private void loadFailed(Exception exception) {
-        if (exception.getCause() != null && exception.getCause() instanceof final LimitReachedException cause) {
+        /*if (exception.getCause() != null && exception.getCause() instanceof final LimitReachedException cause) {
             sendMsg(
                 new MessageConfig.Builder()
                     .setChannel(this.data.getChannel())
@@ -225,13 +230,15 @@ private void loadFailed(Exception exception) {
             );
 
             return;
-        }
+        }*/
 
         if (!this.announce) {
             return;
         }
 
-        if (exception.getMessage().endsWith("Playback on other websites has been disabled by the video owner.")) {
+        final String finalCause = Objects.requireNonNullElse(exception.getMessage(), exception.getCause());
+
+        if (finalCause.endsWith("Playback on other websites has been disabled by the video owner.")) {
             sendMsg(
                 new MessageConfig.Builder()
                     .setChannel(this.data.getChannel())
@@ -245,18 +252,12 @@ private void loadFailed(Exception exception) {
             return;
         }
 
-        @Nullable Throwable root = ExceptionUtils.getRootCause(exception);
-
-        if (root == null) {
-            root = exception;
-        }
-
         sendMsg(
             new MessageConfig.Builder()
                 .setChannel(this.data.getChannel())
                 .replyTo(this.data.getReplyToMessage())
                 .setEmbeds(
-                    embedMessage("Could not play: " + StringKt.abbreviate(root.getMessage(), MessageEmbed.VALUE_MAX_LENGTH)
+                    embedMessage("Could not play: " + StringKt.abbreviate(finalCause, MessageEmbed.VALUE_MAX_LENGTH)
                         + "\nIf this happens often try another link or join our [discord server](https://duncte.bot/server) to get help!")
                 )
                 .build()
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/LocalPlayer.java b/bot/src/main/java/ml/duncte123/skybot/audio/LocalPlayer.java
index 55a71d1cd..d6c2404f8 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/LocalPlayer.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/LocalPlayer.java
@@ -18,10 +18,13 @@
 
 package ml.duncte123.skybot.audio;
 
+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.protocol.v4.Track;
 import fredboat.audio.player.LavalinkManager;
+import reactor.core.publisher.Mono;
 
 import javax.annotation.Nullable;
 import java.util.concurrent.atomic.AtomicReference;
@@ -39,6 +42,10 @@ public Link getLink() {
         return LavalinkManager.INS.getLavalink().getLink(this.guildId);
     }
 
+    public Mono<LavalinkPlayer> getLavalinkPlayer() {
+        return this.getLink().getPlayer();
+    }
+
     public void stopPlayback() {
         this.getLink()
             .updatePlayer(
@@ -48,6 +55,22 @@ public void stopPlayback() {
             .subscribe();
     }
 
+    public void setFilters(Filters filters) {
+        this.getLink()
+            .updatePlayer(
+                (player) -> player.setFilters(filters)
+            )
+            .subscribe();
+    }
+
+    public void seekTo(long position) {
+        this.getLink()
+           .updatePlayer(
+                (player) -> player.setPosition(position)
+            )
+           .subscribe();
+    }
+
     @Nullable
     public Track getCurrentTrack() {
         return this.currentTrack.get();
@@ -72,4 +95,8 @@ public long getPosition() {
     public void updateLocalPlayerState(PlayerState state) {
         this.state.set(state);
     }
+
+    public void updateCurrentTrack(Track track) {
+        this.currentTrack.set(track);
+    }
 }
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
index 02647cac7..48f3f9e23 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
@@ -97,17 +97,6 @@ public void addToQueue(Track track, boolean isPatron) throws LimitReachedExcepti
      * This is a special case for the skip command where it has to announce the next track
      * due to it being a user interaction
      */
-    public void specialSkipCase() {
-        // Get the currently playing track
-        final Track playingTrack = this.guildMusicManager.getPlayer().getCurrentTrack();
-        // Set in the data that it was from a skip
-        getUserData(playingTrack).setWasFromSkip(true);
-
-        // We trigger a fake on track end here to make it adhere to the normal loop flow
-        // and inject a boolean for forcing the announcement on skip
-        this.onTrackEnd(playingTrack, AudioTrackEndReason.FINISHED);
-    }
-
     public void skipCurrentTrack() {
         this.skipTrack(true);
     }
@@ -149,18 +138,20 @@ public void onTrackStart(Track track) {
                 data.setWasFromSkip(false);
             }
 
-            final EmbedBuilder message = AudioTrackKt.toEmbed(
+            AudioTrackKt.toEmbed(
                 track,
                 this.guildMusicManager,
                 getInstance().getShardManager(),
-                false
-            );
-
-
-            sendMsg(
-                new MessageConfig.Builder()
-                    .setChannel(guildMusicManager.getLatestChannel())
-                    .setEmbeds(false, message)
+                false,
+                (message) -> {
+                    sendMsg(
+                        new MessageConfig.Builder()
+                            .setChannel(guildMusicManager.getLatestChannel())
+                            .setEmbeds(false, message)
+                    );
+
+                    return null;
+                }
             );
         }
     }
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/music/SeekCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/music/SeekCommand.java
index 5af482b20..ad665a3e2 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/music/SeekCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/music/SeekCommand.java
@@ -18,9 +18,9 @@
 
 package ml.duncte123.skybot.commands.music;
 
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import lavalink.client.player.LavalinkPlayer;
+import dev.arbjerg.lavalink.protocol.v4.Track;
 import ml.duncte123.skybot.Variables;
+import ml.duncte123.skybot.audio.LocalPlayer;
 import ml.duncte123.skybot.objects.command.CommandContext;
 import ml.duncte123.skybot.objects.command.MusicCommand;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
@@ -66,15 +66,15 @@ public void run(@NotNull CommandContext ctx) {
     }
 
     public void run0(@Nonnull CommandContext ctx) throws NumberFormatException {
-        final LavalinkPlayer player = ctx.getAudioUtils().getMusicManager(ctx.getGuildId()).player;
-        final AudioTrack currentTrack = player.getPlayingTrack();
+        final var player = ctx.getAudioUtils().getMusicManager(ctx.getGuildId()).getPlayer();
+        final Track currentTrack = player.getCurrentTrack();
 
         if (currentTrack == null) {
             sendMsg(ctx, "The player is currently not playing anything");
             return;
         }
 
-        if (!currentTrack.isSeekable()) {
+        if (!currentTrack.getInfo().isSeekable()) {
             sendMsg(ctx, "This track is not seekable");
             return;
         }
@@ -95,7 +95,7 @@ public void run0(@Nonnull CommandContext ctx) throws NumberFormatException {
         }
 
         // To hopefully prevent race conditions
-        final Supplier<Long> trackDuration = () -> player.getPlayingTrack().getDuration();
+        final Supplier<Long> trackDuration = () -> player.getCurrentTrack().getInfo().getLength();
 
         int seconds = Integer.parseInt(seekTime) * 1000;
 
@@ -109,7 +109,7 @@ public void run0(@Nonnull CommandContext ctx) throws NumberFormatException {
             seconds = ~seconds;
         }
 
-        final Supplier<Long> trackPosition = () -> player.getPlayingTrack().getPosition();
+        final Supplier<Long> trackPosition = player::getPosition;
         final long currentPosition = trackPosition.get();
         final long newPosition = currentPosition + seconds;
 
@@ -131,7 +131,7 @@ 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, LavalinkPlayer player, String arg0, Supplier<Long> trackDuration) {
+    private void handleOverSkip(@NotNull CommandContext ctx, LocalPlayer 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;
@@ -141,7 +141,7 @@ private void handleOverSkip(@NotNull CommandContext ctx, LavalinkPlayer player,
         player.seekTo(trackDuration.get());
     }
 
-    private void handleTimeSkip(@NotNull CommandContext ctx, LavalinkPlayer player, Matcher matcher) {
+    private void handleTimeSkip(@NotNull CommandContext ctx, LocalPlayer player, Matcher matcher) {
         final long minutes = Long.parseLong(matcher.group(1)) * 60 * 1000;
         final long seconds = Long.parseLong(matcher.group(2)) * 1000;
 
diff --git a/bot/src/main/java/ml/duncte123/skybot/utils/AudioUtils.java b/bot/src/main/java/ml/duncte123/skybot/utils/AudioUtils.java
index a0998d0fd..b9267fd82 100644
--- a/bot/src/main/java/ml/duncte123/skybot/utils/AudioUtils.java
+++ b/bot/src/main/java/ml/duncte123/skybot/utils/AudioUtils.java
@@ -31,8 +31,8 @@
 import com.sedmelluq.discord.lavaplayer.track.AudioItem;
 import com.sedmelluq.discord.lavaplayer.track.AudioReference;
 import com.sedmelluq.discord.lavaplayer.track.BasicAudioPlaylist;
+import fredboat.audio.player.LavalinkManager;
 import gnu.trove.map.TLongObjectMap;
-import lavalink.client.LavalinkUtil;
 import ml.duncte123.skybot.Variables;
 import ml.duncte123.skybot.audio.AudioLoader;
 import ml.duncte123.skybot.audio.GuildMusicManager;
@@ -43,6 +43,7 @@
 import net.dv8tion.jda.api.entities.Guild;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
 
 public class AudioUtils {
@@ -66,7 +67,6 @@ public AudioUtils(DunctebotConfig.Apis config, Variables variables) {
         playerManager.registerSourceManager(this.youtubeManager);
 
         DuncteBotSources.registerDuncteBot(playerManager, "en-AU", 6);
-        DuncteBotSources.registerDuncteBot(LavalinkUtil.getPlayerManager(), "en-AU", 6);
 
         playerManager.registerSourceManager(SoundCloudAudioSourceManager.createDefault());
         playerManager.registerSourceManager(new BandcampAudioSourceManager());
@@ -106,9 +106,18 @@ public Future<Void> loadAndPlay(final AudioData data, final String trackUrlRaw,
 
         final GuildMusicManager mng = getMusicManager(data.getGuildId());
         final AudioLoader loader = new AudioLoader(data, mng, announce, trackUrl, isPatron);
-        final DBAudioRef reference = new DBAudioRef(trackUrl, null, isPatron);
-
-        return getPlayerManager().loadItemOrdered(mng, reference, loader);
+//        final DBAudioRef reference = new DBAudioRef(trackUrl, null, isPatron);
+        final CompletableFuture<Void> future = new CompletableFuture<>();
+
+        LavalinkManager.INS.getLavalink()
+            .getLink(data.getGuildId())
+            .loadItem(trackUrl)
+            .subscribe((result) -> {
+                future.complete(null);
+                loader.accept(result);
+            });
+
+        return future;
     }
 
     public GuildMusicManager getMusicManager(long guildId) {
diff --git a/bot/src/main/java/ml/duncte123/skybot/utils/MusicEmbedUtils.java b/bot/src/main/java/ml/duncte123/skybot/utils/MusicEmbedUtils.java
index 40ba854bc..6dcdba78c 100644
--- a/bot/src/main/java/ml/duncte123/skybot/utils/MusicEmbedUtils.java
+++ b/bot/src/main/java/ml/duncte123/skybot/utils/MusicEmbedUtils.java
@@ -18,50 +18,72 @@
 
 package ml.duncte123.skybot.utils;
 
+import dev.arbjerg.lavalink.protocol.v4.TrackInfo;
 import ml.duncte123.skybot.audio.GuildMusicManager;
 
+import java.util.function.Consumer;
+
 public class MusicEmbedUtils {
+    private static final String ICON_PAUSE = "⏸";
+    private static final String ICON_PLAY = "▶";
+    private static final String ICON_PROGRESS_THUMB = "\uD83D\uDD18";
+    private static final char ICON_PROGRESS_BAR = '▬';
+    private static final String ICON_SPEAKER_MUTE = "\uD83D\uDD07";
+    private static final String ICON_SPEAKER_LOW = "\uD83D\uDD08";
+    private static final String ICON_SPEAKER_MED = "\uD83D\uDD09";
+    private static final String ICON_SPEAKER_FULL = "\uD83D\uDD0A";
+    private static final String ICON_EXPLOSION_EAR = "\uD83D\uDCA5\uD83D\uDC42";
 
     private MusicEmbedUtils() {}
 
-    public static String playerEmbed(GuildMusicManager mng) {
-        return (mng.player.isPaused() ? "\u23F8" : "\u25B6") + " " +
-            generateProgressBar((double) mng.player.getTrackPosition() / mng.player.getPlayingTrack().getDuration())
-            + " `[" + formatTime(mng.player.getTrackPosition()) + "/" + formatTime(mng.player.getPlayingTrack().getDuration()) + "]` "
-            + getVolumeIcon(mng.player.getVolume());
+    public static void createPlayerString(GuildMusicManager mng, Consumer<String> callback) {
+        mng.getPlayer().getLavalinkPlayer().subscribe((player) -> {
+            final TrackInfo trackInfo = player.getTrack().getInfo();
+            final long position = player.getPosition();
+            final long duration = trackInfo.getLength();
+
+            callback.accept(
+                "%s %s `[%s/%s]` %s".formatted(
+                    player.getPaused() ? ICON_PAUSE : ICON_PLAY,
+                    generateProgressBar((double) position / duration),
+                    formatTime(position),
+                    formatTime(duration),
+                    getVolumeIcon(player.getVolume())
+                )
+            );
+        });
     }
 
     private static String generateProgressBar(double percent) {
         final StringBuilder str = new StringBuilder();
         for (int i = 0; i < 8; i++) {
             if (i == (int) (percent * 8)) {
-                str.append("\uD83D\uDD18");
+                str.append(ICON_PROGRESS_THUMB);
             } else {
-                str.append('▬');
+                str.append(ICON_PROGRESS_BAR);
             }
         }
         return str.toString();
     }
 
-    private static String getVolumeIcon(float volume) {
-        if (volume == 0.0) {
-            return "\uD83D\uDD07";
+    private static String getVolumeIcon(int volume) {
+        if (volume == 0) {
+            return ICON_SPEAKER_MUTE;
         }
 
-        if (volume < 0.33) {
-            return "\uD83D\uDD08";
+        if (volume < 33) {
+            return ICON_SPEAKER_LOW;
         }
 
-        if (volume < 0.67) {
-            return "\uD83D\uDD09";
+        if (volume < 67) {
+            return ICON_SPEAKER_MED;
         }
 
-        if (volume > 1) {
-            // explosion ear
-            return "\uD83D\uDCA5\uD83D\uDC42";
+        if (volume > 100) {
+            return ICON_EXPLOSION_EAR;
         }
 
-        return "\uD83D\uDD0A";
+        return ICON_SPEAKER_FULL;
     }
 
     private static String formatTime(long duration) {
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/essentials/StatsCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/essentials/StatsCommand.kt
index 63ba49a87..eaec3b93f 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/essentials/StatsCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/essentials/StatsCommand.kt
@@ -121,7 +121,7 @@ class StatsCommand : Command() {
             return
         }
 
-        val availableNodes = llm.lavalink.nodes.filter { it.isAvailable }
+        val availableNodes = llm.lavalink.nodes.filter { it.available }
 
         val embed = EmbedUtils.getDefaultEmbed()
             .setFooter("Available nodes: ${availableNodes.size}")
@@ -132,10 +132,10 @@ class StatsCommand : Command() {
             embed.addField(
                 "Lavalink node #$index",
                 """**Uptime:** ${AirUtils.getUptime(stats.uptime)}
-                    |**CPU cores:** ${stats.cpuCores}
-                    |**System Load:** ${stats.systemLoad}%
-                    |**Used memory:** ${stats.memUsed shr 20}MB
-                    |**Free memory:** ${stats.memFree shr 20}MB
+                    |**CPU cores:** ${stats.cpu.cores}
+                    |**System Load:** ${stats.cpu.systemLoad}%
+                    |**Used memory:** ${stats.memory.used shr 20}MB
+                    |**Free memory:** ${stats.memory.free shr 20}MB
                     |**Players:** ${stats.players}
                     |**Players playing:** ${stats.playingPlayers}
                 """.trimMargin(),
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/BassBoostCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/BassBoostCommand.kt
index 2189d24c9..e6d0db1b8 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/BassBoostCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/BassBoostCommand.kt
@@ -18,6 +18,9 @@
 
 package ml.duncte123.skybot.commands.music
 
+import dev.arbjerg.lavalink.protocol.v4.Band
+import dev.arbjerg.lavalink.protocol.v4.Filters
+import dev.arbjerg.lavalink.protocol.v4.toOmissible
 import me.duncte123.botcommons.messaging.MessageUtils.sendMsg
 import ml.duncte123.skybot.Variables
 import ml.duncte123.skybot.objects.command.CommandContext
@@ -78,13 +81,15 @@ class BassBoostCommand : MusicCommand() {
 
     private fun setLavalinkEQ(gain: Float, variable: Variables, guildId: Long) {
         val player = variable.audioUtils.getMusicManager(guildId).player
-        val filters = player.filters
+        val bands = mutableListOf<Band>()
 
         for (i in 0..2) {
-            filters.setBand(i, gain)
+            bands.add(Band(i, gain))
         }
 
-        filters.commit()
+        player.setFilters(Filters(
+            equalizer = bands.toOmissible()
+        ))
     }
 
     override fun getSubData(): SubcommandData {
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ForceSkip.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ForceSkip.kt
index ecf79757b..13647ee31 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ForceSkip.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ForceSkip.kt
@@ -18,13 +18,10 @@
 
 package ml.duncte123.skybot.commands.music
 
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack
 import me.duncte123.botcommons.messaging.EmbedUtils
 import me.duncte123.botcommons.messaging.MessageUtils.sendEmbed
 import me.duncte123.botcommons.messaging.MessageUtils.sendMsg
 import ml.duncte123.skybot.Variables
-import ml.duncte123.skybot.extensions.getImageUrl
-import ml.duncte123.skybot.objects.TrackUserData
 import ml.duncte123.skybot.objects.command.CommandContext
 import ml.duncte123.skybot.objects.command.MusicCommand
 import ml.duncte123.skybot.objects.user.UnknownUser
@@ -49,7 +46,7 @@ class ForceSkip : MusicCommand() {
         val mng = ctx.audioUtils.getMusicManager(ctx.guildId)
         val player = mng.player
 
-        if (player.playingTrack == null) {
+        if (player.currentTrack == null) {
             sendMsg(ctx, "The player is not playing.")
             return
         }
@@ -67,14 +64,14 @@ class ForceSkip : MusicCommand() {
             1
         }
 
-        val trackData = player.playingTrack.getUserData(TrackUserData::class.java)
+        val trackData = scheduler.getUserData(player.currentTrack)
 
         scheduler.skipTracks(count, false)
 
         // Return the console user if the requester is null
         val user = ctx.jda.getUserById(trackData.requester) ?: UnknownUser()
 
-        val track: AudioTrack? = player.playingTrack
+        val track = player.currentTrack
 
         if (track == null) {
             sendMsg(
@@ -92,7 +89,7 @@ class ForceSkip : MusicCommand() {
                     "Now playing: ${track.info.title}\n" +
                     "Requester: ${user.asTag}"
             )
-                .setThumbnail(track.getImageUrl())
+                .setThumbnail(track.info.artworkUrl)
         )
     }
 
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/JoinCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/JoinCommand.kt
index ee16d3b4d..b781cd0e6 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/JoinCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/JoinCommand.kt
@@ -54,7 +54,7 @@ class JoinCommand : MusicCommand() {
 
         val lavalink = getLavalinkManager()
 
-        if (lavalink.isConnected(event.guild) && mng.player.playingTrack != null) {
+        if (lavalink.isConnected(event.guild) && mng.player.currentTrack != null) {
             val channel = lavalink.getConnectedChannel(event.guild)
 
             if (channel == null) {
@@ -102,7 +102,7 @@ class JoinCommand : MusicCommand() {
 
         val lavalink = getLavalinkManager()
 
-        if (lavalink.isConnected(event.guild) && mng.player.playingTrack != null) {
+        if (lavalink.isConnected(event.guild) && mng.player.currentTrack != null) {
             val channel = lavalink.getConnectedChannel(event.guild!!)
 
             if (channel == null) {
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/LyricsCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/LyricsCommand.kt
index 5cefa34a2..97f1e747d 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/LyricsCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/LyricsCommand.kt
@@ -61,7 +61,7 @@ class LyricsCommand : MusicCommand() {
         }
 
         val player = ctx.audioUtils.getMusicManager(ctx.guildId).player
-        val playingTrack = player.playingTrack
+        val playingTrack = player.currentTrack
 
         if (playingTrack == null) {
             sendMsg(ctx, "The player is not currently playing anything!")
@@ -96,7 +96,7 @@ class LyricsCommand : MusicCommand() {
 
         if (opt == null) {
             val player = variables.audioUtils.getMusicManager(event.guild!!.idLong).player
-            val playingTrack = player.playingTrack
+            val playingTrack = player.currentTrack
 
             if (playingTrack == null) {
                 event.reply("The player is not currently playing anything!").queue()
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/NowPlayingCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/NowPlayingCommand.kt
index f119f986f..2feccd6fc 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/NowPlayingCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/NowPlayingCommand.kt
@@ -37,27 +37,35 @@ class NowPlayingCommand : MusicCommand() {
     override fun run(ctx: CommandContext) {
         val mng = ctx.audioUtils.getMusicManager(ctx.guildId)
         val player = mng.player
+        val currentTrack = player.currentTrack
 
-        sendEmbed(
-            ctx,
-            when {
-                player.playingTrack != null -> player.playingTrack.toEmbed(mng, ctx.shardManager)
+        if (currentTrack == null) {
+            sendEmbed(
+                ctx,
+                embedMessage("The player is not currently playing anything!")
+            )
+            return
+        }
 
-                else -> embedMessage("The player is not currently playing anything!")
-            }
-        )
+        currentTrack.toEmbed(mng, ctx.shardManager) { message ->
+            sendEmbed(ctx, message)
+        }
     }
 
     override fun handleEvent(event: SlashCommandInteractionEvent, variables: Variables) {
         val mng = variables.audioUtils.getMusicManager(event.guild!!.idLong)
         val player = mng.player
+        val currentTrack = player.currentTrack
 
-        event.replyEmbeds(
-            when {
-                player.playingTrack != null -> player.playingTrack.toEmbed(mng, event.jda.shardManager!!)
+        if (currentTrack == null) {
+            event.replyEmbeds(
+                embedMessage("The player is not currently playing anything!").build()
+            ).queue()
+            return
+        }
 
-                else -> embedMessage("The player is not currently playing anything!")
-            }.build()
-        ).queue()
+        currentTrack.toEmbed(mng, event.jda.shardManager!!) { message ->
+            event.replyEmbeds(message.build()).queue()
+        }
     }
 }
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PauseCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PauseCommand.kt
index 059f9770e..987a29fbd 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PauseCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PauseCommand.kt
@@ -34,27 +34,31 @@ class PauseCommand : MusicCommand() {
 
     override fun run(ctx: CommandContext) {
         val mng = ctx.audioUtils.getMusicManager(ctx.guildId)
-        val player = mng.player
+        val localPlayer = mng.player
+        val player = localPlayer.lavalinkPlayer.block()!!
 
-        if (player.playingTrack == null) {
+        if (player.track == null) {
             sendMsg(ctx, "Cannot pause or resume player because no track is loaded for playing.")
             return
         }
 
-        player.isPaused = !player.isPaused
-        sendMsg(ctx, "The player has ${if (player.isPaused) "been paused" else "resumed playing"}.")
+        player.setPaused(!player.paused).asMono().subscribe {
+            sendMsg(ctx, "The player has ${if (it.paused) "been paused" else "resumed playing"}.")
+        }
     }
 
     override fun handleEvent(event: SlashCommandInteractionEvent, variables: Variables) {
         val mng = variables.audioUtils.getMusicManager(event.guild!!.idLong)
-        val player = mng.player
+        val localPlayer = mng.player
+        val player = localPlayer.lavalinkPlayer.block()!!
 
-        if (player.playingTrack == null) {
+        if (player.track == null) {
             event.reply("Cannot pause or resume player because no track is loaded for playing.").queue()
             return
         }
 
-        player.isPaused = !player.isPaused
-        event.reply("The player has ${if (player.isPaused) "been paused" else "resumed playing"}.").queue()
+        player.setPaused(!player.paused).asMono().subscribe {
+            event.reply("The player has ${if (it.paused) "been paused" else "resumed playing"}.").queue()
+        }
     }
 }
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PlayCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PlayCommand.kt
index e77bd8296..8d9827d21 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PlayCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PlayCommand.kt
@@ -50,17 +50,17 @@ open class PlayCommand(private val skipParsing: Boolean = false) : MusicCommand(
             }
 
             val mng = ctx.audioUtils.getMusicManager(ctx.guildId)
-            val player = mng.player
+            val player = mng.player.lavalinkPlayer.block()!!
             val scheduler = mng.scheduler
 
             when {
-                player.isPaused -> {
-                    player.isPaused = false
+                player.paused -> {
+                    player.setPaused(false).asMono().subscribe()
 
                     sendMsg(ctx, "Playback has been resumed.")
                 }
 
-                player.playingTrack != null -> sendMsg(ctx, "Player is already playing!")
+                player.track != null -> sendMsg(ctx, "Player is already playing!")
 
                 scheduler.queue.isEmpty() -> sendMsg(
                     ctx,
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/QueueCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/QueueCommand.kt
index 4d89f8e74..de063ff1e 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/QueueCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/QueueCommand.kt
@@ -19,6 +19,7 @@
 package ml.duncte123.skybot.commands.music
 
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack
+import dev.arbjerg.lavalink.protocol.v4.Track
 import me.duncte123.botcommons.messaging.EmbedUtils
 import me.duncte123.botcommons.messaging.MessageUtils.sendEmbed
 import ml.duncte123.skybot.Variables
@@ -55,8 +56,8 @@ class QueueCommand : MusicCommand() {
     private fun generateQueueEmbed(variables: Variables, guild: Guild, prefix: String): EmbedBuilder {
         val mng = variables.audioUtils.getMusicManager(guild.idLong)
         val scheduler = mng.scheduler
-        val queue: Queue<AudioTrack> = scheduler.queue
-        val playingTrack = mng.player.playingTrack
+        val queue: Queue<Track> = scheduler.queue
+        val playingTrack = mng.player.currentTrack
         var embed: EmbedBuilder
 
         synchronized(queue) {
@@ -66,7 +67,7 @@ class QueueCommand : MusicCommand() {
             if (queue.isEmpty()) {
                 embed = EmbedUtils.embedMessage("$current\n**Queue:** Empty")
             } else {
-                val queueLength = queue.sumOf { it.duration }
+                val queueLength = queue.sumOf { it.info.length }
                 val maxTracks = 10
                 val queueText = buildString {
                     appendLine(current)
@@ -77,7 +78,7 @@ class QueueCommand : MusicCommand() {
                             break
                         }
 
-                        appendLine(StringUtils.abbreviate("`[${getTimestamp(track.duration)}]` ${track.info.title}", 60))
+                        appendLine(StringUtils.abbreviate("`[${getTimestamp(track.info.length)}]` ${track.info.title}", 60))
                     }
 
                     appendLine("Total Queue Time Length: ${getTimestamp(queueLength)}")
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RadioCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RadioCommand.kt
index 9f9e03bf2..2100fa528 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RadioCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RadioCommand.kt
@@ -65,8 +65,7 @@ class RadioCommand : MusicCommand() {
                 val mng = audioUtils.getMusicManager(ctx.guildId)
                 val player = mng.player
 
-                player.stopTrack()
-                player.isPaused = false
+                player.stopPlayback()
                 mng.scheduler.queue.clear()
 
                 audioUtils.loadAndPlay(ctx.audioData, radio.url, true)
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ReaddCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ReaddCommand.kt
index 0954d42a5..586e73d18 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ReaddCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ReaddCommand.kt
@@ -21,6 +21,7 @@ package ml.duncte123.skybot.commands.music
 import me.duncte123.botcommons.messaging.EmbedUtils
 import me.duncte123.botcommons.messaging.MessageUtils.*
 import ml.duncte123.skybot.Variables
+import ml.duncte123.skybot.audio.makeClone
 import ml.duncte123.skybot.exceptions.LimitReachedException
 import ml.duncte123.skybot.objects.TrackUserData
 import ml.duncte123.skybot.objects.command.CommandContext
@@ -37,7 +38,7 @@ class ReaddCommand : MusicCommand() {
 
     override fun run(ctx: CommandContext) {
         val manager = ctx.audioUtils.getMusicManager(ctx.guildId)
-        val track = manager.player.playingTrack
+        val track = manager.player.currentTrack
 
         if (track == null) {
             sendError(ctx.message)
@@ -46,7 +47,7 @@ class ReaddCommand : MusicCommand() {
         }
 
         val clone = track.makeClone()
-        clone.userData = track.getUserData(TrackUserData::class.java).copy()
+        manager.scheduler.storeUserData(clone, manager.scheduler.getUserData(track).copy())
 
         // This is from AudioUtils.java but in Kotlin
         var title = clone.info.title
@@ -58,7 +59,7 @@ class ReaddCommand : MusicCommand() {
             }
         }
         var msg = "Adding to queue: $title"
-        if (manager.player.playingTrack == null) {
+        if (manager.player.currentTrack == null) {
             msg += "\nand the Player has started playing;"
         }
 
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RestartCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RestartCommand.kt
index 196ada63b..b77f9e3b2 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RestartCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RestartCommand.kt
@@ -33,14 +33,15 @@ class RestartCommand : MusicCommand() {
 
     override fun run(ctx: CommandContext) {
         val player = ctx.audioUtils.getMusicManager(ctx.guildId).player
+        val currentTrack = player.currentTrack
 
-        if (player.playingTrack == null) {
+        if (currentTrack == null) {
             sendError(ctx.message)
             sendMsg(ctx, "No track currently playing")
             return
         }
 
-        if (!player.playingTrack.isSeekable) {
+        if (!currentTrack.info.isSeekable) {
             sendMsg(ctx, "This track is not seekable")
             return
         }
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SaveCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SaveCommand.kt
index fb999c87b..294d85c8f 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SaveCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SaveCommand.kt
@@ -58,12 +58,14 @@ class SaveCommand : MusicCommand() {
 
         val urls = manager.scheduler.queue
             .map {
-                it.lpUrl()
+                it.info.uri
             }
             .toMutableList()
 
-        if (manager.player.playingTrack != null) {
-            urls.add(0, manager.player.playingTrack.lpUrl())
+        val currentTrack = manager.player.currentTrack
+
+        if (currentTrack != null) {
+            urls.add(0, currentTrack.info.uri)
         }
 
         for (url in urls) {
@@ -72,9 +74,4 @@ class SaveCommand : MusicCommand() {
 
         return mapper.writeValueAsBytes(array)
     }
-
-    private fun AudioTrack.lpUrl() = when (this) {
-        is IWillUseIdentifierInstead -> this.info.identifier
-        else -> this.info.uri
-    }
 }
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SkipCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SkipCommand.kt
index 1296e3f4b..30a18f3bb 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SkipCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SkipCommand.kt
@@ -53,6 +53,7 @@ class SkipCommand : MusicCommand() {
         val mng = variables.audioUtils.getMusicManager(guild.idLong)
         val player = mng.player
         val currentTrack = player.currentTrack
+        val scheduler = mng.scheduler
 
         if (currentTrack == null) {
             sendMessage("The player is not playing.")
@@ -64,7 +65,7 @@ class SkipCommand : MusicCommand() {
             return
         }
 
-        val trackData = currentTrack.getUserData(TrackUserData::class.java)
+        val trackData = scheduler.getUserData(currentTrack)
 
         if (trackData.requester == user.idLong) {
             doSkip(mng, sendMessage)
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/StopCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/StopCommand.kt
index 2897c505f..a1b9ede70 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/StopCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/StopCommand.kt
@@ -37,19 +37,19 @@ class StopCommand : MusicCommand() {
     override fun run(ctx: CommandContext) {
         val mng = ctx.audioUtils.getMusicManager(ctx.guildId)
         val player = mng.player
-        val track = player.playingTrack
+        val scheduler = mng.scheduler
+        val track = player.currentTrack
 
         if (track == null) {
             sendMsg(ctx, "The player is not playing.")
             return
         }
 
-        val trackData: TrackUserData? = track.getUserData(TrackUserData::class.java)
+        val trackData: TrackUserData = scheduler.getUserData(track)
 
-        if (ctx.guild.settings.isAllowAllToStop || trackData?.requester == ctx.author.idLong || ctx.member.hasPermission(Permission.MANAGE_SERVER)) {
+        if (ctx.guild.settings.isAllowAllToStop || trackData.requester == ctx.author.idLong || ctx.member.hasPermission(Permission.MANAGE_SERVER)) {
             mng.scheduler.queue.clear()
-            player.stopTrack()
-            player.isPaused = false
+            player.stopPlayback()
 
             sendMsg(ctx, "Playback has been completely stopped and the queue has been cleared.")
 
@@ -67,20 +67,20 @@ class StopCommand : MusicCommand() {
     override fun handleEvent(event: SlashCommandInteractionEvent, variables: Variables) {
         val mng = variables.audioUtils.getMusicManager(event.guild!!.idLong)
         val player = mng.player
-        val track = player.playingTrack
+        val scheduler = mng.scheduler
+        val track = player.currentTrack
 
         if (track == null) {
             event.reply("The player is not playing.").queue()
             return
         }
 
-        val trackData: TrackUserData? = track.getUserData(TrackUserData::class.java)
+        val trackData: TrackUserData = scheduler.getUserData(track)
         val dbg = DunctebotGuild(event.guild!!, variables)
 
-        if (dbg.settings.isAllowAllToStop || trackData?.requester == event.user.idLong || event.member!!.hasPermission(Permission.MANAGE_SERVER)) {
+        if (dbg.settings.isAllowAllToStop || trackData.requester == event.user.idLong || event.member!!.hasPermission(Permission.MANAGE_SERVER)) {
             mng.scheduler.queue.clear()
-            player.stopTrack()
-            player.isPaused = false
+            player.stopPlayback()
 
             event.reply("Playback has been completely stopped and the queue has been cleared.").queue()
 
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/TestFilterCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/TestFilterCommand.kt
deleted file mode 100644
index 86a63eab6..000000000
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/TestFilterCommand.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Skybot, a multipurpose discord bot
- *      Copyright (C) 2017  Duncan "duncte123" Sterken & Ramid "ramidzkh" Khan & Maurice R S "Sanduhr32"
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package ml.duncte123.skybot.commands.music
-
-import lavalink.client.io.filters.Karaoke
-import lavalink.client.io.filters.Rotation
-import ml.duncte123.skybot.Variables
-import ml.duncte123.skybot.objects.command.CommandContext
-import ml.duncte123.skybot.objects.command.MusicCommand
-import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent
-
-class TestFilterCommand : MusicCommand() {
-    init {
-        this.displayAliasesInHelp = false
-    }
-
-    override fun run(ctx: CommandContext) {
-        val player = getLavalinkManager().lavalink.getLink(ctx.guild).player
-
-        player.filters.rotation = Rotation()
-        player.filters.karaoke = Karaoke().apply {
-            level = 3f
-        }
-
-        player.filters.commit()
-    }
-
-    override fun handleEvent(event: SlashCommandInteractionEvent, variables: Variables) {
-        event.reply("Slash command not supported yet, sorry. Please report this issue.").queue()
-    }
-
-    override fun getName(): String = "testfilter"
-}
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/VolumeCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/VolumeCommand.kt
index 8f3ec788a..0ee47c2bb 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/VolumeCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/VolumeCommand.kt
@@ -44,7 +44,7 @@ class VolumeCommand : MusicCommand() {
         }
 
         val mng = ctx.audioUtils.getMusicManager(ctx.guildId)
-        val player = mng.player
+        val player = mng.player.lavalinkPlayer.block()!!
         val args = ctx.args
 
         if (args.isEmpty()) {
@@ -57,7 +57,7 @@ class VolumeCommand : MusicCommand() {
             val newVolume = max(0, min(1000, userInput))
             val oldVolume = player.volume
 
-            player.volume = newVolume
+            player.setVolume(newVolume).asMono().subscribe()
 
             sendMsg(ctx, "Player volume changed from **$oldVolume%** to **$newVolume%**")
         } catch (e: NumberFormatException) {
@@ -85,7 +85,7 @@ class VolumeCommand : MusicCommand() {
         }
 
         val mng = variables.audioUtils.getMusicManager(event.guild!!.idLong)
-        val player = mng.player
+        val player = mng.player.lavalinkPlayer.block()!!
         val volumeOpt = event.getOption("volume")
 
         if (volumeOpt == null) {
@@ -98,7 +98,7 @@ class VolumeCommand : MusicCommand() {
             val newVolume = max(0, min(1000, userInput))
             val oldVolume = player.volume
 
-            player.volume = newVolume
+            player.setVolume(newVolume).asMono().subscribe()
 
             event.reply("Player volume changed from **$oldVolume%** to **$newVolume%**").queue()
         } catch (e: NumberFormatException) {
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt b/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt
index d17c03aec..5b9ef40d8 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt
@@ -34,13 +34,18 @@ import me.duncte123.botcommons.messaging.EmbedUtils.embedMessage
 import me.duncte123.botcommons.web.WebUtils
 import ml.duncte123.skybot.audio.GuildMusicManager
 import ml.duncte123.skybot.objects.TrackUserData
-import ml.duncte123.skybot.utils.MusicEmbedUtils.playerEmbed
+import ml.duncte123.skybot.utils.MusicEmbedUtils.createPlayerString
 import ml.duncte123.skybot.utils.YoutubeUtils
 import net.dv8tion.jda.api.EmbedBuilder
 import net.dv8tion.jda.api.sharding.ShardManager
 
-fun Track.toEmbed(mng: GuildMusicManager, shardManager: ShardManager, withPlayer: Boolean = true): EmbedBuilder {
-    val userData: TrackUserData? = this.getUserData(TrackUserData::class.java)
+fun Track.toEmbed(
+    mng: GuildMusicManager,
+    shardManager: ShardManager,
+    withPlayer: Boolean = true,
+    callback: (EmbedBuilder) -> Unit
+) {
+    val userData: TrackUserData? = mng.scheduler.getUserData(this)
     var requester = "Unknown"
 
     if (userData != null) {
@@ -55,52 +60,27 @@ fun Track.toEmbed(mng: GuildMusicManager, shardManager: ShardManager, withPlayer
     val uri = this.info.uri
 
     if (this.info.isStream) {
-        return embedMessage(
-            """**Currently playing** [${this.info.title}]($uri) by ${this.info.author}
-            |**Requester:** $requester
-            """.trimMargin()
+        callback(
+            embedMessage(
+                """**Currently playing** [${this.info.title}]($uri) by ${this.info.author}
+                |**Requester:** $requester
+                """.trimMargin()
+            )
+                .setThumbnail(this.info.artworkUrl)
         )
-            .setThumbnail(this.info.artworkUrl)
+        return
     }
 
-    return embedMessage(
-        """**Currently playing** [${this.info.title}]($uri) by ${this.info.author}
-            |**Requester:** $requester${if (withPlayer) "\n" + playerEmbed(mng) else ""}
-        """.trimMargin()
-    )
-        .setThumbnail(this.info.artworkUrl)
-}
-
-fun AudioTrack.toEmbed(mng: GuildMusicManager, shardManager: ShardManager, withPlayer: Boolean = true): EmbedBuilder {
-    val userData = this.getUserData(TrackUserData::class.java)
-    var requester = "Unknown"
-
-    if (userData != null) {
-        val userId = userData.requester
-        val user = shardManager.getUserById(userId)
-
-        if (user != null) {
-            requester = user.asTag
-        }
-    }
-
-    val uri = if (this is IWillUseIdentifierInstead) this.info.identifier else this.info.uri
-
-    if (this.info.isStream) {
-        return embedMessage(
-            """**Currently playing** [${this.info.title}]($uri) by ${this.info.author}
-            |**Requester:** $requester
-            """.trimMargin()
+    createPlayerString(mng) { playerState ->
+        callback(
+            embedMessage(
+                """**Currently playing** [${this.info.title}]($uri) by ${this.info.author}
+                |**Requester:** $requester${if (withPlayer) "\n" + playerState else ""}
+                """.trimMargin()
+            )
+                .setThumbnail(this.info.artworkUrl)
         )
-            .setThumbnail(this.getImageUrl())
     }
-
-    return embedMessage(
-        """**Currently playing** [${this.info.title}]($uri) by ${this.info.author}
-            |**Requester:** $requester${if (withPlayer) "\n" + playerEmbed(mng) else ""}
-        """.trimMargin()
-    )
-        .setThumbnail(this.getImageUrl())
 }
 
 /**
@@ -149,7 +129,8 @@ fun AudioTrack.getImageUrl(onlyStatic: Boolean = false): String? {
         if (this is SoundCloudAudioTrack ||
             (this is HttpAudioTrack && this.info.uri.startsWith("https://www.pornhub.com/"))
         ) {
-            val page = WebUtils.ins.scrapeWebPage(this.info.uri) { it.setRateLimiter(RateLimiter.directLimiter()) }.execute()
+            val page =
+                WebUtils.ins.scrapeWebPage(this.info.uri) { it.setRateLimiter(RateLimiter.directLimiter()) }.execute()
             val elems = page.select("meta[property=og:image]")
 
             if (!elems.isEmpty()) {

From 6de09e8a71084901e40a89ab418899340047c053 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 26 Nov 2023 13:42:57 +0100
Subject: [PATCH 06/17] Now it compiles again

---
 .editorconfig                                 |   9 +-
 bot/build.gradle.kts                          |   2 -
 .../ml/duncte123/skybot/CommandManager.java   |   1 -
 .../java/ml/duncte123/skybot/Variables.java   |   2 +-
 .../audio/sourcemanagers/DBAudioRef.java      |  34 --
 .../spotify/SpotifyAudioSourceManager.java    | 312 ------------------
 .../spotify/SpotifyAudioTrack.java            |  97 ------
 .../youtube/YoutubeApiPlaylistLoader.java     | 122 -------
 .../youtube/YoutubeApiSearchProvider.java     |  70 ----
 .../YoutubeAudioSourceManagerOverride.java    |  79 -----
 .../uncategorized/SPLookupCommand.java        | 117 -------
 .../ml/duncte123/skybot/utils/AirUtils.java   |   1 -
 .../ml/duncte123/skybot/utils/AudioUtils.java |  60 +---
 .../skybot/commands/music/PlayCommand.kt      |  16 +-
 .../skybot/commands/music/QueueCommand.kt     |   1 -
 .../skybot/commands/music/SaveCommand.kt      |   2 -
 .../skybot/commands/music/SearchCommand.kt    |   2 +-
 .../duncte123/skybot/extensions/AudioTrack.kt |  68 ----
 settings.gradle.kts                           |   3 -
 19 files changed, 26 insertions(+), 972 deletions(-)
 delete mode 100644 bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/DBAudioRef.java
 delete mode 100644 bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/spotify/SpotifyAudioSourceManager.java
 delete mode 100644 bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/spotify/SpotifyAudioTrack.java
 delete mode 100644 bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/youtube/YoutubeApiPlaylistLoader.java
 delete mode 100644 bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/youtube/YoutubeApiSearchProvider.java
 delete mode 100644 bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/youtube/YoutubeAudioSourceManagerOverride.java
 delete mode 100644 bot/src/main/java/ml/duncte123/skybot/commands/uncategorized/SPLookupCommand.java

diff --git a/.editorconfig b/.editorconfig
index 9348afb4b..486237753 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +1,3 @@
-
 root = true
 
 [*]
@@ -12,10 +11,10 @@ indent_size = 4
 end_of_line = lf
 
 [*.{kt,kts}]
-# ktlint_code_style = ktlint_official
-ktlint_standard = disabled # Disable all rules from the `standard` rule set provided by KtLint
-ktlint_experimental = disabled # Enable all `experimental` rules from all rule sets provided by KtLint or other rule providers
-ktlint_custom-rule-set = disabled # Enable all rules in the `custom-rule-set` rule set (not provided by KtLint)
+ktlint_code_style = ktlint_official
+ktlint_standard = enabled
+ktlint_experimental = disabled
+ktlint_custom-rule-set = disabled
 klint_standard_no-wildcard-imports = disabled
 klint_standard_function-signature = disabled
 klint_standard_trailing-comma-on-call-site = disabled
diff --git a/bot/build.gradle.kts b/bot/build.gradle.kts
index c49b0fdcb..0c31c9084 100644
--- a/bot/build.gradle.kts
+++ b/bot/build.gradle.kts
@@ -50,8 +50,6 @@ dependencies {
     implementation(libs.jda) {
         exclude(module = "opus-java")
     }
-    implementation(libs.sourceManagers)
-    implementation(libs.lavaplayer)
     implementation(libs.lavalink.client) {
         exclude(module = "lavaplayer")
     }
diff --git a/bot/src/main/java/ml/duncte123/skybot/CommandManager.java b/bot/src/main/java/ml/duncte123/skybot/CommandManager.java
index 13435d37d..9d3ec6144 100644
--- a/bot/src/main/java/ml/duncte123/skybot/CommandManager.java
+++ b/bot/src/main/java/ml/duncte123/skybot/CommandManager.java
@@ -279,7 +279,6 @@ public CommandManager(Variables variables) {
         this.addCommand(new SkipCommand());
         this.addCommand(new SlowModeCommand());
         this.addCommand(new SoftbanCommand());
-        this.addCommand(new SPLookupCommand());
         this.addCommand(new StatsCommand());
         this.addCommand(new StopCommand());
         this.addCommand(new SuggestCommand());
diff --git a/bot/src/main/java/ml/duncte123/skybot/Variables.java b/bot/src/main/java/ml/duncte123/skybot/Variables.java
index 0b5f97c2c..cf3e1453e 100644
--- a/bot/src/main/java/ml/duncte123/skybot/Variables.java
+++ b/bot/src/main/java/ml/duncte123/skybot/Variables.java
@@ -89,7 +89,7 @@ public final class Variables {
         this.apis = new DuncteApis("Bot " + this.config.discord.token, this.mapper);
         this.commandManager = new CommandManager(this);
         this.blargBot = new BlargBot(this.config.apis.blargbot, this.mapper);
-        this.audioUtils = new AudioUtils(this.config.apis, this);
+        this.audioUtils = new AudioUtils(this);
         this.alexflipnote = new Alexflipnote(this.mapper, this.config.apis.alexflipnote);
         this.weebApi = new WeebApiBuilder(TokenType.WOLKETOKENS)
             .setBotInfo("DuncteBot(SkyBot)", Settings.VERSION, "Production")
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/DBAudioRef.java b/bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/DBAudioRef.java
deleted file mode 100644
index 6f200afd7..000000000
--- a/bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/DBAudioRef.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Skybot, a multipurpose discord bot
- *      Copyright (C) 2017  Duncan "duncte123" Sterken & Ramid "ramidzkh" Khan & Maurice R S "Sanduhr32"
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package ml.duncte123.skybot.audio.sourcemanagers;
-
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-
-public class DBAudioRef extends AudioReference {
-    private final boolean patron;
-
-    public DBAudioRef(String identifier, String title, boolean patron) {
-        super(identifier, title);
-        this.patron = patron;
-    }
-
-    public boolean isPatron() {
-        return this.patron;
-    }
-}
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/spotify/SpotifyAudioSourceManager.java b/bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/spotify/SpotifyAudioSourceManager.java
deleted file mode 100644
index 468ecfb4c..000000000
--- a/bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/spotify/SpotifyAudioSourceManager.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
- * Skybot, a multipurpose discord bot
- *      Copyright (C) 2017  Duncan "duncte123" Sterken & Ramid "ramidzkh" Khan & Maurice R S "Sanduhr32"
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package ml.duncte123.skybot.audio.sourcemanagers.spotify;
-
-import com.dunctebot.sourcemanagers.AudioTrackInfoWithImage;
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity;
-import com.sedmelluq.discord.lavaplayer.track.*;
-import se.michaelthelin.spotify.SpotifyApi;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.IPlaylistItem;
-import se.michaelthelin.spotify.model_objects.credentials.ClientCredentials;
-import se.michaelthelin.spotify.model_objects.specification.*;
-import se.michaelthelin.spotify.requests.authorization.client_credentials.ClientCredentialsRequest;
-import ml.duncte123.skybot.audio.BigChungusPlaylist;
-import ml.duncte123.skybot.audio.TrackScheduler;
-import ml.duncte123.skybot.audio.sourcemanagers.DBAudioRef;
-import ml.duncte123.skybot.objects.config.DunctebotConfig;
-import org.apache.hc.core5.http.ParseException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class SpotifyAudioSourceManager implements AudioSourceManager {
-    private static final Logger LOGGER = LoggerFactory.getLogger(SpotifyAudioSourceManager.class);
-
-    private static final String PROTOCOL_REGEX = "?:spotify:(track:)|(?:http://|https://)[a-z]+\\.";
-    private static final String DOMAIN_REGEX = "spotify\\.com/";
-    private static final String TRACK_REGEX = "track/([a-zA-z0-9]+)";
-    private static final String ALBUM_REGEX = "album/([a-zA-z0-9]+)";
-    private static final String USER_PART = "user/.*/";
-    private static final String PLAYLIST_REGEX = "playlist/([a-zA-z0-9]+)";
-    private static final String REST_REGEX = ".*";
-    private static final String SPOTIFY_BASE_REGEX = PROTOCOL_REGEX + DOMAIN_REGEX;
-
-    private static final Pattern SPOTIFY_TRACK_REGEX = Pattern.compile("^(" + SPOTIFY_BASE_REGEX + TRACK_REGEX + ")" + REST_REGEX + "$");
-    private static final Pattern SPOTIFY_ALBUM_REGEX = Pattern.compile("^(" + SPOTIFY_BASE_REGEX + ALBUM_REGEX + ")" + REST_REGEX + "$");
-    private static final Pattern SPOTIFY_PLAYLIST_REGEX = Pattern.compile("^(" + SPOTIFY_BASE_REGEX + ")" + PLAYLIST_REGEX + REST_REGEX + "$");
-    private static final Pattern SPOTIFY_PLAYLIST_REGEX_USER = Pattern.compile("^(" + SPOTIFY_BASE_REGEX + ")" +
-        USER_PART + PLAYLIST_REGEX + REST_REGEX + "$");
-    private static final Pattern SPOTIFY_SECOND_PLAYLIST_REGEX = Pattern.compile("^spotify(?::user:.*)?:playlist:(.*)$");
-    private final SpotifyApi spotifyApi;
-    /* package */ final YoutubeAudioSourceManager youtubeAudioSourceManager;
-    private final ScheduledExecutorService service;
-
-    public SpotifyAudioSourceManager(YoutubeAudioSourceManager youtubeAudioSourceManager, DunctebotConfig.Apis config) {
-        final String clientId = config.spotify.clientId;
-        final String clientSecret = config.spotify.clientSecret;
-
-        this.youtubeAudioSourceManager = youtubeAudioSourceManager;
-        this.spotifyApi = new SpotifyApi.Builder()
-            .setClientId(clientId)
-            .setClientSecret(clientSecret)
-            .build();
-
-        this.service = Executors.newScheduledThreadPool(2, (r) -> new Thread(r, "Spotify-Token-Update-Thread"));
-        service.scheduleAtFixedRate(this::updateAccessToken, 0, 1, TimeUnit.HOURS);
-    }
-
-    @Override
-    public String getSourceName() {
-        return "spotify";
-    }
-
-    @Override
-    public AudioItem loadItem(AudioPlayerManager manager, AudioReference reference) {
-        final boolean isPatron = reference instanceof DBAudioRef dbRef && dbRef.isPatron();
-
-        return loadItem(reference, isPatron);
-    }
-
-    public AudioItem loadItem(AudioReference reference, boolean isPatron) {
-        AudioItem item = getSpotifyAlbum(reference);
-
-        if (item == null) {
-            item = getSpotifyPlaylist(reference, isPatron);
-        }
-
-        if (item == null) {
-            item = getSpotifyTrack(reference);
-        }
-
-        return item;
-    }
-
-    private AudioItem getSpotifyAlbum(AudioReference reference) {
-        final Matcher res = SPOTIFY_ALBUM_REGEX.matcher(reference.identifier);
-
-        if (!res.matches()) {
-            return null;
-        }
-
-        try {
-            final List<AudioTrack> playList = new ArrayList<>();
-            final Future<Album> albumFuture = this.spotifyApi.getAlbum(res.group(res.groupCount())).build().executeAsync();
-            final Album album = albumFuture.get();
-            final Image[] images = album.getImages();
-
-            for (final TrackSimplified t : album.getTracks().getItems()) {
-                playList.add(buildTrackFromSimple(t, images));
-            }
-
-            return new BasicAudioPlaylist(album.getName(), playList, null, false);
-        }
-        catch (Exception e) {
-            //logger.error("Something went wrong!", e);
-            throw new FriendlyException(e.getMessage(), Severity.FAULT, e);
-        }
-    }
-
-    private AudioItem getSpotifyPlaylist(AudioReference reference, boolean isPatron) {
-
-        final Matcher res = getSpotifyPlaylistFromString(reference.identifier);
-
-        if (!res.matches()) {
-            return null;
-        }
-
-        final String playListId = res.group(res.groupCount());
-
-        try {
-            final Playlist spotifyPlaylist = this.spotifyApi.getPlaylist(playListId).build().execute();
-            List<PlaylistTrack> playlistTracks = List.of(spotifyPlaylist.getTracks().getItems());
-
-            if (playlistTracks.isEmpty()) {
-                return null;
-            }
-
-            final int originalSize = playlistTracks.size();
-
-            if (originalSize > TrackScheduler.MAX_QUEUE_SIZE && !isPatron) {
-                // yes this is correct, last param is exclusive so it ranges from 0-49
-                playlistTracks = playlistTracks.subList(0, TrackScheduler.MAX_QUEUE_SIZE);
-            }
-
-            final List<AudioTrack> finalPlaylist = new ArrayList<>();
-
-            for (final PlaylistTrack playlistTrack : playlistTracks) {
-                if (playlistTrack.getIsLocal()) {
-                    continue;
-                }
-
-                final IPlaylistItem item = playlistTrack.getTrack();
-
-                // playlist item can either be a track or podcast episode
-                if (!(item instanceof final Track track)) {
-                    continue;
-                }
-
-                finalPlaylist.add(buildTrack(track));
-            }
-
-            if (finalPlaylist.isEmpty()) {
-                throw new FriendlyException("This playlist does not contain playable tracks (podcasts cannot be played)", Severity.COMMON, null);
-            }
-
-            return new BigChungusPlaylist(spotifyPlaylist.getName(), finalPlaylist, null, false, originalSize);
-        }
-        catch (IllegalArgumentException ex) {
-            throw new FriendlyException("This playlist could not be loaded, make sure that it's public", Severity.COMMON, ex);
-        }
-        catch (IOException | ParseException | SpotifyWebApiException e) {
-            //logger.error("Something went wrong!", e);
-            throw ExceptionTools.wrapUnfriendlyExceptions(e.getMessage(), Severity.FAULT, e);
-        }
-    }
-
-    private AudioItem getSpotifyTrack(AudioReference reference) {
-
-        final Matcher res = SPOTIFY_TRACK_REGEX.matcher(reference.identifier);
-
-        if (!res.matches()) {
-            return null;
-        }
-
-        try {
-            final Track track = this.spotifyApi.getTrack(res.group(res.groupCount())).build().execute();
-
-            return buildTrack(track);
-        }
-        catch (Exception e) {
-            //logger.error("Something went wrong!", e);
-            throw new FriendlyException(e.getMessage(), Severity.FAULT, e);
-        }
-    }
-
-    @Override
-    public boolean isTrackEncodable(AudioTrack track) {
-        return true;
-    }
-
-    @Override
-    public void encodeTrack(AudioTrack track, DataOutput output) {
-        // Nothing to encode
-    }
-
-    @Override
-    public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) {
-        return new SpotifyAudioTrack(trackInfo, this);
-    }
-
-    @Override
-    public void shutdown() {
-        if (this.service != null) {
-            this.service.shutdown();
-        }
-    }
-
-    private void updateAccessToken() {
-        try {
-            final ClientCredentialsRequest request = this.spotifyApi.clientCredentials().build();
-            final ClientCredentials clientCredentials = request.execute();
-
-            // Set access token for further "spotifyApi" object usage
-            this.spotifyApi.setAccessToken(clientCredentials.getAccessToken());
-
-            LOGGER.debug("Successfully retrieved an access token! " + clientCredentials.getAccessToken());
-            LOGGER.debug("The access token expires in " + clientCredentials.getExpiresIn() + " seconds");
-        }
-        catch (IOException | SpotifyWebApiException | ParseException e) {
-            LOGGER.error("Error while fetching Spotify token", e);
-
-            // Retry after 10 seconds
-            this.service.schedule(this::updateAccessToken, 10L, TimeUnit.SECONDS);
-        }
-    }
-
-    private Matcher getSpotifyPlaylistFromString(String input) {
-        final Matcher match = SPOTIFY_PLAYLIST_REGEX.matcher(input);
-
-        if (match.matches()) {
-            return match;
-        }
-
-        final Matcher withUser = SPOTIFY_PLAYLIST_REGEX_USER.matcher(input);
-
-        if (withUser.matches()) {
-            return withUser;
-        }
-
-        return SPOTIFY_SECOND_PLAYLIST_REGEX.matcher(input);
-    }
-
-    private AudioTrack buildTrackFromSimple(TrackSimplified track, Image[] images) {
-        return new SpotifyAudioTrack(
-            new AudioTrackInfoWithImage(
-                track.getName(),
-                track.getArtists()[0].getName(),
-                track.getDurationMs(),
-                track.getId(),
-                false,
-                track.getExternalUrls().get("spotify"),
-                getImageOrDefault(images)
-            ),
-            this
-        );
-    }
-
-    private AudioTrack buildTrack(Track track) {
-        return new SpotifyAudioTrack(
-            new AudioTrackInfoWithImage(
-                track.getName(),
-                track.getArtists()[0].getName(),
-                track.getDurationMs(),
-                track.getId(),
-                false,
-                track.getExternalUrls().get("spotify"),
-                getImageOrDefault(track.getAlbum().getImages())
-            ),
-            this
-        );
-    }
-
-    private String getImageOrDefault(Image[] images) {
-        if (images.length > 0) {
-            return images[0].getUrl();
-        }
-
-        return "https://dunctebot.com/img/favicon.png";
-    }
-}
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/spotify/SpotifyAudioTrack.java b/bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/spotify/SpotifyAudioTrack.java
deleted file mode 100644
index 0a507c093..000000000
--- a/bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/spotify/SpotifyAudioTrack.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Skybot, a multipurpose discord bot
- *      Copyright (C) 2017  Duncan "duncte123" Sterken & Ramid "ramidzkh" Khan & Maurice R S "Sanduhr32"
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package ml.duncte123.skybot.audio.sourcemanagers.spotify;
-
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioTrack;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity;
-import com.sedmelluq.discord.lavaplayer.track.*;
-
-import java.lang.reflect.Field;
-import java.util.List;
-
-public class SpotifyAudioTrack extends YoutubeAudioTrack {
-    private final SpotifyAudioSourceManager sourceManager;
-
-    private String youtubeId;
-
-    /* default */ SpotifyAudioTrack(AudioTrackInfo trackInfo, SpotifyAudioSourceManager sourceManager) {
-        super(trackInfo, sourceManager.youtubeAudioSourceManager);
-        this.sourceManager = sourceManager;
-    }
-
-    // custom override to load the youtube id
-    @Override
-    public String getIdentifier() {
-        if (this.youtubeId == null) {
-            final AudioTrackInfo info = this.trackInfo;
-            final AudioItem audioItem = this.sourceManager.youtubeAudioSourceManager.loadItem(
-                null,
-                new AudioReference(
-                    "ytsearch:" + info.title + ' ' + info.author,
-                    null
-                )
-            );
-
-            if (audioItem instanceof BasicAudioPlaylist results) {
-                final List<AudioTrack> tracks = results.getTracks();
-
-                if (tracks.isEmpty()) {
-                    throw new FriendlyException("Failed to read info for " + info.uri, Severity.SUSPICIOUS, null);
-                }
-
-                final AudioTrack audioTrack = tracks.stream()
-                    // TODO: margin of 3 seconds?
-                    .filter((track) -> track.getDuration() == info.length)
-                    .findFirst()
-                    .orElseGet(() -> tracks.get(0));
-
-                // Identifier === youtube video id
-                this.youtubeId = audioTrack.getIdentifier();
-
-                // HACK: set the identifier on the trackInfo object
-                this.setIdentifier(this.youtubeId);
-            } else {
-                throw new FriendlyException("Search results were not a playlist", Severity.FAULT, null);
-            }
-        }
-
-        return this.youtubeId;
-    }
-
-    // TODO: I could probably override the track info class with a custom one that has a setter for the identifier
-    private void setIdentifier(String videoId) {
-        final Class<AudioTrackInfo> infoCls = AudioTrackInfo.class;
-
-        try {
-            final Field identifier = infoCls.getDeclaredField("identifier");
-
-            identifier.setAccessible(true);
-
-            identifier.set(this.trackInfo, videoId);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            throw new FriendlyException("Failed to look up youtube track", Severity.SUSPICIOUS, e);
-        }
-    }
-
-    @Override
-    protected AudioTrack makeShallowClone() {
-        return new SpotifyAudioTrack(trackInfo, sourceManager);
-    }
-}
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/youtube/YoutubeApiPlaylistLoader.java b/bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/youtube/YoutubeApiPlaylistLoader.java
deleted file mode 100644
index 58c29e2ac..000000000
--- a/bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/youtube/YoutubeApiPlaylistLoader.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Skybot, a multipurpose discord bot
- *      Copyright (C) 2017  Duncan "duncte123" Sterken & Ramid "ramidzkh" Khan & Maurice R S "Sanduhr32"
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package ml.duncte123.skybot.audio.sourcemanagers.youtube;
-
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubePlaylistLoader;
-import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.BasicAudioPlaylist;
-import io.sentry.Sentry;
-import ml.duncte123.skybot.objects.YoutubePlaylistMetadata;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Function;
-
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.COMMON;
-import static ml.duncte123.skybot.utils.YoutubeUtils.getPlaylistPageById;
-
-public class YoutubeApiPlaylistLoader implements YoutubePlaylistLoader {
-    private final String apiKey;
-    private int playlistPageCount = 6;
-
-    public YoutubeApiPlaylistLoader(String apiKey) {
-        this.apiKey = apiKey;
-    }
-
-    @Override
-    public void setPlaylistPageCount(int playlistPageCount) {
-        this.playlistPageCount = playlistPageCount;
-    }
-
-    @Override
-    public AudioPlaylist load(HttpInterface httpInterface, String playlistId, String selectedVideoId, Function<AudioTrackInfo, AudioTrack> trackFactory) {
-        try {
-            final YoutubePlaylistMetadata firstPage = getPlaylistPageById(playlistId, this.apiKey, null, true);
-
-            if (firstPage == null) {
-                throw new FriendlyException("This playlist does not exist", COMMON, null);
-            }
-
-            return buildPlaylist(firstPage, playlistId, selectedVideoId, trackFactory);
-        }
-        catch (IOException e) {
-            Sentry.captureException(e);
-
-            throw ExceptionTools.wrapUnfriendlyExceptions(e);
-        }
-    }
-
-    private AudioPlaylist buildPlaylist(YoutubePlaylistMetadata firstPage, String playlistId, String selectedVideoId,
-                                        Function<AudioTrackInfo, AudioTrack> trackFactory) throws IOException {
-        final List<AudioTrack> convertedTracks = new ArrayList<>();
-
-        firstPage.tracks()
-            .stream()
-            .map(trackFactory)
-            .forEach(convertedTracks::add);
-
-        String nextPageKey = firstPage.nextPageKey();
-        int loadCount = 0;
-        final int pageCount = playlistPageCount;
-
-        while (nextPageKey != null && ++loadCount < pageCount) {
-            nextPageKey = fetchNextPage(nextPageKey, playlistId, trackFactory, convertedTracks);
-        }
-
-        return new BasicAudioPlaylist(
-            firstPage.title(),
-            convertedTracks,
-            getSelectedTrack(selectedVideoId, convertedTracks),
-            false
-        );
-    }
-
-    private AudioTrack getSelectedTrack(String selectedVideoId, List<AudioTrack> tracks) {
-        if (selectedVideoId == null) {
-            return null;
-        }
-
-        return tracks.stream()
-            .filter((track) -> selectedVideoId.equals(track.getInfo().identifier))
-            .findFirst()
-            .orElse(null);
-    }
-
-    private String fetchNextPage(String nextPageKey, String playlistId, Function<AudioTrackInfo, AudioTrack> trackFactory,
-                                                  List<AudioTrack> tracks) throws IOException {
-        final YoutubePlaylistMetadata nextPage = getPlaylistPageById(playlistId, this.apiKey, nextPageKey, false);
-
-        if (nextPage == null) {
-            return null;
-        }
-
-        nextPage.tracks()
-            .stream()
-            .map(trackFactory)
-            .forEach(tracks::add);
-
-        return nextPage.nextPageKey();
-    }
-}
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/youtube/YoutubeApiSearchProvider.java b/bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/youtube/YoutubeApiSearchProvider.java
deleted file mode 100644
index 57e1b764d..000000000
--- a/bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/youtube/YoutubeApiSearchProvider.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Skybot, a multipurpose discord bot
- *      Copyright (C) 2017  Duncan "duncte123" Sterken & Ramid "ramidzkh" Khan & Maurice R S "Sanduhr32"
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package ml.duncte123.skybot.audio.sourcemanagers.youtube;
-
-import com.google.api.services.youtube.model.SearchResult;
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeSearchResultLoader;
-import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
-import com.sedmelluq.discord.lavaplayer.tools.http.ExtendedHttpConfigurable;
-import com.sedmelluq.discord.lavaplayer.track.AudioItem;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import java.io.IOException;
-import java.util.List;
-import java.util.function.Function;
-
-import static ml.duncte123.skybot.utils.YoutubeUtils.*;
-
-public class YoutubeApiSearchProvider implements YoutubeSearchResultLoader {
-    private final String apiKey;
-
-    public YoutubeApiSearchProvider(String apiKey) {
-        this.apiKey = apiKey;
-    }
-
-    @Override
-    public AudioItem loadSearchResult(String query, Function<AudioTrackInfo, AudioTrack> trackFactory) {
-        return this.searchYoutubeAPI(query, trackFactory);
-    }
-
-    @Override
-    public ExtendedHttpConfigurable getHttpConfiguration() {
-        return null;
-    }
-
-    private AudioItem searchYoutubeAPI(String query, Function<AudioTrackInfo, AudioTrack> trackFactory) {
-        try {
-            final List<SearchResult> searchResults = searchYoutube(query, this.apiKey, 1L);
-
-            if (searchResults.isEmpty()) {
-                return null;
-            }
-
-            final String videoId = searchResults.get(0).getId().getVideoId();
-            final AudioTrackInfo info = videoToTrackInfo(
-                getVideoById(videoId, this.apiKey)
-            );
-
-            return trackFactory.apply(info);
-        }
-        catch (IOException e) {
-            throw ExceptionTools.wrapUnfriendlyExceptions(e);
-        }
-    }
-}
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/youtube/YoutubeAudioSourceManagerOverride.java b/bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/youtube/YoutubeAudioSourceManagerOverride.java
deleted file mode 100644
index b38f15ea2..000000000
--- a/bot/src/main/java/ml/duncte123/skybot/audio/sourcemanagers/youtube/YoutubeAudioSourceManagerOverride.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Skybot, a multipurpose discord bot
- *      Copyright (C) 2017  Duncan "duncte123" Sterken & Ramid "ramidzkh" Khan & Maurice R S "Sanduhr32"
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package ml.duncte123.skybot.audio.sourcemanagers.youtube;
-
-import com.sedmelluq.discord.lavaplayer.source.youtube.*;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.track.AudioItem;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-
-import java.io.IOException;
-
-import static ml.duncte123.skybot.utils.YoutubeUtils.getVideoById;
-import static ml.duncte123.skybot.utils.YoutubeUtils.videoToTrack;
-
-public class YoutubeAudioSourceManagerOverride extends YoutubeAudioSourceManager {
-    private final String ytApiKey;
-
-    public YoutubeAudioSourceManagerOverride(String ytApiKey) {
-        super(
-            true,
-            null,
-            null,
-            new DefaultYoutubeTrackDetailsLoader(),
-            new YoutubeApiSearchProvider(ytApiKey),
-            new YoutubeSearchMusicProvider(),
-            new YoutubeSignatureCipherManager(),
-            new YoutubeApiPlaylistLoader(ytApiKey),
-            new DefaultYoutubeLinkRouter(),
-            new YoutubeMixProvider()
-        );
-
-        this.ytApiKey = ytApiKey;
-    }
-
-    @Override
-    public AudioItem loadTrackWithVideoId(String videoId, boolean mustExist) {
-        if (mustExist) {
-            return getFromYoutubeApi(videoId);
-        }
-
-        return super.loadTrackWithVideoId(videoId, mustExist);
-    }
-
-    private AudioItem getFromYoutubeApi(String videoId) {
-        try {
-            return videoToTrack(
-                getVideoById(videoId, this.ytApiKey),
-                this
-            );
-        } catch (IOException e) {
-            throw new FriendlyException("This video does not exist", FriendlyException.Severity.SUSPICIOUS, e);
-        }
-    }
-
-    /**
-     * Don't cache tracks that are already retrieved from the cache
-     */
-    public static class DoNotCache extends YoutubeAudioTrack {
-        /* default */ DoNotCache(AudioTrack track) {
-            super(track.getInfo(), (YoutubeAudioSourceManager) track.getSourceManager());
-        }
-    }
-}
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/uncategorized/SPLookupCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/uncategorized/SPLookupCommand.java
deleted file mode 100644
index 0ace60998..000000000
--- a/bot/src/main/java/ml/duncte123/skybot/commands/uncategorized/SPLookupCommand.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Skybot, a multipurpose discord bot
- *      Copyright (C) 2017  Duncan "duncte123" Sterken & Ramid "ramidzkh" Khan & Maurice R S "Sanduhr32"
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package ml.duncte123.skybot.commands.uncategorized;
-
-import com.google.api.services.youtube.model.ResourceId;
-import com.google.api.services.youtube.model.SearchResult;
-import com.sedmelluq.discord.lavaplayer.track.AudioItem;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.BasicAudioPlaylist;
-import ml.duncte123.skybot.audio.sourcemanagers.DBAudioRef;
-import ml.duncte123.skybot.audio.sourcemanagers.spotify.SpotifyAudioSourceManager;
-import ml.duncte123.skybot.audio.sourcemanagers.spotify.SpotifyAudioTrack;
-import ml.duncte123.skybot.objects.command.Command;
-import ml.duncte123.skybot.objects.command.CommandContext;
-import ml.duncte123.skybot.utils.YoutubeUtils;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.IOException;
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static me.duncte123.botcommons.messaging.EmbedUtils.getDefaultEmbed;
-import static me.duncte123.botcommons.messaging.MessageUtils.sendEmbed;
-import static me.duncte123.botcommons.messaging.MessageUtils.sendMsg;
-import static ml.duncte123.skybot.utils.YoutubeUtils.*;
-
-public class SPLookupCommand extends Command {
-    public SPLookupCommand() {
-        this.requiresArgs = true;
-        this.name = "splookup";
-        this.help = "Look up a track from spotify";
-        this.usage = "<spotify url>";
-    }
-
-    @Override
-    public void execute(@NotNull CommandContext ctx) {
-        final var source = ctx.getAudioUtils().getPlayerManager().source(SpotifyAudioSourceManager.class);
-        final DBAudioRef reference = new DBAudioRef(ctx.getArgsRaw(), null, false);
-        final AudioItem audioItem = source.loadItem(null, reference);
-
-        if (audioItem == null) {
-            sendMsg(ctx, "Nothing found for your input");
-            return;
-        }
-
-        final String googl = ctx.getConfig().apis.googl;
-
-        try {
-            if (audioItem instanceof SpotifyAudioTrack track) {
-                final AudioTrackInfo info = track.getInfo();
-                final List<SearchResult> searchResults = searchYoutubeIdOnly(
-                    info.title + ' ' + info.author,
-                    googl,
-                    5L
-                );
-                // Convert the results to usable videos
-                final var videos = getVideosByIds(
-                    searchResults.stream()
-                        .map(SearchResult::getId)
-                        .map(ResourceId::getVideoId)
-                        .collect(Collectors.joining(",")),
-                    googl
-                );
-                final var trackInfos = videos.stream()
-                    .map(YoutubeUtils::videoToTrackInfo)
-                    .toList();
-
-                if (trackInfos.isEmpty()) {
-                    sendMsg(ctx, "Nothing found on youtube?!");
-                    return;
-                }
-
-                // find the best match
-                final long trackDuration = info.length;
-                final AudioTrackInfo foundTrack = trackInfos.stream()
-                    .min(Comparator.comparingLong(
-                        (i) -> Math.abs(i.length - trackDuration)
-                    ))
-                    .get();
-
-                sendEmbed(
-                    ctx,
-                    getDefaultEmbed()
-                        .setTitle(foundTrack.title)
-                        .setAuthor(foundTrack.author)
-                        .setDescription(
-                            "Watch here: [%1$s]([%1$s)".formatted(foundTrack.uri)
-                        )
-                        .setThumbnail(getThumbnail(foundTrack.identifier))
-                );
-
-            } else if (audioItem instanceof BasicAudioPlaylist) {
-                sendMsg(ctx, "Playlists are not supported atm");
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-            sendMsg(ctx, e.getMessage());
-        }
-    }
-}
diff --git a/bot/src/main/java/ml/duncte123/skybot/utils/AirUtils.java b/bot/src/main/java/ml/duncte123/skybot/utils/AirUtils.java
index cb54bd4f0..1e75a7fd1 100644
--- a/bot/src/main/java/ml/duncte123/skybot/utils/AirUtils.java
+++ b/bot/src/main/java/ml/duncte123/skybot/utils/AirUtils.java
@@ -146,7 +146,6 @@ private static String formatTimeWord(String word, int amount, boolean withComma)
     public static void stop(AudioUtils audioUtils) {
         stopMusic(audioUtils);
 
-        audioUtils.getPlayerManager().shutdown();
         LavalinkManager.INS.shutdown();
     }
 
diff --git a/bot/src/main/java/ml/duncte123/skybot/utils/AudioUtils.java b/bot/src/main/java/ml/duncte123/skybot/utils/AudioUtils.java
index b9267fd82..4670fa2a5 100644
--- a/bot/src/main/java/ml/duncte123/skybot/utils/AudioUtils.java
+++ b/bot/src/main/java/ml/duncte123/skybot/utils/AudioUtils.java
@@ -18,28 +18,14 @@
 
 package ml.duncte123.skybot.utils;
 
-import com.dunctebot.sourcemanagers.DuncteBotSources;
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.source.bandcamp.BandcampAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.beam.BeamAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.http.HttpAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.soundcloud.SoundCloudAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.twitch.TwitchStreamAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.vimeo.VimeoAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.track.AudioItem;
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-import com.sedmelluq.discord.lavaplayer.track.BasicAudioPlaylist;
+import dev.arbjerg.lavalink.protocol.v4.LoadResult;
+import dev.arbjerg.lavalink.protocol.v4.Playlist;
 import fredboat.audio.player.LavalinkManager;
 import gnu.trove.map.TLongObjectMap;
 import ml.duncte123.skybot.Variables;
 import ml.duncte123.skybot.audio.AudioLoader;
 import ml.duncte123.skybot.audio.GuildMusicManager;
-import ml.duncte123.skybot.audio.sourcemanagers.DBAudioRef;
-import ml.duncte123.skybot.audio.sourcemanagers.spotify.SpotifyAudioSourceManager;
 import ml.duncte123.skybot.objects.AudioData;
-import ml.duncte123.skybot.objects.config.DunctebotConfig;
 import net.dv8tion.jda.api.entities.Guild;
 import org.jetbrains.annotations.Nullable;
 
@@ -48,44 +34,22 @@
 
 public class AudioUtils {
     // public static final String EMBED_TITLE = "AirPlayer";
-    private final TLongObjectMap<GuildMusicManager> musicManagers;
+    private final TLongObjectMap<GuildMusicManager> musicManagers = MapUtils.newLongObjectMap();
     private final Variables variables;
-    private final AudioPlayerManager playerManager;
-    private final YoutubeAudioSourceManager youtubeManager;
 
-    public AudioUtils(DunctebotConfig.Apis config, Variables variables) {
+    public AudioUtils(Variables variables) {
         this.variables = variables;
-        musicManagers = MapUtils.newLongObjectMap();
-
-        playerManager = new DefaultAudioPlayerManager();
-        //playerManager.enableGcMonitoring();
-
-//        this.youtubeManager = new YoutubeAudioSourceManagerOverride(config.googl);
-        this.youtubeManager = new YoutubeAudioSourceManager();
-
-        playerManager.registerSourceManager(new SpotifyAudioSourceManager(this.youtubeManager, config));
-        playerManager.registerSourceManager(this.youtubeManager);
-
-        DuncteBotSources.registerDuncteBot(playerManager, "en-AU", 6);
-
-        playerManager.registerSourceManager(SoundCloudAudioSourceManager.createDefault());
-        playerManager.registerSourceManager(new BandcampAudioSourceManager());
-        playerManager.registerSourceManager(new VimeoAudioSourceManager());
-        playerManager.registerSourceManager(new TwitchStreamAudioSourceManager());
-        playerManager.registerSourceManager(new BeamAudioSourceManager());
-        playerManager.registerSourceManager(new HttpAudioSourceManager());
-    }
-
-    public AudioPlayerManager getPlayerManager() {
-        return this.playerManager;
     }
 
     @Nullable("If the playlist is not a basic audio playlist")
-    public BasicAudioPlaylist searchYoutube(String query) {
-        final AudioItem audioItem = this.youtubeManager.loadItem(null, new AudioReference("ytsearch:" + query, null));
-
-        if (audioItem instanceof BasicAudioPlaylist playlist) {
-            return playlist;
+    public Playlist searchYoutube(long guildId, String query) {
+        final LoadResult result = LavalinkManager.INS.getLavalink()
+            .getLink(guildId)
+            .loadItem("ytsearch:" + query)
+            .block();
+
+        if (result instanceof LoadResult.PlaylistLoaded playlist) {
+            return playlist.getData();
         }
 
         return null;
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PlayCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PlayCommand.kt
index 8d9827d21..cfe84bc23 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PlayCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PlayCommand.kt
@@ -18,7 +18,6 @@
 
 package ml.duncte123.skybot.commands.music
 
-import com.dunctebot.sourcemanagers.pornhub.PornHubAudioSourceManager
 import me.duncte123.botcommons.messaging.MessageUtils
 import me.duncte123.botcommons.messaging.MessageUtils.sendMsg
 import ml.duncte123.skybot.Variables
@@ -33,6 +32,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData
 
 open class PlayCommand(private val skipParsing: Boolean = false) : MusicCommand() {
+    private val pornhubRegex = "https?://([a-z]+\\.)?pornhub\\.(com|net|org)"
     private val acceptedExtensions = listOf("wav", "mkv", "mp4", "flac", "ogg", "mp3", "aac", "ts")
 
     init {
@@ -74,7 +74,7 @@ open class PlayCommand(private val skipParsing: Boolean = false) : MusicCommand(
 
         var toPlay = ctx.argsRaw
 
-        if (toPlay.contains(PornHubAudioSourceManager.DOMAIN_REGEX.toRegex()) && !ctx.isChannelNSFW) {
+        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")
             return
         }
@@ -85,7 +85,7 @@ open class PlayCommand(private val skipParsing: Boolean = false) : MusicCommand(
         }
 
         if (!AirUtils.isURL(toPlay) && !toPlay.startsWith("OCR", true)) {
-            val vidId = searchYt(toPlay, ctx.variables)
+            val vidId = searchYt(ctx.guildId, toPlay, ctx.variables)
 
             if (vidId == null) {
                 MessageUtils.sendError(ctx.message)
@@ -118,14 +118,14 @@ open class PlayCommand(private val skipParsing: Boolean = false) : MusicCommand(
         return true
     }
 
-    private fun searchYt(search: String, variables: Variables): String? {
-        val playlist = variables.audioUtils.searchYoutube(search)
+    private fun searchYt(guildId: Long, search: String, variables: Variables): String? {
+        val playlist = variables.audioUtils.searchYoutube(guildId, search)
 
         if (playlist == null || playlist.tracks.isEmpty()) {
             return null
         }
 
-        return playlist.tracks[0].identifier
+        return playlist.tracks[0].info.identifier
     }
 
     private fun handlePlay(toPlay: String, ctx: CommandContext) {
@@ -163,7 +163,7 @@ open class PlayCommand(private val skipParsing: Boolean = false) : MusicCommand(
     override fun handleEvent(event: SlashCommandInteractionEvent, variables: Variables) {
         var toPlay = event.getOption("item")!!.asString
 
-        if (toPlay.contains(PornHubAudioSourceManager.DOMAIN_REGEX.toRegex()) && !event.channel.isNSFW) {
+        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()
             return
         }
@@ -174,7 +174,7 @@ open class PlayCommand(private val skipParsing: Boolean = false) : MusicCommand(
         }
 
         if (!AirUtils.isURL(toPlay) && !toPlay.startsWith("OCR", true)) {
-            val vidId = searchYt(toPlay, variables)
+            val vidId = searchYt(event.guild!!.idLong, toPlay, variables)
 
             if (vidId == null) {
                 event.reply("No tracks were found").queue()
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/QueueCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/QueueCommand.kt
index de063ff1e..7f0cf57ac 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/QueueCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/QueueCommand.kt
@@ -18,7 +18,6 @@
 
 package ml.duncte123.skybot.commands.music
 
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack
 import dev.arbjerg.lavalink.protocol.v4.Track
 import me.duncte123.botcommons.messaging.EmbedUtils
 import me.duncte123.botcommons.messaging.MessageUtils.sendEmbed
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SaveCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SaveCommand.kt
index 294d85c8f..6e3baaf9c 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SaveCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SaveCommand.kt
@@ -19,9 +19,7 @@
 package ml.duncte123.skybot.commands.music
 
 import com.dunctebot.models.utils.DateUtils.getDatabaseDateFormat
-import com.dunctebot.sourcemanagers.IWillUseIdentifierInstead
 import com.fasterxml.jackson.databind.ObjectMapper
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack
 import ml.duncte123.skybot.Variables
 import ml.duncte123.skybot.objects.command.CommandContext
 import ml.duncte123.skybot.objects.command.MusicCommand
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SearchCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SearchCommand.kt
index 2804be2b5..85c501bf6 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SearchCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SearchCommand.kt
@@ -60,7 +60,7 @@ class SearchCommand : MusicCommand() {
         val searchLimit = if (isPatron) 20 else 5
 
         val toPlay = ctx.argsRaw
-        val res = ctx.audioUtils.searchYoutube(toPlay)
+        val res = ctx.audioUtils.searchYoutube(ctx.guildId, toPlay)
 
         if (res == null || res.tracks.isEmpty()) {
             sendMsg(ctx, "$SEARCH_EMOTE No results found.")
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt b/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt
index 5b9ef40d8..272a2d9b9 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt
@@ -19,15 +19,6 @@
 package ml.duncte123.skybot.extensions
 
 import com.dunctebot.sourcemanagers.AudioTrackInfoWithImage
-import com.dunctebot.sourcemanagers.IWillUseIdentifierInstead
-import com.dunctebot.sourcemanagers.getyarn.GetyarnAudioTrack
-import com.github.natanbc.reliqua.limiter.RateLimiter
-import com.sedmelluq.discord.lavaplayer.source.http.HttpAudioTrack
-import com.sedmelluq.discord.lavaplayer.source.soundcloud.SoundCloudAudioTrack
-import com.sedmelluq.discord.lavaplayer.source.twitch.TwitchStreamAudioTrack
-import com.sedmelluq.discord.lavaplayer.source.vimeo.VimeoAudioTrack
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioTrack
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack
 import dev.arbjerg.lavalink.protocol.v4.Track
 import io.sentry.Sentry
 import me.duncte123.botcommons.messaging.EmbedUtils.embedMessage
@@ -82,62 +73,3 @@ fun Track.toEmbed(
         )
     }
 }
-
-/**
- * @param onlyStatic If we only should return thumbnails that do not require an http request
- */
-fun AudioTrack.getImageUrl(onlyStatic: Boolean = false): String? {
-    if (this.info is AudioTrackInfoWithImage) {
-        return (this.info as AudioTrackInfoWithImage).image
-    }
-
-    if (this is YoutubeAudioTrack) {
-        return YoutubeUtils.getThumbnail(this.info.identifier)
-    }
-
-    if (this is TwitchStreamAudioTrack) {
-        return "https://static-cdn.jtvnw.net/previews-ttv/live_user_${this.info.author}-320x180.jpg?r=${System.currentTimeMillis()}"
-    }
-
-    /*if (this is BeamAudioTrack) {
-        val id = this.identifier.substring(0, this.identifier.indexOf('|'))
-
-        return "https://thumbs.mixer.com/channel/$id.small.jpg?r=${System.currentTimeMillis()}"
-    }*/
-
-    if (this is GetyarnAudioTrack) {
-        // Gif url https://y.yarn.co/{id}_text.gif
-        return "https://y.yarn.co/${this.info.identifier}_screenshot.jpg"
-    }
-
-    // The following make a REST request for the thumbnail
-    if (!onlyStatic) {
-        if (this is VimeoAudioTrack) {
-            return try {
-                val info = this.info
-                val id = info.identifier.substring(info.identifier.lastIndexOf('/') + 1)
-                val url = "https://vimeo.com/api/v2/video/$id.json"
-                val json = WebUtils.ins.getJSONArray(url).execute()[0]
-
-                json["thumbnail_small"].asText()
-            } catch (e: Exception) {
-                Sentry.captureException(e)
-                null
-            }
-        }
-
-        if (this is SoundCloudAudioTrack ||
-            (this is HttpAudioTrack && this.info.uri.startsWith("https://www.pornhub.com/"))
-        ) {
-            val page =
-                WebUtils.ins.scrapeWebPage(this.info.uri) { it.setRateLimiter(RateLimiter.directLimiter()) }.execute()
-            val elems = page.select("meta[property=og:image]")
-
-            if (!elems.isEmpty()) {
-                return elems.first()!!.attr("content")
-            }
-        }
-    }
-
-    return null
-}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 359148258..4313ff3a1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -91,9 +91,6 @@ fun VersionCatalogBuilder.database() {
 }
 
 fun VersionCatalogBuilder.voice() {
-    library("sourceManagers", "com.dunctebot", "sourcemanagers").version("1.8.5")
-//    implementation(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.78")
-    library("lavaplayer", "com.github.walkyst", "lavaplayer-fork").version("1.4.2")
     library("lavalink-client", "dev.arbjerg", "lavalink-client").version("0.0.1")
 }
 

From 543144ab09b9b0c928f3ed49ebb0b77d0a8abb13 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 26 Nov 2023 15:00:56 +0100
Subject: [PATCH 07/17] Add skip votes to player embed

---
 .idea/jarRepositories.xml                     |  10 +
 .../audio/player/LavalinkManager.java         |   1 -
 .../duncte123/skybot/audio/AudioLoader.java   |  23 +-
 .../skybot/audio/BigChungusPlaylist.java      |  42 ---
 .../skybot/audio/TrackScheduler.java          |  20 +-
 .../uncategorized/BotinfoCommand.java         |   4 +-
 .../objects/YoutubePlaylistMetadata.java      |  29 ---
 .../duncte123/skybot/utils/YoutubeUtils.java  | 242 ------------------
 .../ml/duncte123/skybot/audio/TrackUtils.kt   |   6 +
 .../skybot/commands/music/ReaddCommand.kt     |   1 +
 .../skybot/commands/music/SkipCommand.kt      |   4 +-
 .../duncte123/skybot/extensions/AudioTrack.kt |  13 +-
 build.gradle.kts                              |   3 +-
 settings.gradle.kts                           |   3 +-
 14 files changed, 58 insertions(+), 343 deletions(-)
 delete mode 100644 bot/src/main/java/ml/duncte123/skybot/audio/BigChungusPlaylist.java
 delete mode 100644 bot/src/main/java/ml/duncte123/skybot/objects/YoutubePlaylistMetadata.java
 delete mode 100644 bot/src/main/java/ml/duncte123/skybot/utils/YoutubeUtils.java

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 5413c531c..c4ed069a0 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -51,5 +51,15 @@
       <option name="name" value="maven3" />
       <option name="url" value="https://maven.arbjerg.dev/releases" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven4" />
+      <option name="name" value="maven4" />
+      <option name="url" value="https://maven.lavalink.dev/snapshots" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="https://maven.lavalink.dev/releases" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/bot/src/main/java/fredboat/audio/player/LavalinkManager.java b/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
index 969032194..d10d77695 100644
--- a/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
+++ b/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
@@ -171,7 +171,6 @@ private void registerPlayerUpdateEvent() {
 
     private void registerTrackStartEvent() {
         lavalink.on(TrackStartEvent.class).subscribe((data) -> {
-            System.out.println("Track start event: " + data);
             final var event = data.getEvent();
             final long guildIdLong = Long.parseUnsignedLong(event.getGuildId());
             final var mng = audioUtils.getMusicManagers().get(guildIdLong);
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java b/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java
index 7b72b189b..55e5f109c 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java
@@ -18,8 +18,10 @@
 
 package ml.duncte123.skybot.audio;
 
-import dev.arbjerg.lavalink.protocol.v4.*;
 import dev.arbjerg.lavalink.protocol.v4.Exception;
+import dev.arbjerg.lavalink.protocol.v4.*;
+import kotlinx.serialization.json.JsonElementKt;
+import kotlinx.serialization.json.JsonObject;
 import me.duncte123.botcommons.messaging.MessageConfig;
 import ml.duncte123.skybot.CommandManager;
 import ml.duncte123.skybot.commands.music.RadioCommand;
@@ -29,12 +31,8 @@
 import ml.duncte123.skybot.objects.RadioStream;
 import ml.duncte123.skybot.objects.TrackUserData;
 import net.dv8tion.jda.api.entities.MessageEmbed;
-import org.apache.commons.lang3.exception.ExceptionUtils;
 
-import javax.annotation.Nullable;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.Consumer;
 
 import static me.duncte123.botcommons.messaging.EmbedUtils.embedMessage;
@@ -74,7 +72,9 @@ public void accept(LoadResult loadResult) {
     }
 
     private void trackLoaded(LoadResult.TrackLoaded data) {
-        final Track track = data.getData();
+        final Track track = data.getData().copyWithUserData(new JsonObject(Map.of(
+            "uuid", JsonElementKt.JsonPrimitive(UUID.randomUUID().toString())
+        )));
 
         mng.getScheduler().storeUserData(track, new TrackUserData(this.requester));
 
@@ -148,9 +148,14 @@ private void playlistLoaded(LoadResult.PlaylistLoaded playlistLoaded) {
                 tracksRaw = tracksRaw.subList(selectedTrackIndex, tracksRaw.size());
             }
 
-            final List<Track> tracks = tracksRaw.stream().peek((track) -> {
-                // don't store this externally since it will cause issues
+            final List<Track> tracks = tracksRaw.stream().map((track) -> {
+                track = track.copyWithUserData(new JsonObject(Map.of(
+                    "uuid", JsonElementKt.JsonPrimitive(UUID.randomUUID().toString())
+                )));
+
                 mng.getScheduler().storeUserData(track, new TrackUserData(this.requester));
+
+                return track;
             }).toList();
 
             for (final Track track : tracks) {
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/BigChungusPlaylist.java b/bot/src/main/java/ml/duncte123/skybot/audio/BigChungusPlaylist.java
deleted file mode 100644
index f90858897..000000000
--- a/bot/src/main/java/ml/duncte123/skybot/audio/BigChungusPlaylist.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Skybot, a multipurpose discord bot
- *      Copyright (C) 2017  Duncan "duncte123" Sterken & Ramid "ramidzkh" Khan & Maurice R S "Sanduhr32"
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package ml.duncte123.skybot.audio;
-
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.BasicAudioPlaylist;
-
-import java.util.List;
-
-public class BigChungusPlaylist extends BasicAudioPlaylist {
-    private final int originalSize;
-
-    public BigChungusPlaylist(String name, List<AudioTrack> tracks, AudioTrack selectedTrack, boolean isSearchResult, int originalSize) {
-        super(name, tracks, selectedTrack, isSearchResult);
-
-        this.originalSize = originalSize;
-    }
-
-    public int getOriginalSize() {
-        return originalSize;
-    }
-
-    public boolean isBig() {
-        return originalSize > getTracks().size();
-    }
-}
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
index 48f3f9e23..c59afc6fd 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
@@ -22,6 +22,8 @@
 import dev.arbjerg.lavalink.protocol.v4.Message.EmittedEvent.TrackEndEvent.AudioTrackEndReason;
 import dev.arbjerg.lavalink.protocol.v4.Track;
 import dev.arbjerg.lavalink.protocol.v4.TrackInfo;
+import kotlinx.serialization.json.JsonObject;
+import kotlinx.serialization.json.JsonPrimitive;
 import me.duncte123.botcommons.messaging.MessageConfig;
 import ml.duncte123.skybot.exceptions.LimitReachedException;
 import ml.duncte123.skybot.extensions.AudioTrackKt;
@@ -248,27 +250,29 @@ public void onTrackException(Track track, Exception exception) {
             "Details: " + finalCause);
     }
 
-    // TODO: these use the identifier for now, we need to use something more unique
     public TrackUserData getUserData(Track track) {
-        return Objects.requireNonNull(
-            this.userData.get(track.getInfo().getIdentifier()),
-            "Somehow, userdata was null for " + track.getInfo()
-        );
+        final var element = Objects.requireNonNull((JsonPrimitive) track.getUserData().get("uuid"));
+
+        return this.userData.get(element.getContent());
     }
 
     public void storeUserData(Track track, TrackUserData data) {
-        this.userData.put(track.getInfo().getIdentifier(), data);
+        final var element = Objects.requireNonNull((JsonPrimitive) track.getUserData().get("uuid"));
+
+        this.userData.put(element.getContent(), data);
     }
 
     public void removeUserData(Track track) {
-        this.userData.remove(track.getInfo().getIdentifier());
+        final var element = Objects.requireNonNull((JsonPrimitive) track.getUserData().get("uuid"));
+
+        this.userData.remove(element.getContent());
     }
 
     private void play(Track track) {
         this.guildMusicManager.getPlayer()
             .getLink()
             .updatePlayer(
-                (builder) -> builder.setEncodedTrack(track.getEncoded())
+                (builder) -> builder.applyTrack(track)
             )
             .subscribe();
     }
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/uncategorized/BotinfoCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/uncategorized/BotinfoCommand.java
index 1cdf366a0..768ba2bfe 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/uncategorized/BotinfoCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/uncategorized/BotinfoCommand.java
@@ -18,7 +18,7 @@
 
 package ml.duncte123.skybot.commands.uncategorized;
 
-import com.sedmelluq.discord.lavaplayer.tools.PlayerLibrary;
+import dev.arbjerg.lavalink.LLClientInfo;
 import kotlin.KotlinVersion;
 import me.duncte123.botcommons.messaging.EmbedUtils;
 import me.duncte123.botcommons.messaging.MessageUtils;
@@ -68,7 +68,7 @@ public void execute(@Nonnull CommandContext ctx) {
             .addField("Lang & lib info", "**Coded in:** Java (version " + System.getProperty("java.version") +
                 ") and Kotlin (version " + KotlinVersion.CURRENT + ")\n\n" +
                 "**JDA version:** " + JDAInfo.VERSION +
-                "\n**LavaPlayer version:** " + PlayerLibrary.VERSION + "\n" +
+                "\n**Lavalink-client version:** " + LLClientInfo.VERSION + "\n" +
                 "**Weeb.java version:** " + WeebInfo.VERSION + "\n\u200B", false)
             .addField("Support", "If you want to help keep the bot up 24/7, please consider " +
                 "[becoming a patron](" + PATREON + ").", false);
diff --git a/bot/src/main/java/ml/duncte123/skybot/objects/YoutubePlaylistMetadata.java b/bot/src/main/java/ml/duncte123/skybot/objects/YoutubePlaylistMetadata.java
deleted file mode 100644
index dc8113581..000000000
--- a/bot/src/main/java/ml/duncte123/skybot/objects/YoutubePlaylistMetadata.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Skybot, a multipurpose discord bot
- *      Copyright (C) 2017  Duncan "duncte123" Sterken & Ramid "ramidzkh" Khan & Maurice R S "Sanduhr32"
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package ml.duncte123.skybot.objects;
-
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-
-import javax.annotation.Nullable;
-import java.util.List;
-
-public record YoutubePlaylistMetadata(String listId, String title, @Nullable String nextPageKey,
-                                      List<AudioTrackInfo> tracks) {
-    //
-}
diff --git a/bot/src/main/java/ml/duncte123/skybot/utils/YoutubeUtils.java b/bot/src/main/java/ml/duncte123/skybot/utils/YoutubeUtils.java
deleted file mode 100644
index 20cfbd4fe..000000000
--- a/bot/src/main/java/ml/duncte123/skybot/utils/YoutubeUtils.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Skybot, a multipurpose discord bot
- *      Copyright (C) 2017  Duncan "duncte123" Sterken & Ramid "ramidzkh" Khan & Maurice R S "Sanduhr32"
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package ml.duncte123.skybot.utils;
-
-import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
-import com.google.api.client.json.jackson2.JacksonFactory;
-import com.google.api.services.youtube.YouTube;
-import com.google.api.services.youtube.model.*;
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import ml.duncte123.skybot.objects.YoutubePlaylistMetadata;
-
-import javax.annotation.Nullable;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-public class YoutubeUtils {
-
-    private static YouTube youtube;
-
-    static {
-        try {
-            youtube = new YouTube.Builder(
-                GoogleNetHttpTransport.newTrustedTransport(), JacksonFactory.getDefaultInstance(), null)
-                .setApplicationName("SkyBot-youtube-search")
-                .build();
-        }
-        catch (GeneralSecurityException | IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private YoutubeUtils() {}
-
-    @Nullable
-    public static Video getVideoById(String videoID, String apiKey) throws IOException {
-        final List<Video> items = getVideosByIdBase(videoID, apiKey)
-            .setMaxResults(1L)
-            .execute()
-            .getItems();
-
-        return items.isEmpty() ? null : items.get(0);
-    }
-
-    public static List<Video> getVideosByIds(String videoIds, String apiKey) throws IOException {
-        return getVideosByIdBase(videoIds, apiKey)
-            .execute()
-            .getItems();
-    }
-
-    public static List<SearchResult> searchYoutubeIdOnly(String query, String apiKey, long size) throws IOException {
-        return youtube.search()
-            .list("id")
-            .setKey(apiKey)
-            .setQ(query)
-            .setType("video")
-            .setMaxResults(size)
-            .execute()
-            .getItems();
-    }
-
-    public static List<SearchResult> searchYoutube(String query, String apiKey, long size) throws IOException {
-        return youtube.search()
-            .list("snippet")
-            .setKey(apiKey)
-            .setQ(query)
-            .setType("video")
-            .setFields("items(id/kind,id/videoId,snippet/title)")
-            .setMaxResults(size)
-            .execute()
-            .getItems();
-    }
-
-    @Nullable
-    public static YoutubePlaylistMetadata getPlaylistPageById(String playlistId, String apiKey, @Nullable String nextPageKey, boolean withExtraData) throws IOException {
-        String title = "";
-
-        if (withExtraData) {
-            title = getPlayListName(playlistId, apiKey);
-        }
-
-        if (title == null) {
-            return null;
-        }
-
-        final PlaylistItemListResponse playlistItems = youtube.playlistItems()
-            .list("snippet,contentDetails")
-            .setPageToken(nextPageKey)
-            .setPlaylistId(playlistId)
-            .setMaxResults(20L)
-//            .setMaxResults(1L)
-            .setKey(apiKey)
-            .execute();
-
-        final List<PlaylistItem> items = playlistItems.getItems();
-
-        if (items.isEmpty()) {
-            return new YoutubePlaylistMetadata(playlistId, title, null, new ArrayList<>());
-        }
-
-        final List<AudioTrackInfo> changedItems = items.stream()
-            .map((playlistItem) -> playListItemToTrackInfo(playlistItem, apiKey))
-            .filter(Objects::nonNull)
-            .collect(Collectors.toList());
-
-        return new YoutubePlaylistMetadata(playlistId, title, playlistItems.getNextPageToken(), changedItems);
-    }
-
-    public static String getThumbnail(Video video) {
-        return getThumbnail(video.getId());
-    }
-
-    public static String getThumbnail(String videoID) {
-        return "https://i.ytimg.com/vi/" + videoID + "/hq720.jpg";
-    }
-
-    @Nullable
-    public static AudioTrackInfo videoToTrackInfo(@Nullable Video video) {
-        if (video == null) {
-            return null;
-        }
-
-        final VideoSnippet snippet = video.getSnippet();
-        final VideoContentDetails details = video.getContentDetails();
-
-        return new AudioTrackInfo(
-            snippet.getTitle(),
-            snippet.getChannelTitle(),
-            Duration.parse(details.getDuration()).toMillis(),
-            video.getId(),
-            false,
-            "https://www.youtube.com/watch?v=" + video.getId()
-        );
-    }
-
-    public static AudioTrackInfo playListItemToTrackInfo(PlaylistItem playlistItem, String apiKey) {
-        try {
-            final String videoId = playlistItem.getContentDetails().getVideoId();
-
-            if (videoId == null) {
-                return null;
-            }
-
-            final Video video = getVideoById(videoId, apiKey);
-
-            return videoToTrackInfo(video);
-        }
-        catch (IOException e) {
-            e.printStackTrace();
-            return null; // Should never happen tbh
-        }
-    }
-
-    public static YoutubeAudioTrack videoToTrack(Video video, YoutubeAudioSourceManager sourceManager) {
-        return new YoutubeAudioTrack(videoToTrackInfo(video), sourceManager);
-    }
-
-    private static YouTube.Videos.List getVideosByIdBase(String videoIds, String apiKey) throws IOException {
-        return youtube.videos()
-            .list("id,snippet,contentDetails")
-            .setId(videoIds)
-            .setKey(apiKey)
-            .setFields("items(id/*,snippet/title,snippet/channelTitle,contentDetails/duration)");
-    }
-
-    /**
-     * Gets the name for a playlist
-     * <p>
-     * IMPORTANT: returns null if the playlist does not exist
-     */
-    @Nullable
-    private static String getPlayListName(String playlistId, String apiKey) throws IOException {
-        final List<Playlist> playlists = youtube.playlists()
-            .list("snippet")
-            .setId(playlistId)
-            .setKey(apiKey)
-            .execute()
-            .getItems();
-
-        if (playlists.isEmpty()) {
-            return null;
-        }
-
-        final Playlist playlist = playlists.get(0);
-
-        return playlist.getSnippet().getTitle();
-    }
-
-    /*private static YoutubeTrack searchCache(String title, String author, CacheClient cacheClient) {
-        final SearchParams params = new SearchParams()
-            .setSearch(title + " " + author)
-            .setTitle(title.split("\\s+"))
-            .setAuthor(author.split("\\s+"));
-
-        final List<YoutubeTrack> found = cacheClient.search(params);
-
-        if (found.isEmpty()) {
-            return null;
-        }
-
-        return found.get(0);
-    }
-
-    private static Video cacheToYoutubeVideo(YoutubeTrack track) {
-        return new Video()
-            .setId(track.getId())
-            .setKind("youtube#video")
-            .setSnippet(
-                new VideoSnippet()
-                    .setTitle(track.getTitle())
-                    .setChannelTitle(track.getAuthor())
-            )
-            .setContentDetails(
-                new VideoContentDetails()
-                    .setDuration(
-                        Duration.ofMillis(track.getLength()).toString()
-                    )
-            );
-    }*/
-}
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/audio/TrackUtils.kt b/bot/src/main/kotlin/ml/duncte123/skybot/audio/TrackUtils.kt
index 363da14c2..0e5c1526c 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/audio/TrackUtils.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/audio/TrackUtils.kt
@@ -19,7 +19,13 @@
 package ml.duncte123.skybot.audio
 
 import dev.arbjerg.lavalink.protocol.v4.Track
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+import java.util.UUID
 
 fun Track.makeClone() = this.copy(
+    userData = JsonObject(mapOf(
+        "uuid" to JsonPrimitive(UUID.randomUUID().toString())
+    )),
     info = this.info.copy(position = 0L)
 )
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ReaddCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ReaddCommand.kt
index 586e73d18..38f1b75fb 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ReaddCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ReaddCommand.kt
@@ -18,6 +18,7 @@
 
 package ml.duncte123.skybot.commands.music
 
+import kotlinx.serialization.json.JsonObject
 import me.duncte123.botcommons.messaging.EmbedUtils
 import me.duncte123.botcommons.messaging.MessageUtils.*
 import ml.duncte123.skybot.Variables
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SkipCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SkipCommand.kt
index 30a18f3bb..acb2bc220 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SkipCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SkipCommand.kt
@@ -80,9 +80,9 @@ class SkipCommand : MusicCommand() {
         }
 
         // https://github.com/jagrosh/MusicBot/blob/master/src/main/java/com/jagrosh/jmusicbot/commands/music/SkipCmd.java
-        val listeners = vc.members.filter {
+        val listeners = vc.members.count {
             !it.user.isBot && !(it.voiceState?.isDeafened ?: false)
-        }.count()
+        }
 
         val votes = trackData.votes
 
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt b/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt
index 272a2d9b9..fc682f59c 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt
@@ -18,15 +18,11 @@
 
 package ml.duncte123.skybot.extensions
 
-import com.dunctebot.sourcemanagers.AudioTrackInfoWithImage
 import dev.arbjerg.lavalink.protocol.v4.Track
-import io.sentry.Sentry
 import me.duncte123.botcommons.messaging.EmbedUtils.embedMessage
-import me.duncte123.botcommons.web.WebUtils
 import ml.duncte123.skybot.audio.GuildMusicManager
 import ml.duncte123.skybot.objects.TrackUserData
 import ml.duncte123.skybot.utils.MusicEmbedUtils.createPlayerString
-import ml.duncte123.skybot.utils.YoutubeUtils
 import net.dv8tion.jda.api.EmbedBuilder
 import net.dv8tion.jda.api.sharding.ShardManager
 
@@ -38,6 +34,7 @@ fun Track.toEmbed(
 ) {
     val userData: TrackUserData? = mng.scheduler.getUserData(this)
     var requester = "Unknown"
+    var voteSkipText = ""
 
     if (userData != null) {
         val userId = userData.requester
@@ -46,6 +43,10 @@ fun Track.toEmbed(
         if (user != null) {
             requester = user.asTag
         }
+
+        if (!userData.votes.isEmpty) {
+            voteSkipText = "\n\n${userData.votes.size()} people voted to skip"
+        }
     }
 
     val uri = this.info.uri
@@ -54,7 +55,7 @@ fun Track.toEmbed(
         callback(
             embedMessage(
                 """**Currently playing** [${this.info.title}]($uri) by ${this.info.author}
-                |**Requester:** $requester
+                |**Requester:** $requester$voteSkipText
                 """.trimMargin()
             )
                 .setThumbnail(this.info.artworkUrl)
@@ -66,7 +67,7 @@ fun Track.toEmbed(
         callback(
             embedMessage(
                 """**Currently playing** [${this.info.title}]($uri) by ${this.info.author}
-                |**Requester:** $requester${if (withPlayer) "\n" + playerState else ""}
+                |**Requester:** $requester${if (withPlayer) "\n" + playerState else ""}$voteSkipText
                 """.trimMargin()
             )
                 .setThumbnail(this.info.artworkUrl)
diff --git a/build.gradle.kts b/build.gradle.kts
index 82c065c76..893129f7b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -37,7 +37,8 @@ allprojects {
 
         maven("https://m2.dv8tion.net/releases")
         maven("https://m2.duncte123.dev/releases")
-        maven("https://maven.arbjerg.dev/releases")
+        maven("https://maven.lavalink.dev/releases")
+        maven("https://maven.lavalink.dev/snapshots")
         maven("https://repo.jenkins-ci.org/releases")
         maven("https://m2.duncte123.dev/snapshots")
         maven("https://jitpack.io")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4313ff3a1..8342448fd 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -91,7 +91,8 @@ fun VersionCatalogBuilder.database() {
 }
 
 fun VersionCatalogBuilder.voice() {
-    library("lavalink-client", "dev.arbjerg", "lavalink-client").version("0.0.1")
+//    library("lavalink-client", "dev.arbjerg", "lavalink-client").version("0.0.1")
+    library("lavalink-client", "dev.arbjerg", "lavalink-client").version("0f716127212f8f5d52b215db85f64e3a94c41c75-SNAPSHOT")
 }
 
 fun VersionCatalogBuilder.dashboard() {

From 4184cb733e14b22883b6cc53d77b291930c7ec97 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 26 Nov 2023 15:06:53 +0100
Subject: [PATCH 08/17] Stuff mostly works now

---
 bot/build.gradle.kts                                |  2 +-
 .../java/fredboat/audio/player/LavalinkManager.java |  2 --
 .../java/ml/duncte123/skybot/audio/AudioLoader.java | 13 +++++++------
 .../duncte123/skybot/audio/GuildMusicManager.java   |  4 ++++
 .../ml/duncte123/skybot/audio/TrackScheduler.java   |  8 ++++----
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/bot/build.gradle.kts b/bot/build.gradle.kts
index 0c31c9084..c54dd0bff 100644
--- a/bot/build.gradle.kts
+++ b/bot/build.gradle.kts
@@ -29,7 +29,7 @@ plugins {
 
     kotlin("jvm")
     id("org.liquibase.gradle")
-    // id("org.jmailen.kotlinter")
+//    id("org.jmailen.kotlinter")
     id("com.github.johnrengelman.shadow")
     id("com.github.breadmoirai.github-release")
 }
diff --git a/bot/src/main/java/fredboat/audio/player/LavalinkManager.java b/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
index d10d77695..d2f0d37e7 100644
--- a/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
+++ b/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
@@ -19,9 +19,7 @@
 package fredboat.audio.player;
 
 import dev.arbjerg.lavalink.client.*;
-import dev.arbjerg.lavalink.protocol.v4.Message;
 import dev.arbjerg.lavalink.protocol.v4.Track;
-import ml.duncte123.skybot.SkyBot;
 import ml.duncte123.skybot.objects.config.DunctebotConfig;
 import ml.duncte123.skybot.utils.AirUtils;
 import ml.duncte123.skybot.utils.AudioUtils;
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java b/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java
index 55e5f109c..bf01805a6 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java
@@ -122,9 +122,10 @@ private void trackLoaded(LoadResult.TrackLoaded data) {
     }
 
     private void playlistLoaded(LoadResult.PlaylistLoaded playlistLoaded) {
-        Playlist playlist = playlistLoaded.getData();
+        final Playlist playlist = playlistLoaded.getData();
+        final List<Track> tracks = playlist.getTracks();
 
-        if (playlist.getTracks().isEmpty()) {
+        if (tracks.isEmpty()) {
             sendMsg(
                 new MessageConfig.Builder()
                     .setChannel(this.data.getChannel())
@@ -141,14 +142,14 @@ private void playlistLoaded(LoadResult.PlaylistLoaded playlistLoaded) {
         try {
             final TrackScheduler trackScheduler = this.mng.getScheduler();
 
-            List<Track> tracksRaw = playlist.getTracks();
+            List<Track> tracksRaw = tracks;
             final int selectedTrackIndex = playlistInfo.getSelectedTrack();
 
             if (selectedTrackIndex > -1) {
                 tracksRaw = tracksRaw.subList(selectedTrackIndex, tracksRaw.size());
             }
 
-            final List<Track> tracks = tracksRaw.stream().map((track) -> {
+            final List<Track> limitedTracks = tracksRaw.stream().map((track) -> {
                 track = track.copyWithUserData(new JsonObject(Map.of(
                     "uuid", JsonElementKt.JsonPrimitive(UUID.randomUUID().toString())
                 )));
@@ -158,7 +159,7 @@ private void playlistLoaded(LoadResult.PlaylistLoaded playlistLoaded) {
                 return track;
             }).toList();
 
-            for (final Track track : tracks) {
+            for (final Track track : limitedTracks) {
                 trackScheduler.addToQueue(track, this.isPatron);
             }
 
@@ -207,7 +208,7 @@ private String getPlaylistMsg(List<Track> tracks, PlaylistInfo playlistInfo) {
     }
 
     private void searchLoaded(LoadResult.SearchResult searchResult) {
-        // TODO: common method for handling playlists
+        System.out.println("WARNING A SEARCH RESULT WAS TRIGGERED " + searchResult);
     }
 
     private void noMatches() {
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/GuildMusicManager.java b/bot/src/main/java/ml/duncte123/skybot/audio/GuildMusicManager.java
index d818f375a..f77768937 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/GuildMusicManager.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/GuildMusicManager.java
@@ -78,4 +78,8 @@ public MessageChannel getLatestChannel() {
     public LocalPlayer getPlayer() {
         return this.player;
     }
+
+    public long getGuildId() {
+        return guildId;
+    }
 }
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
index c59afc6fd..447308bdd 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
@@ -22,20 +22,19 @@
 import dev.arbjerg.lavalink.protocol.v4.Message.EmittedEvent.TrackEndEvent.AudioTrackEndReason;
 import dev.arbjerg.lavalink.protocol.v4.Track;
 import dev.arbjerg.lavalink.protocol.v4.TrackInfo;
-import kotlinx.serialization.json.JsonObject;
 import kotlinx.serialization.json.JsonPrimitive;
 import me.duncte123.botcommons.messaging.MessageConfig;
 import ml.duncte123.skybot.exceptions.LimitReachedException;
 import ml.duncte123.skybot.extensions.AudioTrackKt;
 import ml.duncte123.skybot.objects.TrackUserData;
 import ml.duncte123.skybot.utils.Debouncer;
-import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.exceptions.ErrorHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
 import static me.duncte123.botcommons.messaging.MessageUtils.sendMsg;
@@ -49,7 +48,7 @@ public class TrackScheduler {
     // TODO: keep track of user-data per track (need something unique)
     public static final int MAX_QUEUE_SIZE = 100;
     private final Queue<Track> queue = new LinkedList<>();
-    private final Map<String, TrackUserData> userData = new HashMap<>();
+    private final Map<String, TrackUserData> userData = new ConcurrentHashMap<>();
 
     private static final long DEBOUNCE_INTERVAL = TimeUnit.SECONDS.toMillis(5);
     private static final Logger LOGGER = LoggerFactory.getLogger(TrackScheduler.class);
@@ -233,12 +232,13 @@ private TrackUserData createNewTrackData(Track track, boolean wasFromSkip) {
 
     public void onTrackException(Track track, Exception exception) {
         final String finalCause = Objects.requireNonNullElse(exception.getMessage(), exception.getCause());
-        final TrackInfo info = track.getInfo();
 
         if (finalCause.contains("Something went wrong when decoding the track.")) {
             return;
         }
 
+        final TrackInfo info = track.getInfo();
+
         if (finalCause.contains("age-restricted")) {
             this.messageDebouncer.accept("Cannot play `" + info.getTitle() + "` because it is age-restricted");
             return;

From a49685bcd74132a50d9210814eeef7f60fa0f4a5 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 26 Nov 2023 15:15:17 +0100
Subject: [PATCH 09/17] Fix auto-search

---
 .../java/ml/duncte123/skybot/utils/AudioUtils.java    | 11 ++++++-----
 .../ml/duncte123/skybot/commands/music/PlayCommand.kt |  4 ++--
 .../duncte123/skybot/commands/music/SearchCommand.kt  |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/bot/src/main/java/ml/duncte123/skybot/utils/AudioUtils.java b/bot/src/main/java/ml/duncte123/skybot/utils/AudioUtils.java
index 4670fa2a5..0a7faabca 100644
--- a/bot/src/main/java/ml/duncte123/skybot/utils/AudioUtils.java
+++ b/bot/src/main/java/ml/duncte123/skybot/utils/AudioUtils.java
@@ -19,7 +19,7 @@
 package ml.duncte123.skybot.utils;
 
 import dev.arbjerg.lavalink.protocol.v4.LoadResult;
-import dev.arbjerg.lavalink.protocol.v4.Playlist;
+import dev.arbjerg.lavalink.protocol.v4.Track;
 import fredboat.audio.player.LavalinkManager;
 import gnu.trove.map.TLongObjectMap;
 import ml.duncte123.skybot.Variables;
@@ -29,6 +29,7 @@
 import net.dv8tion.jda.api.entities.Guild;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
 
@@ -41,15 +42,15 @@ public AudioUtils(Variables variables) {
         this.variables = variables;
     }
 
-    @Nullable("If the playlist is not a basic audio playlist")
-    public Playlist searchYoutube(long guildId, String query) {
+    @Nullable("If the playlist is not a search result")
+    public List<Track> searchYoutube(long guildId, String query) {
         final LoadResult result = LavalinkManager.INS.getLavalink()
             .getLink(guildId)
             .loadItem("ytsearch:" + query)
             .block();
 
-        if (result instanceof LoadResult.PlaylistLoaded playlist) {
-            return playlist.getData();
+        if (result instanceof LoadResult.SearchResult playlist) {
+            return playlist.getData().getTracks();
         }
 
         return null;
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PlayCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PlayCommand.kt
index cfe84bc23..16575e6ef 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PlayCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PlayCommand.kt
@@ -121,11 +121,11 @@ open class PlayCommand(private val skipParsing: Boolean = false) : MusicCommand(
     private fun searchYt(guildId: Long, search: String, variables: Variables): String? {
         val playlist = variables.audioUtils.searchYoutube(guildId, search)
 
-        if (playlist == null || playlist.tracks.isEmpty()) {
+        if (playlist.isNullOrEmpty()) {
             return null
         }
 
-        return playlist.tracks[0].info.identifier
+        return playlist[0].info.identifier
     }
 
     private fun handlePlay(toPlay: String, ctx: CommandContext) {
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SearchCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SearchCommand.kt
index 85c501bf6..9f174404a 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SearchCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SearchCommand.kt
@@ -62,12 +62,12 @@ class SearchCommand : MusicCommand() {
         val toPlay = ctx.argsRaw
         val res = ctx.audioUtils.searchYoutube(ctx.guildId, toPlay)
 
-        if (res == null || res.tracks.isEmpty()) {
+        if (res.isNullOrEmpty()) {
             sendMsg(ctx, "$SEARCH_EMOTE No results found.")
             return
         }
 
-        val tracks = res.tracks.take(searchLimit)
+        val tracks = res.take(searchLimit)
 
         val string = buildString {
             tracks.map { it.info.title }.forEachIndexed { index: Int, s: String ->

From 5a6ff7a39e3f2fd2d0b94076ee0422d15c9f53e6 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 26 Nov 2023 15:18:26 +0100
Subject: [PATCH 10/17] Log error for search result

---
 .../duncte123/skybot/audio/AudioLoader.java   | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java b/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java
index bf01805a6..b5f645153 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java
@@ -31,6 +31,8 @@
 import ml.duncte123.skybot.objects.RadioStream;
 import ml.duncte123.skybot.objects.TrackUserData;
 import net.dv8tion.jda.api.entities.MessageEmbed;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.*;
 import java.util.function.Consumer;
@@ -39,6 +41,7 @@
 import static me.duncte123.botcommons.messaging.MessageUtils.sendMsg;
 
 public class AudioLoader implements Consumer<LoadResult> {
+    private static final Logger logger = LoggerFactory.getLogger(AudioLoader.class);
 
     private final AudioData data;
     private final long requester;
@@ -63,7 +66,15 @@ public void accept(LoadResult loadResult) {
         } else if (loadResult instanceof LoadResult.PlaylistLoaded playlistLoaded) {
             this.playlistLoaded(playlistLoaded);
         } else if (loadResult instanceof LoadResult.SearchResult searchResult) {
-            this.searchLoaded(searchResult);
+            logger.error("Search result not handled: {}", searchResult);
+            sendMsg(
+                new MessageConfig.Builder()
+                    .setChannel(this.data.getChannel())
+                    .replyTo(this.data.getReplyToMessage())
+                    .setEmbeds(embedMessage("Error: Unhandled search result, please report this bug to the devs!"))
+                    .build()
+            );
+//            this.searchLoaded(searchResult);
         } else if (loadResult instanceof LoadResult.NoMatches) {
             this.noMatches();
         } else if (loadResult instanceof LoadResult.LoadFailed loadFailed) {
@@ -207,9 +218,9 @@ private String getPlaylistMsg(List<Track> tracks, PlaylistInfo playlistInfo) {
         );
     }
 
-    private void searchLoaded(LoadResult.SearchResult searchResult) {
-        System.out.println("WARNING A SEARCH RESULT WAS TRIGGERED " + searchResult);
-    }
+//    private void searchLoaded(LoadResult.SearchResult searchResult) {
+//        System.out.println("WARNING A SEARCH RESULT WAS TRIGGERED " + searchResult);
+//    }
 
     private void noMatches() {
         if (this.announce) {

From 4e6114b973177baebcdbcfd471fb1b5e9240df61 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 26 Nov 2023 15:25:54 +0100
Subject: [PATCH 11/17] Fuck the linter man

---
 bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java b/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java
index b5f645153..3f5a73c84 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/AudioLoader.java
@@ -41,7 +41,7 @@
 import static me.duncte123.botcommons.messaging.MessageUtils.sendMsg;
 
 public class AudioLoader implements Consumer<LoadResult> {
-    private static final Logger logger = LoggerFactory.getLogger(AudioLoader.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AudioLoader.class);
 
     private final AudioData data;
     private final long requester;
@@ -66,7 +66,7 @@ public void accept(LoadResult loadResult) {
         } else if (loadResult instanceof LoadResult.PlaylistLoaded playlistLoaded) {
             this.playlistLoaded(playlistLoaded);
         } else if (loadResult instanceof LoadResult.SearchResult searchResult) {
-            logger.error("Search result not handled: {}", searchResult);
+            LOGGER.error("Search result not handled: {}", searchResult);
             sendMsg(
                 new MessageConfig.Builder()
                     .setChannel(this.data.getChannel())

From faa92445d289530311e0e9a0239727f54cf3a13d Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Mon, 27 Nov 2023 19:37:32 +0100
Subject: [PATCH 12/17] Linter fixes

---
 .editorconfig                                 | 11 ++--
 bot/.editorconfig                             |  9 ---
 bot/build.gradle.kts                          | 12 ++--
 .../ml/duncte123/skybot/CommandManager.java   |  2 +-
 .../{fun => funCmds}/CSShumorCommand.java     |  2 +-
 .../{fun => funCmds}/ColorCommand.java        |  2 +-
 .../{fun => funCmds}/ExplosmCommand.java      |  2 +-
 .../{fun => funCmds}/LoadingBarCommand.java   |  2 +-
 .../{fun => funCmds}/LoveCommand.java         |  2 +-
 .../{fun => funCmds}/OrlyCommand.java         |  2 +-
 .../commands/{fun => funCmds}/TagCommand.java |  2 +-
 .../{fun => funCmds}/UrbanCommand.java        |  2 +-
 .../{fun => funCmds}/YodaSpeakCommand.java    |  2 +-
 .../ml/duncte123/skybot/audio/TrackUtils.kt   |  8 ++-
 .../skybot/commands/admin/BlackListCommand.kt |  5 +-
 .../commands/admin/VcAutoRoleCommand.kt       |  1 -
 .../skybot/commands/animals/BirbCommand.kt    |  1 -
 .../commands/essentials/RemindersCommand.kt   |  1 -
 .../essentials/RestartShardCommand.kt         |  1 -
 .../commands/essentials/StatsCommand.kt       |  1 -
 .../{fun => funCmds}/AdviceCommand.kt         |  7 ++-
 .../commands/{fun => funCmds}/ChatCommand.kt  | 12 ++--
 .../commands/{fun => funCmds}/CoinCommand.kt  |  3 +-
 .../commands/{fun => funCmds}/DeletCommand.kt |  2 +-
 .../{fun => funCmds}/DiscordMemesCommand.kt   |  3 +-
 .../{fun => funCmds}/EveryoneCommand.kt       |  3 +-
 .../{fun => funCmds}/FakeWordCommand.kt       |  3 +-
 .../commands/{fun => funCmds}/JokeCommand.kt  |  3 +-
 .../commands/{fun => funCmds}/MemeCommand.kt  |  2 +-
 .../{fun => funCmds}/OldestCommand.kt         |  2 +-
 .../commands/{fun => funCmds}/TrashCommand.kt |  3 +-
 .../commands/{fun => funCmds}/XkcdCommand.kt  |  2 +-
 .../{fun => funCmds}/YoungestCommand.kt       |  2 +-
 .../skybot/commands/mod/DeHoistUtils.kt       |  4 +-
 .../skybot/commands/mod/SlowModeCommand.kt    |  8 ++-
 .../skybot/commands/mod/VoiceKickCommand.kt   |  1 -
 .../skybot/commands/mod/WarnCommand.kt        | 15 ++++-
 .../skybot/commands/mod/WarningsCommand.kt    |  1 -
 .../skybot/commands/music/BassBoostCommand.kt |  9 +--
 .../skybot/commands/music/ForceSkip.kt        |  1 -
 .../skybot/commands/music/JoinCommand.kt      |  1 -
 .../skybot/commands/music/LeaveCommand.kt     |  1 -
 .../commands/music/NowPlayingCommand.kt       |  1 -
 .../skybot/commands/music/PPlayCommand.kt     |  1 -
 .../skybot/commands/music/PauseCommand.kt     |  1 -
 .../skybot/commands/music/QueueCommand.kt     |  1 -
 .../skybot/commands/music/ReaddCommand.kt     |  3 -
 .../skybot/commands/music/RepeatCommand.kt    |  1 -
 .../commands/music/RepeatQueueCommand.kt      |  1 -
 .../skybot/commands/music/RestartCommand.kt   |  1 -
 .../skybot/commands/music/SaveCommand.kt      |  1 -
 .../skybot/commands/music/SearchCommand.kt    |  4 +-
 .../skybot/commands/music/ShuffleCommand.kt   |  1 -
 .../skybot/commands/music/SkipCommand.kt      |  2 -
 .../skybot/commands/music/StopCommand.kt      | 13 +++-
 .../skybot/commands/music/VolumeCommand.kt    |  1 -
 .../commands/nsfw/CarsAndHentaiCommand.kt     |  1 -
 .../skybot/commands/nsfw/HentaiCommand.kt     |  1 -
 .../commands/nsfw/LewdKitsuneCommand.kt       |  1 -
 .../skybot/commands/nsfw/LewdNekoCommand.kt   |  1 -
 .../commands/patreon/ScreenshotCommand.kt     |  1 -
 .../commands/uncategorized/CookieCommand.kt   |  1 -
 .../commands/uncategorized/DonateCommand.kt   |  1 -
 .../commands/uncategorized/InviteCommand.kt   |  1 -
 .../commands/uncategorized/IssueCommand.kt    | 10 ++-
 .../commands/uncategorized/KickMeCommand.kt   |  1 -
 .../uncategorized/PatreonCheckCommand.kt      |  1 -
 .../commands/uncategorized/QuoteCommand.kt    |  1 -
 .../commands/uncategorized/ReverseCommand.kt  |  1 -
 .../commands/uncategorized/RolesCommand.kt    |  1 -
 .../commands/uncategorized/ShortenCommand.kt  |  1 -
 .../commands/uncategorized/SuggestCommand.kt  |  1 -
 .../uncategorized/UnshortenCommand.kt         |  1 -
 .../commands/uncategorized/UptimeCommand.kt   |  1 -
 .../commands/uncategorized/UserinfoCommand.kt |  3 +-
 .../skybot/commands/utils/EmoteCommand.kt     |  5 +-
 .../skybot/commands/utils/RoleInfoCommand.kt  |  1 -
 .../skybot/commands/weeb/B1nzyCommand.kt      |  1 -
 .../skybot/commands/weeb/DanceCommand.kt      |  1 -
 .../skybot/commands/weeb/HugCommand.kt        |  1 -
 .../skybot/commands/weeb/LewdCommand.kt       |  1 -
 .../skybot/commands/weeb/LickCommand.kt       |  1 -
 .../skybot/commands/weeb/MeguminCommand.kt    |  1 -
 .../skybot/commands/weeb/OwoCommand.kt        |  1 -
 .../skybot/commands/weeb/PatCommand.kt        |  1 -
 .../skybot/commands/weeb/PunchCommand.kt      |  1 -
 .../skybot/commands/weeb/ShootCommand.kt      |  1 -
 .../skybot/commands/weeb/ShrugCommand.kt      |  1 -
 .../skybot/entities/jda/FakeMember.kt         |  1 +
 .../duncte123/skybot/extensions/AudioTrack.kt |  2 +-
 .../ml/duncte123/skybot/extensions/Time4J.kt  |  1 +
 .../ml/duncte123/skybot/objects/AudioData.kt  |  2 +-
 .../duncte123/skybot/objects/EvalFunctions.kt |  7 ---
 .../ml/duncte123/skybot/utils/FinderUtils.kt  |  6 +-
 .../ml/duncte123/skybot/utils/SpamCache.kt    |  1 -
 .../ml/duncte123/skybot/utils/SpamFilter.kt   |  6 +-
 .../duncte123/skybot/web/WebSocketClient.kt   |  4 +-
 .../skybot/web/handlers/RequestHandler.kt     |  6 +-
 shared/build.gradle.kts                       | 63 -------------------
 99 files changed, 121 insertions(+), 215 deletions(-)
 delete mode 100644 bot/.editorconfig
 rename bot/src/main/java/ml/duncte123/skybot/commands/{fun => funCmds}/CSShumorCommand.java (98%)
 rename bot/src/main/java/ml/duncte123/skybot/commands/{fun => funCmds}/ColorCommand.java (98%)
 rename bot/src/main/java/ml/duncte123/skybot/commands/{fun => funCmds}/ExplosmCommand.java (98%)
 rename bot/src/main/java/ml/duncte123/skybot/commands/{fun => funCmds}/LoadingBarCommand.java (98%)
 rename bot/src/main/java/ml/duncte123/skybot/commands/{fun => funCmds}/LoveCommand.java (99%)
 rename bot/src/main/java/ml/duncte123/skybot/commands/{fun => funCmds}/OrlyCommand.java (97%)
 rename bot/src/main/java/ml/duncte123/skybot/commands/{fun => funCmds}/TagCommand.java (99%)
 rename bot/src/main/java/ml/duncte123/skybot/commands/{fun => funCmds}/UrbanCommand.java (98%)
 rename bot/src/main/java/ml/duncte123/skybot/commands/{fun => funCmds}/YodaSpeakCommand.java (98%)
 rename bot/src/main/kotlin/ml/duncte123/skybot/commands/{fun => funCmds}/AdviceCommand.kt (93%)
 rename bot/src/main/kotlin/ml/duncte123/skybot/commands/{fun => funCmds}/ChatCommand.kt (94%)
 rename bot/src/main/kotlin/ml/duncte123/skybot/commands/{fun => funCmds}/CoinCommand.kt (97%)
 rename bot/src/main/kotlin/ml/duncte123/skybot/commands/{fun => funCmds}/DeletCommand.kt (97%)
 rename bot/src/main/kotlin/ml/duncte123/skybot/commands/{fun => funCmds}/DiscordMemesCommand.kt (97%)
 rename bot/src/main/kotlin/ml/duncte123/skybot/commands/{fun => funCmds}/EveryoneCommand.kt (97%)
 rename bot/src/main/kotlin/ml/duncte123/skybot/commands/{fun => funCmds}/FakeWordCommand.kt (98%)
 rename bot/src/main/kotlin/ml/duncte123/skybot/commands/{fun => funCmds}/JokeCommand.kt (98%)
 rename bot/src/main/kotlin/ml/duncte123/skybot/commands/{fun => funCmds}/MemeCommand.kt (97%)
 rename bot/src/main/kotlin/ml/duncte123/skybot/commands/{fun => funCmds}/OldestCommand.kt (97%)
 rename bot/src/main/kotlin/ml/duncte123/skybot/commands/{fun => funCmds}/TrashCommand.kt (98%)
 rename bot/src/main/kotlin/ml/duncte123/skybot/commands/{fun => funCmds}/XkcdCommand.kt (98%)
 rename bot/src/main/kotlin/ml/duncte123/skybot/commands/{fun => funCmds}/YoungestCommand.kt (97%)

diff --git a/.editorconfig b/.editorconfig
index 486237753..e7357323e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -15,7 +15,10 @@ ktlint_code_style = ktlint_official
 ktlint_standard = enabled
 ktlint_experimental = disabled
 ktlint_custom-rule-set = disabled
-klint_standard_no-wildcard-imports = disabled
-klint_standard_function-signature = disabled
-klint_standard_trailing-comma-on-call-site = disabled
-klint_standard_multiline-expression-wrapping = disabled
+ktlint_standard_filename = disabled
+ktlint_standard_function-signature = disabled
+ktlint_standard_no-wildcard-imports = disabled
+ktlint_standard_argument-list-wrapping = disabled
+ktlint_standard_string-template-indent = disabled
+ktlint_standard_trailing-comma-on-call-site = disabled
+ktlint_standard_multiline-expression-wrapping = disabled
diff --git a/bot/.editorconfig b/bot/.editorconfig
deleted file mode 100644
index a7f517798..000000000
--- a/bot/.editorconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-[*.{kt,kts}]
-# ktlint_code_style = ktlint_official
-ktlint_standard = enabled # Disable all rules from the `standard` rule set provided by KtLint
-ktlint_experimental = disabled # Enable all `experimental` rules from all rule sets provided by KtLint or other rule providers
-ktlint_custom-rule-set = disabled # Enable all rules in the `custom-rule-set` rule set (not provided by KtLint)
-klint_standard_no-wildcard-imports = disabled
-klint_standard_function-signature = disabled
-klint_standard_trailing-comma-on-call-site = disabled
-klint_standard_multiline-expression-wrapping = disabled
diff --git a/bot/build.gradle.kts b/bot/build.gradle.kts
index c54dd0bff..4221ca485 100644
--- a/bot/build.gradle.kts
+++ b/bot/build.gradle.kts
@@ -29,7 +29,7 @@ plugins {
 
     kotlin("jvm")
     id("org.liquibase.gradle")
-//    id("org.jmailen.kotlinter")
+    id("org.jmailen.kotlinter")
     id("com.github.johnrengelman.shadow")
     id("com.github.breadmoirai.github-release")
 }
@@ -176,10 +176,10 @@ shadowJar.apply {
     archiveClassifier.set("prod")
 }
 
-//kotlinter {
-//    ignoreFailures = false
-//    reporters = arrayOf("checkstyle", "plain")
-//}
+kotlinter {
+    ignoreFailures = false
+    reporters = arrayOf("checkstyle", "plain")
+}
 
 pmd {
     isConsoleOutput = true
@@ -190,7 +190,7 @@ pmd {
 }
 
 task<Task>("lintAll") {
-//    dependsOn(tasks.lintKotlin)
+    dependsOn(tasks.lintKotlin)
     dependsOn(tasks.pmdMain)
 }
 
diff --git a/bot/src/main/java/ml/duncte123/skybot/CommandManager.java b/bot/src/main/java/ml/duncte123/skybot/CommandManager.java
index 9d3ec6144..20455aa3c 100644
--- a/bot/src/main/java/ml/duncte123/skybot/CommandManager.java
+++ b/bot/src/main/java/ml/duncte123/skybot/CommandManager.java
@@ -27,7 +27,7 @@
 import ml.duncte123.skybot.commands.animals.*;
 import ml.duncte123.skybot.commands.essentials.*;
 import ml.duncte123.skybot.commands.essentials.eval.EvalCommand;
-import ml.duncte123.skybot.commands.fun.*;
+import ml.duncte123.skybot.commands.funCmds.*;
 import ml.duncte123.skybot.commands.guild.GuildInfoCommand;
 import ml.duncte123.skybot.commands.guild.GuildJoinsCommand;
 import ml.duncte123.skybot.commands.guild.mod.*;
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/fun/CSShumorCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/CSShumorCommand.java
similarity index 98%
rename from bot/src/main/java/ml/duncte123/skybot/commands/fun/CSShumorCommand.java
rename to bot/src/main/java/ml/duncte123/skybot/commands/funCmds/CSShumorCommand.java
index c29fd3f37..e63e7efcd 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/fun/CSShumorCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/CSShumorCommand.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.fun;
+package ml.duncte123.skybot.commands.funCmds;
 
 import gnu.trove.map.TLongIntMap;
 import ml.duncte123.skybot.objects.command.Command;
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/fun/ColorCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/ColorCommand.java
similarity index 98%
rename from bot/src/main/java/ml/duncte123/skybot/commands/fun/ColorCommand.java
rename to bot/src/main/java/ml/duncte123/skybot/commands/funCmds/ColorCommand.java
index 25ed41f05..9ef3e95a1 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/fun/ColorCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/ColorCommand.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.fun;
+package ml.duncte123.skybot.commands.funCmds;
 
 import me.duncte123.botcommons.messaging.EmbedUtils;
 import ml.duncte123.skybot.objects.command.Command;
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/fun/ExplosmCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/ExplosmCommand.java
similarity index 98%
rename from bot/src/main/java/ml/duncte123/skybot/commands/fun/ExplosmCommand.java
rename to bot/src/main/java/ml/duncte123/skybot/commands/funCmds/ExplosmCommand.java
index b3558db62..19cb01f1b 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/fun/ExplosmCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/ExplosmCommand.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.fun;
+package ml.duncte123.skybot.commands.funCmds;
 
 import kotlin.Pair;
 import me.duncte123.botcommons.messaging.EmbedUtils;
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/fun/LoadingBarCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/LoadingBarCommand.java
similarity index 98%
rename from bot/src/main/java/ml/duncte123/skybot/commands/fun/LoadingBarCommand.java
rename to bot/src/main/java/ml/duncte123/skybot/commands/funCmds/LoadingBarCommand.java
index e1e47b0d8..7919d3519 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/fun/LoadingBarCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/LoadingBarCommand.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.fun;
+package ml.duncte123.skybot.commands.funCmds;
 
 import me.duncte123.loadingbar.LoadingBar;
 import ml.duncte123.skybot.objects.command.Command;
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/fun/LoveCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/LoveCommand.java
similarity index 99%
rename from bot/src/main/java/ml/duncte123/skybot/commands/fun/LoveCommand.java
rename to bot/src/main/java/ml/duncte123/skybot/commands/funCmds/LoveCommand.java
index a8c572cd9..31a9c6cd4 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/fun/LoveCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/LoveCommand.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.fun;
+package ml.duncte123.skybot.commands.funCmds;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import me.duncte123.botcommons.messaging.EmbedUtils;
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/fun/OrlyCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/OrlyCommand.java
similarity index 97%
rename from bot/src/main/java/ml/duncte123/skybot/commands/fun/OrlyCommand.java
rename to bot/src/main/java/ml/duncte123/skybot/commands/funCmds/OrlyCommand.java
index d5deaeb39..34b689a0d 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/fun/OrlyCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/OrlyCommand.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.fun;
+package ml.duncte123.skybot.commands.funCmds;
 
 import me.duncte123.botcommons.messaging.EmbedUtils;
 import ml.duncte123.skybot.objects.command.Command;
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/fun/TagCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/TagCommand.java
similarity index 99%
rename from bot/src/main/java/ml/duncte123/skybot/commands/fun/TagCommand.java
rename to bot/src/main/java/ml/duncte123/skybot/commands/funCmds/TagCommand.java
index dfeb496e1..a861e5c3a 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/fun/TagCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/TagCommand.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.fun;
+package ml.duncte123.skybot.commands.funCmds;
 
 import gnu.trove.map.TLongObjectMap;
 import ml.duncte123.skybot.Settings;
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/fun/UrbanCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/UrbanCommand.java
similarity index 98%
rename from bot/src/main/java/ml/duncte123/skybot/commands/fun/UrbanCommand.java
rename to bot/src/main/java/ml/duncte123/skybot/commands/funCmds/UrbanCommand.java
index f33feeb22..e4578507d 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/fun/UrbanCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/UrbanCommand.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.fun;
+package ml.duncte123.skybot.commands.funCmds;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import me.duncte123.botcommons.messaging.EmbedUtils;
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/fun/YodaSpeakCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/YodaSpeakCommand.java
similarity index 98%
rename from bot/src/main/java/ml/duncte123/skybot/commands/fun/YodaSpeakCommand.java
rename to bot/src/main/java/ml/duncte123/skybot/commands/funCmds/YodaSpeakCommand.java
index 3e497af9b..d09341ad2 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/fun/YodaSpeakCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/YodaSpeakCommand.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.fun;
+package ml.duncte123.skybot.commands.funCmds;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import io.sentry.Sentry;
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/audio/TrackUtils.kt b/bot/src/main/kotlin/ml/duncte123/skybot/audio/TrackUtils.kt
index 0e5c1526c..5a5755038 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/audio/TrackUtils.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/audio/TrackUtils.kt
@@ -24,8 +24,10 @@ import kotlinx.serialization.json.JsonPrimitive
 import java.util.UUID
 
 fun Track.makeClone() = this.copy(
-    userData = JsonObject(mapOf(
-        "uuid" to JsonPrimitive(UUID.randomUUID().toString())
-    )),
+    userData = JsonObject(
+        mapOf(
+            "uuid" to JsonPrimitive(UUID.randomUUID().toString())
+        )
+    ),
     info = this.info.copy(position = 0L)
 )
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/admin/BlackListCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/admin/BlackListCommand.kt
index 56df840f3..0a32ec694 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/admin/BlackListCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/admin/BlackListCommand.kt
@@ -33,7 +33,6 @@ import net.dv8tion.jda.api.utils.FileUpload
 import java.util.concurrent.atomic.AtomicLong
 
 class BlackListCommand : ModBaseCommand() {
-
     init {
         this.requiresArgs = true
         this.category = CommandCategory.ADMINISTRATION
@@ -166,7 +165,7 @@ class BlackListCommand : ModBaseCommand() {
         word: String,
         database: AbstractDatabase,
         guild: DunctebotGuild,
-        ctx: CommandContext
+        ctx: CommandContext,
     ) {
         val list = guild.settings.blacklistedWords
 
@@ -187,7 +186,7 @@ class BlackListCommand : ModBaseCommand() {
         word: String,
         database: AbstractDatabase,
         guild: DunctebotGuild,
-        ctx: CommandContext
+        ctx: CommandContext,
     ) {
         val list = guild.settings.blacklistedWords
 
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/admin/VcAutoRoleCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/admin/VcAutoRoleCommand.kt
index 6a0e7c933..672aec567 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/admin/VcAutoRoleCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/admin/VcAutoRoleCommand.kt
@@ -32,7 +32,6 @@ import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel
 import java.util.stream.Collectors
 
 class VcAutoRoleCommand : ModBaseCommand() {
-
     init {
         this.requiresArgs = true
         this.category = CommandCategory.ADMINISTRATION
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/animals/BirbCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/animals/BirbCommand.kt
index 17e94f454..4df49bbb9 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/animals/BirbCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/animals/BirbCommand.kt
@@ -27,7 +27,6 @@ import ml.duncte123.skybot.objects.command.CommandCategory
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class BirbCommand : Command() {
-
     init {
         this.category = CommandCategory.ANIMALS
         this.name = "bird"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/essentials/RemindersCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/essentials/RemindersCommand.kt
index 8ffcb4a32..b19cd76c5 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/essentials/RemindersCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/essentials/RemindersCommand.kt
@@ -28,7 +28,6 @@ import ml.duncte123.skybot.utils.AirUtils
 import net.dv8tion.jda.api.utils.TimeFormat
 
 class RemindersCommand : Command() {
-
     init {
         this.name = "reminders"
         this.aliases = arrayOf("remindmanager", "reminder")
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/essentials/RestartShardCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/essentials/RestartShardCommand.kt
index 86f3967c6..2fe53ae60 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/essentials/RestartShardCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/essentials/RestartShardCommand.kt
@@ -33,7 +33,6 @@ import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 
 class RestartShardCommand : Command() {
-
     private val thread = Executors.newSingleThreadExecutor()
     private val restartInSec = 5L
 
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/essentials/StatsCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/essentials/StatsCommand.kt
index eaec3b93f..6beda577d 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/essentials/StatsCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/essentials/StatsCommand.kt
@@ -33,7 +33,6 @@ import java.text.DecimalFormat
 import kotlin.math.floor
 
 class StatsCommand : Command() {
-
     init {
         this.category = CommandCategory.UTILS
         this.name = "stats"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/AdviceCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/AdviceCommand.kt
similarity index 93%
rename from bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/AdviceCommand.kt
rename to bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/AdviceCommand.kt
index 95afdb1f8..c52e4d373 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/AdviceCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/AdviceCommand.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.`fun`
+package ml.duncte123.skybot.commands.funCmds
 
 import com.github.natanbc.reliqua.limiter.RateLimiter
 import com.github.natanbc.reliqua.request.RequestException
@@ -28,7 +28,6 @@ import ml.duncte123.skybot.objects.command.CommandCategory
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class AdviceCommand : Command() {
-
     init {
         this.category = CommandCategory.FUN
         this.name = "advice"
@@ -37,7 +36,9 @@ class AdviceCommand : Command() {
 
     override fun execute(ctx: CommandContext) {
         try {
-            val json = WebUtils.ins.getJSONObject("https://api.adviceslip.com/advice") { it.setRateLimiter(RateLimiter.directLimiter()) }.execute()
+            val json = WebUtils.ins.getJSONObject("https://api.adviceslip.com/advice") {
+                it.setRateLimiter(RateLimiter.directLimiter())
+            }.execute()
 
             if (json.has("message")) {
                 val type = json["message"]["type"].asText()
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/ChatCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/ChatCommand.kt
similarity index 94%
rename from bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/ChatCommand.kt
rename to bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/ChatCommand.kt
index 0fcbbee4e..58ba7b98c 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/ChatCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/ChatCommand.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.`fun`
+package ml.duncte123.skybot.commands.funCmds
 
 import gnu.trove.map.hash.TLongObjectHashMap
 import me.duncte123.botcommons.messaging.MessageConfig
@@ -42,9 +42,8 @@ import javax.xml.xpath.XPathConstants
 import javax.xml.xpath.XPathFactory
 
 class ChatCommand : Command() {
-
     private val sessions = MapUtils.newLongObjectMap<ChatSession>()
-    private val MAX_DURATION = MILLISECONDS.convert(20, MINUTES)
+    private val maxDuration = MILLISECONDS.convert(20, MINUTES)
     private val responses = arrayOf(
         "My prefix in this guild is *`{PREFIX}`*",
         "Thanks for asking, my prefix here is *`{PREFIX}`*",
@@ -70,7 +69,7 @@ class ChatCommand : Command() {
                 var cleared = 0
                 for (it in temp.keys()) {
                     val duration = now.time - sessions.get(it).time.time
-                    if (duration >= MAX_DURATION) {
+                    if (duration >= maxDuration) {
                         sessions.remove(it)
                         cleared++
                     }
@@ -125,7 +124,10 @@ class ChatCommand : Command() {
                 sendMsg(
                     MessageConfig.Builder.fromCtx(ctx)
                         .replyTo(ctx.message)
-                        .setMessage("$NO_STATIC Chatbot error: no content returned, this is likely due to the chatbot banning you (we are working on a fix)")
+                        .setMessage(
+                            "$NO_STATIC Chatbot error: no content returned, " +
+                                "this is likely due to the chatbot banning you (we are working on a fix)"
+                        )
                 )
                 return@think
             }
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/CoinCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/CoinCommand.kt
similarity index 97%
rename from bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/CoinCommand.kt
rename to bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/CoinCommand.kt
index 085614506..9fa1f32a6 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/CoinCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/CoinCommand.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.`fun`
+package ml.duncte123.skybot.commands.funCmds
 
 import me.duncte123.botcommons.messaging.EmbedUtils.embedImage
 import me.duncte123.botcommons.messaging.MessageUtils.sendEmbed
@@ -26,7 +26,6 @@ import ml.duncte123.skybot.objects.command.CommandContext
 import java.util.concurrent.TimeUnit
 
 class CoinCommand : Command() {
-
     private val imagesArr = arrayOf("heads.png", "tails.png")
 
     init {
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/DeletCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/DeletCommand.kt
similarity index 97%
rename from bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/DeletCommand.kt
rename to bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/DeletCommand.kt
index 9753d8032..eabe6abc5 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/DeletCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/DeletCommand.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.`fun`
+package ml.duncte123.skybot.commands.funCmds
 
 import me.duncte123.botcommons.messaging.MessageUtils.sendEmbed
 import me.duncte123.weebJava.configs.ImageConfig
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/DiscordMemesCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/DiscordMemesCommand.kt
similarity index 97%
rename from bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/DiscordMemesCommand.kt
rename to bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/DiscordMemesCommand.kt
index 8d6dcbc1a..ec199a399 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/DiscordMemesCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/DiscordMemesCommand.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.`fun`
+package ml.duncte123.skybot.commands.funCmds
 
 import me.duncte123.botcommons.messaging.MessageUtils.sendEmbed
 import me.duncte123.weebJava.configs.ImageConfig
@@ -25,7 +25,6 @@ import ml.duncte123.skybot.objects.command.CommandCategory
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class DiscordMemesCommand : WeebCommandBase() {
-
     init {
         this.displayAliasesInHelp = false
         this.category = CommandCategory.FUN
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/EveryoneCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/EveryoneCommand.kt
similarity index 97%
rename from bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/EveryoneCommand.kt
rename to bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/EveryoneCommand.kt
index cc9dd8c86..8fb679d3f 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/EveryoneCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/EveryoneCommand.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.`fun`
+package ml.duncte123.skybot.commands.funCmds
 
 import me.duncte123.botcommons.messaging.MessageUtils.sendEmbed
 import me.duncte123.weebJava.configs.ImageConfig
@@ -25,7 +25,6 @@ import ml.duncte123.skybot.objects.command.CommandCategory
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class EveryoneCommand : WeebCommandBase() {
-
     init {
         this.category = CommandCategory.FUN
         this.name = "everyone"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/FakeWordCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/FakeWordCommand.kt
similarity index 98%
rename from bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/FakeWordCommand.kt
rename to bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/FakeWordCommand.kt
index a99ea20a9..61d3de5d3 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/FakeWordCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/FakeWordCommand.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.`fun`
+package ml.duncte123.skybot.commands.funCmds
 
 import com.fasterxml.jackson.databind.JsonNode
 import me.duncte123.botcommons.messaging.EmbedUtils
@@ -32,7 +32,6 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEve
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData
 
 class FakeWordCommand : SlashSupport() {
-
     init {
         this.category = CommandCategory.FUN
         this.name = "fakeword"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/JokeCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/JokeCommand.kt
similarity index 98%
rename from bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/JokeCommand.kt
rename to bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/JokeCommand.kt
index ffab85816..1d4071f7a 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/JokeCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/JokeCommand.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.`fun`
+package ml.duncte123.skybot.commands.funCmds
 
 import com.github.natanbc.reliqua.limiter.RateLimiter
 import me.duncte123.botcommons.messaging.EmbedUtils
@@ -29,7 +29,6 @@ import ml.duncte123.skybot.objects.command.CommandContext
 import net.dv8tion.jda.api.entities.MessageEmbed
 
 class JokeCommand : Command() {
-
     init {
         this.category = CommandCategory.FUN
         this.name = "joke"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/MemeCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/MemeCommand.kt
similarity index 97%
rename from bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/MemeCommand.kt
rename to bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/MemeCommand.kt
index 9241dbd5b..2253235a3 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/MemeCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/MemeCommand.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.`fun`
+package ml.duncte123.skybot.commands.funCmds
 
 import me.duncte123.botcommons.messaging.EmbedUtils
 import me.duncte123.botcommons.messaging.MessageUtils
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/OldestCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/OldestCommand.kt
similarity index 97%
rename from bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/OldestCommand.kt
rename to bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/OldestCommand.kt
index 729a34c8c..17cb51c54 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/OldestCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/OldestCommand.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.`fun`
+package ml.duncte123.skybot.commands.funCmds
 
 import ml.duncte123.skybot.objects.CooldownScope
 import ml.duncte123.skybot.objects.command.Command
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/TrashCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/TrashCommand.kt
similarity index 98%
rename from bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/TrashCommand.kt
rename to bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/TrashCommand.kt
index 27f8534ea..c3355bbdf 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/TrashCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/TrashCommand.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.`fun`
+package ml.duncte123.skybot.commands.funCmds
 
 import me.duncte123.botcommons.messaging.MessageUtils.sendMsg
 import ml.duncte123.skybot.commands.image.NoPatronImageCommand
@@ -24,7 +24,6 @@ import ml.duncte123.skybot.extensions.getStaticAvatarUrl
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class TrashCommand : NoPatronImageCommand() {
-
     init {
         this.requiresArgs = true
         this.name = "trash"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/XkcdCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/XkcdCommand.kt
similarity index 98%
rename from bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/XkcdCommand.kt
rename to bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/XkcdCommand.kt
index 9c3e83eae..31fcbf84b 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/XkcdCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/XkcdCommand.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.`fun`
+package ml.duncte123.skybot.commands.funCmds
 
 import com.fasterxml.jackson.databind.node.ObjectNode
 import com.github.natanbc.reliqua.limiter.RateLimiter
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/YoungestCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/YoungestCommand.kt
similarity index 97%
rename from bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/YoungestCommand.kt
rename to bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/YoungestCommand.kt
index 51578aa42..17ec8d989 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/fun/YoungestCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/funCmds/YoungestCommand.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.`fun`
+package ml.duncte123.skybot.commands.funCmds
 
 import ml.duncte123.skybot.objects.CooldownScope
 import ml.duncte123.skybot.objects.command.Command
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/DeHoistUtils.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/DeHoistUtils.kt
index 79de4d8fd..109b803ca 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/DeHoistUtils.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/DeHoistUtils.kt
@@ -31,7 +31,6 @@ import net.dv8tion.jda.api.events.guild.member.update.GuildMemberUpdateNicknameE
 import net.dv8tion.jda.api.hooks.ListenerAdapter
 
 class DeHoistCommand : ModBaseCommand() {
-
     init {
         this.requiresArgs = true
         this.name = "dehoist"
@@ -69,7 +68,6 @@ class DeHoistCommand : ModBaseCommand() {
 }
 
 class DeHoistListener(private val variables: Variables) : ListenerAdapter() {
-
     private val regex = "[!\"#\$%&'()*+,-./](?:.*)".toRegex()
     private val dehoistChar = "▪"
 
@@ -100,6 +98,6 @@ class DeHoistListener(private val variables: Variables) : ListenerAdapter() {
             !memberName.startsWith(dehoistChar) && matcher &&
                 member.guild.selfMember.hasPermission(Permission.NICKNAME_MANAGE) &&
                 GuildSettingsUtils.getGuild(member.guild.idLong, this.variables).isAutoDeHoist
-            )
+        )
     }
 }
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/SlowModeCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/SlowModeCommand.kt
index 5e4c8a37c..c04681646 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/SlowModeCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/SlowModeCommand.kt
@@ -29,7 +29,6 @@ import net.dv8tion.jda.api.entities.channel.attribute.ISlowmodeChannel
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel
 
 class SlowModeCommand : ModBaseCommand() {
-
     init {
         this.name = "slowmode"
         this.aliases = arrayOf("sm")
@@ -77,7 +76,12 @@ class SlowModeCommand : ModBaseCommand() {
         }
 
         if (intDelay < 0 || intDelay > TextChannel.MAX_SLOWMODE) {
-            sendMsg(ctx, "$intDelay is not valid, a valid delay is a number in the range 0-${TextChannel.MAX_SLOWMODE} (21600 is 6 hours in seconds)")
+            sendMsg(
+                ctx,
+                "$intDelay is not valid, a valid delay is a number in the range 0-${
+                    TextChannel.MAX_SLOWMODE
+                } (21600 is 6 hours in seconds)"
+            )
             return
         }
 
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/VoiceKickCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/VoiceKickCommand.kt
index d3e3c59e2..42fe7266f 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/VoiceKickCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/VoiceKickCommand.kt
@@ -25,7 +25,6 @@ import ml.duncte123.skybot.objects.command.CommandContext
 import net.dv8tion.jda.api.Permission
 
 class VoiceKickCommand : ModBaseCommand() {
-
     init {
         this.requiresArgs = true
         this.name = "voicekick"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/WarnCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/WarnCommand.kt
index fcd12798a..5de529a5b 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/WarnCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/WarnCommand.kt
@@ -38,7 +38,6 @@ import net.dv8tion.jda.api.requests.ErrorResponse.CANNOT_SEND_TO_USER
 import java.util.concurrent.TimeUnit
 
 class WarnCommand : ModBaseCommand() {
-
     init {
         this.requiresArgs = true
         this.name = "warn"
@@ -155,7 +154,12 @@ class WarnCommand : ModBaseCommand() {
         if ((action.type == WarnAction.Type.MUTE || action.type == WarnAction.Type.TEMP_MUTE) &&
             !muteRoleCheck(guild)
         ) {
-            modLog("[warn actions] Failed to apply automatic mute `${targetUser.asTag}` as there is no mute role set in the settings of this server", guild)
+            modLog(
+                "[warn actions] Failed to apply automatic mute `${
+                    targetUser.asTag
+                }` as there is no mute role set in the settings of this server",
+                guild
+            )
             return
         }
 
@@ -211,7 +215,12 @@ class WarnCommand : ModBaseCommand() {
         val role = guild.getRoleById(roleId)
 
         if (role == null) {
-            modLog("[warn actions] Failed to apply automatic mute `${target.user.asTag}` as I could not find the role that is specified in the settings", guild)
+            modLog(
+                "[warn actions] Failed to apply automatic mute `${
+                    target.user.asTag
+                }` as I could not find the role that is specified in the settings",
+                guild
+            )
             return
         }
 
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/WarningsCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/WarningsCommand.kt
index a89b4a9ec..54894b1a0 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/WarningsCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/mod/WarningsCommand.kt
@@ -26,7 +26,6 @@ import ml.duncte123.skybot.objects.command.CommandContext
 import net.dv8tion.jda.api.Permission
 
 class WarningsCommand : ModBaseCommand() {
-
     init {
         this.requiresArgs = true
         this.name = "warnings"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/BassBoostCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/BassBoostCommand.kt
index e6d0db1b8..79a804af2 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/BassBoostCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/BassBoostCommand.kt
@@ -32,7 +32,6 @@ import net.dv8tion.jda.api.interactions.commands.build.OptionData
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData
 
 class BassBoostCommand : MusicCommand() {
-
     init {
         this.name = "bassboost"
         this.aliases = arrayOf("bb", "baseboost")
@@ -87,9 +86,11 @@ class BassBoostCommand : MusicCommand() {
             bands.add(Band(i, gain))
         }
 
-        player.setFilters(Filters(
-            equalizer = bands.toOmissible()
-        ))
+        player.setFilters(
+            Filters(
+                equalizer = bands.toOmissible()
+            )
+        )
     }
 
     override fun getSubData(): SubcommandData {
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ForceSkip.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ForceSkip.kt
index 13647ee31..f89a72c80 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ForceSkip.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ForceSkip.kt
@@ -31,7 +31,6 @@ import net.dv8tion.jda.api.interactions.commands.OptionType
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData
 
 class ForceSkip : MusicCommand() {
-
     init {
         this.name = "forceskip"
         this.aliases = arrayOf("modskip")
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/JoinCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/JoinCommand.kt
index b781cd0e6..9a9036d9d 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/JoinCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/JoinCommand.kt
@@ -27,7 +27,6 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEve
 import net.dv8tion.jda.api.exceptions.PermissionException
 
 class JoinCommand : MusicCommand() {
-
     init {
         this.justRunLmao = true
 
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/LeaveCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/LeaveCommand.kt
index 5bf3ad31a..2189168c8 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/LeaveCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/LeaveCommand.kt
@@ -26,7 +26,6 @@ import ml.duncte123.skybot.objects.command.MusicCommand
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent
 
 class LeaveCommand : MusicCommand() {
-
     init {
         this.name = "leave"
         this.aliases = arrayOf("disconnect", "exit", "fuckoff")
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/NowPlayingCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/NowPlayingCommand.kt
index 2feccd6fc..5cd450247 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/NowPlayingCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/NowPlayingCommand.kt
@@ -27,7 +27,6 @@ import ml.duncte123.skybot.objects.command.MusicCommand
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent
 
 class NowPlayingCommand : MusicCommand() {
-
     init {
         this.name = "nowplaying"
         this.aliases = arrayOf("np", "song")
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PPlayCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PPlayCommand.kt
index 397d78aaf..8677a1bcc 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PPlayCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PPlayCommand.kt
@@ -26,7 +26,6 @@ import ml.duncte123.skybot.objects.command.MusicCommand
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent
 
 class PPlayCommand : MusicCommand() {
-
     init {
         this.mayAutoJoin = true
         this.name = "pplay"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PauseCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PauseCommand.kt
index 987a29fbd..913f9ee06 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PauseCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/PauseCommand.kt
@@ -25,7 +25,6 @@ import ml.duncte123.skybot.objects.command.MusicCommand
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent
 
 class PauseCommand : MusicCommand() {
-
     init {
         this.name = "pause"
         this.aliases = arrayOf("resume")
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/QueueCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/QueueCommand.kt
index 7f0cf57ac..5906e458c 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/QueueCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/QueueCommand.kt
@@ -33,7 +33,6 @@ import java.util.*
 import kotlin.math.min
 
 class QueueCommand : MusicCommand() {
-
     init {
         this.name = "queue"
         this.aliases = arrayOf("list", "q")
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ReaddCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ReaddCommand.kt
index 38f1b75fb..eb836d19d 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ReaddCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ReaddCommand.kt
@@ -18,20 +18,17 @@
 
 package ml.duncte123.skybot.commands.music
 
-import kotlinx.serialization.json.JsonObject
 import me.duncte123.botcommons.messaging.EmbedUtils
 import me.duncte123.botcommons.messaging.MessageUtils.*
 import ml.duncte123.skybot.Variables
 import ml.duncte123.skybot.audio.makeClone
 import ml.duncte123.skybot.exceptions.LimitReachedException
-import ml.duncte123.skybot.objects.TrackUserData
 import ml.duncte123.skybot.objects.command.CommandContext
 import ml.duncte123.skybot.objects.command.MusicCommand
 import ml.duncte123.skybot.utils.CommandUtils.isUserTagPatron
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent
 
 class ReaddCommand : MusicCommand() {
-
     init {
         this.name = "readd"
         this.help = "Adds the currently playing track to the end of the queue"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RepeatCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RepeatCommand.kt
index 47b9db7b5..d7f2c4830 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RepeatCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RepeatCommand.kt
@@ -26,7 +26,6 @@ import ml.duncte123.skybot.objects.command.MusicCommand
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent
 
 class RepeatCommand : MusicCommand() {
-
     init {
         this.name = "repeat"
         this.aliases = arrayOf("loop")
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RepeatQueueCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RepeatQueueCommand.kt
index fd1b0ffde..eddd03924 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RepeatQueueCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RepeatQueueCommand.kt
@@ -25,7 +25,6 @@ import ml.duncte123.skybot.objects.command.MusicCommand
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent
 
 class RepeatQueueCommand : MusicCommand() {
-
     init {
         this.name = "repeatqueue"
         this.aliases = arrayOf("loopqueue")
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RestartCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RestartCommand.kt
index b77f9e3b2..a86524aec 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RestartCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/RestartCommand.kt
@@ -25,7 +25,6 @@ import ml.duncte123.skybot.objects.command.MusicCommand
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent
 
 class RestartCommand : MusicCommand() {
-
     init {
         this.name = "restart"
         this.help = "Start the current track from the beginning"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SaveCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SaveCommand.kt
index 6e3baaf9c..d837cfc7d 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SaveCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SaveCommand.kt
@@ -29,7 +29,6 @@ import net.dv8tion.jda.api.utils.FileUpload
 import java.time.ZonedDateTime
 
 class SaveCommand : MusicCommand() {
-
     init {
         this.name = "save"
         this.help = "Saves a playlist into a file with can be loaded with `{prefix}load`"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SearchCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SearchCommand.kt
index 9f174404a..bccd96007 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SearchCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SearchCommand.kt
@@ -34,7 +34,6 @@ import java.util.concurrent.TimeUnit
 import kotlin.math.min
 
 class SearchCommand : MusicCommand() {
-
     init {
         this.mayAutoJoin = true
         this.name = "search"
@@ -91,7 +90,8 @@ class SearchCommand : MusicCommand() {
             menu.addOption(
                 "${index + 1}) ${title.substring(0, min(title.length, 20)).trim()}",
                 track.info.identifier,
-                title.substring(0, min(title.length, 50)).trim() // TODO: full title or url?
+                // TODO: full title or url?
+                title.substring(0, min(title.length, 50)).trim()
             )
         }
 
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ShuffleCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ShuffleCommand.kt
index a5a0c7ebb..642b78355 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ShuffleCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ShuffleCommand.kt
@@ -25,7 +25,6 @@ import ml.duncte123.skybot.objects.command.MusicCommand
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent
 
 class ShuffleCommand : MusicCommand() {
-
     init {
         this.name = "shuffle"
         this.help = "Shuffles the current queue"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SkipCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SkipCommand.kt
index acb2bc220..de46c6960 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SkipCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/SkipCommand.kt
@@ -23,7 +23,6 @@ import ml.duncte123.skybot.Settings.NO_STATIC
 import ml.duncte123.skybot.Settings.YES_STATIC
 import ml.duncte123.skybot.Variables
 import ml.duncte123.skybot.audio.GuildMusicManager
-import ml.duncte123.skybot.objects.TrackUserData
 import ml.duncte123.skybot.objects.command.CommandContext
 import ml.duncte123.skybot.objects.command.MusicCommand
 import net.dv8tion.jda.api.entities.Guild
@@ -32,7 +31,6 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEve
 import kotlin.math.ceil
 
 class SkipCommand : MusicCommand() {
-
     init {
         this.name = "skip"
         this.aliases = arrayOf("next", "nexttrack", "skiptrack")
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/StopCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/StopCommand.kt
index a1b9ede70..106f581a1 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/StopCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/StopCommand.kt
@@ -28,7 +28,6 @@ import net.dv8tion.jda.api.Permission
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent
 
 class StopCommand : MusicCommand() {
-
     init {
         this.name = "stop"
         this.help = "Stops the music"
@@ -47,7 +46,11 @@ class StopCommand : MusicCommand() {
 
         val trackData: TrackUserData = scheduler.getUserData(track)
 
-        if (ctx.guild.settings.isAllowAllToStop || trackData.requester == ctx.author.idLong || ctx.member.hasPermission(Permission.MANAGE_SERVER)) {
+        if (
+            ctx.guild.settings.isAllowAllToStop ||
+            trackData.requester == ctx.author.idLong ||
+            ctx.member.hasPermission(Permission.MANAGE_SERVER)
+        ) {
             mng.scheduler.queue.clear()
             player.stopPlayback()
 
@@ -78,7 +81,11 @@ class StopCommand : MusicCommand() {
         val trackData: TrackUserData = scheduler.getUserData(track)
         val dbg = DunctebotGuild(event.guild!!, variables)
 
-        if (dbg.settings.isAllowAllToStop || trackData.requester == event.user.idLong || event.member!!.hasPermission(Permission.MANAGE_SERVER)) {
+        if (
+            dbg.settings.isAllowAllToStop ||
+            trackData.requester == event.user.idLong ||
+            event.member!!.hasPermission(Permission.MANAGE_SERVER)
+        ) {
             mng.scheduler.queue.clear()
             player.stopPlayback()
 
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/VolumeCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/VolumeCommand.kt
index 0ee47c2bb..ab664d15e 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/VolumeCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/VolumeCommand.kt
@@ -31,7 +31,6 @@ import kotlin.math.max
 import kotlin.math.min
 
 class VolumeCommand : MusicCommand() {
-
     init {
         this.name = "volume"
         this.help = "Sets the volume on the music player"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/nsfw/CarsAndHentaiCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/nsfw/CarsAndHentaiCommand.kt
index 1a4fa8f36..22b75af44 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/nsfw/CarsAndHentaiCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/nsfw/CarsAndHentaiCommand.kt
@@ -26,7 +26,6 @@ import ml.duncte123.skybot.objects.command.CommandCategory
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class CarsAndHentaiCommand : Command() {
-
     init {
         this.category = CommandCategory.NSFW
         this.name = "carsandhentai"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/nsfw/HentaiCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/nsfw/HentaiCommand.kt
index cbc65e535..52e9b6910 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/nsfw/HentaiCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/nsfw/HentaiCommand.kt
@@ -27,7 +27,6 @@ import ml.duncte123.skybot.objects.command.CommandCategory
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class HentaiCommand : Command() {
-
     init {
         this.category = CommandCategory.NSFW
         this.name = "hentai"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/nsfw/LewdKitsuneCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/nsfw/LewdKitsuneCommand.kt
index 1f0e242e4..5438789fa 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/nsfw/LewdKitsuneCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/nsfw/LewdKitsuneCommand.kt
@@ -27,7 +27,6 @@ import ml.duncte123.skybot.objects.command.CommandCategory
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class LewdKitsuneCommand : Command() {
-
     init {
         this.category = CommandCategory.NSFW
         this.name = "lewdkitsune"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/nsfw/LewdNekoCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/nsfw/LewdNekoCommand.kt
index e72a46545..38832ddc0 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/nsfw/LewdNekoCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/nsfw/LewdNekoCommand.kt
@@ -26,7 +26,6 @@ import ml.duncte123.skybot.objects.command.CommandCategory
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class LewdNekoCommand : Command() {
-
     init {
         this.category = CommandCategory.NSFW
         this.name = "lewdneko"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/patreon/ScreenshotCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/patreon/ScreenshotCommand.kt
index 734d67b7c..2a2cea518 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/patreon/ScreenshotCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/patreon/ScreenshotCommand.kt
@@ -29,7 +29,6 @@ import net.dv8tion.jda.api.Permission
 import net.dv8tion.jda.api.utils.FileUpload
 
 class ScreenshotCommand : Command() {
-
     init {
         this.requiresArgs = true
         this.category = CommandCategory.PATRON
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/CookieCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/CookieCommand.kt
index b2bd314d6..328a05916 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/CookieCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/CookieCommand.kt
@@ -23,7 +23,6 @@ import ml.duncte123.skybot.objects.command.Command
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class CookieCommand : Command() {
-
     init {
         this.name = "cookie"
         this.help = "blobnomcookie"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/DonateCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/DonateCommand.kt
index a15545f37..b88ed1144 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/DonateCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/DonateCommand.kt
@@ -24,7 +24,6 @@ import ml.duncte123.skybot.objects.command.Command
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class DonateCommand : Command() {
-
     init {
         this.name = "donate"
         this.help = "Help to keep the bot online by donating"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/InviteCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/InviteCommand.kt
index 72d167575..b3acafe5c 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/InviteCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/InviteCommand.kt
@@ -23,7 +23,6 @@ import ml.duncte123.skybot.objects.command.Command
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class InviteCommand : Command() {
-
     init {
         this.name = "invite"
         this.help = "Gives you the bot invite link"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/IssueCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/IssueCommand.kt
index 2f494c469..3dbaa08a9 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/IssueCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/IssueCommand.kt
@@ -29,7 +29,6 @@ import net.dv8tion.jda.api.Permission
 import net.dv8tion.jda.api.entities.channel.attribute.IInviteContainer
 
 class IssueCommand : Command() {
-
     val regex = "\\s+".toRegex()
 
     init {
@@ -60,7 +59,9 @@ class IssueCommand : Command() {
                     val cmds = issue.lastCommands.map {
                         if (it.contains(regex)) {
                             val split = it.split(regex)
-                            return@map split[0] + " " + split.takeLastWhile { s -> split.indexOf(s) != 0 }.joinToString(separator = " ", transform = { "<$it>" })
+                            return@map split[0] + " " + split.takeLastWhile { s ->
+                                split.indexOf(s) != 0
+                            }.joinToString(separator = " ", transform = { "<$it>" })
                         } else {
                             return@map it
                         }
@@ -68,7 +69,10 @@ class IssueCommand : Command() {
 
                     var invite = issue.inv
 
-                    if (invite.isNullOrEmpty() && ctx.selfMember.hasPermission(ctx.channel.asGuildMessageChannel(), Permission.CREATE_INSTANT_INVITE)) {
+                    if (
+                        invite.isNullOrEmpty() &&
+                        ctx.selfMember.hasPermission(ctx.channel.asGuildMessageChannel(), Permission.CREATE_INSTANT_INVITE)
+                    ) {
                         val chan = event.channel
 
                         if (chan is IInviteContainer) {
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/KickMeCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/KickMeCommand.kt
index fb3903490..80ac970f4 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/KickMeCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/KickMeCommand.kt
@@ -27,7 +27,6 @@ import net.dv8tion.jda.api.Permission
 import java.util.concurrent.TimeUnit
 
 class KickMeCommand : Command() {
-
     init {
         this.name = "kickme"
         this.help = "Kicks you off the server"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/PatreonCheckCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/PatreonCheckCommand.kt
index e9244547b..a3c755ed2 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/PatreonCheckCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/PatreonCheckCommand.kt
@@ -29,7 +29,6 @@ import net.dv8tion.jda.api.entities.User
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel
 
 class PatreonCheckCommand : Command() {
-
     init {
         this.category = CommandCategory.UNLISTED
         this.name = "patroncheck"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/QuoteCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/QuoteCommand.kt
index 43e5cfe2c..70381665d 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/QuoteCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/QuoteCommand.kt
@@ -28,7 +28,6 @@ import java.time.Month
 import java.time.OffsetDateTime
 
 class QuoteCommand : Command() {
-
     init {
         this.name = "quote"
         this.help = "Shows an inspiring quote"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/ReverseCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/ReverseCommand.kt
index 8dcbfef90..c6cb46923 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/ReverseCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/ReverseCommand.kt
@@ -23,7 +23,6 @@ import ml.duncte123.skybot.objects.command.Command
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class ReverseCommand : Command() {
-
     init {
         this.name = "reverse"
         this.help = "Reverses a string"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/RolesCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/RolesCommand.kt
index 736318309..662604b38 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/RolesCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/RolesCommand.kt
@@ -29,7 +29,6 @@ import java.math.BigInteger
 import java.security.MessageDigest
 
 class RolesCommand : Command() {
-
     init {
         this.name = "roles"
         this.help = "Returns a list of roles on the server"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/ShortenCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/ShortenCommand.kt
index 980c04d0b..abc789118 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/ShortenCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/ShortenCommand.kt
@@ -26,7 +26,6 @@ import ml.duncte123.skybot.utils.AirUtils.shortenUrl
 import ml.duncte123.skybot.utils.CommandUtils.isDev
 
 class ShortenCommand : Command() {
-
     init {
         this.requiresArgs = true
         this.name = "shorten"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/SuggestCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/SuggestCommand.kt
index 14b981d23..6e5e5dd73 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/SuggestCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/SuggestCommand.kt
@@ -23,7 +23,6 @@ import ml.duncte123.skybot.objects.command.Command
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class SuggestCommand : Command() {
-
     init {
         this.name = "suggest"
         this.help = "Suggest a new feature for DuncteBot!"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/UnshortenCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/UnshortenCommand.kt
index 48c68498b..a4be7bdd4 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/UnshortenCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/UnshortenCommand.kt
@@ -27,7 +27,6 @@ import ml.duncte123.skybot.objects.command.CommandContext
 import ml.duncte123.skybot.utils.AirUtils
 
 class UnshortenCommand : Command() {
-
     init {
         this.name = "unshorten"
         this.help = "Gets the long url from a shortened url"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/UptimeCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/UptimeCommand.kt
index 3c231f20b..93886467e 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/UptimeCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/UptimeCommand.kt
@@ -25,7 +25,6 @@ import ml.duncte123.skybot.utils.AirUtils
 import java.lang.management.ManagementFactory
 
 class UptimeCommand : Command() {
-
     init {
         this.name = "uptime"
         this.help = "Shows the bot's uptime"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/UserinfoCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/UserinfoCommand.kt
index 89ed2a5e5..21a51d260 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/UserinfoCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/uncategorized/UserinfoCommand.kt
@@ -42,7 +42,8 @@ import java.time.OffsetDateTime
 import java.time.temporal.ChronoUnit
 
 class UserinfoCommand : Command() {
-    private val nitroUserLink = "**[Nitro User:](https://github.com/DuncteBot/SkyBot/issues/201#issuecomment-486182959 \"Click for more info on the nitro user check\")**"
+    private val nitroUserLink = "**[Nitro User:](https://github.com/DuncteBot/SkyBot/issues/201#issuecomment-486182959 " +
+        "\"Click for more info on the nitro user check\")**"
 
     init {
         this.name = "userinfo"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/utils/EmoteCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/utils/EmoteCommand.kt
index 0b8270f27..f02affa5b 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/utils/EmoteCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/utils/EmoteCommand.kt
@@ -83,7 +83,7 @@ class EmoteCommand : SlashSupport() {
             |**Id:** $id
             |**Markdown:** `$markdownStr`
             |**Url:** $url
-        """.trimMargin()
+            """.trimMargin()
     }
 
     private fun normalEmoteMentioned(variables: Variables, emote: String) = buildString {
@@ -126,8 +126,11 @@ class EmoteCommand : SlashSupport() {
     }
 
     private fun Int.toHex() = Integer.toHexString(this).uppercase()
+
     private fun Int.getName() = Character.getName(this)
+
     private fun Char.toHex() = this.code.toHex()
+
     private fun String.ensureFourHex() = "0000$this".substring(this.length.coerceAtMost(4))
 
     override fun configureSlashSupport(baseData: SlashCommandData) {
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/utils/RoleInfoCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/utils/RoleInfoCommand.kt
index 7822bb4a4..5bc4c29bd 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/utils/RoleInfoCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/utils/RoleInfoCommand.kt
@@ -31,7 +31,6 @@ import ml.duncte123.skybot.utils.AirUtils.colorToHex
 import net.dv8tion.jda.api.entities.Role
 
 class RoleInfoCommand : Command() {
-
     init {
         this.category = CommandCategory.UTILS
         this.name = "roleinfo"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/B1nzyCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/B1nzyCommand.kt
index b3de68888..5c5a5e264 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/B1nzyCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/B1nzyCommand.kt
@@ -23,7 +23,6 @@ import me.duncte123.weebJava.configs.ImageConfig
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class B1nzyCommand : WeebCommandBase() {
-
     init {
         this.name = "b1nzy"
         this.help = "Shows a b1nzy meme"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/DanceCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/DanceCommand.kt
index 9a9e2975d..93d011bbf 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/DanceCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/DanceCommand.kt
@@ -21,7 +21,6 @@ package ml.duncte123.skybot.commands.weeb
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class DanceCommand : WeebCommandBase() {
-
     init {
         this.name = "dance"
         this.help = "Do a little dance"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/HugCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/HugCommand.kt
index 8385635e9..949182a5d 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/HugCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/HugCommand.kt
@@ -21,7 +21,6 @@ package ml.duncte123.skybot.commands.weeb
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class HugCommand : WeebCommandBase() {
-
     init {
         this.name = "hug"
         this.help = "Hug a user"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/LewdCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/LewdCommand.kt
index e02e146d1..114403548 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/LewdCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/LewdCommand.kt
@@ -21,7 +21,6 @@ package ml.duncte123.skybot.commands.weeb
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class LewdCommand : WeebCommandBase() {
-
     init {
         this.name = "lewd"
         this.help = "Someone's being a bit lewd"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/LickCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/LickCommand.kt
index d29fe35c6..d4e6d251a 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/LickCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/LickCommand.kt
@@ -21,7 +21,6 @@ package ml.duncte123.skybot.commands.weeb
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class LickCommand : WeebCommandBase() {
-
     init {
         this.name = "lick"
         this.help = "Lick someone"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/MeguminCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/MeguminCommand.kt
index 6c4923e8f..1999585f0 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/MeguminCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/MeguminCommand.kt
@@ -23,7 +23,6 @@ import me.duncte123.weebJava.configs.ImageConfig
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class MeguminCommand : WeebCommandBase() {
-
     init {
         this.name = "megumin"
         this.help = "EXPLOSION!!!!!"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/OwoCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/OwoCommand.kt
index 604ffe1f3..e989e153f 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/OwoCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/OwoCommand.kt
@@ -23,7 +23,6 @@ import me.duncte123.weebJava.configs.ImageConfig
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class OwoCommand : WeebCommandBase() {
-
     init {
         this.name = "owo"
         this.help = "OwO what's this"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/PatCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/PatCommand.kt
index 4335a13e9..971429aee 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/PatCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/PatCommand.kt
@@ -21,7 +21,6 @@ package ml.duncte123.skybot.commands.weeb
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class PatCommand : WeebCommandBase() {
-
     init {
         this.name = "pat"
         this.help = "Pat someone"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/PunchCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/PunchCommand.kt
index 43291b3e9..86e1730d0 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/PunchCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/PunchCommand.kt
@@ -21,7 +21,6 @@ package ml.duncte123.skybot.commands.weeb
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class PunchCommand : WeebCommandBase() {
-
     init {
         this.name = "punch"
         this.help = "Punch someone in their face"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/ShootCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/ShootCommand.kt
index 1d86c34e4..5cd09e1dc 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/ShootCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/ShootCommand.kt
@@ -21,7 +21,6 @@ package ml.duncte123.skybot.commands.weeb
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class ShootCommand : WeebCommandBase() {
-
     init {
         this.name = "shoot"
         this.help = "Shoot someone"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/ShrugCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/ShrugCommand.kt
index 19ae8f1c8..0812e41e5 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/ShrugCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/weeb/ShrugCommand.kt
@@ -23,7 +23,6 @@ import me.duncte123.weebJava.configs.ImageConfig
 import ml.duncte123.skybot.objects.command.CommandContext
 
 class ShrugCommand : WeebCommandBase() {
-
     init {
         this.name = "shrug"
         this.help = "¯\\\\_(ツ)\\_/¯"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/entities/jda/FakeMember.kt b/bot/src/main/kotlin/ml/duncte123/skybot/entities/jda/FakeMember.kt
index 9bdfab198..44b5c6e09 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/entities/jda/FakeMember.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/entities/jda/FakeMember.kt
@@ -137,6 +137,7 @@ class FakeMember(private val name: String) : Member {
     }
 
     override fun hasTimeJoined() = false
+
     override fun isPending() = false
 
     override fun canSync(targetChannel: IPermissionContainer, syncSource: IPermissionContainer) = false
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt b/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt
index fc682f59c..28ebb7ce6 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt
@@ -30,7 +30,7 @@ fun Track.toEmbed(
     mng: GuildMusicManager,
     shardManager: ShardManager,
     withPlayer: Boolean = true,
-    callback: (EmbedBuilder) -> Unit
+    callback: (EmbedBuilder) -> Unit,
 ) {
     val userData: TrackUserData? = mng.scheduler.getUserData(this)
     var requester = "Unknown"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/extensions/Time4J.kt b/bot/src/main/kotlin/ml/duncte123/skybot/extensions/Time4J.kt
index b0d413e9c..133a159ee 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/extensions/Time4J.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/extensions/Time4J.kt
@@ -40,6 +40,7 @@ fun OffsetDateTime.parseTimes(timeFormat: TimeFormat = TimeFormat.RELATIVE): Pai
 }
 
 // old method, in case we ever need that
+
 /*fun OffsetDateTime.humanize(textWidth: TextWidth = TextWidth.WIDE): String {
     val start = PlainTimestamp.from(this.toLocalDateTime())
     val end = PlainTimestamp.from(LocalDateTime.now(ZoneOffset.UTC))
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/objects/AudioData.kt b/bot/src/main/kotlin/ml/duncte123/skybot/objects/AudioData.kt
index 00e644263..833bc0b88 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/objects/AudioData.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/objects/AudioData.kt
@@ -29,7 +29,7 @@ data class AudioData(
     val channelId: Long,
     val replyToMessage: Long,
     val jda: JDA,
-    val variables: Variables
+    val variables: Variables,
 ) {
     fun getChannel() = jda.getChannelById(MessageChannelUnion::class.java, channelId)!!
 
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/objects/EvalFunctions.kt b/bot/src/main/kotlin/ml/duncte123/skybot/objects/EvalFunctions.kt
index eed956a0d..a19da4ba1 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/objects/EvalFunctions.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/objects/EvalFunctions.kt
@@ -38,13 +38,6 @@ object EvalFunctions {
         return number % 2 == 0
     }
 
-    @Suppress("UnnecessaryVariable", "LocalVariableName")
-    @JvmStatic
-    fun quick_mafs(x: Int): Int {
-        val the_thing = x + 2 - 1
-        return the_thing
-    }
-
     @JvmStatic
     fun stats(shardManager: ShardManager, channel: MessageChannel): RestAction<Message> {
         val embed = EmbedUtils.getDefaultEmbed()
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/utils/FinderUtils.kt b/bot/src/main/kotlin/ml/duncte123/skybot/utils/FinderUtils.kt
index 3496b6605..a2ee857ff 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/utils/FinderUtils.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/utils/FinderUtils.kt
@@ -211,7 +211,11 @@ object FinderUtils {
                     .queue(
                         { retrieveFuture.complete(listOf(it)) },
                         {
-                            if (it is ErrorResponseException && it.errorResponse != ErrorResponse.UNKNOWN_USER && it.errorResponse != ErrorResponse.UNKNOWN_MEMBER) {
+                            if (
+                                it is ErrorResponseException &&
+                                it.errorResponse != ErrorResponse.UNKNOWN_USER &&
+                                it.errorResponse != ErrorResponse.UNKNOWN_MEMBER
+                            ) {
                                 // only log if it's not unknown user/member
                                 logger.error("Failed to retrieve member by id", it)
                             }
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/utils/SpamCache.kt b/bot/src/main/kotlin/ml/duncte123/skybot/utils/SpamCache.kt
index d2d8d4ef7..35a641366 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/utils/SpamCache.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/utils/SpamCache.kt
@@ -23,7 +23,6 @@ import gnu.trove.list.array.TLongArrayList
 import gnu.trove.map.hash.TLongObjectHashMap
 
 class SpamCache : TLongObjectHashMap<TLongList>() {
-
     @Throws(IllegalArgumentException::class)
     fun update(longs: LongArray, updateMode: Int = 0): SpamCache {
         when {
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/utils/SpamFilter.kt b/bot/src/main/kotlin/ml/duncte123/skybot/utils/SpamFilter.kt
index 52f8cee72..d17adbef2 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/utils/SpamFilter.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/utils/SpamFilter.kt
@@ -30,7 +30,6 @@ import org.slf4j.LoggerFactory
 import java.util.stream.Collectors
 
 class SpamFilter(private val variables: Variables) : TLongObjectHashMap<SpamCache>() {
-
     private lateinit var rates: LongArray
     private val database = variables.database
     private val logger = LoggerFactory.getLogger(SpamFilter::class.java)
@@ -158,7 +157,10 @@ class SpamFilter(private val variables: Variables) : TLongObjectHashMap<SpamCach
                     ModerationUtils.muteUser(guild, author, textChannel, "Spam", ratelimit, false)
                 }
 
-                val clearable = textChannel.iterableHistory.stream().filter { it.author == author.user }.limit(9).collect(Collectors.toList())
+                val clearable = textChannel.iterableHistory.stream()
+                    .filter { it.author == author.user }
+                    .limit(9)
+                    .collect(Collectors.toList())
 
                 textChannel.deleteMessages(clearable).queue {
                     this[guild.idLong]?.get(author.user.idLong)?.grep { value -> !clearable.map { l -> l.idLong }.contains(value) }
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/web/WebSocketClient.kt b/bot/src/main/kotlin/ml/duncte123/skybot/web/WebSocketClient.kt
index cb84eff64..a56055f48 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/web/WebSocketClient.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/web/WebSocketClient.kt
@@ -37,7 +37,7 @@ import java.util.concurrent.TimeUnit
 
 class WebSocketClient(
     private val variables: Variables,
-    private val shardManager: ShardManager
+    private val shardManager: ShardManager,
 ) : WebSocketAdapter(), WebSocketListener {
     private val log = LoggerFactory.getLogger(WebSocketClient::class.java)
     private val executor = Executors.newSingleThreadExecutor {
@@ -92,7 +92,7 @@ class WebSocketClient(
         websocket: WebSocket,
         serverCloseFrame: WebSocketFrame?,
         clientCloseFrame: WebSocketFrame?,
-        closedByServer: Boolean
+        closedByServer: Boolean,
     ) {
         if (closedByServer && serverCloseFrame != null) {
             val reason = serverCloseFrame.closeReason ?: "<no reason given>"
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/web/handlers/RequestHandler.kt b/bot/src/main/kotlin/ml/duncte123/skybot/web/handlers/RequestHandler.kt
index 38f4b006b..71d21e891 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/web/handlers/RequestHandler.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/web/handlers/RequestHandler.kt
@@ -28,7 +28,11 @@ import net.dv8tion.jda.api.sharding.ShardManager
 import net.dv8tion.jda.api.utils.data.DataArray
 import net.dv8tion.jda.api.utils.data.DataObject
 
-class RequestHandler(private val variables: Variables, private val shardManager: ShardManager, client: WebSocketClient) : SocketHandler(client) {
+class RequestHandler(
+    private val variables: Variables,
+    private val shardManager: ShardManager,
+    client: WebSocketClient,
+) : SocketHandler(client) {
     override fun handleInternally(data: JsonNode) {
         val responseData = DataObject.empty()
             .put("identifier", data["identifier"].asText())
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index a98d9f336..fdf896866 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -27,10 +27,8 @@ plugins {
     idea
     java
     `java-library`
-    `maven-publish`
 
     kotlin("jvm")
-    id("com.github.breadmoirai.github-release")
 }
 
 group = "com.dunctebot"
@@ -64,7 +62,6 @@ val compileJava: JavaCompile by tasks
 val javadoc: Javadoc by tasks
 val jar: Jar by tasks
 val build: Task by tasks
-val publish: Task by tasks
 val clean: Task by tasks
 val test: Task by tasks
 val check: Task by tasks
@@ -80,66 +77,6 @@ val javadocJar = task<Jar>("javadocJar") {
     from(javadoc.destinationDir)
 }
 
-// TODO: remove!!!
-publishing {
-    repositories {
-        maven {
-            name = "jfrog"
-            url = uri("https://duncte123.jfrog.io/artifactory/maven/")
-            credentials {
-                username = System.getenv("JFROG_USERNAME")
-                password = System.getenv("JFROG_TOKEN")
-            }
-        }
-    }
-    publications {
-        create<MavenPublication>("jfrog") {
-            pom {
-                name.set(archivesBaseName)
-                description.set("A helper package for shared models")
-                url.set("https://github.com/DuncteBot/models")
-                licenses {
-                    license {
-                        name.set("MIT")
-                        url.set("https://opensource.org/licenses/MIT")
-                    }
-                }
-                developers {
-                    developer {
-                        id.set("duncte123")
-                        name.set("Duncan Sterken")
-                        email.set("contact@duncte123.me")
-                    }
-                }
-                scm {
-                    connection.set("scm:git:git://github.com/DuncteBot/models.git")
-                    developerConnection.set("scm:git:ssh://git@github.com:DuncteBot/models.git")
-                    url.set("https://github.com/DuncteBot/models")
-                }
-            }
-
-            from(components["java"])
-
-            artifactId = archivesBaseName
-            groupId = project.group as String
-            version = project.version as String
-
-            artifact(javadocJar)
-            artifact(sourcesJar)
-        }
-    }
-}
-
-githubRelease {
-    token(System.getenv("GITHUB_TOKEN"))
-    owner("DuncteBot")
-    repo("models")
-    tagName(project.version as String)
-    overwrite(false)
-    prerelease(false)
-    body(changelog())
-}
-
 build.apply {
     dependsOn(jar)
     dependsOn(javadocJar)

From b91e8b35816bb8b9923d8a80400dc3f70994ae7b Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Mon, 27 Nov 2023 19:58:02 +0100
Subject: [PATCH 13/17] Move makeClone

---
 .../audio/player/LavalinkManager.java         | 14 --------
 .../skybot/audio/TrackScheduler.java          |  4 +--
 .../ml/duncte123/skybot/audio/TrackUtils.kt   | 33 -------------------
 .../skybot/commands/music/ReaddCommand.kt     |  2 +-
 .../duncte123/skybot/extensions/AudioTrack.kt | 12 +++++++
 5 files changed, 15 insertions(+), 50 deletions(-)
 delete mode 100644 bot/src/main/kotlin/ml/duncte123/skybot/audio/TrackUtils.kt

diff --git a/bot/src/main/java/fredboat/audio/player/LavalinkManager.java b/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
index d2f0d37e7..7d4cfefe8 100644
--- a/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
+++ b/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
@@ -27,7 +27,6 @@
 import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel;
 import net.dv8tion.jda.api.entities.channel.unions.AudioChannelUnion;
 import net.dv8tion.jda.api.managers.AudioManager;
-import reactor.core.publisher.Mono;
 
 import javax.annotation.Nonnull;
 import java.net.URI;
@@ -86,14 +85,6 @@ public boolean isEnabled() {
         return this.enabledOverride && config.lavalink.enable;
     }
 
-    public Mono<LavalinkPlayer> createPlayer(long guildId) {
-        if (!isEnabled()) {
-            throw new IllegalStateException("Music is not enabled right now");
-        }
-
-        return lavalink.getLink(guildId).getPlayer();
-    }
-
     public void openConnection(AudioChannel channel) {
         if (isEnabled()) {
             final AudioManager audioManager = channel.getGuild().getAudioManager();
@@ -111,11 +102,6 @@ public void closeConnection(Guild guild) {
         }
     }
 
-    @Deprecated
-    public void closeConnection(String guildId) {
-        throw new UnsupportedOperationException();
-    }
-
     public boolean isConnected(Guild guild) {
         return isConnected(guild.getIdLong());
     }
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
index 447308bdd..998bde01e 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
@@ -172,7 +172,7 @@ public void onTrackEnd(Track lastTrack, AudioTrackEndReason endReason) {
         if (this.looping) {
             LOGGER.debug("repeating the current song");
 
-            final Track clone = TrackUtilsKt.makeClone(lastTrack);
+            final Track clone = AudioTrackKt.makeClone(lastTrack);
             storeUserData(clone, createNewTrackData(lastTrack, wasFromSkip));
             this.play(clone);
 
@@ -180,7 +180,7 @@ public void onTrackEnd(Track lastTrack, AudioTrackEndReason endReason) {
         } else if (this.loopingQueue) {
             LOGGER.debug("repeating the queue");
             //Offer it to the queue to prevent the player from playing it
-            final Track clone = TrackUtilsKt.makeClone(lastTrack);
+            final Track clone = AudioTrackKt.makeClone(lastTrack);
             storeUserData(clone, createNewTrackData(lastTrack, wasFromSkip));
             queue.offer(clone);
         }
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/audio/TrackUtils.kt b/bot/src/main/kotlin/ml/duncte123/skybot/audio/TrackUtils.kt
deleted file mode 100644
index 5a5755038..000000000
--- a/bot/src/main/kotlin/ml/duncte123/skybot/audio/TrackUtils.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Skybot, a multipurpose discord bot
- *      Copyright (C) 2017  Duncan "duncte123" Sterken & Ramid "ramidzkh" Khan & Maurice R S "Sanduhr32"
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package ml.duncte123.skybot.audio
-
-import dev.arbjerg.lavalink.protocol.v4.Track
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.JsonPrimitive
-import java.util.UUID
-
-fun Track.makeClone() = this.copy(
-    userData = JsonObject(
-        mapOf(
-            "uuid" to JsonPrimitive(UUID.randomUUID().toString())
-        )
-    ),
-    info = this.info.copy(position = 0L)
-)
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ReaddCommand.kt b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ReaddCommand.kt
index eb836d19d..f5f3e48d5 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ReaddCommand.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/commands/music/ReaddCommand.kt
@@ -21,8 +21,8 @@ package ml.duncte123.skybot.commands.music
 import me.duncte123.botcommons.messaging.EmbedUtils
 import me.duncte123.botcommons.messaging.MessageUtils.*
 import ml.duncte123.skybot.Variables
-import ml.duncte123.skybot.audio.makeClone
 import ml.duncte123.skybot.exceptions.LimitReachedException
+import ml.duncte123.skybot.extensions.makeClone
 import ml.duncte123.skybot.objects.command.CommandContext
 import ml.duncte123.skybot.objects.command.MusicCommand
 import ml.duncte123.skybot.utils.CommandUtils.isUserTagPatron
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt b/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt
index 28ebb7ce6..d7c5ffefc 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/extensions/AudioTrack.kt
@@ -19,12 +19,24 @@
 package ml.duncte123.skybot.extensions
 
 import dev.arbjerg.lavalink.protocol.v4.Track
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
 import me.duncte123.botcommons.messaging.EmbedUtils.embedMessage
 import ml.duncte123.skybot.audio.GuildMusicManager
 import ml.duncte123.skybot.objects.TrackUserData
 import ml.duncte123.skybot.utils.MusicEmbedUtils.createPlayerString
 import net.dv8tion.jda.api.EmbedBuilder
 import net.dv8tion.jda.api.sharding.ShardManager
+import java.util.*
+
+fun Track.makeClone() = this.copy(
+    userData = JsonObject(
+        mapOf(
+            "uuid" to JsonPrimitive(UUID.randomUUID().toString())
+        )
+    ),
+    info = this.info.copy(position = 0L)
+)
 
 fun Track.toEmbed(
     mng: GuildMusicManager,

From 7aed16c91284c8e8b3cd1f25f0353233b9134a02 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Mon, 27 Nov 2023 20:03:41 +0100
Subject: [PATCH 14/17] cleanup

---
 .../main/java/ml/duncte123/skybot/audio/TrackScheduler.java    | 3 ---
 .../ml/duncte123/skybot/listeners/ReadyShutdownListener.java   | 1 -
 bot/src/main/java/ml/duncte123/skybot/utils/AudioUtils.java    | 2 --
 3 files changed, 6 deletions(-)

diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
index 998bde01e..3cad320e5 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
@@ -42,10 +42,7 @@
 import static net.dv8tion.jda.api.requests.ErrorResponse.MISSING_PERMISSIONS;
 import static net.dv8tion.jda.api.requests.ErrorResponse.UNKNOWN_CHANNEL;
 
-// TODO: player events
 public class TrackScheduler {
-
-    // TODO: keep track of user-data per track (need something unique)
     public static final int MAX_QUEUE_SIZE = 100;
     private final Queue<Track> queue = new LinkedList<>();
     private final Map<String, TrackUserData> userData = new ConcurrentHashMap<>();
diff --git a/bot/src/main/java/ml/duncte123/skybot/listeners/ReadyShutdownListener.java b/bot/src/main/java/ml/duncte123/skybot/listeners/ReadyShutdownListener.java
index 7eec0de07..6b6061c59 100644
--- a/bot/src/main/java/ml/duncte123/skybot/listeners/ReadyShutdownListener.java
+++ b/bot/src/main/java/ml/duncte123/skybot/listeners/ReadyShutdownListener.java
@@ -108,7 +108,6 @@ private void onReady(ReadyEvent event) {
         }
     }
 
-    // TODO: get access to JDA, somehow
     private void onShutdown() {
         if (!arePoolsRunning.get()) {
             return;
diff --git a/bot/src/main/java/ml/duncte123/skybot/utils/AudioUtils.java b/bot/src/main/java/ml/duncte123/skybot/utils/AudioUtils.java
index 0a7faabca..60adec8d7 100644
--- a/bot/src/main/java/ml/duncte123/skybot/utils/AudioUtils.java
+++ b/bot/src/main/java/ml/duncte123/skybot/utils/AudioUtils.java
@@ -34,7 +34,6 @@
 import java.util.concurrent.Future;
 
 public class AudioUtils {
-    // public static final String EMBED_TITLE = "AirPlayer";
     private final TLongObjectMap<GuildMusicManager> musicManagers = MapUtils.newLongObjectMap();
     private final Variables variables;
 
@@ -71,7 +70,6 @@ public Future<Void> loadAndPlay(final AudioData data, final String trackUrlRaw,
 
         final GuildMusicManager mng = getMusicManager(data.getGuildId());
         final AudioLoader loader = new AudioLoader(data, mng, announce, trackUrl, isPatron);
-//        final DBAudioRef reference = new DBAudioRef(trackUrl, null, isPatron);
         final CompletableFuture<Void> future = new CompletableFuture<>();
 
         LavalinkManager.INS.getLavalink()

From 790dfef7c4ac45071f887a80097fe1641dc0647a Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Mon, 27 Nov 2023 20:20:06 +0100
Subject: [PATCH 15/17] Rename 'wasFromSkip' to 'forceAnnoune'

---
 .../skybot/audio/TrackScheduler.java          | 26 +++++++++----------
 .../duncte123/skybot/objects/TrackUserData.kt |  2 +-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
index 3cad320e5..7c01c4df4 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
@@ -99,11 +99,11 @@ public void skipCurrentTrack() {
         this.skipTrack(true);
     }
 
-    private void skipTrack(boolean wasFromSkip) {
-        skipTracks(1, wasFromSkip);
+    private void skipTrack(boolean forceAnnounce) {
+        skipTracks(1, forceAnnounce);
     }
 
-    public void skipTracks(int count, boolean wasFromSkip) {
+    public void skipTracks(int count, boolean forceAnnounce) {
         Track nextTrack = null;
 
         for (int i = 0; i < count; i++) {
@@ -119,7 +119,7 @@ public void skipTracks(int count, boolean wasFromSkip) {
             );
         } else {
             // Make sure to cary over the skip state, we want to announce skipped tracks
-            getUserData(nextTrack).setWasFromSkip(wasFromSkip);
+            getUserData(nextTrack).setForceAnnounce(forceAnnounce);
 
             this.play(nextTrack);
         }
@@ -128,12 +128,10 @@ public void skipTracks(int count, boolean wasFromSkip) {
     public void onTrackStart(Track track) {
         final TrackUserData data = getUserData(track);
 
-        // TODO: do I still need "wasFromSkip" status tracking?
-        // If the track was a skipped track, or we announce tracks
-        if (data != null && data.getWasFromSkip() || this.guildMusicManager.isAnnounceTracks()) {
+        if ((data != null && data.getForceAnnounce()) || this.guildMusicManager.isAnnounceTracks()) {
             // Reset the was from skip status
             if (data != null) {
-                data.setWasFromSkip(false);
+                data.setForceAnnounce(false);
             }
 
             AudioTrackKt.toEmbed(
@@ -164,13 +162,13 @@ public void onTrackEnd(Track lastTrack, AudioTrackEndReason endReason) {
 
         // Get if the track was from a skip event
         final TrackUserData userData = getUserData(lastTrack);
-        final boolean wasFromSkip = userData.getWasFromSkip();
+        final boolean wasForceAnnounce = userData.getForceAnnounce();
 
         if (this.looping) {
             LOGGER.debug("repeating the current song");
 
             final Track clone = AudioTrackKt.makeClone(lastTrack);
-            storeUserData(clone, createNewTrackData(lastTrack, wasFromSkip));
+            storeUserData(clone, createNewTrackData(lastTrack, wasForceAnnounce));
             this.play(clone);
 
             return;
@@ -178,7 +176,7 @@ public void onTrackEnd(Track lastTrack, AudioTrackEndReason endReason) {
             LOGGER.debug("repeating the queue");
             //Offer it to the queue to prevent the player from playing it
             final Track clone = AudioTrackKt.makeClone(lastTrack);
-            storeUserData(clone, createNewTrackData(lastTrack, wasFromSkip));
+            storeUserData(clone, createNewTrackData(lastTrack, wasForceAnnounce));
             queue.offer(clone);
         }
 
@@ -187,7 +185,7 @@ public void onTrackEnd(Track lastTrack, AudioTrackEndReason endReason) {
 
         LOGGER.debug("can start next track");
 
-        skipTrack(wasFromSkip);
+        skipTrack(wasForceAnnounce);
     }
 
     public boolean isLooping() {
@@ -210,7 +208,7 @@ public void shuffle() {
         Collections.shuffle((List<?>) queue);
     }
 
-    private TrackUserData createNewTrackData(Track track, boolean wasFromSkip) {
+    private TrackUserData createNewTrackData(Track track, boolean wasForceAnnounce) {
         final TrackUserData oldData = getUserData(track);
         final TrackUserData newData;
 
@@ -222,7 +220,7 @@ private TrackUserData createNewTrackData(Track track, boolean wasFromSkip) {
         }
 
         // Set the was from skip status on the track
-        newData.setWasFromSkip(wasFromSkip);
+        newData.setForceAnnounce(wasForceAnnounce);
 
         return newData;
     }
diff --git a/bot/src/main/kotlin/ml/duncte123/skybot/objects/TrackUserData.kt b/bot/src/main/kotlin/ml/duncte123/skybot/objects/TrackUserData.kt
index d69d5b0d4..dbb1d8e2d 100644
--- a/bot/src/main/kotlin/ml/duncte123/skybot/objects/TrackUserData.kt
+++ b/bot/src/main/kotlin/ml/duncte123/skybot/objects/TrackUserData.kt
@@ -23,5 +23,5 @@ import gnu.trove.list.array.TLongArrayList
 
 data class TrackUserData(val requester: Long) {
     val votes: TLongList = TLongArrayList()
-    var wasFromSkip: Boolean = false
+    var forceAnnounce: Boolean = false
 }

From 428e7cd204188b3400ae7e16e11a8442cc567a3b Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Mon, 27 Nov 2023 20:23:00 +0100
Subject: [PATCH 16/17] More code linting

---
 bot/src/main/java/ml/duncte123/skybot/CommandManager.java       | 1 +
 bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java | 2 +-
 .../skybot/commands/{funCmds => funcmds}/CSShumorCommand.java   | 2 +-
 .../skybot/commands/{funCmds => funcmds}/ColorCommand.java      | 2 +-
 .../skybot/commands/{funCmds => funcmds}/ExplosmCommand.java    | 2 +-
 .../skybot/commands/{funCmds => funcmds}/LoadingBarCommand.java | 2 +-
 .../skybot/commands/{funCmds => funcmds}/LoveCommand.java       | 2 +-
 .../skybot/commands/{funCmds => funcmds}/OrlyCommand.java       | 2 +-
 .../skybot/commands/{funCmds => funcmds}/TagCommand.java        | 2 +-
 .../skybot/commands/{funCmds => funcmds}/UrbanCommand.java      | 2 +-
 .../skybot/commands/{funCmds => funcmds}/YodaSpeakCommand.java  | 2 +-
 11 files changed, 11 insertions(+), 10 deletions(-)
 rename bot/src/main/java/ml/duncte123/skybot/commands/{funCmds => funcmds}/CSShumorCommand.java (98%)
 rename bot/src/main/java/ml/duncte123/skybot/commands/{funCmds => funcmds}/ColorCommand.java (98%)
 rename bot/src/main/java/ml/duncte123/skybot/commands/{funCmds => funcmds}/ExplosmCommand.java (98%)
 rename bot/src/main/java/ml/duncte123/skybot/commands/{funCmds => funcmds}/LoadingBarCommand.java (98%)
 rename bot/src/main/java/ml/duncte123/skybot/commands/{funCmds => funcmds}/LoveCommand.java (99%)
 rename bot/src/main/java/ml/duncte123/skybot/commands/{funCmds => funcmds}/OrlyCommand.java (97%)
 rename bot/src/main/java/ml/duncte123/skybot/commands/{funCmds => funcmds}/TagCommand.java (99%)
 rename bot/src/main/java/ml/duncte123/skybot/commands/{funCmds => funcmds}/UrbanCommand.java (98%)
 rename bot/src/main/java/ml/duncte123/skybot/commands/{funCmds => funcmds}/YodaSpeakCommand.java (98%)

diff --git a/bot/src/main/java/ml/duncte123/skybot/CommandManager.java b/bot/src/main/java/ml/duncte123/skybot/CommandManager.java
index 20455aa3c..079d1abea 100644
--- a/bot/src/main/java/ml/duncte123/skybot/CommandManager.java
+++ b/bot/src/main/java/ml/duncte123/skybot/CommandManager.java
@@ -28,6 +28,7 @@
 import ml.duncte123.skybot.commands.essentials.*;
 import ml.duncte123.skybot.commands.essentials.eval.EvalCommand;
 import ml.duncte123.skybot.commands.funCmds.*;
+import ml.duncte123.skybot.commands.funcmds.*;
 import ml.duncte123.skybot.commands.guild.GuildInfoCommand;
 import ml.duncte123.skybot.commands.guild.GuildJoinsCommand;
 import ml.duncte123.skybot.commands.guild.mod.*;
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
index 7c01c4df4..24ea58066 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
@@ -128,7 +128,7 @@ public void skipTracks(int count, boolean forceAnnounce) {
     public void onTrackStart(Track track) {
         final TrackUserData data = getUserData(track);
 
-        if ((data != null && data.getForceAnnounce()) || this.guildMusicManager.isAnnounceTracks()) {
+        if (data != null && data.getForceAnnounce() || this.guildMusicManager.isAnnounceTracks()) {
             // Reset the was from skip status
             if (data != null) {
                 data.setForceAnnounce(false);
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/CSShumorCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/funcmds/CSShumorCommand.java
similarity index 98%
rename from bot/src/main/java/ml/duncte123/skybot/commands/funCmds/CSShumorCommand.java
rename to bot/src/main/java/ml/duncte123/skybot/commands/funcmds/CSShumorCommand.java
index e63e7efcd..370bada2c 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/CSShumorCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/funcmds/CSShumorCommand.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.funCmds;
+package ml.duncte123.skybot.commands.funcmds;
 
 import gnu.trove.map.TLongIntMap;
 import ml.duncte123.skybot.objects.command.Command;
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/ColorCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/funcmds/ColorCommand.java
similarity index 98%
rename from bot/src/main/java/ml/duncte123/skybot/commands/funCmds/ColorCommand.java
rename to bot/src/main/java/ml/duncte123/skybot/commands/funcmds/ColorCommand.java
index 9ef3e95a1..a88698d82 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/ColorCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/funcmds/ColorCommand.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.funCmds;
+package ml.duncte123.skybot.commands.funcmds;
 
 import me.duncte123.botcommons.messaging.EmbedUtils;
 import ml.duncte123.skybot.objects.command.Command;
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/ExplosmCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/funcmds/ExplosmCommand.java
similarity index 98%
rename from bot/src/main/java/ml/duncte123/skybot/commands/funCmds/ExplosmCommand.java
rename to bot/src/main/java/ml/duncte123/skybot/commands/funcmds/ExplosmCommand.java
index 19cb01f1b..70439e4cc 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/ExplosmCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/funcmds/ExplosmCommand.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.funCmds;
+package ml.duncte123.skybot.commands.funcmds;
 
 import kotlin.Pair;
 import me.duncte123.botcommons.messaging.EmbedUtils;
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/LoadingBarCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/funcmds/LoadingBarCommand.java
similarity index 98%
rename from bot/src/main/java/ml/duncte123/skybot/commands/funCmds/LoadingBarCommand.java
rename to bot/src/main/java/ml/duncte123/skybot/commands/funcmds/LoadingBarCommand.java
index 7919d3519..e4b1f5c0a 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/LoadingBarCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/funcmds/LoadingBarCommand.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.funCmds;
+package ml.duncte123.skybot.commands.funcmds;
 
 import me.duncte123.loadingbar.LoadingBar;
 import ml.duncte123.skybot.objects.command.Command;
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/LoveCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/funcmds/LoveCommand.java
similarity index 99%
rename from bot/src/main/java/ml/duncte123/skybot/commands/funCmds/LoveCommand.java
rename to bot/src/main/java/ml/duncte123/skybot/commands/funcmds/LoveCommand.java
index 31a9c6cd4..7529284ed 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/LoveCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/funcmds/LoveCommand.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.funCmds;
+package ml.duncte123.skybot.commands.funcmds;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import me.duncte123.botcommons.messaging.EmbedUtils;
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/OrlyCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/funcmds/OrlyCommand.java
similarity index 97%
rename from bot/src/main/java/ml/duncte123/skybot/commands/funCmds/OrlyCommand.java
rename to bot/src/main/java/ml/duncte123/skybot/commands/funcmds/OrlyCommand.java
index 34b689a0d..ea9f8d584 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/OrlyCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/funcmds/OrlyCommand.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.funCmds;
+package ml.duncte123.skybot.commands.funcmds;
 
 import me.duncte123.botcommons.messaging.EmbedUtils;
 import ml.duncte123.skybot.objects.command.Command;
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/TagCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/funcmds/TagCommand.java
similarity index 99%
rename from bot/src/main/java/ml/duncte123/skybot/commands/funCmds/TagCommand.java
rename to bot/src/main/java/ml/duncte123/skybot/commands/funcmds/TagCommand.java
index a861e5c3a..5acefe202 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/TagCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/funcmds/TagCommand.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.funCmds;
+package ml.duncte123.skybot.commands.funcmds;
 
 import gnu.trove.map.TLongObjectMap;
 import ml.duncte123.skybot.Settings;
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/UrbanCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/funcmds/UrbanCommand.java
similarity index 98%
rename from bot/src/main/java/ml/duncte123/skybot/commands/funCmds/UrbanCommand.java
rename to bot/src/main/java/ml/duncte123/skybot/commands/funcmds/UrbanCommand.java
index e4578507d..461ea7ea9 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/UrbanCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/funcmds/UrbanCommand.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.funCmds;
+package ml.duncte123.skybot.commands.funcmds;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import me.duncte123.botcommons.messaging.EmbedUtils;
diff --git a/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/YodaSpeakCommand.java b/bot/src/main/java/ml/duncte123/skybot/commands/funcmds/YodaSpeakCommand.java
similarity index 98%
rename from bot/src/main/java/ml/duncte123/skybot/commands/funCmds/YodaSpeakCommand.java
rename to bot/src/main/java/ml/duncte123/skybot/commands/funcmds/YodaSpeakCommand.java
index d09341ad2..ee01dd3c4 100644
--- a/bot/src/main/java/ml/duncte123/skybot/commands/funCmds/YodaSpeakCommand.java
+++ b/bot/src/main/java/ml/duncte123/skybot/commands/funcmds/YodaSpeakCommand.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package ml.duncte123.skybot.commands.funCmds;
+package ml.duncte123.skybot.commands.funcmds;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import io.sentry.Sentry;

From 5336f5d9be5863d6b4fd9f80fdd411fd828191e1 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 1 Dec 2023 19:08:55 +0100
Subject: [PATCH 17/17] Remove useless entries from config

---
 bot/docker-compose.yml                        |  2 -
 .../skybot/audio/TrackScheduler.java          |  6 +--
 .../objects/config/DunctebotConfig.java       | 38 +------------------
 docker-compose.yml                            |  2 -
 4 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/bot/docker-compose.yml b/bot/docker-compose.yml
index fe7208a66..7f2f02134 100644
--- a/bot/docker-compose.yml
+++ b/bot/docker-compose.yml
@@ -21,8 +21,6 @@ services:
             - API_GOOGLE=
             - API_WEEBSH=
             - API_KSOFT=
-            - API_SPOTIFY_CLIENT_ID=
-            - API_SPOTIFY_CLIENT_SECRET=
             - API_BLARGBOT=
             - API_WOLFRAMALPHA=
             - API_THECATAPI=
diff --git a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
index 24ea58066..95424ddd0 100644
--- a/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
+++ b/bot/src/main/java/ml/duncte123/skybot/audio/TrackScheduler.java
@@ -168,7 +168,7 @@ public void onTrackEnd(Track lastTrack, AudioTrackEndReason endReason) {
             LOGGER.debug("repeating the current song");
 
             final Track clone = AudioTrackKt.makeClone(lastTrack);
-            storeUserData(clone, createNewTrackData(lastTrack, wasForceAnnounce));
+            storeUserData(clone, copyTrackDataOrCreateNew(lastTrack, wasForceAnnounce));
             this.play(clone);
 
             return;
@@ -176,7 +176,7 @@ public void onTrackEnd(Track lastTrack, AudioTrackEndReason endReason) {
             LOGGER.debug("repeating the queue");
             //Offer it to the queue to prevent the player from playing it
             final Track clone = AudioTrackKt.makeClone(lastTrack);
-            storeUserData(clone, createNewTrackData(lastTrack, wasForceAnnounce));
+            storeUserData(clone, copyTrackDataOrCreateNew(lastTrack, wasForceAnnounce));
             queue.offer(clone);
         }
 
@@ -208,7 +208,7 @@ public void shuffle() {
         Collections.shuffle((List<?>) queue);
     }
 
-    private TrackUserData createNewTrackData(Track track, boolean wasForceAnnounce) {
+    private TrackUserData copyTrackDataOrCreateNew(Track track, boolean wasForceAnnounce) {
         final TrackUserData oldData = getUserData(track);
         final TrackUserData newData;
 
diff --git a/bot/src/main/java/ml/duncte123/skybot/objects/config/DunctebotConfig.java b/bot/src/main/java/ml/duncte123/skybot/objects/config/DunctebotConfig.java
index 93835769e..82188f59d 100644
--- a/bot/src/main/java/ml/duncte123/skybot/objects/config/DunctebotConfig.java
+++ b/bot/src/main/java/ml/duncte123/skybot/objects/config/DunctebotConfig.java
@@ -58,53 +58,29 @@ public Discord(long[] constantSuperUserIds, String prefix, int totalShards, Stri
     @SuppressWarnings("PMD.ShortClassName")
     public static class Apis {
         public final String alexflipnote;
-        public final Cache youtubeCache;
         public final String googl;
         public final String shroten;
         public final String weebSh;
         public final String ksoft;
         public final String genius;
-        public final Spotify spotify;
         public final String blargbot;
         public final String wolframalpha;
         public final String thecatapi;
 
         public Apis(
-            String alexflipnote, Cache youtubeCache, String googl, String shorten, String weebSh, String ksoft,
-            String genius, Spotify spotify, String blargbot, String wolframalpha, String thecatapi
+            String alexflipnote, String googl, String shorten, String weebSh, String ksoft,
+            String genius, String blargbot, String wolframalpha, String thecatapi
         ) {
             this.alexflipnote = alexflipnote;
-            this.youtubeCache = youtubeCache;
             this.googl = googl;
             this.shroten = shorten;
             this.weebSh = weebSh;
             this.ksoft = ksoft;
             this.genius = genius;
-            this.spotify = spotify;
             this.blargbot = blargbot;
             this.wolframalpha = wolframalpha;
             this.thecatapi = thecatapi;
         }
-
-        public static class Cache {
-            public final String endpoint;
-            public final String token;
-
-            public Cache(String endpoint, String token) {
-                this.endpoint = endpoint;
-                this.token = token;
-            }
-        }
-
-        public static class Spotify {
-            public final String clientId;
-            public final String clientSecret;
-
-            public Spotify(String clientId, String clientSecret) {
-                this.clientId = clientId;
-                this.clientSecret = clientSecret;
-            }
-        }
     }
 
     public static class Lavalink {
@@ -167,23 +143,13 @@ public static DunctebotConfig fromEnv() {
             System.getenv("BOT_TOKEN")
         );
 
-        final Apis.Cache youtubeCache = new Apis.Cache(
-            System.getenv("API_YOUTUBECACHE_ENDPOINT"),
-            System.getenv("API_YOUTUBECACHE_TOKEN")
-        );
-        final Apis.Spotify spotify = new Apis.Spotify(
-            System.getenv("API_SPOTIFY_CLIENT_ID"),
-            System.getenv("API_SPOTIFY_CLIENT_SECRET")
-        );
         final Apis apis = new Apis(
             System.getenv("API_ALEXFLIPNOTE"),
-            youtubeCache,
             System.getenv("API_GOOGLE"),
             System.getenv("API_SHORTEN"),
             System.getenv("API_WEEBSH"),
             System.getenv("API_KSOFT"),
             System.getenv("API_GENIUS"),
-            spotify,
             System.getenv("API_BLARGBOT"),
             System.getenv("API_WOLFRAMALPHA"),
             System.getenv("API_THECATAPI")
diff --git a/docker-compose.yml b/docker-compose.yml
index e85051dcd..a4d2fb65b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,8 +23,6 @@ services:
             - API_SHORTEN=
             - API_WEEBSH=
             - API_KSOFT=
-            - API_SPOTIFY_CLIENT_ID=
-            - API_SPOTIFY_CLIENT_SECRET=
             - API_BLARGBOT=
             - API_WOLFRAMALPHA=
             - API_THECATAPI=