Switch to lavalink's new YouTube audio source manager (#1552)

* Switch to new lavalink's new YouTube audio source manager * Add back setPlaylistPageCount call for the youtube audio source manager * Manually add all the individual audio sources EXCEPT for old youtube * Remove unused import * Upgrade lavaplayer-youtube-source to 1.0.3 * Upgrade lavaplayer-youtube-source to 1.0.4
jagrosh · May 10, 2024 · 0afb3db · 0afb3db
1 parent 81322ef
commit 0afb3db
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 49 deletions.
diff --git a/pom.xml b/pom.xml
@@ -55,7 +55,12 @@
         <dependency>
             <groupId>dev.arbjerg</groupId>
             <artifactId>lavaplayer</artifactId>
-            <version>727959e9f621fc457b3a5adafcfffb55fdeaa538-SNAPSHOT</version>
+            <version>2.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.lavalink-devs</groupId>
+            <artifactId>lavaplayer-youtube-source</artifactId>
+            <version>1.0.4</version>
         </dependency>
 	<dependency>
 	    <groupId>com.github.jagrosh</groupId>

diff --git a/src/main/java/com/jagrosh/jmusicbot/audio/PlayerManager.java b/src/main/java/com/jagrosh/jmusicbot/audio/PlayerManager.java
@@ -17,10 +17,19 @@
 
 import com.dunctebot.sourcemanagers.DuncteBotSources;
 import com.jagrosh.jmusicbot.Bot;
+import com.sedmelluq.discord.lavaplayer.container.MediaContainerRegistry;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
 import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
 import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers;
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
+import com.sedmelluq.discord.lavaplayer.source.bandcamp.BandcampAudioSourceManager;
+import com.sedmelluq.discord.lavaplayer.source.beam.BeamAudioSourceManager;
+import com.sedmelluq.discord.lavaplayer.source.getyarn.GetyarnAudioSourceManager;
+import com.sedmelluq.discord.lavaplayer.source.http.HttpAudioSourceManager;
+import com.sedmelluq.discord.lavaplayer.source.nico.NicoAudioSourceManager;
+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 dev.lavalink.youtube.YoutubeAudioSourceManager;
 import net.dv8tion.jda.api.entities.Guild;
 
 /**
@@ -39,9 +48,22 @@ public PlayerManager(Bot bot)
     public void init()
     {
         TransformativeAudioSourceManager.createTransforms(bot.getConfig().getTransforms()).forEach(t -> registerSourceManager(t));
-        AudioSourceManagers.registerRemoteSources(this);
+
+        registerSourceManager(new YoutubeAudioSourceManager(true));
+
+        registerSourceManager(SoundCloudAudioSourceManager.createDefault());
+        registerSourceManager(new BandcampAudioSourceManager());
+        registerSourceManager(new VimeoAudioSourceManager());
+        registerSourceManager(new TwitchStreamAudioSourceManager());
+        registerSourceManager(new BeamAudioSourceManager());
+        registerSourceManager(new GetyarnAudioSourceManager());
+        registerSourceManager(new NicoAudioSourceManager());
+        registerSourceManager(new HttpAudioSourceManager(MediaContainerRegistry.DEFAULT_REGISTRY));
+
         AudioSourceManagers.registerLocalSource(this);
+
         DuncteBotSources.registerAll(this, "en-US");
+
         source(YoutubeAudioSourceManager.class).setPlaylistPageCount(10);
     }
 

diff --git a/src/main/java/com/jagrosh/jmusicbot/utils/LogBackTurboFilter.java b/src/main/java/com/jagrosh/jmusicbot/utils/LogBackTurboFilter.java
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
@@ -14,6 +14,4 @@
         <appender-ref ref="Simple"/>
     </root>
 
-    <turboFilter class="com.jagrosh.jmusicbot.utils.LogBackTurboFilter" />
-
 </configuration>