From f6dd65757813032d0057e86b48614b3a6ddfbf62 Mon Sep 17 00:00:00 2001
From: DaniDipp <dippigames@gmail.com>
Date: Fri, 19 Apr 2024 00:35:10 +0000
Subject: [PATCH] Revert "Switch to lavalink's lavaplayer fork (#1490)"

This reverts commit 49c3ec79607bef5b15096ebd7b3645ba5a5b2095.
---
 pom.xml                                       | 21 ++++-----
 .../jmusicbot/utils/LogBackTurboFilter.java   | 44 -------------------
 src/main/resources/logback.xml                |  2 -
 3 files changed, 11 insertions(+), 56 deletions(-)
 delete mode 100644 src/main/java/com/jagrosh/jmusicbot/utils/LogBackTurboFilter.java

diff --git a/pom.xml b/pom.xml
index e153e4f44..3e55e2ef2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,11 +32,6 @@
             <name>m2-duncte123</name>
             <url>https://m2.duncte123.dev/releases</url>
         </repository>
-        <repository>
-            <id>arbjergDev-snapshots</id>
-            <name>Lavalink Repository</name>
-            <url>https://maven.lavalink.dev/snapshots</url>
-        </repository>
     </repositories>
 
     <dependencies>
@@ -54,11 +49,17 @@
         </dependency>
 
         <!-- Music Dependencies -->
-        <dependency>
-            <groupId>dev.arbjerg</groupId>
+        <!-- using a fork of this to fix some issues faster -->
+        <!-- dependency>
+            <groupId>com.sedmelluq</groupId>
             <artifactId>lavaplayer</artifactId>
-            <version>727959e9f621fc457b3a5adafcfffb55fdeaa538-SNAPSHOT</version>
-        </dependency>
+            <version>1.3.78</version>
+        </dependency -->
+        <dependency>
+	    <groupId>com.github.jagrosh</groupId>
+	    <artifactId>lavaplayer</artifactId>
+	    <version>jmusicbot-SNAPSHOT</version>
+	</dependency>
 	<dependency>
 	    <groupId>com.github.jagrosh</groupId>
 	    <artifactId>JLyrics</artifactId>
@@ -69,7 +70,7 @@
             <artifactId>sourcemanagers</artifactId>
             <version>1.9.0</version>
         </dependency>
-
+        
         <!-- Misc Internal Dependencies -->
         <dependency>
             <groupId>ch.qos.logback</groupId>
diff --git a/src/main/java/com/jagrosh/jmusicbot/utils/LogBackTurboFilter.java b/src/main/java/com/jagrosh/jmusicbot/utils/LogBackTurboFilter.java
deleted file mode 100644
index c991a07ec..000000000
--- a/src/main/java/com/jagrosh/jmusicbot/utils/LogBackTurboFilter.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2024 John Grosh <john.a.grosh@gmail.com>.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.jagrosh.jmusicbot.utils;
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.turbo.TurboFilter;
-import ch.qos.logback.core.spi.FilterReply;
-import org.slf4j.Marker;
-
-/**
- * A TurboFilter, currently only used to suppress specific log messages from libraries.
- *
- * @author Michaili K. <git@michaili.dev>
- */
-public class LogBackTurboFilter extends TurboFilter 
-{
-    @Override
-    public FilterReply decide(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t) 
-    {
-        // Suppresses the auth token warning from the YoutubeAudioSourceManager
-        // https://github.com/jagrosh/MusicBot/pull/1490#issuecomment-1974070225
-        if (logger.getName().equals("com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAccessTokenTracker")
-                && format.equals("YouTube auth tokens can't be retrieved because email and password is not set in YoutubeAudioSourceManager, age restricted videos will throw exceptions.")
-        ) {
-            return FilterReply.DENY;
-        }
-
-        return FilterReply.NEUTRAL;
-    }
-}
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 1d03fcc22..4a7033f5d 100644
--- 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>