Tumblr support works

duncte123 · duncte123 · commit 373ea708102b · 2026-03-01T15:49:23.000+01:00
diff --git a/README.md b/README.md
@@ -13,6 +13,7 @@ Adding support for the following sources:
 - streamDeckAudio files
   - These files are only accepted over HTTP currently
 - Pixeldrain.com
+- Tumblr.com (when it does not throw a 403 your way)
 
 ## Lavalink version compatibility
 
@@ -64,7 +65,7 @@ plugins:
             mixcloud: true # mixcloud.com
             soundgasm: true # soundgasm.net
             pixeldrain: true # pixeldrain.com
-            tumblr: true # tumblr.com, requires an app to be configured with oauth2 support
+            tumblr: false # tumblr.com, requires an app to be configured with oauth2 support
 ```
 
 ## development
diff --git a/source-managers/src/main/java/com/dunctebot/sourcemanagers/Utils.java b/source-managers/src/main/java/com/dunctebot/sourcemanagers/Utils.java
@@ -23,7 +23,7 @@
 import java.nio.charset.Charset;
 
 public class Utils {
-    public static final String USER_AGENT = "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/114.0";
+    public static final String USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64; rv:147.0) Gecko/20100101 Firefox/147.0";
 
     public static String urlDecode(String in) {
         return URLDecoder.decode(in, Charset.defaultCharset());
diff --git a/source-managers/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioTrack.java b/source-managers/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioTrack.java
@@ -19,7 +19,6 @@
 package com.dunctebot.sourcemanagers.ocremix;
 
 import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
-import com.dunctebot.sourcemanagers.IWillUseIdentifierInstead;
 import com.dunctebot.sourcemanagers.Mp3Track;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
diff --git a/source-managers/src/main/java/com/dunctebot/sourcemanagers/tumblr/TumblrAudioSourceManager.java b/source-managers/src/main/java/com/dunctebot/sourcemanagers/tumblr/TumblrAudioSourceManager.java
@@ -9,6 +9,7 @@
 
 import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
 import com.dunctebot.sourcemanagers.tumblr.audio.TumblrBasePostAudioTrack;
+import com.dunctebot.sourcemanagers.tumblr.audio.TumblrMp3AudioTrack;
 import com.dunctebot.sourcemanagers.tumblr.audio.TumblrMpegAudioTrack;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
@@ -24,6 +25,8 @@
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -32,15 +35,21 @@
 import java.util.List;
 import java.util.regex.Pattern;
 
+import static com.dunctebot.sourcemanagers.Utils.USER_AGENT;
+
 public class TumblrAudioSourceManager extends AbstractDuncteBotHttpSource {
     private static final Pattern NORMAL_POST_PATTERN = Pattern.compile("https:\\/\\/(?:www\\.)?tumblr\\.com\\/(?<username>[^\\/]+)\\/(?<postId>[^\\/]+)\\/?.*");
     private static final Pattern BLOG_SUB_PATTERN = Pattern.compile("https:\\/\\/(?<username>[^\\.]+)\\.tumblr\\.com\\/post\\/(?<postId>[^\\/]+)\\/?.*");
+    private static final Logger log = LoggerFactory.getLogger(TumblrAudioSourceManager.class);
 
-    // TODO: https://tmblr.co/ZWMt9uiVE9gHKi00
+    // TODO: https://tmblr.co/ZWMt9uiVE9gHKi00 (when I feel like it tbh, nobody uses these links)
 
     private final String oauthConsumerKey;
     private final String oauthSecretKey;
 
+    private long tokenExpiresAt = -1;
+    private String accessToken = null;
+
     public TumblrAudioSourceManager(String consumerKey, String secretKey) {
         this.oauthConsumerKey = consumerKey;
         this.oauthSecretKey = secretKey;
@@ -101,12 +110,15 @@ public void encodeTrack(AudioTrack track, DataOutput output) throws IOException
     public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) throws IOException {
         final var mediaUrl = input.readUTF();
 
-        if (trackInfo.identifier.endsWith("audio/mpeg")) {
+        if (trackInfo.uri.endsWith("audio/mpeg")) {
+            return new TumblrMp3AudioTrack(trackInfo, this, mediaUrl);
+        }
+
+        if (trackInfo.uri.endsWith("video/mp4")) {
             return new TumblrMpegAudioTrack(trackInfo, this, mediaUrl);
         }
 
-        // TODO: this error is wrong
-        throw new FriendlyException("Unknown post type encountered while decoding tumblr track", FriendlyException.Severity.COMMON, null);
+        throw new FriendlyException("Unknown media type encountered whilst trying to decode tumblr track", FriendlyException.Severity.COMMON, null);
     }
 
     public TumblrBasePostAudioTrack fetchPostData(String username, String postId) throws Exception {
@@ -149,22 +161,22 @@ public TumblrBasePostAudioTrack postToTrack(JsonBrowser post, String postUrl) {
                     throw new FriendlyException("Provider not supported: " + ci.get("provider").text(), FriendlyException.Severity.COMMON, null);
                 }
 
-                final var creatorName = post.get("blog").get("title").text();
+                final var creatorName = getBlogName(post);
                 final var artwork = post.get("blog").get("avatar").index(0).get("url").text();
 
                 final var audioType = ci.get("media").get("type").text();
                 final var audioUrl = ci.get("media").get("url").text();
                 final var audioTitle = ci.get("title").textOrDefault("Tumblr Audio by " + creatorName);
 
                 if (audioType.equals("audio/mpeg")) {
-                    return new TumblrMpegAudioTrack(
+                    return new TumblrMp3AudioTrack(
                             new AudioTrackInfo(
                                     audioTitle,
                                     creatorName,
                                     Units.CONTENT_LENGTH_UNKNOWN,
-                                    postUrl + "?dbextra=" + audioType,
-                                    false,
                                     postUrl,
+                                    false,
+                                    postUrl + "?dbextra=" + audioType,
                                     artwork,
                                     null
                             ),
@@ -173,7 +185,32 @@ public TumblrBasePostAudioTrack postToTrack(JsonBrowser post, String postUrl) {
                     );
                 }
             } else if ("video".equals(ci.get("type").text())) {
-                // TODO
+                if (!"tumblr".equals(ci.get("provider").text())) {
+                    throw new FriendlyException("Provider not supported: " + ci.get("provider").text(), FriendlyException.Severity.COMMON, null);
+                }
+
+                final var creatorName = getBlogName(post);
+                final var artwork = post.get("blog").get("avatar").index(0).get("url").text();
+
+                final var videoType = ci.get("media").get("type").text();
+                final var videoUrl = ci.get("media").get("url").text();
+
+                if (videoType.equals("video/mp4")) {
+                    return new TumblrMpegAudioTrack(
+                            new AudioTrackInfo(
+                                    "Tumblr Video by " + creatorName,
+                                    creatorName,
+                                    Units.CONTENT_LENGTH_UNKNOWN,
+                                    postUrl,
+                                    false,
+                                    postUrl + "?dbextra=" + videoType,
+                                    artwork,
+                                    null
+                            ),
+                            this,
+                            videoUrl
+                    );
+                }
             }
         }
 
@@ -192,18 +229,33 @@ public JsonBrowser fetchNPFData(String username, String postId) throws Exception
         final var token = this.fetchOAuth2Token();
 
         httpGet.addHeader("Authorization", "Bearer " + token);
+        httpGet.addHeader("Accept", "application/json");
+        httpGet.setHeader("User-Agent", USER_AGENT);
 
         try (final CloseableHttpResponse res = getHttpInterface().execute(httpGet)) {
             final String content = IOUtils.toString(res.getEntity().getContent(), StandardCharsets.UTF_8);
 
+            System.out.println(content);
+
+            final int statusCode = res.getStatusLine().getStatusCode();
+
+            if (statusCode != 200) {
+                throw new IOException("Tumblr api request failed: " + statusCode);
+            }
+
             return JsonBrowser.parse(content);
         }
     }
 
     public String fetchOAuth2Token() throws Exception {
+        if (System.currentTimeMillis() < this.tokenExpiresAt) {
+            return this.accessToken;
+        }
+
         final var httpPost = new HttpPost("https://api.tumblr.com/v2/oauth2/token");
 
         httpPost.addHeader("Content-Type", "application/x-www-form-urlencoded");
+        httpPost.setHeader("User-Agent", USER_AGENT);
 
         final var body = String.join("&", List.of(
                 // Thank you for not documenting this LMAO
@@ -217,9 +269,32 @@ public String fetchOAuth2Token() throws Exception {
         );
 
         try (final CloseableHttpResponse res = getHttpInterface().execute(httpPost)) {
+            final int statusCode = res.getStatusLine().getStatusCode();
+
+            if (statusCode != 200) {
+                throw new IOException("Invalid status for fetching tumblr access token: " + statusCode);
+            }
+
             final String content = IOUtils.toString(res.getEntity().getContent(), StandardCharsets.UTF_8);
 
-            return JsonBrowser.parse(content).get("access_token").text();
+            System.out.println(content);
+
+            final var json = JsonBrowser.parse(content);
+            this.accessToken = json.get("access_token").text();
+            // expires_in is in seconds
+            this.tokenExpiresAt = System.currentTimeMillis() + (json.get("expires_in").asLong(0L) * 1000L);
+
+            return this.accessToken;
         }
     }
+
+    private static String getBlogName(JsonBrowser post) {
+        final var blogTitle = post.get("blog").get("title").safeText();
+
+        if (blogTitle.isBlank()) {
+            return post.get("blog").get("name").text();
+        }
+
+        return blogTitle;
+    }
 }
diff --git a/source-managers/src/main/java/com/dunctebot/sourcemanagers/tumblr/audio/TumblrMp3AudioTrack.java b/source-managers/src/main/java/com/dunctebot/sourcemanagers/tumblr/audio/TumblrMp3AudioTrack.java
@@ -2,16 +2,24 @@
 
 import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
 import com.dunctebot.sourcemanagers.Mp3Track;
-import com.dunctebot.sourcemanagers.tumblr.TumblrPostType;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 
 public class TumblrMp3AudioTrack extends Mp3Track implements TumblrBasePostAudioTrack {
-    public TumblrMp3AudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource manager) {
+    private final String mediaUrl;
+
+    public TumblrMp3AudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource manager, String mediaUrl) {
         super(trackInfo, manager);
+
+        this.mediaUrl = mediaUrl;
     }
 
     @Override
     public String getMediaUrl() {
-        return "";
+        return this.mediaUrl;
+    }
+
+    @Override
+    public String getPlaybackUrl() {
+        return this.getMediaUrl();
     }
 }
diff --git a/source-managers/src/test/java/TumblrTest.java b/source-managers/src/test/java/TumblrTest.java
@@ -11,8 +11,12 @@ public static void main(String[] args) throws Exception {
 
         System.out.println("Token found " + token);
 
-        final var npfData = mngr.fetchPostData("pukicho", "801421495209476096");
+        final var npfData = mngr.fetchNPFData("ectoblood", "809867644956213248");
 
-        System.out.println(npfData.getMediaUrl());
+        System.out.println(npfData.text());
+
+//        final var audioTrack = mngr.fetchPostData("pukicho", "801421495209476096");
+
+//        System.out.println(audioTrack.getMediaUrl());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,12 @@ public static void main(String[] args) throws Exception {`
`11`	`11`
`12`	`12`	`System.out.println("Token found " + token);`
`13`	`13`
`14`		`- final var npfData = mngr.fetchPostData("pukicho", "801421495209476096");`
	`14`	`+ final var npfData = mngr.fetchNPFData("ectoblood", "809867644956213248");`
`15`	`15`
`16`		`- System.out.println(npfData.getMediaUrl());`
	`16`	`+ System.out.println(npfData.text());`
	`17`	`+`
	`18`	`+// final var audioTrack = mngr.fetchPostData("pukicho", "801421495209476096");`
	`19`	`+`
	`20`	`+// System.out.println(audioTrack.getMediaUrl());`
`17`	`21`	`}`
`18`	`22`	`}`