Remove old audio track info for images

DuncteBot · Nov 26, 2023 · f14589b · f14589b
1 parent 5117ccb
commit f14589b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,8 @@
 # Skybot source managers
+
+> [!IMPORTANT]
+> This is compiled with `dev.arbjerg:lavalink` version 2.0.x in order to send artwork urls
+
 A bunch of extra source managers for LavaPlayer:
 
 - Mixcloud

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -39,15 +39,13 @@ repositories {
 }
 
 dependencies {
-    // build override for age-restricted videos
-//    implementation(group = "com.github.duncte123", name = "lavaplayer", version = "be6e364")
-    compileOnly(group = "com.github.walkyst", name = "lavaplayer-fork", version = "1.4.2")
+    compileOnly(group = "dev.arbjerg", name = "lavaplayer", version = "2.0.3")
 
     implementation("commons-io:commons-io:2.7")
     implementation(group = "org.jsoup", name = "jsoup", version = "1.15.3")
     implementation(group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2")
 
-    testImplementation(group = "com.github.walkyst", name = "lavaplayer-fork", version = "1.4.2")
+    testImplementation(group = "dev.arbjerg", name = "lavaplayer", version = " 2.0.3")
 }
 
 configure<JavaPluginExtension> {

diff --git a/src/main/java/com/dunctebot/sourcemanagers/AudioTrackInfoWithImage.java b/src/main/java/com/dunctebot/sourcemanagers/AudioTrackInfoWithImage.java
diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
@@ -17,7 +17,6 @@
 package com.dunctebot.sourcemanagers.pornhub;
 
 import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
-import com.dunctebot.sourcemanagers.AudioTrackInfoWithImage;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
 import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
@@ -114,15 +113,16 @@ private AudioItem loadItemOnce(AudioReference reference) throws IOException {
         );
     }
 
-    private AudioTrackInfoWithImage buildInfo(String title, String author, long duration, String identifier, String uri, String imageUrl) {
-        return new AudioTrackInfoWithImage(
+    private AudioTrackInfo buildInfo(String title, String author, long duration, String identifier, String uri, String imageUrl) {
+        return new AudioTrackInfo(
             title,
             author,
             duration,
             identifier,
             false,
             uri,
-            imageUrl
+            imageUrl,
+            null
         );
     }
 

diff --git a/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioSourceManager.java
@@ -17,7 +17,6 @@
 package com.dunctebot.sourcemanagers.reddit;
 
 import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
-import com.dunctebot.sourcemanagers.AudioTrackInfoWithImage;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
 import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
@@ -41,9 +40,9 @@
 
 import static com.dunctebot.sourcemanagers.Utils.USER_AGENT;
 import static com.dunctebot.sourcemanagers.Utils.isURL;
+import static com.dunctebot.sourcemanagers.reddit.RedditAudioTrack.getPlaybackUrl;
 import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.COMMON;
 import static com.sedmelluq.discord.lavaplayer.tools.JsonBrowser.NULL_BROWSER;
-import static com.dunctebot.sourcemanagers.reddit.RedditAudioTrack.getPlaybackUrl;
 
 public class RedditAudioSourceManager extends AbstractDuncteBotHttpSource {
     private static final Pattern FULL_LINK_REGEX = Pattern.compile("https:\\/\\/(?:www|old)\\.reddit\\.com\\/r\\/(?:[^\\/]+)\\/(?:[^\\/]+)\\/([^\\/]+)(?:\\/?(?:[^\\/]+)?\\/?)?");
@@ -204,14 +203,15 @@ private AudioItem buildTrack(@Nullable JsonBrowser data, String pageURl) {
         }
 
         return new RedditAudioTrack(
-            new AudioTrackInfoWithImage(
+            new AudioTrackInfo(
                 data.get("title").safeText(),
                 "u/" + data.get("author").safeText(),
                 media.get("duration").asLong(1) * 1000,
                 videoId,
                 false,
                 pageURl,
-                thumbnail
+                thumbnail,
+                null
             ),
             this
         );

diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
@@ -17,7 +17,6 @@
 package com.dunctebot.sourcemanagers.tiktok;
 
 import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
-import com.dunctebot.sourcemanagers.AudioTrackInfoWithImage;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
 import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
@@ -185,15 +184,16 @@ protected static class MetaData {
         // author
         String uniqueId;
 
-        AudioTrackInfoWithImage toTrackInfo() {
-            return new AudioTrackInfoWithImage(
+        AudioTrackInfo toTrackInfo() {
+            return new AudioTrackInfo(
                 this.title,
                 this.uniqueId,
                 this.duration * 1000L,
                 this.videoId,
                 false,
                 this.pageUrl,
-                this.cover
+                this.cover,
+                null
             );
         }