Bump lavaplayer (#683)

* Bump lavaplayer

* Email and pass not necessary

* 1.3.98.1

Author: Walkyst

LavalinkServer/application.yml.example

@@ -26,9 +26,9 @@ lavalink:
       #strategy: "RotateOnBan" # RotateOnBan | LoadBalance | NanoSwitch | RotatingNanoSwitch
       #searchTriggersFail: true # Whether a search 429 should trigger marking the ip as failing
       #retryLimit: -1 # -1 = use default lavaplayer value | 0 = infinity | >0 = retry will happen this numbers times
-    #youtubeConfig: # Required for avoiding age restrictions by YouTube. Guide https://github.com/Walkyst/lavaplayer-fork/issues/18
-      #PAPISID:      ""
-      #PSID:         ""
+    #youtubeConfig: # Required for avoiding all age restrictions by YouTube, some restricted videos still can be played without.
+      #email: "" # Email of Google account
+      #password: "" # Password of Google account
     #httpConfig: # Useful for blocking bad-actors from ip-grabbing your music node and attacking it, this way only the http proxy will be attacked
       #proxyHost: "localhost" # Hostname of the proxy, (ip or domain)
       #proxyPort: 3128 # Proxy port, 3128 is the default for squidProxy

LavalinkServer/build.gradle

@@ -51,12 +51,9 @@ dependencies {
         exclude group: "org.slf4j", module: "slf4j-api"
     }
     implementation group: 'moe.kyokobot.koe', name: 'ext-udpqueue', version: koeVersion
-    implementation group: 'com.github.walkyst', name: 'lavaplayer-fork', version: lavaplayerVersion
+    implementation group: 'com.github.walkyst.lavaplayer-fork', name: 'lavaplayer', version: lavaplayerVersion
+    implementation group: 'com.github.walkyst.lavaplayer-fork', name: 'lavaplayer-ext-youtube-rotator', version: lavaplayerVersion
 
-    //implementation group: 'com.sedmelluq', name: 'lavaplayer', version: lavaplayerVersion
-    implementation(group: 'com.sedmelluq', name: 'lavaplayer-ext-youtube-rotator', version: lavaplayerIpRotatorVersion) {
-        exclude group: 'com.sedmelluq', module: 'lavaplayer'
-    }
     implementation group: 'com.github.natanbc', name: 'lavadsp', version: lavaDspVersion
     implementation group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlinVersion
 

LavalinkServer/src/main/java/lavalink/server/config/AudioPlayerConfiguration.kt

@@ -79,7 +79,25 @@ class AudioPlayerConfiguration {
         val mcr: MediaContainerRegistry = MediaContainerRegistry.extended(*mediaContainerProbes.toTypedArray())
 
         if (sources.isYoutube) {
-            val youtube = YoutubeAudioSourceManager(serverConfig.isYoutubeSearchEnabled)
+            val youtubeConfig = serverConfig.youtubeConfig
+            val youtube: YoutubeAudioSourceManager
+            if (youtubeConfig != null) {
+                if (youtubeConfig.email.isBlank() && youtubeConfig.password.isBlank()) {
+                    log.info("Email and password fields are blank, some age restricted videos will throw exceptions")
+                }
+                youtube = YoutubeAudioSourceManager(
+                    serverConfig.isYoutubeSearchEnabled,
+                    youtubeConfig.email,
+                    youtubeConfig.password
+                )
+            } else {
+                youtube = YoutubeAudioSourceManager(
+                    serverConfig.isYoutubeSearchEnabled,
+                    "",
+                    ""
+                )
+                log.debug("Youtube config block is not found")
+            }
             if (routePlanner != null) {
                 val retryLimit = serverConfig.ratelimit?.retryLimit ?: -1
                 when {
@@ -93,18 +111,6 @@ class AudioPlayerConfiguration {
             val playlistLoadLimit = serverConfig.youtubePlaylistLoadLimit
             if (playlistLoadLimit != null) youtube.setPlaylistPageCount(playlistLoadLimit)
 
-            val youtubeConfig = serverConfig.youtubeConfig
-            if (youtubeConfig != null) {
-                if (youtubeConfig.PAPISID.isNotBlank() && youtubeConfig.PSID.isNotBlank()) {
-                    YoutubeHttpContextFilter.setPAPISID(youtubeConfig.PAPISID)
-                    YoutubeHttpContextFilter.setPSID(youtubeConfig.PSID)
-                } else {
-                    log.info("PAPISID and PSID fields are blank, age restricted videos will throw exceptions")
-                }
-            } else {
-                log.debug("Youtube config block is not found")
-            }
-
             audioPlayerManager.registerSourceManager(youtube)
         }
         if (sources.isSoundcloud) {

LavalinkServer/src/main/java/lavalink/server/config/YoutubeConfig.kt

@@ -1,6 +1,6 @@
 package lavalink.server.config
 
 data class YoutubeConfig(
-        var PAPISID: String = "",
-        var PSID: String = ""
+        var email: String = "",
+        var password: String = ""
 )

build.gradle

@@ -53,8 +53,8 @@ subprojects {
 
     ext {
         //@formatter:off
-        
-        lavaplayerVersion               = '1.3.97.1'
+
+        lavaplayerVersion               = '1.3.98.1'
         lavaplayerIpRotatorVersion      = '0.2.3'
         jdaNasVersion                   = '1.1.0'
         jappVersion                     = '1.3.2-MINN'