From df2f4d0e871446bdc222f538d44c6eb6d3a83aab Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Tue, 9 Feb 2021 13:16:40 +0100
Subject: [PATCH 01/76] Bump version

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 04349c8..d6fa5e6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.5.1"
+project.version = "1.5.2"
 val archivesBaseName = "sourcemanagers"
 
 repositories {

From 8ade2d7e1ee5975d6081b6b380a8e261a2070bca Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Tue, 9 Feb 2021 13:50:15 +0100
Subject: [PATCH 02/76] Give github a try

---
 .github/workflows/02-publish.yml | 11 +++++++----
 build.gradle.kts                 | 27 +++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/02-publish.yml b/.github/workflows/02-publish.yml
index 429b291..555492e 100644
--- a/.github/workflows/02-publish.yml
+++ b/.github/workflows/02-publish.yml
@@ -24,8 +24,11 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew --no-daemon build
-      - name: Upload to github
+        run: ./gradlew --no-daemon publish
         env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew --no-daemon githubRelease
+            USERNAME: ${{ github.actor }}
+            TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#      - name: Upload to github
+#        env:
+#            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        run: ./gradlew --no-daemon githubRelease
diff --git a/build.gradle.kts b/build.gradle.kts
index d6fa5e6..26393af 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
     `java-library`
     `maven-publish`
 
-    id("com.github.breadmoirai.github-release") version "2.2.12"
+//    id("com.github.breadmoirai.github-release") version "2.2.12"
 }
 
 project.group = "com.dunctebot"
@@ -58,6 +58,7 @@ tasks.withType<Wrapper> {
 val jar: Jar by tasks
 val build: Task by tasks
 val clean: Task by tasks
+val publish: Task by tasks
 
 val sourcesJar = task<Jar>("sourcesJar") {
     archiveClassifier.set("sources")
@@ -74,8 +75,18 @@ build.apply {
 }
 
 publishing {
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/DuncteBot/skybot-source-managers")
+            credentials {
+                username = System.getenv("USERNAME")
+                password = System.getenv("TOKEN")
+            }
+        }
+    }
     publications {
-        create<MavenPublication>("mavenJava") {
+        register<MavenPublication>("gpr") {
             pom {
                 name.set(archivesBaseName)
                 description.set("Source managers for skybot")
@@ -111,7 +122,15 @@ publishing {
     }
 }
 
-githubRelease {
+publish.apply {
+    dependsOn(build)
+
+    onlyIf {
+        System.getenv("USERNAME") != null && System.getenv("TOKEN") != null
+    }
+}
+
+/*githubRelease {
     token(System.getenv("GITHUB_TOKEN"))
     owner("DuncteBot")
     repo("skybot-source-managers")
@@ -119,4 +138,4 @@ githubRelease {
     overwrite(false)
     prerelease(false)
     body(changelog())
-}
+}*/

From 185f164a3de1de91a38e443e4239645aa83f269e Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Tue, 9 Feb 2021 14:29:05 +0100
Subject: [PATCH 03/76] Attempt to update repo

---
 .github/workflows/02-publish.yml |  4 ++--
 build.gradle.kts                 | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/02-publish.yml b/.github/workflows/02-publish.yml
index 555492e..dbd104d 100644
--- a/.github/workflows/02-publish.yml
+++ b/.github/workflows/02-publish.yml
@@ -26,8 +26,8 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew --no-daemon publish
         env:
-            USERNAME: ${{ github.actor }}
-            TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            USERNAME: ${{ secrets.JFROG_USER }}
+            PASSWORD: ${{ secrets.JFROG_PASS }}
 #      - name: Upload to github
 #        env:
 #            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/build.gradle.kts b/build.gradle.kts
index 26393af..4d8a0d4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -77,16 +77,16 @@ build.apply {
 publishing {
     repositories {
         maven {
-            name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/DuncteBot/skybot-source-managers")
+            name = "jfrog"
+            url = uri("https://duncte123.jfrog.io/artifactory/maven/")
             credentials {
                 username = System.getenv("USERNAME")
-                password = System.getenv("TOKEN")
+                password = System.getenv("PASSWORD")
             }
         }
     }
     publications {
-        register<MavenPublication>("gpr") {
+        register<MavenPublication>("jfrog") {
             pom {
                 name.set(archivesBaseName)
                 description.set("Source managers for skybot")
@@ -126,7 +126,7 @@ publish.apply {
     dependsOn(build)
 
     onlyIf {
-        System.getenv("USERNAME") != null && System.getenv("TOKEN") != null
+        System.getenv("USERNAME") != null && System.getenv("PASSWORD") != null
     }
 }
 

From 5f56393a12c0092e93568903c40022da4788026d Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Tue, 9 Feb 2021 14:43:18 +0100
Subject: [PATCH 04/76] Remove id token

---
 build.gradle.kts                                      |  2 +-
 .../extra/YoutubeContextFilterOverride.java           |  1 -
 .../sourcemanagers/extra/YoutubeVersionData.java      | 11 ++---------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 4d8a0d4..cb4b7d1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.5.2"
+project.version = "1.5.3"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
diff --git a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java b/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java
index 5fea6e0..bda7c78 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java
@@ -111,7 +111,6 @@ public void onRequest(HttpClientContext context, HttpUriRequest request, boolean
         request.setHeader("x-youtube-client-version", youtubeVersionData.getVersion());
         request.setHeader("x-youtube-page-cl", youtubeVersionData.getPageCl());
         request.setHeader("x-youtube-page-label", youtubeVersionData.getLabel());
-        request.setHeader("x-youtube-identity-token", youtubeVersionData.getIdToken());
     }
 
     @Override
diff --git a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeVersionData.java b/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeVersionData.java
index ef719a6..8a5d727 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeVersionData.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeVersionData.java
@@ -27,15 +27,14 @@ public class YoutubeVersionData {
     /* PAGE_BUILD_LABEL  x-youtube-page-label */
     private final String label;
     /* ID_TOKEN  x-youtube-identity-token */
-    private final String idToken;
+    // private final String idToken;
     /* PAGE_CL  x-youtube-page-cl */
     private final String pageCl;
     /* DEVICE  x-youtube-device */
 //    private final String device;
 
-    public YoutubeVersionData(String version, String idToken, String label, String pageCl) {
+    public YoutubeVersionData(String version, String label, String pageCl) {
         this.version = version;
-        this.idToken = idToken;
         this.label = label;
         this.pageCl = pageCl;
     }
@@ -44,10 +43,6 @@ public String getVersion() {
         return version;
     }
 
-    public String getIdToken() {
-        return idToken;
-    }
-
     public String getLabel() {
         return label;
     }
@@ -60,7 +55,6 @@ public String getPageCl() {
     public String toString() {
         return "YoutubeVersionData{" +
                 "version='" + version + '\'' +
-                ", idToken='" + idToken + '\'' +
                 ", label='" + label + '\'' +
                 ", pageCl='" + pageCl + '\'' +
                 '}';
@@ -69,7 +63,6 @@ public String toString() {
     public static YoutubeVersionData fromBrowser(JsonBrowser json) {
         return new YoutubeVersionData(
                 json.get("INNERTUBE_CONTEXT_CLIENT_VERSION").safeText(),
-                json.get("ID_TOKEN").safeText(),
                 json.get("PAGE_BUILD_LABEL").safeText(),
                 json.get("PAGE_CL").safeText()
         );

From 84249d9642f4143929a74d23e25d8a5a348d2bb9 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 11:40:30 +0100
Subject: [PATCH 05/76] First test for tiktok

---
 .../com/dunctebot/sourcemanagers/Utils.java   |   9 +
 .../pornhub/PornHubAudioSourceManager.java    |   4 -
 .../tiktok/TikTokAudioSourceManager.java      | 181 ++++++++++++++++++
 .../tiktok/TikTokAudioTrack.java              |  50 +++++
 4 files changed, 240 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
 create mode 100644 src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java

diff --git a/src/main/java/com/dunctebot/sourcemanagers/Utils.java b/src/main/java/com/dunctebot/sourcemanagers/Utils.java
index 420ecdf..7167356 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/Utils.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/Utils.java
@@ -16,10 +16,19 @@
 
 package com.dunctebot.sourcemanagers;
 
+import org.apache.http.client.methods.HttpGet;
+
 public class Utils {
 
     public static boolean isURL(String url) {
         return url.matches("^https?:\\/\\/[-a-zA-Z0-9+&@#\\/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#\\/%=~_|]");
     }
 
+    public static void fakeChrome(HttpGet httpGet) {
+        httpGet.setHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9");
+        httpGet.setHeader("dnt", "1");
+        httpGet.setHeader("upgrade-insecure-requests", "1");
+        httpGet.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36");
+    }
+
 }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
index e950abd..e368525 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
@@ -146,10 +146,6 @@ private PornHubAudioTrack buildAudioTrack(String title, String author, long dura
         );
     }
 
-    /*private PornHubAudioTrack buildAudioTrack(AudioTrackInfoWithImage info) {
-        return new PornHubAudioTrack(info, this);
-    }*/
-
     private JsonBrowser getVideoInfo(String html) throws IOException {
         // flashvars_130837711['mediaDefinitions'][0]['videoUrl']
         final Matcher matcher = VIDEO_INFO_REGEX.matcher(html);
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
new file mode 100644
index 0000000..ff05e7a
--- /dev/null
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2021 Duncan "duncte123" Sterken
+ *
+ *    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.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;
+import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity;
+import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
+import com.sedmelluq.discord.lavaplayer.track.AudioItem;
+import com.sedmelluq.discord.lavaplayer.track.AudioReference;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static com.dunctebot.sourcemanagers.Utils.fakeChrome;
+
+public class TikTokAudioSourceManager extends AbstractDuncteBotHttpSource {
+    private static final String BASE = "https:\\/\\/(?:www\\.)?tiktok\\.com";
+    private static final String USER = "@(?<user>[a-z0-9A-Z]+)";
+    private static final String VIDEO = "(?<video>[0-9]+)";
+    private static final Pattern VIDEO_REGEX = Pattern.compile("^" + BASE + "\\/" + USER + "\\/video\\/" + VIDEO + "(?:.*)$");
+    private static final Pattern JS_REGEX = Pattern.compile(
+        "<script id=\"__NEXT_DATA__\" type=\"application/json\" crossorigin=\"anonymous\">(.*)<\\/script>");
+
+    @Override
+    public String getSourceName() {
+        return "tiktok";
+    }
+
+    @Override
+    public AudioItem loadItem(AudioPlayerManager manager, AudioReference reference) {
+        final Matcher matcher = VIDEO_REGEX.matcher(reference.identifier);
+
+        if (!matcher.matches()) {
+            return null;
+        }
+
+        final String user = matcher.group("user");
+        final String video = matcher.group("video");
+
+        try {
+            final MetaData metaData = extractData(user, video);
+
+            return new TikTokAudioTrack(metaData.toTrackInfo(), this);
+        } catch (Exception e) {
+            throw ExceptionTools.wrapUnfriendlyExceptions("Something went wrong", Severity.SUSPICIOUS, e);
+        }
+    }
+
+    @Override
+    public boolean isTrackEncodable(AudioTrack track) {
+        return true;
+    }
+
+    @Override
+    public void encodeTrack(AudioTrack track, DataOutput output) {
+        // Nothing to encode
+    }
+
+    @Override
+    public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) {
+        return new TikTokAudioTrack(trackInfo, this);
+    }
+
+    private MetaData extractData(String userId, String videoId) throws IOException {
+        return extractData("https://www.tiktok.com/@" + userId + "/video/" + videoId);
+    }
+
+    protected MetaData extractData(String url) throws IOException {
+        final HttpGet httpGet = new HttpGet(url);
+
+        fakeChrome(httpGet);
+
+        try (final CloseableHttpResponse response = getHttpInterface().execute(httpGet)) {
+            final int statusCode = response.getStatusLine().getStatusCode();
+
+            if (statusCode != 200) {
+                if (statusCode == 302) { // most likely a 404
+                    return null;
+                }
+
+                throw new IOException("Unexpected status code for video page response: " + statusCode);
+            }
+
+            final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+            final Matcher matcher = JS_REGEX.matcher(html);
+
+            if (!matcher.find()) {
+                // TODO: temp
+                System.out.println(html);
+                throw new FriendlyException("Failed to find data for tiktok video", Severity.SUSPICIOUS, null);
+            }
+
+            final JsonBrowser json = JsonBrowser.parse(matcher.group(1).trim());
+            final JsonBrowser base = json.get("props").get("pageProps").get("itemInfo").get("itemStruct");
+            final MetaData metaData = new MetaData();
+
+            final JsonBrowser video = base.get("video");
+
+            metaData.pageUrl = httpGet.getURI().toString();
+            metaData.videoId = video.get("id").safeText();
+            metaData.cover = video.get("cover").safeText();
+            metaData.title = video.get("desc").safeText();
+            metaData.uri = video.get("playAddr").safeText();
+            metaData.duration = Integer.parseInt(video.get("duration").safeText());
+
+            final JsonBrowser author = base.get("author");
+
+            metaData.uniqueId = author.get("uniqueId").safeText();
+
+            System.out.println(metaData);
+
+            return metaData;
+        }
+    }
+
+    protected static class MetaData {
+        // video
+        String cover; // image url
+        String pageUrl;
+        String videoId;
+        String uri;
+        int duration; // in seconds
+        String title;
+
+        // author
+        String uniqueId;
+
+        AudioTrackInfoWithImage toTrackInfo() {
+            return new AudioTrackInfoWithImage(
+                this.title,
+                this.uniqueId,
+                this.duration * 1000L,
+                this.videoId,
+                false,
+                this.pageUrl,
+                this.cover
+            );
+        }
+
+        // TEMP
+        @Override
+        public String toString() {
+            return "MetaData{" +
+                "cover='" + cover + '\'' +
+                ", pageUrl='" + pageUrl + '\'' +
+                ", videoId='" + videoId + '\'' +
+                ", uri='" + uri + '\'' +
+                ", duration=" + duration +
+                ", title='" + title + '\'' +
+                ", uniqueId='" + uniqueId + '\'' +
+                '}';
+        }
+    }
+}
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
new file mode 100644
index 0000000..5d62593
--- /dev/null
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2021 Duncan "duncte123" Sterken
+ *
+ *    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.dunctebot.sourcemanagers.tiktok;
+
+import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
+import com.dunctebot.sourcemanagers.MpegTrack;
+import com.dunctebot.sourcemanagers.tiktok.TikTokAudioSourceManager.MetaData;
+import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
+
+import java.io.IOException;
+
+import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
+
+public class TikTokAudioTrack extends MpegTrack {
+    public TikTokAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource manager) {
+        super(trackInfo, manager);
+    }
+
+    @Override
+    protected String getPlaybackUrl() {
+        try {
+            final MetaData metaData = ((TikTokAudioSourceManager) getSourceManager()).extractData(this.trackInfo.uri);
+
+            return metaData.uri;
+        } catch (IOException e) {
+            throw new FriendlyException("Could not load TikTok video", SUSPICIOUS, e);
+        }
+    }
+
+    @Override
+    protected AudioTrack makeShallowClone() {
+        return new TikTokAudioTrack(this.trackInfo, getSourceManager());
+    }
+}

From 0447639032de608b3bc5aeab8c7fdc2faaa42121 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 11:42:17 +0100
Subject: [PATCH 06/76] Something something copyright

---
 build.gradle.kts                                 |  2 +-
 settings.gradle.kts                              | 16 ++++++++++++++++
 .../AbstractDuncteBotHttpSource.java             |  2 +-
 .../sourcemanagers/AudioTrackInfoWithImage.java  |  2 +-
 .../sourcemanagers/DuncteBotSources.java         |  2 +-
 .../sourcemanagers/IdentifiedAudioReference.java |  2 +-
 .../com/dunctebot/sourcemanagers/Mp3Track.java   |  2 +-
 .../com/dunctebot/sourcemanagers/MpegTrack.java  |  2 +-
 .../java/com/dunctebot/sourcemanagers/Utils.java |  2 +-
 .../clypit/ClypitAudioSourceManager.java         |  2 +-
 .../sourcemanagers/clypit/ClypitAudioTrack.java  |  2 +-
 .../extra/YoutubeContextFilterOverride.java      |  2 +-
 .../sourcemanagers/extra/YoutubeVersionData.java |  2 +-
 .../getyarn/GetyarnAudioSourceManager.java       |  2 +-
 .../getyarn/GetyarnAudioTrack.java               |  2 +-
 .../pornhub/PornHubAudioSourceManager.java       |  2 +-
 .../pornhub/PornHubAudioTrack.java               |  2 +-
 .../reddit/RedditAudioSourceManager.java         |  2 +-
 .../sourcemanagers/reddit/RedditAudioTrack.java  |  2 +-
 .../speech/SpeechAudioSourceManager.java         |  2 +-
 .../sourcemanagers/speech/SpeechAudioTrack.java  |  2 +-
 21 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index cb4b7d1..814813d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8c144c7..14de823 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,2 +1,18 @@
+/*
+ * Copyright 2021 Duncan "duncte123" Sterken
+ *
+ *    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.
+ */
+
 rootProject.name = "skybot-source-managers"
 
diff --git a/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java b/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java
index f5323f5..48af4ee 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/dunctebot/sourcemanagers/AudioTrackInfoWithImage.java b/src/main/java/com/dunctebot/sourcemanagers/AudioTrackInfoWithImage.java
index 24ce34e..ccb3679 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/AudioTrackInfoWithImage.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/AudioTrackInfoWithImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
index 0462897..faa4219 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/dunctebot/sourcemanagers/IdentifiedAudioReference.java b/src/main/java/com/dunctebot/sourcemanagers/IdentifiedAudioReference.java
index f03968b..4566e31 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/IdentifiedAudioReference.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/IdentifiedAudioReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java b/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
index 9964cd7..09911bf 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/dunctebot/sourcemanagers/MpegTrack.java b/src/main/java/com/dunctebot/sourcemanagers/MpegTrack.java
index 23ba6eb..8004770 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/MpegTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/MpegTrack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/dunctebot/sourcemanagers/Utils.java b/src/main/java/com/dunctebot/sourcemanagers/Utils.java
index 7167356..6a7f3d9 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/Utils.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/dunctebot/sourcemanagers/clypit/ClypitAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/clypit/ClypitAudioSourceManager.java
index a65cddc..ea6eb5d 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/clypit/ClypitAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/clypit/ClypitAudioSourceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/dunctebot/sourcemanagers/clypit/ClypitAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/clypit/ClypitAudioTrack.java
index 3bfe4ac..5e2fd86 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/clypit/ClypitAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/clypit/ClypitAudioTrack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java b/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java
index bda7c78..736526d 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeVersionData.java b/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeVersionData.java
index 8a5d727..56f187c 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeVersionData.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeVersionData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioSourceManager.java
index d0b48d6..82797b9 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioSourceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioTrack.java
index 2b143e5..e1dab2b 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioTrack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
index e368525..d732b7f 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
index d754a5d..78027d2 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioSourceManager.java
index 22034e5..3f60b28 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioSourceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioTrack.java
index 42503d0..cb8a3a5 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioTrack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioSourceManager.java
index 3b55df1..399cd40 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioSourceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioTrack.java
index 96324d1..f4726e0 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioTrack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Duncan "duncte123" Sterken
+ * Copyright 2021 Duncan "duncte123" Sterken
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

From fd44ff395095c16fa5ac79b80caf2e2da2385e98 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 12:18:52 +0100
Subject: [PATCH 07/76] Register it

---
 .../java/com/dunctebot/sourcemanagers/DuncteBotSources.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
index faa4219..dc2c038 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
@@ -22,6 +22,7 @@
 import com.dunctebot.sourcemanagers.pornhub.PornHubAudioSourceManager;
 import com.dunctebot.sourcemanagers.reddit.RedditAudioSourceManager;
 import com.dunctebot.sourcemanagers.speech.SpeechAudioSourceManager;
+import com.dunctebot.sourcemanagers.tiktok.TikTokAudioSourceManager;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
 import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
 
@@ -41,6 +42,7 @@ public static void registerCustom(AudioPlayerManager playerManager, String speec
         playerManager.registerSourceManager(new SpeechAudioSourceManager(speechLanguage));
         playerManager.registerSourceManager(new PornHubAudioSourceManager());
         playerManager.registerSourceManager(new RedditAudioSourceManager());
+        playerManager.registerSourceManager(new TikTokAudioSourceManager());
 
     }
 }

From e28763feb28b49a50fa7aacfb602d061e50c51d2 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 13:27:06 +0100
Subject: [PATCH 08/76] With cookies

---
 build.gradle.kts                              |  2 +-
 .../AbstractDuncteBotHttpSource.java          |  8 ++-
 .../tiktok/TikTokAudioSourceManager.java      | 51 +++++++++++--------
 .../tiktok/TikTokAudioTrack.java              | 17 +++++--
 4 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 814813d..13f6d81 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -39,7 +39,7 @@ repositories {
 dependencies {
     // build override for age-restricted videos
 //    implementation(group = "com.github.duncte123", name = "lavaplayer", version = "be6e364")
-    implementation(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.67")
+    implementation(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.71")
     implementation(group = "io.sentry", name = "sentry-logback", version = "1.7.17")
 
     implementation(group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2")
diff --git a/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java b/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java
index 48af4ee..76c6f46 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java
@@ -33,9 +33,15 @@ public abstract class AbstractDuncteBotHttpSource implements AudioSourceManager,
     private final HttpInterfaceManager httpInterfaceManager;
 
     public AbstractDuncteBotHttpSource() {
+        this(true);
+    }
+
+    public AbstractDuncteBotHttpSource(boolean withoutCookies) {
         httpInterfaceManager = HttpClientTools.createDefaultThreadLocalManager();
 
-        httpInterfaceManager.setHttpContextFilter(new PornHubAudioSourceManager.FuckCookies());
+        if (withoutCookies) {
+            httpInterfaceManager.setHttpContextFilter(new PornHubAudioSourceManager.FuckCookies());
+        }
     }
 
     public HttpInterface getHttpInterface() {
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
index ff05e7a..3a2b523 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
@@ -48,6 +48,10 @@ public class TikTokAudioSourceManager extends AbstractDuncteBotHttpSource {
     private static final Pattern JS_REGEX = Pattern.compile(
         "<script id=\"__NEXT_DATA__\" type=\"application/json\" crossorigin=\"anonymous\">(.*)<\\/script>");
 
+    public TikTokAudioSourceManager() {
+        super(false);
+    }
+
     @Override
     public String getSourceName() {
         return "tiktok";
@@ -93,6 +97,30 @@ private MetaData extractData(String userId, String videoId) throws IOException {
     }
 
     protected MetaData extractData(String url) throws IOException {
+        final JsonBrowser json = extractDataRaw(url);
+        final JsonBrowser base = json.get("props").get("pageProps").get("itemInfo").get("itemStruct");
+        final MetaData metaData = new MetaData();
+
+        final JsonBrowser video = base.get("video");
+
+        metaData.pageUrl = url;
+        metaData.videoId = video.get("id").safeText();
+        metaData.cover = video.get("cover").safeText();
+        metaData.title = video.get("desc").safeText();
+
+        metaData.uri = video.get("playAddr").safeText();
+        metaData.duration = Integer.parseInt(video.get("duration").safeText());
+
+        final JsonBrowser author = base.get("author");
+
+        metaData.uniqueId = author.get("uniqueId").safeText();
+
+        System.out.println(metaData);
+
+        return metaData;
+    }
+
+    protected JsonBrowser extractDataRaw(String url) throws IOException {
         final HttpGet httpGet = new HttpGet(url);
 
         fakeChrome(httpGet);
@@ -117,30 +145,11 @@ protected MetaData extractData(String url) throws IOException {
                 throw new FriendlyException("Failed to find data for tiktok video", Severity.SUSPICIOUS, null);
             }
 
-            final JsonBrowser json = JsonBrowser.parse(matcher.group(1).trim());
-            final JsonBrowser base = json.get("props").get("pageProps").get("itemInfo").get("itemStruct");
-            final MetaData metaData = new MetaData();
-
-            final JsonBrowser video = base.get("video");
-
-            metaData.pageUrl = httpGet.getURI().toString();
-            metaData.videoId = video.get("id").safeText();
-            metaData.cover = video.get("cover").safeText();
-            metaData.title = video.get("desc").safeText();
-            metaData.uri = video.get("playAddr").safeText();
-            metaData.duration = Integer.parseInt(video.get("duration").safeText());
-
-            final JsonBrowser author = base.get("author");
-
-            metaData.uniqueId = author.get("uniqueId").safeText();
-
-            System.out.println(metaData);
-
-            return metaData;
+            return JsonBrowser.parse(matcher.group(1).trim());
         }
     }
 
-    protected static class MetaData {
+    private static class MetaData {
         // video
         String cover; // image url
         String pageUrl;
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
index 5d62593..863dea6 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
@@ -18,8 +18,8 @@
 
 import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
 import com.dunctebot.sourcemanagers.MpegTrack;
-import com.dunctebot.sourcemanagers.tiktok.TikTokAudioSourceManager.MetaData;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
+import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 
@@ -35,9 +35,18 @@ public TikTokAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource ma
     @Override
     protected String getPlaybackUrl() {
         try {
-            final MetaData metaData = ((TikTokAudioSourceManager) getSourceManager()).extractData(this.trackInfo.uri);
-
-            return metaData.uri;
+            final JsonBrowser json = ((TikTokAudioSourceManager) getSourceManager()).extractDataRaw(
+                "https://www.tiktok.com/embed/v2/" + this.trackInfo.identifier + "?lang=en-US"
+            );
+
+            return json.get("props")
+                .get("pageProps")
+                .get("videoData")
+                .get("itemInfos")
+                .get("video")
+                .get("urls")
+                .index(0)
+                .safeText();
         } catch (IOException e) {
             throw new FriendlyException("Could not load TikTok video", SUSPICIOUS, e);
         }

From 67acafb3e8069c1e4e9fd30625c2eb55376a8603 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 14:29:16 +0100
Subject: [PATCH 09/76] Attempt 5

---
 .../AbstractDuncteBotHttpSource.java          |   2 +-
 .../tiktok/TikTokAudioSourceManager.java      | 160 +++++++++++++++---
 .../tiktok/TikTokAudioTrack.java              |  18 +-
 3 files changed, 146 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java b/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java
index 76c6f46..a6fc19c 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java
@@ -30,7 +30,7 @@
 
 public abstract class AbstractDuncteBotHttpSource implements AudioSourceManager, HttpConfigurable {
 
-    private final HttpInterfaceManager httpInterfaceManager;
+    protected final HttpInterfaceManager httpInterfaceManager;
 
     public AbstractDuncteBotHttpSource() {
         this(true);
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
index 3a2b523..b98db94 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
@@ -23,25 +23,30 @@
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity;
 import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
+import com.sedmelluq.discord.lavaplayer.tools.http.HttpContextFilter;
 import com.sedmelluq.discord.lavaplayer.track.AudioItem;
 import com.sedmelluq.discord.lavaplayer.track.AudioReference;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.client.protocol.HttpClientContext;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import static com.dunctebot.sourcemanagers.Utils.fakeChrome;
 
 public class TikTokAudioSourceManager extends AbstractDuncteBotHttpSource {
-    private static final String BASE = "https:\\/\\/(?:www\\.)?tiktok\\.com";
+    private static final String BASE = "https:\\/\\/(?:www\\.|m\\.)?tiktok\\.com";
     private static final String USER = "@(?<user>[a-z0-9A-Z]+)";
     private static final String VIDEO = "(?<video>[0-9]+)";
     private static final Pattern VIDEO_REGEX = Pattern.compile("^" + BASE + "\\/" + USER + "\\/video\\/" + VIDEO + "(?:.*)$");
@@ -50,6 +55,8 @@ public class TikTokAudioSourceManager extends AbstractDuncteBotHttpSource {
 
     public TikTokAudioSourceManager() {
         super(false);
+
+        this.httpInterfaceManager.setHttpContextFilter(new TikTokFilter());
     }
 
     @Override
@@ -99,25 +106,8 @@ private MetaData extractData(String userId, String videoId) throws IOException {
     protected MetaData extractData(String url) throws IOException {
         final JsonBrowser json = extractDataRaw(url);
         final JsonBrowser base = json.get("props").get("pageProps").get("itemInfo").get("itemStruct");
-        final MetaData metaData = new MetaData();
-
-        final JsonBrowser video = base.get("video");
-
-        metaData.pageUrl = url;
-        metaData.videoId = video.get("id").safeText();
-        metaData.cover = video.get("cover").safeText();
-        metaData.title = video.get("desc").safeText();
-
-        metaData.uri = video.get("playAddr").safeText();
-        metaData.duration = Integer.parseInt(video.get("duration").safeText());
-
-        final JsonBrowser author = base.get("author");
-
-        metaData.uniqueId = author.get("uniqueId").safeText();
 
-        System.out.println(metaData);
-
-        return metaData;
+        return getMetaData(url, base);
     }
 
     protected JsonBrowser extractDataRaw(String url) throws IOException {
@@ -149,7 +139,64 @@ protected JsonBrowser extractDataRaw(String url) throws IOException {
         }
     }
 
-    private static class MetaData {
+    protected MetaData extractFromJson(String url) throws IOException {
+        final Matcher matcher = VIDEO_REGEX.matcher(url);
+
+        if (!matcher.matches()) {
+            throw new IOException("Url does not match tiktok anymore? wtf");
+        }
+
+        final String user = matcher.group("user");
+        final String video = matcher.group("video");
+
+        final HttpGet httpGet = new HttpGet(
+            "https://www.tiktok.com/node/share/video/@" + user + '/' + video
+        );
+
+        fakeChrome(httpGet);
+
+        try (final CloseableHttpResponse response = getHttpInterface().execute(httpGet)) {
+            final int statusCode = response.getStatusLine().getStatusCode();
+
+            if (statusCode != 200) {
+                if (statusCode == 302) { // most likely a 404
+                    return null;
+                }
+
+                throw new IOException("Unexpected status code for video page response: " + statusCode);
+            }
+
+            final String string = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+            final JsonBrowser json = JsonBrowser.parse(string);
+            final JsonBrowser base = json.get("itemInfo").get("itemStruct");
+
+            return getMetaData(url, base);
+        }
+    }
+
+    private MetaData getMetaData(String url, JsonBrowser base) {
+        final MetaData metaData = new MetaData();
+
+        final JsonBrowser videoJson = base.get("video");
+
+        metaData.pageUrl = url;
+        metaData.videoId = videoJson.get("id").safeText();
+        metaData.cover = videoJson.get("cover").safeText();
+        metaData.title = base.get("desc").safeText();
+
+        metaData.uri = videoJson.get("playAddr").safeText();
+        metaData.duration = Integer.parseInt(videoJson.get("duration").safeText());
+
+        final JsonBrowser author = base.get("author");
+
+        metaData.uniqueId = author.get("uniqueId").safeText();
+
+        System.out.println(metaData);
+
+        return metaData;
+    }
+
+    protected static class MetaData {
         // video
         String cover; // image url
         String pageUrl;
@@ -187,4 +234,77 @@ public String toString() {
                 '}';
         }
     }
+
+    public static class TikTokFilter implements HttpContextFilter {
+        @Override
+        public void onContextOpen(HttpClientContext context) {
+            //
+        }
+
+        @Override
+        public void onContextClose(HttpClientContext context) {
+            // Not used
+        }
+
+        @Override
+        public void onRequest(HttpClientContext context, HttpUriRequest request, boolean isRepetition) {
+            request.setHeader("Referer", "https://www.tiktok.com/");
+            request.setHeader("Cookie", "tt_webid_v2=68" + makeId(16));
+
+            final String ua = fakeUserAgent();
+
+            System.out.println("NEW USER AGENT " + ua);
+
+            request.setHeader("User-Agent", ua);
+
+        }
+
+        @Override
+        public boolean onRequestResponse(HttpClientContext context, HttpUriRequest request, HttpResponse response) {
+            return false;
+        }
+
+        @Override
+        public boolean onRequestException(HttpClientContext context, HttpUriRequest request, Throwable error) {
+            return false;
+        }
+
+        private static String makeId(int length) {
+            final StringBuilder sb = new StringBuilder();
+            final String charList = "0123456789";
+
+            for (int i = 0; i < length; i += 1) {
+                sb.append(charList.charAt((int) Math.floor(Math.random() * charList.length())));
+            }
+
+            return sb.toString();
+        }
+
+        private static String fakeUserAgent() {
+            final String[] parts = {
+                "Macintosh; Intel Mac OS X 10_15_7",
+                "Macintosh; Intel Mac OS X 10_15_5",
+                "Macintosh; Intel Mac OS X 10_11_6",
+                "Macintosh; Intel Mac OS X 10_6_6",
+                "Macintosh; Intel Mac OS X 10_9_5",
+                "Macintosh; Intel Mac OS X 10_10_5",
+                "Macintosh; Intel Mac OS X 10_7_5",
+                "Macintosh; Intel Mac OS X 10_11_3",
+                "Macintosh; Intel Mac OS X 10_10_3",
+                "Macintosh; Intel Mac OS X 10_6_8",
+                "Macintosh; Intel Mac OS X 10_10_2",
+                "Macintosh; Intel Mac OS X 10_10_3",
+                "Macintosh; Intel Mac OS X 10_11_5",
+                "Windows NT 10.0; Win64; x64",
+                "Windows NT 10.0; WOW64",
+                "Windows NT 10.0",
+            };
+
+            final ThreadLocalRandom rnd = ThreadLocalRandom.current();
+
+            return "Mozilla/5.0 (" + parts[rnd.nextInt(parts.length)] + ") AppleWebKit/537.36 (KHTML, like Gecko) Chrome/" +
+                (rnd.nextInt(3) + 85) + ".0." + (rnd.nextInt(190) + 4100) + '.' + (rnd.nextInt(50) + 140) +
+                "Safari/537.36";
+        }
+    }
 }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
index 863dea6..8973e6c 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
@@ -18,8 +18,8 @@
 
 import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
 import com.dunctebot.sourcemanagers.MpegTrack;
+import com.dunctebot.sourcemanagers.tiktok.TikTokAudioSourceManager.MetaData;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 
@@ -35,18 +35,10 @@ public TikTokAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource ma
     @Override
     protected String getPlaybackUrl() {
         try {
-            final JsonBrowser json = ((TikTokAudioSourceManager) getSourceManager()).extractDataRaw(
-                "https://www.tiktok.com/embed/v2/" + this.trackInfo.identifier + "?lang=en-US"
-            );
-
-            return json.get("props")
-                .get("pageProps")
-                .get("videoData")
-                .get("itemInfos")
-                .get("video")
-                .get("urls")
-                .index(0)
-                .safeText();
+            final MetaData metaData = ((TikTokAudioSourceManager) getSourceManager())
+                .extractFromJson(this.trackInfo.uri);
+
+            return metaData.uri;
         } catch (IOException e) {
             throw new FriendlyException("Could not load TikTok video", SUSPICIOUS, e);
         }

From 969911ba7ca579e719d7040398c8152877f9a7ff Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 14:44:20 +0100
Subject: [PATCH 10/76] Cookie store

---
 .../sourcemanagers/tiktok/TikTokAudioSourceManager.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
index b98db94..f3ae9fd 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
@@ -30,10 +30,12 @@
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpResponse;
+import org.apache.http.client.CookieStore;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.impl.client.BasicCookieStore;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -53,6 +55,9 @@ public class TikTokAudioSourceManager extends AbstractDuncteBotHttpSource {
     private static final Pattern JS_REGEX = Pattern.compile(
         "<script id=\"__NEXT_DATA__\" type=\"application/json\" crossorigin=\"anonymous\">(.*)<\\/script>");
 
+    // keep a cookie store in memory
+    private static final CookieStore cookieStore = new BasicCookieStore();
+
     public TikTokAudioSourceManager() {
         super(false);
 
@@ -238,7 +243,7 @@ public String toString() {
     public static class TikTokFilter implements HttpContextFilter {
         @Override
         public void onContextOpen(HttpClientContext context) {
-            //
+            context.setCookieStore(cookieStore);
         }
 
         @Override

From 1ccdcb0cef10a542cfe5b67456e043d284d68e06 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 14:59:51 +0100
Subject: [PATCH 11/76] Try to copy a cookie

---
 .../sourcemanagers/tiktok/TikTokAudioSourceManager.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
index f3ae9fd..1e74d86 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
@@ -254,7 +254,8 @@ public void onContextClose(HttpClientContext context) {
         @Override
         public void onRequest(HttpClientContext context, HttpUriRequest request, boolean isRepetition) {
             request.setHeader("Referer", "https://www.tiktok.com/");
-            request.setHeader("Cookie", "tt_webid_v2=68" + makeId(16));
+//            request.setHeader("Cookie", "tt_webid_v2=68" + makeId(16));
+            request.setHeader("Cookie", "tt_webid_v2=6930951741719643654; tt_webid=6930951741719643654; tt_csrf_token=oIE-pGapg3HhLpw4okMKouQE; bm_sz=1D7B2A5C3CE40E72AA2EDF957F29F996~YAAQ9vp7XCr1eB13AQAA4xpHugqAHEd7XhOGx7ADrTdeJSOGXeu3dMn3D8VK2tLtRzg3hHvrJu8zVhDHNbCVuJLKSYJNqO4hGQV1Wv5an9yjhHHni+OXPLEq2Z8jnH8CJJ9/mDYsa38iK4uhWoj1LWpTomOIDQ04lDQ/+ptIS/j2qymZYhNfGWfb1VPE5J7w; csrf_session_id=59db840225234be19cae4f09b50d65fc; R6kq3TV7=AH0eR7p3AQAAmf0BkeXsHuBeFsHfupJ0Uz70iJ1I3lFWmBwfxEqA2pyrlXEm|1|0|cb2e2a7b2c53e039465b82f493fb6a8309e2c12e; s_v_web_id=verify_klc9wz5x_RnKm6BBB_zGUE_4NIv_Amyp_iQnEJuUqiGiI; _abck=E031D1F37D5F1FB86124B6209D9D9621~0~YAAQ9vp7XGz1eB13AQAA1iNHugWhOYMPXUH6lDl8u7JREPlG5fKjcchhZuQSIyfQjQvGBkleZUGxcwOvdaTIJ+y7PCnijTNmCqpa/6h0blaIJsgUhSqxFtzGvSQ1AF3zLM/sEmBTL8272gZdv5wLZ9IDBs5EdeVwkXe83MN+Xkeu/A3Enkl7Ww7b2AJXPF7I1UAvljjXl4uSsay/UplBzWYd/GzwY1dewZj1aqbnGUk+UdMp+EHbpFO4DPVf4nAK6A76226/wxTKZlhwGtCD4wCY7IpCTpUrGT6eEy1pXduCTrZqQr02/rAwwi5aPJB+lHzkQulGH/pL4z1YOSc7GWXEG0vM4g==~-1~||-1||~-1; MONITOR_WEB_ID=6930951741719643654; bm_mi=C903011609E9246F5705C37DAB23438C~TLbWkU2lK07SJd4AEnfIep1qyvRMLo8dk0Ia/9JqiizV0Je06cnPffkpuaiXK1owXx8d+5hQfAxq2Rzyhn8vx/O9irH7i8jM/Opke2qkeGVwEMC/j3ZHQcKNXZ7bCeHicfR94IjDT90WeByQdRs21uGdiqzJVed+hx604WVvLCOmf+2PZCVvyZkT3YhzRvM3o/2vsL0mPH/le/mnnSkSaXvfSOjVC1Ejnj8TXkqGcHs=; bm_sv=43029414F4FFB9469BC50FFC27EABFD5~U8fwrdQmK9DaRqNyRL+2Q5LdaYbFXujau64u0KV6hPHmbobEUj/aPqfsDXY6x4R9B3lmiBdjlkVnCpthdFrrq7OwvK3aTwkKSCW2NbFxFCocthusvTtJ/9hC+CLQVf7cvScr9zPn8HJR2GhlAD8f+T4wQZRgfIss3JaqXs2ORxI=; ak_bmsc=16F1ADB9A7C2ACBFC688E7DA7FC6D44D5C7BFAF6853C0000E6AF2F6033BAB61D~plD1kBh5z0AC8DOgQbkp/GkJKVUKri6+qoZr1c9l6f6OqvIJ6HeOoLqrZERsUxmR1jYJl7lfkAqk/M+PLt5eDR+0nlZtibK459604wHaMzu3OYykuWT68qA6ahNblylWF1b57gOnB608r3uXGAaL6d7QE7ilVdGZDynW3ZpVifnt285Q+tsPrhf86cuG8Ltg4KYL527tXmj8jtpNmItmciM4UeAGrB2LT5vXkRGrXWJ4k18GlH4MXlMPLRsNBaA9vu");
 
             final String ua = fakeUserAgent();
 

From cb90f2e6662f1b38b05c7abdae2ea401557aba50 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 15:15:05 +0100
Subject: [PATCH 12/76] Dump to file

---
 src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java | 9 +++++++++
 .../sourcemanagers/tiktok/TikTokAudioSourceManager.java  | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java b/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
index 09911bf..96144aa 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
@@ -27,7 +27,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
 import java.net.URI;
+import java.nio.file.StandardCopyOption;
 
 public class Mp3Track extends DelegatedAudioTrack {
     protected static final Logger log = LoggerFactory.getLogger(Mp3Track.class);
@@ -51,6 +53,13 @@ protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface h
         log.debug("Starting {} track from URL: {}", manager.getSourceName(), trackUrl);
         // Setting contentLength (last param) to null makes it default to Long.MAX_VALUE
         try (PersistentHttpStream stream = new PersistentHttpStream(httpInterface, new URI(trackUrl), this.getTrackDuration())) {
+            File targetFile = new File("./TIKTOK_STREAM.raw");
+
+            java.nio.file.Files.copy(
+                stream,
+                targetFile.toPath(),
+                StandardCopyOption.REPLACE_EXISTING);
+
             processDelegate(createAudioTrack(this.trackInfo, stream), localExecutor);
         }
     }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
index 1e74d86..83e5172 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
@@ -49,7 +49,7 @@
 
 public class TikTokAudioSourceManager extends AbstractDuncteBotHttpSource {
     private static final String BASE = "https:\\/\\/(?:www\\.|m\\.)?tiktok\\.com";
-    private static final String USER = "@(?<user>[a-z0-9A-Z]+)";
+    private static final String USER = "@(?<user>[a-z0-9A-Z_-]+)";
     private static final String VIDEO = "(?<video>[0-9]+)";
     private static final Pattern VIDEO_REGEX = Pattern.compile("^" + BASE + "\\/" + USER + "\\/video\\/" + VIDEO + "(?:.*)$");
     private static final Pattern JS_REGEX = Pattern.compile(

From 8ab53b44e8ac5e3c35996b9be6d6692210f95e38 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 16:02:50 +0100
Subject: [PATCH 13/76] This might work

---
 .../dunctebot/sourcemanagers/Mp3Track.java    |   9 --
 .../com/dunctebot/sourcemanagers/Utils.java   |  19 +++-
 .../tiktok/TikTokAudioSourceManager.java      |  47 +-------
 .../tiktok/TikTokAudioTrack.java              |  60 +++++++++-
 .../tiktok/TikTokAudioTrackHttpManager.java   | 104 ++++++++++++++++++
 5 files changed, 180 insertions(+), 59 deletions(-)
 create mode 100644 src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java

diff --git a/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java b/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
index 96144aa..09911bf 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
@@ -27,9 +27,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
 import java.net.URI;
-import java.nio.file.StandardCopyOption;
 
 public class Mp3Track extends DelegatedAudioTrack {
     protected static final Logger log = LoggerFactory.getLogger(Mp3Track.class);
@@ -53,13 +51,6 @@ protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface h
         log.debug("Starting {} track from URL: {}", manager.getSourceName(), trackUrl);
         // Setting contentLength (last param) to null makes it default to Long.MAX_VALUE
         try (PersistentHttpStream stream = new PersistentHttpStream(httpInterface, new URI(trackUrl), this.getTrackDuration())) {
-            File targetFile = new File("./TIKTOK_STREAM.raw");
-
-            java.nio.file.Files.copy(
-                stream,
-                targetFile.toPath(),
-                StandardCopyOption.REPLACE_EXISTING);
-
             processDelegate(createAudioTrack(this.trackInfo, stream), localExecutor);
         }
     }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/Utils.java b/src/main/java/com/dunctebot/sourcemanagers/Utils.java
index 6a7f3d9..f352cf3 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/Utils.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/Utils.java
@@ -16,7 +16,7 @@
 
 package com.dunctebot.sourcemanagers;
 
-import org.apache.http.client.methods.HttpGet;
+import org.apache.http.HttpRequest;
 
 public class Utils {
 
@@ -24,11 +24,18 @@ public static boolean isURL(String url) {
         return url.matches("^https?:\\/\\/[-a-zA-Z0-9+&@#\\/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#\\/%=~_|]");
     }
 
-    public static void fakeChrome(HttpGet httpGet) {
-        httpGet.setHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9");
-        httpGet.setHeader("dnt", "1");
-        httpGet.setHeader("upgrade-insecure-requests", "1");
-        httpGet.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36");
+    public static void fakeChrome(HttpRequest request) {
+        request.setHeader("dnt", "1");
+        request.setHeader("upgrade-insecure-requests", "1");
+        request.setHeader("Accept", "*/*");
+        request.setHeader("Accept-Encoding", "identity;q=1, *;q=0");
+        request.setHeader("Accept-Language", "en-US,en;q=0.9");
+        request.setHeader("sec-ch-ua", "\"Chromium\";v=\"88\", \"Google Chrome\";v=\"88\", \";Not A Brand\";v=\"99\"");
+        request.setHeader("sec-ch-ua-mobile", "?0");
+        request.setHeader("sec-fetch-dest", "video");
+        request.setHeader("sec-fetch-mode", "no-cors");
+        request.setHeader("sec-fetch-site", "cross-site");
+        request.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36");
     }
 
 }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
index 83e5172..ba1448c 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
@@ -51,13 +51,10 @@ public class TikTokAudioSourceManager extends AbstractDuncteBotHttpSource {
     private static final String BASE = "https:\\/\\/(?:www\\.|m\\.)?tiktok\\.com";
     private static final String USER = "@(?<user>[a-z0-9A-Z_-]+)";
     private static final String VIDEO = "(?<video>[0-9]+)";
-    private static final Pattern VIDEO_REGEX = Pattern.compile("^" + BASE + "\\/" + USER + "\\/video\\/" + VIDEO + "(?:.*)$");
+    protected static final Pattern VIDEO_REGEX = Pattern.compile("^" + BASE + "\\/" + USER + "\\/video\\/" + VIDEO + "(?:.*)$");
     private static final Pattern JS_REGEX = Pattern.compile(
         "<script id=\"__NEXT_DATA__\" type=\"application/json\" crossorigin=\"anonymous\">(.*)<\\/script>");
 
-    // keep a cookie store in memory
-    private static final CookieStore cookieStore = new BasicCookieStore();
-
     public TikTokAudioSourceManager() {
         super(false);
 
@@ -144,42 +141,7 @@ protected JsonBrowser extractDataRaw(String url) throws IOException {
         }
     }
 
-    protected MetaData extractFromJson(String url) throws IOException {
-        final Matcher matcher = VIDEO_REGEX.matcher(url);
-
-        if (!matcher.matches()) {
-            throw new IOException("Url does not match tiktok anymore? wtf");
-        }
-
-        final String user = matcher.group("user");
-        final String video = matcher.group("video");
-
-        final HttpGet httpGet = new HttpGet(
-            "https://www.tiktok.com/node/share/video/@" + user + '/' + video
-        );
-
-        fakeChrome(httpGet);
-
-        try (final CloseableHttpResponse response = getHttpInterface().execute(httpGet)) {
-            final int statusCode = response.getStatusLine().getStatusCode();
-
-            if (statusCode != 200) {
-                if (statusCode == 302) { // most likely a 404
-                    return null;
-                }
-
-                throw new IOException("Unexpected status code for video page response: " + statusCode);
-            }
-
-            final String string = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
-            final JsonBrowser json = JsonBrowser.parse(string);
-            final JsonBrowser base = json.get("itemInfo").get("itemStruct");
-
-            return getMetaData(url, base);
-        }
-    }
-
-    private MetaData getMetaData(String url, JsonBrowser base) {
+    protected static MetaData getMetaData(String url, JsonBrowser base) {
         final MetaData metaData = new MetaData();
 
         final JsonBrowser videoJson = base.get("video");
@@ -243,7 +205,7 @@ public String toString() {
     public static class TikTokFilter implements HttpContextFilter {
         @Override
         public void onContextOpen(HttpClientContext context) {
-            context.setCookieStore(cookieStore);
+            //
         }
 
         @Override
@@ -254,8 +216,9 @@ public void onContextClose(HttpClientContext context) {
         @Override
         public void onRequest(HttpClientContext context, HttpUriRequest request, boolean isRepetition) {
             request.setHeader("Referer", "https://www.tiktok.com/");
+//            request.setHeader("Referer", request.getURI().toString());
 //            request.setHeader("Cookie", "tt_webid_v2=68" + makeId(16));
-            request.setHeader("Cookie", "tt_webid_v2=6930951741719643654; tt_webid=6930951741719643654; tt_csrf_token=oIE-pGapg3HhLpw4okMKouQE; bm_sz=1D7B2A5C3CE40E72AA2EDF957F29F996~YAAQ9vp7XCr1eB13AQAA4xpHugqAHEd7XhOGx7ADrTdeJSOGXeu3dMn3D8VK2tLtRzg3hHvrJu8zVhDHNbCVuJLKSYJNqO4hGQV1Wv5an9yjhHHni+OXPLEq2Z8jnH8CJJ9/mDYsa38iK4uhWoj1LWpTomOIDQ04lDQ/+ptIS/j2qymZYhNfGWfb1VPE5J7w; csrf_session_id=59db840225234be19cae4f09b50d65fc; R6kq3TV7=AH0eR7p3AQAAmf0BkeXsHuBeFsHfupJ0Uz70iJ1I3lFWmBwfxEqA2pyrlXEm|1|0|cb2e2a7b2c53e039465b82f493fb6a8309e2c12e; s_v_web_id=verify_klc9wz5x_RnKm6BBB_zGUE_4NIv_Amyp_iQnEJuUqiGiI; _abck=E031D1F37D5F1FB86124B6209D9D9621~0~YAAQ9vp7XGz1eB13AQAA1iNHugWhOYMPXUH6lDl8u7JREPlG5fKjcchhZuQSIyfQjQvGBkleZUGxcwOvdaTIJ+y7PCnijTNmCqpa/6h0blaIJsgUhSqxFtzGvSQ1AF3zLM/sEmBTL8272gZdv5wLZ9IDBs5EdeVwkXe83MN+Xkeu/A3Enkl7Ww7b2AJXPF7I1UAvljjXl4uSsay/UplBzWYd/GzwY1dewZj1aqbnGUk+UdMp+EHbpFO4DPVf4nAK6A76226/wxTKZlhwGtCD4wCY7IpCTpUrGT6eEy1pXduCTrZqQr02/rAwwi5aPJB+lHzkQulGH/pL4z1YOSc7GWXEG0vM4g==~-1~||-1||~-1; MONITOR_WEB_ID=6930951741719643654; bm_mi=C903011609E9246F5705C37DAB23438C~TLbWkU2lK07SJd4AEnfIep1qyvRMLo8dk0Ia/9JqiizV0Je06cnPffkpuaiXK1owXx8d+5hQfAxq2Rzyhn8vx/O9irH7i8jM/Opke2qkeGVwEMC/j3ZHQcKNXZ7bCeHicfR94IjDT90WeByQdRs21uGdiqzJVed+hx604WVvLCOmf+2PZCVvyZkT3YhzRvM3o/2vsL0mPH/le/mnnSkSaXvfSOjVC1Ejnj8TXkqGcHs=; bm_sv=43029414F4FFB9469BC50FFC27EABFD5~U8fwrdQmK9DaRqNyRL+2Q5LdaYbFXujau64u0KV6hPHmbobEUj/aPqfsDXY6x4R9B3lmiBdjlkVnCpthdFrrq7OwvK3aTwkKSCW2NbFxFCocthusvTtJ/9hC+CLQVf7cvScr9zPn8HJR2GhlAD8f+T4wQZRgfIss3JaqXs2ORxI=; ak_bmsc=16F1ADB9A7C2ACBFC688E7DA7FC6D44D5C7BFAF6853C0000E6AF2F6033BAB61D~plD1kBh5z0AC8DOgQbkp/GkJKVUKri6+qoZr1c9l6f6OqvIJ6HeOoLqrZERsUxmR1jYJl7lfkAqk/M+PLt5eDR+0nlZtibK459604wHaMzu3OYykuWT68qA6ahNblylWF1b57gOnB608r3uXGAaL6d7QE7ilVdGZDynW3ZpVifnt285Q+tsPrhf86cuG8Ltg4KYL527tXmj8jtpNmItmciM4UeAGrB2LT5vXkRGrXWJ4k18GlH4MXlMPLRsNBaA9vu");
+//            request.setHeader("Cookie", "tt_webid_v2=6930951741719643654; tt_webid=6930951741719643654; tt_csrf_token=oIE-pGapg3HhLpw4okMKouQE; bm_sz=1D7B2A5C3CE40E72AA2EDF957F29F996~YAAQ9vp7XCr1eB13AQAA4xpHugqAHEd7XhOGx7ADrTdeJSOGXeu3dMn3D8VK2tLtRzg3hHvrJu8zVhDHNbCVuJLKSYJNqO4hGQV1Wv5an9yjhHHni+OXPLEq2Z8jnH8CJJ9/mDYsa38iK4uhWoj1LWpTomOIDQ04lDQ/+ptIS/j2qymZYhNfGWfb1VPE5J7w; csrf_session_id=59db840225234be19cae4f09b50d65fc; R6kq3TV7=AH0eR7p3AQAAmf0BkeXsHuBeFsHfupJ0Uz70iJ1I3lFWmBwfxEqA2pyrlXEm|1|0|cb2e2a7b2c53e039465b82f493fb6a8309e2c12e; s_v_web_id=verify_klc9wz5x_RnKm6BBB_zGUE_4NIv_Amyp_iQnEJuUqiGiI; _abck=E031D1F37D5F1FB86124B6209D9D9621~0~YAAQ9vp7XGz1eB13AQAA1iNHugWhOYMPXUH6lDl8u7JREPlG5fKjcchhZuQSIyfQjQvGBkleZUGxcwOvdaTIJ+y7PCnijTNmCqpa/6h0blaIJsgUhSqxFtzGvSQ1AF3zLM/sEmBTL8272gZdv5wLZ9IDBs5EdeVwkXe83MN+Xkeu/A3Enkl7Ww7b2AJXPF7I1UAvljjXl4uSsay/UplBzWYd/GzwY1dewZj1aqbnGUk+UdMp+EHbpFO4DPVf4nAK6A76226/wxTKZlhwGtCD4wCY7IpCTpUrGT6eEy1pXduCTrZqQr02/rAwwi5aPJB+lHzkQulGH/pL4z1YOSc7GWXEG0vM4g==~-1~||-1||~-1; MONITOR_WEB_ID=6930951741719643654; bm_mi=C903011609E9246F5705C37DAB23438C~TLbWkU2lK07SJd4AEnfIep1qyvRMLo8dk0Ia/9JqiizV0Je06cnPffkpuaiXK1owXx8d+5hQfAxq2Rzyhn8vx/O9irH7i8jM/Opke2qkeGVwEMC/j3ZHQcKNXZ7bCeHicfR94IjDT90WeByQdRs21uGdiqzJVed+hx604WVvLCOmf+2PZCVvyZkT3YhzRvM3o/2vsL0mPH/le/mnnSkSaXvfSOjVC1Ejnj8TXkqGcHs=; bm_sv=43029414F4FFB9469BC50FFC27EABFD5~U8fwrdQmK9DaRqNyRL+2Q5LdaYbFXujau64u0KV6hPHmbobEUj/aPqfsDXY6x4R9B3lmiBdjlkVnCpthdFrrq7OwvK3aTwkKSCW2NbFxFCocthusvTtJ/9hC+CLQVf7cvScr9zPn8HJR2GhlAD8f+T4wQZRgfIss3JaqXs2ORxI=; ak_bmsc=16F1ADB9A7C2ACBFC688E7DA7FC6D44D5C7BFAF6853C0000E6AF2F6033BAB61D~plD1kBh5z0AC8DOgQbkp/GkJKVUKri6+qoZr1c9l6f6OqvIJ6HeOoLqrZERsUxmR1jYJl7lfkAqk/M+PLt5eDR+0nlZtibK459604wHaMzu3OYykuWT68qA6ahNblylWF1b57gOnB608r3uXGAaL6d7QE7ilVdGZDynW3ZpVifnt285Q+tsPrhf86cuG8Ltg4KYL527tXmj8jtpNmItmciM4UeAGrB2LT5vXkRGrXWJ4k18GlH4MXlMPLRsNBaA9vu");
 
             final String ua = fakeUserAgent();
 
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
index 8973e6c..0b156dc 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
@@ -20,14 +20,27 @@
 import com.dunctebot.sourcemanagers.MpegTrack;
 import com.dunctebot.sourcemanagers.tiktok.TikTokAudioSourceManager.MetaData;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
+import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
+import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
+import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.regex.Matcher;
 
+import static com.dunctebot.sourcemanagers.Utils.fakeChrome;
+import static com.dunctebot.sourcemanagers.tiktok.TikTokAudioSourceManager.VIDEO_REGEX;
+import static com.dunctebot.sourcemanagers.tiktok.TikTokAudioSourceManager.getMetaData;
 import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
 
 public class TikTokAudioTrack extends MpegTrack {
+    private final TikTokAudioTrackHttpManager httpManager = new TikTokAudioTrackHttpManager();
+
     public TikTokAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource manager) {
         super(trackInfo, manager);
     }
@@ -35,8 +48,7 @@ public TikTokAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource ma
     @Override
     protected String getPlaybackUrl() {
         try {
-            final MetaData metaData = ((TikTokAudioSourceManager) getSourceManager())
-                .extractFromJson(this.trackInfo.uri);
+            final MetaData metaData = extractFromJson(this.trackInfo.uri);
 
             return metaData.uri;
         } catch (IOException e) {
@@ -44,6 +56,50 @@ protected String getPlaybackUrl() {
         }
     }
 
+    @Override
+    public void process(LocalAudioTrackExecutor executor) throws Exception {
+        this.httpManager.loadCookies();
+
+        try (HttpInterface httpInterface = this.httpManager.getHttpInterface()) {
+            loadStream(executor, httpInterface);
+        }
+    }
+
+    protected MetaData extractFromJson(String url) throws IOException {
+        final Matcher matcher = VIDEO_REGEX.matcher(url);
+
+        if (!matcher.matches()) {
+            throw new IOException("Url does not match tiktok anymore? wtf");
+        }
+
+        final String user = matcher.group("user");
+        final String video = matcher.group("video");
+
+        final HttpGet httpGet = new HttpGet(
+            "https://www.tiktok.com/node/share/video/@" + user + '/' + video
+        );
+
+        fakeChrome(httpGet);
+
+        try (final CloseableHttpResponse response = this.httpManager.getHttpInterface().execute(httpGet)) {
+            final int statusCode = response.getStatusLine().getStatusCode();
+
+            if (statusCode != 200) {
+                if (statusCode == 302) { // most likely a 404
+                    return null;
+                }
+
+                throw new IOException("Unexpected status code for video page response: " + statusCode);
+            }
+
+            final String string = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+            final JsonBrowser json = JsonBrowser.parse(string);
+            final JsonBrowser base = json.get("itemInfo").get("itemStruct");
+
+            return getMetaData(url, base);
+        }
+    }
+
     @Override
     protected AudioTrack makeShallowClone() {
         return new TikTokAudioTrack(this.trackInfo, getSourceManager());
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
new file mode 100644
index 0000000..2977456
--- /dev/null
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2021 Duncan "duncte123" Sterken
+ *
+ *    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.dunctebot.sourcemanagers.tiktok;
+
+import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
+import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
+import com.sedmelluq.discord.lavaplayer.tools.http.HttpContextFilter;
+import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
+import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
+import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.Header;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.client.protocol.HttpClientContext;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Matcher;
+
+import static com.dunctebot.sourcemanagers.Utils.fakeChrome;
+
+public class TikTokAudioTrackHttpManager {
+    private List<Header> headers = null;
+
+    protected final HttpInterfaceManager httpInterfaceManager;
+
+    public TikTokAudioTrackHttpManager() {
+        httpInterfaceManager = HttpClientTools.createDefaultThreadLocalManager();
+
+        httpInterfaceManager.setHttpContextFilter(new TikTokFilter());
+    }
+
+    public HttpInterface getHttpInterface() {
+        return httpInterfaceManager.getInterface();
+    }
+
+    protected void loadCookies() throws IOException {
+        try (final HttpInterface httpInterface = httpInterfaceManager.getInterface()) {
+            final HttpGet httpGet = new HttpGet("https://www.tiktok.com/");
+
+            try (final CloseableHttpResponse response = httpInterface.execute(httpGet)) {
+                final Header[] allHeaders = response.getAllHeaders();
+
+                System.out.println(Arrays.toString(allHeaders));
+
+                this.headers = new ArrayList<>(
+                    Arrays.asList(response.getHeaders("set-cookie"))
+                );
+            }
+        }
+    }
+
+    private class TikTokFilter implements HttpContextFilter {
+        @Override
+        public void onContextOpen(HttpClientContext context) {
+            //
+        }
+
+        @Override
+        public void onContextClose(HttpClientContext context) {
+            // Not used
+        }
+
+        @Override
+        public void onRequest(HttpClientContext context, HttpUriRequest request, boolean isRepetition) {
+            if (headers != null) {
+                headers.forEach(request::addHeader);
+            }
+
+            // set standard headers
+            fakeChrome(request);
+        }
+
+        @Override
+        public boolean onRequestResponse(HttpClientContext context, HttpUriRequest request, HttpResponse response) {
+            return false;
+        }
+
+        @Override
+        public boolean onRequestException(HttpClientContext context, HttpUriRequest request, Throwable error) {
+            return false;
+        }
+    }
+}

From 97e9fc41e234d265bfa1ba24cd381179e0ed56af Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 16:07:52 +0100
Subject: [PATCH 14/76] Fix cookie setting

---
 .../tiktok/TikTokAudioTrackHttpManager.java   | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
index 2977456..e549d72 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
@@ -16,13 +16,10 @@
 
 package com.dunctebot.sourcemanagers.tiktok;
 
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
 import com.sedmelluq.discord.lavaplayer.tools.http.HttpContextFilter;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
-import org.apache.commons.io.IOUtils;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -31,16 +28,14 @@
 import org.apache.http.client.protocol.HttpClientContext;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.regex.Matcher;
 
 import static com.dunctebot.sourcemanagers.Utils.fakeChrome;
 
 public class TikTokAudioTrackHttpManager {
-    private List<Header> headers = null;
+    private Header cookie = null;
 
     protected final HttpInterfaceManager httpInterfaceManager;
 
@@ -63,9 +58,7 @@ protected void loadCookies() throws IOException {
 
                 System.out.println(Arrays.toString(allHeaders));
 
-                this.headers = new ArrayList<>(
-                    Arrays.asList(response.getHeaders("set-cookie"))
-                );
+                this.cookie = response.getLastHeader("set-cookie");
             }
         }
     }
@@ -83,12 +76,12 @@ public void onContextClose(HttpClientContext context) {
 
         @Override
         public void onRequest(HttpClientContext context, HttpUriRequest request, boolean isRepetition) {
-            if (headers != null) {
-                headers.forEach(request::addHeader);
-            }
-
             // set standard headers
             fakeChrome(request);
+
+            if (cookie != null) {
+                request.setHeader("cookie", cookie.getValue());
+            }
         }
 
         @Override

From 2df8ffaf9fb5667d3245d47e6a38283664d934cc Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 16:26:49 +0100
Subject: [PATCH 15/76] Try again

---
 .../tiktok/TikTokAudioSourceManager.java      | 86 +------------------
 .../tiktok/TikTokAudioTrackHttpManager.java   | 26 ++++--
 2 files changed, 18 insertions(+), 94 deletions(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
index ba1448c..efd209b 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
@@ -23,25 +23,18 @@
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity;
 import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
-import com.sedmelluq.discord.lavaplayer.tools.http.HttpContextFilter;
 import com.sedmelluq.discord.lavaplayer.track.AudioItem;
 import com.sedmelluq.discord.lavaplayer.track.AudioReference;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.CookieStore;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.impl.client.BasicCookieStore;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.concurrent.ThreadLocalRandom;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -49,7 +42,7 @@
 
 public class TikTokAudioSourceManager extends AbstractDuncteBotHttpSource {
     private static final String BASE = "https:\\/\\/(?:www\\.|m\\.)?tiktok\\.com";
-    private static final String USER = "@(?<user>[a-z0-9A-Z_-]+)";
+    private static final String USER = "@(?<user>[a-z0-9A-Z_\\-.]+)";
     private static final String VIDEO = "(?<video>[0-9]+)";
     protected static final Pattern VIDEO_REGEX = Pattern.compile("^" + BASE + "\\/" + USER + "\\/video\\/" + VIDEO + "(?:.*)$");
     private static final Pattern JS_REGEX = Pattern.compile(
@@ -57,8 +50,6 @@ public class TikTokAudioSourceManager extends AbstractDuncteBotHttpSource {
 
     public TikTokAudioSourceManager() {
         super(false);
-
-        this.httpInterfaceManager.setHttpContextFilter(new TikTokFilter());
     }
 
     @Override
@@ -201,79 +192,4 @@ public String toString() {
                 '}';
         }
     }
-
-    public static class TikTokFilter implements HttpContextFilter {
-        @Override
-        public void onContextOpen(HttpClientContext context) {
-            //
-        }
-
-        @Override
-        public void onContextClose(HttpClientContext context) {
-            // Not used
-        }
-
-        @Override
-        public void onRequest(HttpClientContext context, HttpUriRequest request, boolean isRepetition) {
-            request.setHeader("Referer", "https://www.tiktok.com/");
-//            request.setHeader("Referer", request.getURI().toString());
-//            request.setHeader("Cookie", "tt_webid_v2=68" + makeId(16));
-//            request.setHeader("Cookie", "tt_webid_v2=6930951741719643654; tt_webid=6930951741719643654; tt_csrf_token=oIE-pGapg3HhLpw4okMKouQE; bm_sz=1D7B2A5C3CE40E72AA2EDF957F29F996~YAAQ9vp7XCr1eB13AQAA4xpHugqAHEd7XhOGx7ADrTdeJSOGXeu3dMn3D8VK2tLtRzg3hHvrJu8zVhDHNbCVuJLKSYJNqO4hGQV1Wv5an9yjhHHni+OXPLEq2Z8jnH8CJJ9/mDYsa38iK4uhWoj1LWpTomOIDQ04lDQ/+ptIS/j2qymZYhNfGWfb1VPE5J7w; csrf_session_id=59db840225234be19cae4f09b50d65fc; R6kq3TV7=AH0eR7p3AQAAmf0BkeXsHuBeFsHfupJ0Uz70iJ1I3lFWmBwfxEqA2pyrlXEm|1|0|cb2e2a7b2c53e039465b82f493fb6a8309e2c12e; s_v_web_id=verify_klc9wz5x_RnKm6BBB_zGUE_4NIv_Amyp_iQnEJuUqiGiI; _abck=E031D1F37D5F1FB86124B6209D9D9621~0~YAAQ9vp7XGz1eB13AQAA1iNHugWhOYMPXUH6lDl8u7JREPlG5fKjcchhZuQSIyfQjQvGBkleZUGxcwOvdaTIJ+y7PCnijTNmCqpa/6h0blaIJsgUhSqxFtzGvSQ1AF3zLM/sEmBTL8272gZdv5wLZ9IDBs5EdeVwkXe83MN+Xkeu/A3Enkl7Ww7b2AJXPF7I1UAvljjXl4uSsay/UplBzWYd/GzwY1dewZj1aqbnGUk+UdMp+EHbpFO4DPVf4nAK6A76226/wxTKZlhwGtCD4wCY7IpCTpUrGT6eEy1pXduCTrZqQr02/rAwwi5aPJB+lHzkQulGH/pL4z1YOSc7GWXEG0vM4g==~-1~||-1||~-1; MONITOR_WEB_ID=6930951741719643654; bm_mi=C903011609E9246F5705C37DAB23438C~TLbWkU2lK07SJd4AEnfIep1qyvRMLo8dk0Ia/9JqiizV0Je06cnPffkpuaiXK1owXx8d+5hQfAxq2Rzyhn8vx/O9irH7i8jM/Opke2qkeGVwEMC/j3ZHQcKNXZ7bCeHicfR94IjDT90WeByQdRs21uGdiqzJVed+hx604WVvLCOmf+2PZCVvyZkT3YhzRvM3o/2vsL0mPH/le/mnnSkSaXvfSOjVC1Ejnj8TXkqGcHs=; bm_sv=43029414F4FFB9469BC50FFC27EABFD5~U8fwrdQmK9DaRqNyRL+2Q5LdaYbFXujau64u0KV6hPHmbobEUj/aPqfsDXY6x4R9B3lmiBdjlkVnCpthdFrrq7OwvK3aTwkKSCW2NbFxFCocthusvTtJ/9hC+CLQVf7cvScr9zPn8HJR2GhlAD8f+T4wQZRgfIss3JaqXs2ORxI=; ak_bmsc=16F1ADB9A7C2ACBFC688E7DA7FC6D44D5C7BFAF6853C0000E6AF2F6033BAB61D~plD1kBh5z0AC8DOgQbkp/GkJKVUKri6+qoZr1c9l6f6OqvIJ6HeOoLqrZERsUxmR1jYJl7lfkAqk/M+PLt5eDR+0nlZtibK459604wHaMzu3OYykuWT68qA6ahNblylWF1b57gOnB608r3uXGAaL6d7QE7ilVdGZDynW3ZpVifnt285Q+tsPrhf86cuG8Ltg4KYL527tXmj8jtpNmItmciM4UeAGrB2LT5vXkRGrXWJ4k18GlH4MXlMPLRsNBaA9vu");
-
-            final String ua = fakeUserAgent();
-
-            System.out.println("NEW USER AGENT " + ua);
-
-            request.setHeader("User-Agent", ua);
-
-        }
-
-        @Override
-        public boolean onRequestResponse(HttpClientContext context, HttpUriRequest request, HttpResponse response) {
-            return false;
-        }
-
-        @Override
-        public boolean onRequestException(HttpClientContext context, HttpUriRequest request, Throwable error) {
-            return false;
-        }
-
-        private static String makeId(int length) {
-            final StringBuilder sb = new StringBuilder();
-            final String charList = "0123456789";
-
-            for (int i = 0; i < length; i += 1) {
-                sb.append(charList.charAt((int) Math.floor(Math.random() * charList.length())));
-            }
-
-            return sb.toString();
-        }
-
-        private static String fakeUserAgent() {
-            final String[] parts = {
-                "Macintosh; Intel Mac OS X 10_15_7",
-                "Macintosh; Intel Mac OS X 10_15_5",
-                "Macintosh; Intel Mac OS X 10_11_6",
-                "Macintosh; Intel Mac OS X 10_6_6",
-                "Macintosh; Intel Mac OS X 10_9_5",
-                "Macintosh; Intel Mac OS X 10_10_5",
-                "Macintosh; Intel Mac OS X 10_7_5",
-                "Macintosh; Intel Mac OS X 10_11_3",
-                "Macintosh; Intel Mac OS X 10_10_3",
-                "Macintosh; Intel Mac OS X 10_6_8",
-                "Macintosh; Intel Mac OS X 10_10_2",
-                "Macintosh; Intel Mac OS X 10_10_3",
-                "Macintosh; Intel Mac OS X 10_11_5",
-                "Windows NT 10.0; Win64; x64",
-                "Windows NT 10.0; WOW64",
-                "Windows NT 10.0",
-            };
-
-            final ThreadLocalRandom rnd = ThreadLocalRandom.current();
-
-            return "Mozilla/5.0 (" + parts[rnd.nextInt(parts.length)] + ") AppleWebKit/537.36 (KHTML, like Gecko) Chrome/" +
-                (rnd.nextInt(3) + 85) + ".0." + (rnd.nextInt(190) + 4100) + '.' + (rnd.nextInt(50) + 140) +
-                "Safari/537.36";
-        }
-    }
 }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
index e549d72..e6b8859 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
@@ -20,24 +20,28 @@
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
-import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.cookie.Cookie;
+import org.apache.http.cookie.CookieOrigin;
+import org.apache.http.cookie.CookieSpec;
+import org.apache.http.cookie.MalformedCookieException;
+import org.apache.http.impl.cookie.BrowserCompatSpec;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.dunctebot.sourcemanagers.Utils.fakeChrome;
 
 public class TikTokAudioTrackHttpManager {
-    private Header cookie = null;
+    private String cookie = null;
 
     protected final HttpInterfaceManager httpInterfaceManager;
+    private final CookieSpec cookieSpec = new BrowserCompatSpec();
 
     public TikTokAudioTrackHttpManager() {
         httpInterfaceManager = HttpClientTools.createDefaultThreadLocalManager();
@@ -49,16 +53,20 @@ public HttpInterface getHttpInterface() {
         return httpInterfaceManager.getInterface();
     }
 
-    protected void loadCookies() throws IOException {
+    protected void loadCookies() throws IOException, MalformedCookieException {
         try (final HttpInterface httpInterface = httpInterfaceManager.getInterface()) {
             final HttpGet httpGet = new HttpGet("https://www.tiktok.com/");
 
             try (final CloseableHttpResponse response = httpInterface.execute(httpGet)) {
-                final Header[] allHeaders = response.getAllHeaders();
+                CookieOrigin origin = new CookieOrigin(".tiktok.com", 443, "/", true);
 
-                System.out.println(Arrays.toString(allHeaders));
+                final List<Cookie> cookies = cookieSpec.parse(response.getLastHeader("Set-Cookie"), origin);
 
-                this.cookie = response.getLastHeader("set-cookie");
+                System.out.println(cookies);
+
+                this.cookie = cookies.stream()
+                    .map((c) -> c.getName() + '=' + c.getValue())
+                    .collect(Collectors.joining("; "));
             }
         }
     }
@@ -80,7 +88,7 @@ public void onRequest(HttpClientContext context, HttpUriRequest request, boolean
             fakeChrome(request);
 
             if (cookie != null) {
-                request.setHeader("cookie", cookie.getValue());
+                request.setHeader("cookie", cookie);
             }
         }
 

From 720208295973c6070d934043bb171dd77cc365b9 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 16:44:24 +0100
Subject: [PATCH 16/76] Imagine if

---
 .../tiktok/CopyOfPersistentHttpStream.java    | 290 ++++++++++++++++++
 .../tiktok/TikTokAudioTrack.java              |  20 ++
 2 files changed, 310 insertions(+)
 create mode 100644 src/main/java/com/dunctebot/sourcemanagers/tiktok/CopyOfPersistentHttpStream.java

diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/CopyOfPersistentHttpStream.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/CopyOfPersistentHttpStream.java
new file mode 100644
index 0000000..6c2f0fb
--- /dev/null
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/CopyOfPersistentHttpStream.java
@@ -0,0 +1,290 @@
+package com.dunctebot.sourcemanagers.tiktok;
+
+import com.sedmelluq.discord.lavaplayer.tools.Units;
+import com.sedmelluq.discord.lavaplayer.tools.io.*;
+import com.sedmelluq.discord.lavaplayer.track.info.AudioTrackInfoBuilder;
+import com.sedmelluq.discord.lavaplayer.track.info.AudioTrackInfoProvider;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.util.Collections;
+import java.util.List;
+import org.apache.http.Header;
+import org.apache.http.HttpHeaders;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools.getHeaderValue;
+import static com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools.isSuccessWithContent;
+
+
+/**
+ * @see com.sedmelluq.discord.lavaplayer.tools.io.PersistentHttpStream PersistentHttpStream for the original implementation
+ */
+public class CopyOfPersistentHttpStream extends SeekableInputStream implements AutoCloseable {
+    private static final Logger log = LoggerFactory.getLogger(CopyOfPersistentHttpStream.class);
+
+    private static final long MAX_SKIP_DISTANCE = 512L * 1024L;
+
+    private final HttpInterface httpInterface;
+    protected final URI contentUrl;
+    private int lastStatusCode;
+    private CloseableHttpResponse currentResponse;
+    private InputStream currentContent;
+    protected long position;
+
+    public CopyOfPersistentHttpStream(HttpInterface httpInterface, URI contentUrl, Long contentLength) {
+        super(contentLength == null ? Units.CONTENT_LENGTH_UNKNOWN : contentLength, MAX_SKIP_DISTANCE);
+
+        this.httpInterface = httpInterface;
+        this.contentUrl = contentUrl;
+        this.position = 0;
+    }
+
+    public int checkStatusCode() throws IOException {
+        connect(true);
+
+        return lastStatusCode;
+    }
+
+    public HttpResponse getCurrentResponse() {
+        return currentResponse;
+    }
+
+    protected URI getConnectUrl() {
+        return contentUrl;
+    }
+
+    protected boolean useHeadersForRange() {
+        return true;
+    }
+
+    private static boolean validateStatusCode(HttpResponse response, boolean returnOnServerError) {
+        int statusCode = response.getStatusLine().getStatusCode();
+
+        // TIKTOK :D
+        if (statusCode == 403) {
+            return true;
+        }
+
+        if (returnOnServerError && statusCode >= HttpStatus.SC_INTERNAL_SERVER_ERROR) {
+            return false;
+        } else if (!isSuccessWithContent(statusCode)) {
+            throw new RuntimeException("Not success status code: " + statusCode);
+        }
+        return true;
+    }
+
+    private HttpGet getConnectRequest() {
+        HttpGet request = new HttpGet(getConnectUrl());
+
+        if (position > 0 && useHeadersForRange()) {
+            request.setHeader(HttpHeaders.RANGE, "bytes=" + position + "-");
+        }
+
+        return request;
+    }
+
+    private void connect(boolean skipStatusCheck) throws IOException {
+        if (currentResponse == null) {
+            for (int i = 1; i >= 0; i--) {
+                if (attemptConnect(skipStatusCheck, i > 0)) {
+                    break;
+                }
+            }
+        }
+    }
+
+    private boolean attemptConnect(boolean skipStatusCheck, boolean retryOnServerError) throws IOException {
+        currentResponse = httpInterface.execute(getConnectRequest());
+        lastStatusCode = currentResponse.getStatusLine().getStatusCode();
+
+        if (!skipStatusCheck && !validateStatusCode(currentResponse, retryOnServerError)) {
+            return false;
+        }
+
+        if (currentResponse.getEntity() == null) {
+            currentContent = EmptyInputStream.INSTANCE;
+            contentLength = 0;
+            return true;
+        }
+
+        currentContent = new BufferedInputStream(currentResponse.getEntity().getContent());
+
+        if (contentLength == Units.CONTENT_LENGTH_UNKNOWN) {
+            Header header = currentResponse.getFirstHeader("Content-Length");
+
+            if (header != null) {
+                contentLength = Long.parseLong(header.getValue());
+            }
+        }
+
+        return true;
+    }
+
+    private void handleNetworkException(IOException exception, boolean attemptReconnect) throws IOException {
+        if (!attemptReconnect || !HttpClientTools.isRetriableNetworkException(exception)) {
+            throw exception;
+        }
+
+        close();
+
+        log.debug("Encountered retriable exception on url {}.", contentUrl, exception);
+    }
+
+    private int internalRead(boolean attemptReconnect) throws IOException {
+        connect(false);
+
+        try {
+            int result = currentContent.read();
+            if (result >= 0) {
+                position++;
+            }
+            return result;
+        } catch (IOException e) {
+            handleNetworkException(e, attemptReconnect);
+            return internalRead(false);
+        }
+    }
+
+    @Override
+    public int read() throws IOException {
+        return internalRead(true);
+    }
+
+    private int internalRead(byte[] b, int off, int len, boolean attemptReconnect) throws IOException {
+        connect(false);
+
+        try {
+            int result = currentContent.read(b, off, len);
+            if (result >= 0) {
+                position += result;
+            }
+            return result;
+        } catch (IOException e) {
+            handleNetworkException(e, attemptReconnect);
+            return internalRead(b, off, len, false);
+        }
+    }
+
+    @Override
+    public int read(byte[] b, int off, int len) throws IOException {
+        return internalRead(b, off, len, true);
+    }
+
+    private long internalSkip(long n, boolean attemptReconnect) throws IOException {
+        connect(false);
+
+        try {
+            long result = currentContent.skip(n);
+            if (result >= 0) {
+                position += result;
+            }
+            return result;
+        } catch (IOException e) {
+            handleNetworkException(e, attemptReconnect);
+            return internalSkip(n, false);
+        }
+    }
+
+    @Override
+    public long skip(long n) throws IOException {
+        return internalSkip(n, true);
+    }
+
+    private int internalAvailable(boolean attemptReconnect) throws IOException {
+        connect(false);
+
+        try {
+            return currentContent.available();
+        } catch (IOException e) {
+            handleNetworkException(e, attemptReconnect);
+            return internalAvailable(false);
+        }
+    }
+
+    @Override
+    public int available() throws IOException {
+        return internalAvailable(true);
+    }
+
+    @Override
+    public synchronized void reset() throws IOException {
+        throw new IOException("mark/reset not supported");
+    }
+
+    @Override
+    public boolean markSupported() {
+        return false;
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (currentResponse != null) {
+            try {
+                currentResponse.close();
+            } catch (IOException e) {
+                log.debug("Failed to close response.", e);
+            }
+
+            currentResponse = null;
+            currentContent = null;
+        }
+    }
+
+    public void releaseConnection() {
+        if (currentContent != null) {
+            try {
+                currentContent.close();
+            } catch (IOException e) {
+                log.debug("Failed to close response stream.", e);
+            }
+        }
+
+        currentResponse = null;
+        currentContent = null;
+    }
+
+    @Override
+    public long getPosition() {
+        return position;
+    }
+
+    @Override
+    protected void seekHard(long position) throws IOException {
+        close();
+
+        this.position = position;
+    }
+
+    @Override
+    public boolean canSeekHard() {
+        return contentLength != Units.CONTENT_LENGTH_UNKNOWN;
+    }
+
+    @Override
+    public List<AudioTrackInfoProvider> getTrackInfoProviders() {
+        if (currentResponse != null) {
+            return Collections.singletonList(createIceCastHeaderProvider());
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    private AudioTrackInfoProvider createIceCastHeaderProvider() {
+        AudioTrackInfoBuilder builder = AudioTrackInfoBuilder.empty()
+            .setTitle(getHeaderValue(currentResponse, "icy-description"))
+            .setAuthor(getHeaderValue(currentResponse, "icy-name"));
+
+        if (builder.getTitle() == null) {
+            builder.setTitle(getHeaderValue(currentResponse, "icy-url"));
+        }
+
+        return builder;
+    }
+}
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
index 0b156dc..bc41f27 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
@@ -22,6 +22,7 @@
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
+import com.sedmelluq.discord.lavaplayer.tools.io.PersistentHttpStream;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
@@ -30,6 +31,7 @@
 import org.apache.http.client.methods.HttpGet;
 
 import java.io.IOException;
+import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.regex.Matcher;
 
@@ -65,6 +67,16 @@ public void process(LocalAudioTrackExecutor executor) throws Exception {
         }
     }
 
+    @Override
+    protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface httpInterface) throws Exception {
+        final String trackUrl = getPlaybackUrl();
+        log.debug("Starting {} track from URL: {}", getSourceManager().getSourceName(), trackUrl);
+        // Setting contentLength (last param) to null makes it default to Long.MAX_VALUE
+        try (final CopyOfPersistentHttpStream stream = new CopyOfPersistentHttpStream(httpInterface, new URI(trackUrl), this.getTrackDuration())) {
+            processDelegate(createAudioTrack(this.trackInfo, stream), localExecutor);
+        }
+    }
+
     protected MetaData extractFromJson(String url) throws IOException {
         final Matcher matcher = VIDEO_REGEX.matcher(url);
 
@@ -104,4 +116,12 @@ protected MetaData extractFromJson(String url) throws IOException {
     protected AudioTrack makeShallowClone() {
         return new TikTokAudioTrack(this.trackInfo, getSourceManager());
     }
+
+    private static class ErrorIsSuccessStream extends PersistentHttpStream {
+        public ErrorIsSuccessStream(HttpInterface httpInterface, URI contentUrl, Long contentLength) {
+            super(httpInterface, contentUrl, contentLength);
+        }
+
+
+    }
 }

From aad4b949e12029ab578ab8b919890bfbd1d733ba Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 16:54:10 +0100
Subject: [PATCH 17/76] Properly set all cookies

---
 .../tiktok/TikTokAudioTrackHttpManager.java            | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
index e6b8859..5ad3065 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
@@ -20,6 +20,7 @@
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
+import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -32,6 +33,7 @@
 import org.apache.http.impl.cookie.BrowserCompatSpec;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -58,9 +60,13 @@ protected void loadCookies() throws IOException, MalformedCookieException {
             final HttpGet httpGet = new HttpGet("https://www.tiktok.com/");
 
             try (final CloseableHttpResponse response = httpInterface.execute(httpGet)) {
-                CookieOrigin origin = new CookieOrigin(".tiktok.com", 443, "/", true);
+                final CookieOrigin origin = new CookieOrigin(".tiktok.com", 443, "/", true);
 
-                final List<Cookie> cookies = cookieSpec.parse(response.getLastHeader("Set-Cookie"), origin);
+                final List<Cookie> cookies = new ArrayList<>();
+
+                for (final Header header : response.getHeaders("Set-Cookie")) {
+                    cookies.addAll(cookieSpec.parse(header, origin));
+                }
 
                 System.out.println(cookies);
 

From dd240f40dac5c8d7c04e2f853a0d6f8d565ed417 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 17:24:17 +0100
Subject: [PATCH 18/76] Set referer

---
 .../sourcemanagers/tiktok/CopyOfPersistentHttpStream.java   | 2 ++
 .../sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java  | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/CopyOfPersistentHttpStream.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/CopyOfPersistentHttpStream.java
index 6c2f0fb..b059c3d 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/CopyOfPersistentHttpStream.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/CopyOfPersistentHttpStream.java
@@ -67,6 +67,8 @@ protected boolean useHeadersForRange() {
     private static boolean validateStatusCode(HttpResponse response, boolean returnOnServerError) {
         int statusCode = response.getStatusLine().getStatusCode();
 
+        System.out.println("STATUS CODE IS " + statusCode);
+
         // TIKTOK :D
         if (statusCode == 403) {
             return true;
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
index 5ad3065..85ac0fc 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
@@ -30,7 +30,7 @@
 import org.apache.http.cookie.CookieOrigin;
 import org.apache.http.cookie.CookieSpec;
 import org.apache.http.cookie.MalformedCookieException;
-import org.apache.http.impl.cookie.BrowserCompatSpec;
+import org.apache.http.impl.cookie.DefaultCookieSpec;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -43,7 +43,7 @@ public class TikTokAudioTrackHttpManager {
     private String cookie = null;
 
     protected final HttpInterfaceManager httpInterfaceManager;
-    private final CookieSpec cookieSpec = new BrowserCompatSpec();
+    private final CookieSpec cookieSpec = new DefaultCookieSpec();
 
     public TikTokAudioTrackHttpManager() {
         httpInterfaceManager = HttpClientTools.createDefaultThreadLocalManager();
@@ -93,6 +93,8 @@ public void onRequest(HttpClientContext context, HttpUriRequest request, boolean
             // set standard headers
             fakeChrome(request);
 
+            request.setHeader("Referer", "https://www.tiktok.com/");
+
             if (cookie != null) {
                 request.setHeader("cookie", cookie);
             }

From efd7bd981c3de82a2ac33b9842cf4d6e2d5ff53a Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 17:50:15 +0100
Subject: [PATCH 19/76] Add a test cookie

---
 .../tiktok/TikTokAudioTrackHttpManager.java   | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
index 85ac0fc..2f87f09 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
@@ -22,6 +22,7 @@
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
+import org.apache.http.client.CookieStore;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpUriRequest;
@@ -30,9 +31,11 @@
 import org.apache.http.cookie.CookieOrigin;
 import org.apache.http.cookie.CookieSpec;
 import org.apache.http.cookie.MalformedCookieException;
+import org.apache.http.impl.client.BasicCookieStore;
 import org.apache.http.impl.cookie.DefaultCookieSpec;
 
 import java.io.IOException;
+import java.net.HttpCookie;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -65,6 +68,7 @@ protected void loadCookies() throws IOException, MalformedCookieException {
                 final List<Cookie> cookies = new ArrayList<>();
 
                 for (final Header header : response.getHeaders("Set-Cookie")) {
+                    System.out.println(header);
                     cookies.addAll(cookieSpec.parse(header, origin));
                 }
 
@@ -93,11 +97,20 @@ public void onRequest(HttpClientContext context, HttpUriRequest request, boolean
             // set standard headers
             fakeChrome(request);
 
-            request.setHeader("Referer", "https://www.tiktok.com/");
+            final String testCookie = context.getCookieStore()
+                .getCookies()
+                .stream()
+                .map((c) -> c.getName() + '=' + c.getValue())
+                .collect(Collectors.joining("; "));
 
-            if (cookie != null) {
-                request.setHeader("cookie", cookie);
-            }
+            System.out.println("test " + testCookie);
+
+            request.setHeader("cookie", testCookie);
+
+
+            request.setHeader("cookie", cookie);
+
+            request.setHeader("Referer", "https://www.tiktok.com/");
         }
 
         @Override

From a10fe15fa13a5f58c0f44b6a30759c0831972dd6 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 17:54:20 +0100
Subject: [PATCH 20/76] Set a cookie store

---
 .../sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
index 2f87f09..db7dbcf 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
@@ -35,7 +35,6 @@
 import org.apache.http.impl.cookie.DefaultCookieSpec;
 
 import java.io.IOException;
-import java.net.HttpCookie;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -51,6 +50,12 @@ public class TikTokAudioTrackHttpManager {
     public TikTokAudioTrackHttpManager() {
         httpInterfaceManager = HttpClientTools.createDefaultThreadLocalManager();
 
+        CookieStore store = new BasicCookieStore();
+
+        httpInterfaceManager.configureBuilder((builder) -> {
+            builder.setDefaultCookieStore(store);
+        });
+
         httpInterfaceManager.setHttpContextFilter(new TikTokFilter());
     }
 

From 99c8d905ab4d29b385d3607ff2ad95b1fe2fb1e8 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 17:57:12 +0100
Subject: [PATCH 21/76] Actually set the cookie store

---
 .../sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
index db7dbcf..51bf004 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
@@ -46,14 +46,13 @@ public class TikTokAudioTrackHttpManager {
 
     protected final HttpInterfaceManager httpInterfaceManager;
     private final CookieSpec cookieSpec = new DefaultCookieSpec();
+    private final CookieStore cookieStore = new BasicCookieStore();
 
     public TikTokAudioTrackHttpManager() {
         httpInterfaceManager = HttpClientTools.createDefaultThreadLocalManager();
 
-        CookieStore store = new BasicCookieStore();
-
         httpInterfaceManager.configureBuilder((builder) -> {
-            builder.setDefaultCookieStore(store);
+            builder.setDefaultCookieStore(cookieStore);
         });
 
         httpInterfaceManager.setHttpContextFilter(new TikTokFilter());
@@ -89,7 +88,7 @@ protected void loadCookies() throws IOException, MalformedCookieException {
     private class TikTokFilter implements HttpContextFilter {
         @Override
         public void onContextOpen(HttpClientContext context) {
-            //
+            context.setCookieStore(cookieStore);
         }
 
         @Override

From 2fc168e06cb575199e4b874f256c9f532d739ba3 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 18:09:35 +0100
Subject: [PATCH 22/76] Use the deprecated browser spec

---
 .../sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
index 51bf004..373e98c 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
@@ -32,6 +32,7 @@
 import org.apache.http.cookie.CookieSpec;
 import org.apache.http.cookie.MalformedCookieException;
 import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.cookie.BrowserCompatSpec;
 import org.apache.http.impl.cookie.DefaultCookieSpec;
 
 import java.io.IOException;
@@ -45,7 +46,7 @@ public class TikTokAudioTrackHttpManager {
     private String cookie = null;
 
     protected final HttpInterfaceManager httpInterfaceManager;
-    private final CookieSpec cookieSpec = new DefaultCookieSpec();
+    private final CookieSpec cookieSpec = new BrowserCompatSpec();
     private final CookieStore cookieStore = new BasicCookieStore();
 
     public TikTokAudioTrackHttpManager() {

From eece3fa4b4febdf316a8d299b0dbcdce04965ecb Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 18:14:20 +0100
Subject: [PATCH 23/76] Debug the stream and cookies

---
 .../sourcemanagers/tiktok/TikTokAudioTrack.java        | 10 ++++++++++
 .../tiktok/TikTokAudioTrackHttpManager.java            |  6 ++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
index bc41f27..1432266 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
@@ -30,9 +30,12 @@
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.util.regex.Matcher;
 
 import static com.dunctebot.sourcemanagers.Utils.fakeChrome;
@@ -73,6 +76,13 @@ protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface h
         log.debug("Starting {} track from URL: {}", getSourceManager().getSourceName(), trackUrl);
         // Setting contentLength (last param) to null makes it default to Long.MAX_VALUE
         try (final CopyOfPersistentHttpStream stream = new CopyOfPersistentHttpStream(httpInterface, new URI(trackUrl), this.getTrackDuration())) {
+            // dump the stream
+            Files.copy(
+                stream,
+                new File("DUMP.raw").toPath(),
+                StandardCopyOption.REPLACE_EXISTING
+            );
+
             processDelegate(createAudioTrack(this.trackInfo, stream), localExecutor);
         }
     }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
index 373e98c..2001739 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
@@ -110,10 +110,12 @@ public void onRequest(HttpClientContext context, HttpUriRequest request, boolean
 
             System.out.println("test " + testCookie);
 
-            request.setHeader("cookie", testCookie);
+            //request.setHeader("cookie", testCookie);
 
 
-            request.setHeader("cookie", cookie);
+            if (cookie != null) {
+                request.setHeader("cookie", cookie);
+            }
 
             request.setHeader("Referer", "https://www.tiktok.com/");
         }

From 934b458f6f6d3b8fab7c42a405a8b4d2ee0dc35b Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 18:45:56 +0100
Subject: [PATCH 24/76] Remove override class for playback

---
 .../tiktok/CopyOfPersistentHttpStream.java    | 292 ------------------
 .../tiktok/TikTokAudioTrack.java              |  45 +--
 .../tiktok/TikTokAudioTrackHttpManager.java   |   8 +-
 3 files changed, 19 insertions(+), 326 deletions(-)
 delete mode 100644 src/main/java/com/dunctebot/sourcemanagers/tiktok/CopyOfPersistentHttpStream.java

diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/CopyOfPersistentHttpStream.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/CopyOfPersistentHttpStream.java
deleted file mode 100644
index b059c3d..0000000
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/CopyOfPersistentHttpStream.java
+++ /dev/null
@@ -1,292 +0,0 @@
-package com.dunctebot.sourcemanagers.tiktok;
-
-import com.sedmelluq.discord.lavaplayer.tools.Units;
-import com.sedmelluq.discord.lavaplayer.tools.io.*;
-import com.sedmelluq.discord.lavaplayer.track.info.AudioTrackInfoBuilder;
-import com.sedmelluq.discord.lavaplayer.track.info.AudioTrackInfoProvider;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.Collections;
-import java.util.List;
-import org.apache.http.Header;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools.getHeaderValue;
-import static com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools.isSuccessWithContent;
-
-
-/**
- * @see com.sedmelluq.discord.lavaplayer.tools.io.PersistentHttpStream PersistentHttpStream for the original implementation
- */
-public class CopyOfPersistentHttpStream extends SeekableInputStream implements AutoCloseable {
-    private static final Logger log = LoggerFactory.getLogger(CopyOfPersistentHttpStream.class);
-
-    private static final long MAX_SKIP_DISTANCE = 512L * 1024L;
-
-    private final HttpInterface httpInterface;
-    protected final URI contentUrl;
-    private int lastStatusCode;
-    private CloseableHttpResponse currentResponse;
-    private InputStream currentContent;
-    protected long position;
-
-    public CopyOfPersistentHttpStream(HttpInterface httpInterface, URI contentUrl, Long contentLength) {
-        super(contentLength == null ? Units.CONTENT_LENGTH_UNKNOWN : contentLength, MAX_SKIP_DISTANCE);
-
-        this.httpInterface = httpInterface;
-        this.contentUrl = contentUrl;
-        this.position = 0;
-    }
-
-    public int checkStatusCode() throws IOException {
-        connect(true);
-
-        return lastStatusCode;
-    }
-
-    public HttpResponse getCurrentResponse() {
-        return currentResponse;
-    }
-
-    protected URI getConnectUrl() {
-        return contentUrl;
-    }
-
-    protected boolean useHeadersForRange() {
-        return true;
-    }
-
-    private static boolean validateStatusCode(HttpResponse response, boolean returnOnServerError) {
-        int statusCode = response.getStatusLine().getStatusCode();
-
-        System.out.println("STATUS CODE IS " + statusCode);
-
-        // TIKTOK :D
-        if (statusCode == 403) {
-            return true;
-        }
-
-        if (returnOnServerError && statusCode >= HttpStatus.SC_INTERNAL_SERVER_ERROR) {
-            return false;
-        } else if (!isSuccessWithContent(statusCode)) {
-            throw new RuntimeException("Not success status code: " + statusCode);
-        }
-        return true;
-    }
-
-    private HttpGet getConnectRequest() {
-        HttpGet request = new HttpGet(getConnectUrl());
-
-        if (position > 0 && useHeadersForRange()) {
-            request.setHeader(HttpHeaders.RANGE, "bytes=" + position + "-");
-        }
-
-        return request;
-    }
-
-    private void connect(boolean skipStatusCheck) throws IOException {
-        if (currentResponse == null) {
-            for (int i = 1; i >= 0; i--) {
-                if (attemptConnect(skipStatusCheck, i > 0)) {
-                    break;
-                }
-            }
-        }
-    }
-
-    private boolean attemptConnect(boolean skipStatusCheck, boolean retryOnServerError) throws IOException {
-        currentResponse = httpInterface.execute(getConnectRequest());
-        lastStatusCode = currentResponse.getStatusLine().getStatusCode();
-
-        if (!skipStatusCheck && !validateStatusCode(currentResponse, retryOnServerError)) {
-            return false;
-        }
-
-        if (currentResponse.getEntity() == null) {
-            currentContent = EmptyInputStream.INSTANCE;
-            contentLength = 0;
-            return true;
-        }
-
-        currentContent = new BufferedInputStream(currentResponse.getEntity().getContent());
-
-        if (contentLength == Units.CONTENT_LENGTH_UNKNOWN) {
-            Header header = currentResponse.getFirstHeader("Content-Length");
-
-            if (header != null) {
-                contentLength = Long.parseLong(header.getValue());
-            }
-        }
-
-        return true;
-    }
-
-    private void handleNetworkException(IOException exception, boolean attemptReconnect) throws IOException {
-        if (!attemptReconnect || !HttpClientTools.isRetriableNetworkException(exception)) {
-            throw exception;
-        }
-
-        close();
-
-        log.debug("Encountered retriable exception on url {}.", contentUrl, exception);
-    }
-
-    private int internalRead(boolean attemptReconnect) throws IOException {
-        connect(false);
-
-        try {
-            int result = currentContent.read();
-            if (result >= 0) {
-                position++;
-            }
-            return result;
-        } catch (IOException e) {
-            handleNetworkException(e, attemptReconnect);
-            return internalRead(false);
-        }
-    }
-
-    @Override
-    public int read() throws IOException {
-        return internalRead(true);
-    }
-
-    private int internalRead(byte[] b, int off, int len, boolean attemptReconnect) throws IOException {
-        connect(false);
-
-        try {
-            int result = currentContent.read(b, off, len);
-            if (result >= 0) {
-                position += result;
-            }
-            return result;
-        } catch (IOException e) {
-            handleNetworkException(e, attemptReconnect);
-            return internalRead(b, off, len, false);
-        }
-    }
-
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException {
-        return internalRead(b, off, len, true);
-    }
-
-    private long internalSkip(long n, boolean attemptReconnect) throws IOException {
-        connect(false);
-
-        try {
-            long result = currentContent.skip(n);
-            if (result >= 0) {
-                position += result;
-            }
-            return result;
-        } catch (IOException e) {
-            handleNetworkException(e, attemptReconnect);
-            return internalSkip(n, false);
-        }
-    }
-
-    @Override
-    public long skip(long n) throws IOException {
-        return internalSkip(n, true);
-    }
-
-    private int internalAvailable(boolean attemptReconnect) throws IOException {
-        connect(false);
-
-        try {
-            return currentContent.available();
-        } catch (IOException e) {
-            handleNetworkException(e, attemptReconnect);
-            return internalAvailable(false);
-        }
-    }
-
-    @Override
-    public int available() throws IOException {
-        return internalAvailable(true);
-    }
-
-    @Override
-    public synchronized void reset() throws IOException {
-        throw new IOException("mark/reset not supported");
-    }
-
-    @Override
-    public boolean markSupported() {
-        return false;
-    }
-
-    @Override
-    public void close() throws IOException {
-        if (currentResponse != null) {
-            try {
-                currentResponse.close();
-            } catch (IOException e) {
-                log.debug("Failed to close response.", e);
-            }
-
-            currentResponse = null;
-            currentContent = null;
-        }
-    }
-
-    public void releaseConnection() {
-        if (currentContent != null) {
-            try {
-                currentContent.close();
-            } catch (IOException e) {
-                log.debug("Failed to close response stream.", e);
-            }
-        }
-
-        currentResponse = null;
-        currentContent = null;
-    }
-
-    @Override
-    public long getPosition() {
-        return position;
-    }
-
-    @Override
-    protected void seekHard(long position) throws IOException {
-        close();
-
-        this.position = position;
-    }
-
-    @Override
-    public boolean canSeekHard() {
-        return contentLength != Units.CONTENT_LENGTH_UNKNOWN;
-    }
-
-    @Override
-    public List<AudioTrackInfoProvider> getTrackInfoProviders() {
-        if (currentResponse != null) {
-            return Collections.singletonList(createIceCastHeaderProvider());
-        } else {
-            return Collections.emptyList();
-        }
-    }
-
-    private AudioTrackInfoProvider createIceCastHeaderProvider() {
-        AudioTrackInfoBuilder builder = AudioTrackInfoBuilder.empty()
-            .setTitle(getHeaderValue(currentResponse, "icy-description"))
-            .setAuthor(getHeaderValue(currentResponse, "icy-name"));
-
-        if (builder.getTitle() == null) {
-            builder.setTitle(getHeaderValue(currentResponse, "icy-url"));
-        }
-
-        return builder;
-    }
-}
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
index 1432266..8d73043 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
@@ -22,7 +22,6 @@
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.PersistentHttpStream;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
@@ -30,12 +29,8 @@
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 
-import java.io.File;
 import java.io.IOException;
-import java.net.URI;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
 import java.util.regex.Matcher;
 
 import static com.dunctebot.sourcemanagers.Utils.fakeChrome;
@@ -70,12 +65,12 @@ public void process(LocalAudioTrackExecutor executor) throws Exception {
         }
     }
 
-    @Override
+    /*@Override
     protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface httpInterface) throws Exception {
         final String trackUrl = getPlaybackUrl();
         log.debug("Starting {} track from URL: {}", getSourceManager().getSourceName(), trackUrl);
         // Setting contentLength (last param) to null makes it default to Long.MAX_VALUE
-        try (final CopyOfPersistentHttpStream stream = new CopyOfPersistentHttpStream(httpInterface, new URI(trackUrl), this.getTrackDuration())) {
+        try (final PersistentHttpStream stream = new PersistentHttpStream(httpInterface, new URI(trackUrl), this.getTrackDuration())) {
             // dump the stream
             Files.copy(
                 stream,
@@ -85,7 +80,7 @@ protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface h
 
             processDelegate(createAudioTrack(this.trackInfo, stream), localExecutor);
         }
-    }
+    }*/
 
     protected MetaData extractFromJson(String url) throws IOException {
         final Matcher matcher = VIDEO_REGEX.matcher(url);
@@ -103,22 +98,24 @@ protected MetaData extractFromJson(String url) throws IOException {
 
         fakeChrome(httpGet);
 
-        try (final CloseableHttpResponse response = this.httpManager.getHttpInterface().execute(httpGet)) {
-            final int statusCode = response.getStatusLine().getStatusCode();
+        try (final HttpInterface httpInterface = this.httpManager.getHttpInterface()) {
+            try (final CloseableHttpResponse response = httpInterface.execute(httpGet)) {
+                final int statusCode = response.getStatusLine().getStatusCode();
 
-            if (statusCode != 200) {
-                if (statusCode == 302) { // most likely a 404
-                    return null;
-                }
+                if (statusCode != 200) {
+                    if (statusCode == 302) { // most likely a 404
+                        return null;
+                    }
 
-                throw new IOException("Unexpected status code for video page response: " + statusCode);
-            }
+                    throw new IOException("Unexpected status code for video page response: " + statusCode);
+                }
 
-            final String string = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
-            final JsonBrowser json = JsonBrowser.parse(string);
-            final JsonBrowser base = json.get("itemInfo").get("itemStruct");
+                final String string = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+                final JsonBrowser json = JsonBrowser.parse(string);
+                final JsonBrowser base = json.get("itemInfo").get("itemStruct");
 
-            return getMetaData(url, base);
+                return getMetaData(url, base);
+            }
         }
     }
 
@@ -126,12 +123,4 @@ protected MetaData extractFromJson(String url) throws IOException {
     protected AudioTrack makeShallowClone() {
         return new TikTokAudioTrack(this.trackInfo, getSourceManager());
     }
-
-    private static class ErrorIsSuccessStream extends PersistentHttpStream {
-        public ErrorIsSuccessStream(HttpInterface httpInterface, URI contentUrl, Long contentLength) {
-            super(httpInterface, contentUrl, contentLength);
-        }
-
-
-    }
 }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
index 2001739..4ee4215 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
@@ -33,7 +33,6 @@
 import org.apache.http.cookie.MalformedCookieException;
 import org.apache.http.impl.client.BasicCookieStore;
 import org.apache.http.impl.cookie.BrowserCompatSpec;
-import org.apache.http.impl.cookie.DefaultCookieSpec;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -46,7 +45,7 @@ public class TikTokAudioTrackHttpManager {
     private String cookie = null;
 
     protected final HttpInterfaceManager httpInterfaceManager;
-    private final CookieSpec cookieSpec = new BrowserCompatSpec();
+    private final CookieSpec cookieSpec = new BrowserCompatSpec(); // DefaultCookieSpec does not parse
     private final CookieStore cookieStore = new BasicCookieStore();
 
     public TikTokAudioTrackHttpManager() {
@@ -73,12 +72,9 @@ protected void loadCookies() throws IOException, MalformedCookieException {
                 final List<Cookie> cookies = new ArrayList<>();
 
                 for (final Header header : response.getHeaders("Set-Cookie")) {
-                    System.out.println(header);
                     cookies.addAll(cookieSpec.parse(header, origin));
                 }
 
-                System.out.println(cookies);
-
                 this.cookie = cookies.stream()
                     .map((c) -> c.getName() + '=' + c.getValue())
                     .collect(Collectors.joining("; "));
@@ -102,6 +98,7 @@ public void onRequest(HttpClientContext context, HttpUriRequest request, boolean
             // set standard headers
             fakeChrome(request);
 
+            // TODO: set these cookies instead?
             final String testCookie = context.getCookieStore()
                 .getCookies()
                 .stream()
@@ -112,7 +109,6 @@ public void onRequest(HttpClientContext context, HttpUriRequest request, boolean
 
             //request.setHeader("cookie", testCookie);
 
-
             if (cookie != null) {
                 request.setHeader("cookie", cookie);
             }

From 68add9a75f3dbae1ec8ff29dc6bcbda5a036d4e7 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 19 Feb 2021 19:05:31 +0100
Subject: [PATCH 25/76] Alter regex

---
 .../sourcemanagers/tiktok/TikTokAudioSourceManager.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
index efd209b..ef773f0 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
@@ -42,7 +42,7 @@
 
 public class TikTokAudioSourceManager extends AbstractDuncteBotHttpSource {
     private static final String BASE = "https:\\/\\/(?:www\\.|m\\.)?tiktok\\.com";
-    private static final String USER = "@(?<user>[a-z0-9A-Z_\\-.]+)";
+    private static final String USER = "@(?<user>[^/]+)";
     private static final String VIDEO = "(?<video>[0-9]+)";
     protected static final Pattern VIDEO_REGEX = Pattern.compile("^" + BASE + "\\/" + USER + "\\/video\\/" + VIDEO + "(?:.*)$");
     private static final Pattern JS_REGEX = Pattern.compile(

From d6591602f71b680868ca43a2b645fdbc92c17961 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Thu, 1 Apr 2021 11:59:20 +0200
Subject: [PATCH 26/76] First attempt to fix pornhub

---
 build.gradle.kts                              |  5 +-
 .../AbstractDuncteBotHttpSource.java          | 44 ++++++++++++-
 .../sourcemanagers/DuncteBotSources.java      |  2 +-
 .../pornhub/PornHubAudioSourceManager.java    | 42 -------------
 .../pornhub/PornHubAudioTrack.java            | 61 ++++++++++++++++---
 5 files changed, 97 insertions(+), 57 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 13f6d81..2b1713c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,10 +25,11 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.5.3"
+project.version = "1.5.4"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
+    mavenCentral()
     jcenter()
 
     maven {
@@ -39,7 +40,7 @@ repositories {
 dependencies {
     // build override for age-restricted videos
 //    implementation(group = "com.github.duncte123", name = "lavaplayer", version = "be6e364")
-    implementation(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.71")
+    implementation(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.73")
     implementation(group = "io.sentry", name = "sentry-logback", version = "1.7.17")
 
     implementation(group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2")
diff --git a/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java b/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java
index a6fc19c..ea889cb 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java
@@ -16,14 +16,19 @@
 
 package com.dunctebot.sourcemanagers;
 
-import com.dunctebot.sourcemanagers.pornhub.PornHubAudioSourceManager;
 import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
 import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
+import com.sedmelluq.discord.lavaplayer.tools.http.HttpContextFilter;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpConfigurable;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.CookieStore;
 import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.impl.client.BasicCookieStore;
 import org.apache.http.impl.client.HttpClientBuilder;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -40,7 +45,7 @@ public AbstractDuncteBotHttpSource(boolean withoutCookies) {
         httpInterfaceManager = HttpClientTools.createDefaultThreadLocalManager();
 
         if (withoutCookies) {
-            httpInterfaceManager.setHttpContextFilter(new PornHubAudioSourceManager.FuckCookies());
+            httpInterfaceManager.setHttpContextFilter(new FuckCookies());
         }
     }
 
@@ -62,4 +67,39 @@ public void configureRequests(Function<RequestConfig, RequestConfig> configurato
     public void configureBuilder(Consumer<HttpClientBuilder> configurator) {
         httpInterfaceManager.configureBuilder(configurator);
     }
+
+    public static class FuckCookies implements HttpContextFilter {
+        @Override
+        public void onContextOpen(HttpClientContext context) {
+            CookieStore cookieStore = context.getCookieStore();
+
+            if (cookieStore == null) {
+                cookieStore = new BasicCookieStore();
+                context.setCookieStore(cookieStore);
+            }
+
+            // Reset cookies for each sequence of requests.
+            cookieStore.clear();
+        }
+
+        @Override
+        public void onContextClose(HttpClientContext context) {
+            // Not used
+        }
+
+        @Override
+        public void onRequest(HttpClientContext context, HttpUriRequest request, boolean isRepetition) {
+            // Not used
+        }
+
+        @Override
+        public boolean onRequestResponse(HttpClientContext context, HttpUriRequest request, HttpResponse response) {
+            return false;
+        }
+
+        @Override
+        public boolean onRequestException(HttpClientContext context, HttpUriRequest request, Throwable error) {
+            return false;
+        }
+    }
 }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
index dc2c038..c75cf80 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
@@ -42,7 +42,7 @@ public static void registerCustom(AudioPlayerManager playerManager, String speec
         playerManager.registerSourceManager(new SpeechAudioSourceManager(speechLanguage));
         playerManager.registerSourceManager(new PornHubAudioSourceManager());
         playerManager.registerSourceManager(new RedditAudioSourceManager());
-        playerManager.registerSourceManager(new TikTokAudioSourceManager());
+        //playerManager.registerSourceManager(new TikTokAudioSourceManager());
 
     }
 }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
index d732b7f..1e89da6 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
@@ -23,19 +23,13 @@
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity;
 import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
-import com.sedmelluq.discord.lavaplayer.tools.http.HttpContextFilter;
 import com.sedmelluq.discord.lavaplayer.track.AudioItem;
 import com.sedmelluq.discord.lavaplayer.track.AudioReference;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.CookieStore;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.impl.client.BasicCookieStore;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -147,7 +141,6 @@ private PornHubAudioTrack buildAudioTrack(String title, String author, long dura
     }
 
     private JsonBrowser getVideoInfo(String html) throws IOException {
-        // flashvars_130837711['mediaDefinitions'][0]['videoUrl']
         final Matcher matcher = VIDEO_INFO_REGEX.matcher(html);
 
         if (matcher.find()) {
@@ -190,39 +183,4 @@ private String loadHtml(String url) throws IOException {
     private void notAvailable() {
         throw new FriendlyException("This video is not available", Severity.COMMON, null);
     }
-
-    public static class FuckCookies implements HttpContextFilter {
-        @Override
-        public void onContextOpen(HttpClientContext context) {
-            CookieStore cookieStore = context.getCookieStore();
-
-            if (cookieStore == null) {
-                cookieStore = new BasicCookieStore();
-                context.setCookieStore(cookieStore);
-            }
-
-            // Reset cookies for each sequence of requests.
-            cookieStore.clear();
-        }
-
-        @Override
-        public void onContextClose(HttpClientContext context) {
-            // Not used
-        }
-
-        @Override
-        public void onRequest(HttpClientContext context, HttpUriRequest request, boolean isRepetition) {
-            // Not used
-        }
-
-        @Override
-        public boolean onRequestResponse(HttpClientContext context, HttpUriRequest request, HttpResponse response) {
-            return false;
-        }
-
-        @Override
-        public boolean onRequestException(HttpClientContext context, HttpUriRequest request, Throwable error) {
-            return false;
-        }
-    }
 }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
index 78027d2..2723455 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
@@ -19,6 +19,7 @@
 import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
 import com.dunctebot.sourcemanagers.MpegTrack;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
+import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
@@ -33,11 +34,12 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
+import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.*;
 
 public class PornHubAudioTrack extends MpegTrack {
     private static final Pattern MEDIA_STRING = Pattern.compile("(var\\s+?mediastring.+?)<\\/script>");
     private static final Pattern MEDIA_STRING_FILTER = Pattern.compile("\\/\\* \\+ [a-zA-Z0-9_]+ \\+ \\*\\/");
+    private static final Pattern VIDEO_SHOW = Pattern.compile("var\\s+?VIDEO_SHOW\\s+?=\\s+?([^;]+);?<\\/script>");
 
     public PornHubAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource sourceManager) {
         super(trackInfo, sourceManager);
@@ -52,26 +54,33 @@ protected String getPlaybackUrl() {
         }
     }
 
-    private static String loadTrackUrl(AudioTrackInfo trackInfo, HttpInterface httpInterface) throws IOException {
-        final HttpGet httpGet = new HttpGet(trackInfo.identifier);
-
-        httpGet.setHeader("Cookie", "platform=tv");
+    private String loadTrackUrl(AudioTrackInfo trackInfo, HttpInterface httpInterface) throws IOException {
+        final HttpGet httpGet = createGet(trackInfo.identifier);
 
         try (final CloseableHttpResponse response = httpInterface.execute(httpGet)) {
             final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
             final Matcher matcher = MEDIA_STRING.matcher(html);
 
-            if (!matcher.find()) {
-                throw new FriendlyException("Could not find media info", SUSPICIOUS, null);
+            if (matcher.find()) {
+                final String js = matcher.group(matcher.groupCount());
+
+                return parseJsValueToUrl(html, js);
+            }
+
+            final Matcher videoMatcher = VIDEO_SHOW.matcher(html);
+
+            if (videoMatcher.find()) {
+                final String js = videoMatcher.group(videoMatcher.groupCount());
+
+                return extractVideoFromVideoShow(js, httpInterface);
             }
 
-            final String js = matcher.group(matcher.groupCount());
 
-            return parseJsValueToUrl(html, js);
+            throw new FriendlyException("Could not find media info", SUSPICIOUS, null);
         }
     }
 
-    private static String parseJsValueToUrl(String htmlPage, String js) {
+    private String parseJsValueToUrl(String htmlPage, String js) {
         final String filteredJsValue = MEDIA_STRING_FILTER.matcher(js).replaceAll("");
         final String variables = filteredJsValue.split("=")[1].split(";")[0];
         final String[] items = variables.split("\\+");
@@ -96,6 +105,38 @@ private static String parseJsValueToUrl(String htmlPage, String js) {
         return String.join("", videoParts);
     }
 
+    private String extractVideoFromVideoShow(String obj, HttpInterface httpInterface) throws IOException {
+        final JsonBrowser browser = JsonBrowser.parse(obj);
+        final String mediaUrl = browser.get("mediaUrl").safeText();
+
+        final HttpGet mediaGet = createGet("https://www.pornhub.com" + mediaUrl);
+
+        try (final CloseableHttpResponse response = httpInterface.execute(mediaGet)) {
+            final String body = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+            final JsonBrowser json = JsonBrowser.parse(body);
+
+            if (!"OK".equals(json.get("status").safeText())) {
+                throw new FriendlyException("Pornhub video returned non OK status for video info", COMMON, null);
+            }
+
+            final String videoUrl = json.get("videoUrl").text();
+
+            if (videoUrl == null) {
+                throw new FriendlyException("Video url missing on playback page", FAULT, null);
+            }
+
+            return videoUrl;
+        }
+    }
+
+    private HttpGet createGet(String url) {
+        final HttpGet httpGet = new HttpGet(url);
+
+        httpGet.setHeader("Cookie", "platform=tv");
+
+        return httpGet;
+    }
+
     @Override
     protected AudioTrack makeShallowClone() {
         return new PornHubAudioTrack(trackInfo, getSourceManager());

From 19a0170e9e5b245fd29a709218b31b7ad1d10b51 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 2 Apr 2021 14:30:12 +0200
Subject: [PATCH 27/76] Temp repo for lavaplayer

---
 build.gradle.kts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2b1713c..b25796e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -31,6 +31,7 @@ val archivesBaseName = "sourcemanagers"
 repositories {
     mavenCentral()
     jcenter()
+    maven("https://dl.bintray.com/sedmelluq")
 
     maven {
         url = uri("https://jitpack.io")
@@ -40,7 +41,7 @@ repositories {
 dependencies {
     // build override for age-restricted videos
 //    implementation(group = "com.github.duncte123", name = "lavaplayer", version = "be6e364")
-    implementation(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.73")
+    implementation(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.75")
     implementation(group = "io.sentry", name = "sentry-logback", version = "1.7.17")
 
     implementation(group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2")

From 6194af5cea2f01c0c4c7b5c325acdda5bb82f56f Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 2 Apr 2021 14:33:25 +0200
Subject: [PATCH 28/76] Whoops

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b25796e..ddcc46f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -31,7 +31,7 @@ val archivesBaseName = "sourcemanagers"
 repositories {
     mavenCentral()
     jcenter()
-    maven("https://dl.bintray.com/sedmelluq")
+    maven("https://dl.bintray.com/sedmelluq/com.sedmelluq")
 
     maven {
         url = uri("https://jitpack.io")

From cbfc1dc792e2bd60d3f8918d9b590769e0d69e36 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 2 Apr 2021 17:31:34 +0200
Subject: [PATCH 29/76] Add some debug logging

---
 .../dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
index 2723455..61239b8 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
@@ -109,10 +109,15 @@ private String extractVideoFromVideoShow(String obj, HttpInterface httpInterface
         final JsonBrowser browser = JsonBrowser.parse(obj);
         final String mediaUrl = browser.get("mediaUrl").safeText();
 
+        System.out.println("https://www.pornhub.com" + mediaUrl);
+
         final HttpGet mediaGet = createGet("https://www.pornhub.com" + mediaUrl);
 
         try (final CloseableHttpResponse response = httpInterface.execute(mediaGet)) {
             final String body = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+
+            System.out.println("body " + body);
+
             final JsonBrowser json = JsonBrowser.parse(body);
 
             if (!"OK".equals(json.get("status").safeText())) {

From 44a715e87435746ffc17c4242ab6646883038665 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 2 Apr 2021 17:38:55 +0200
Subject: [PATCH 30/76] Try with cookies

---
 .../sourcemanagers/pornhub/PornHubAudioSourceManager.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
index 1e89da6..cd37869 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
@@ -45,6 +45,10 @@ public class PornHubAudioSourceManager extends AbstractDuncteBotHttpSource {
     private static final Pattern VIDEO_INFO_REGEX = Pattern.compile("var flashvars_\\d+ = (\\{.+})");
     private static final Pattern MODEL_INFO_REGEX = Pattern.compile("var MODEL_PROFILE = (\\{.+})");
 
+    public PornHubAudioSourceManager() {
+        super(false);
+    }
+
     @Override
     public String getSourceName() {
         return "pornhub";

From b91ffaf67c94eb2764b4259159071559f848ae97 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 2 Apr 2021 19:27:47 +0200
Subject: [PATCH 31/76] Gonna leave it here for today

---
 .../pornhub/PornHubAudioSourceManager.java    |  8 +-
 .../pornhub/PornHubAudioTrack.java            | 90 ++++++++++++++++++-
 2 files changed, 88 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
index cd37869..bcfaa51 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
@@ -45,10 +45,6 @@ public class PornHubAudioSourceManager extends AbstractDuncteBotHttpSource {
     private static final Pattern VIDEO_INFO_REGEX = Pattern.compile("var flashvars_\\d+ = (\\{.+})");
     private static final Pattern MODEL_INFO_REGEX = Pattern.compile("var MODEL_PROFILE = (\\{.+})");
 
-    public PornHubAudioSourceManager() {
-        super(false);
-    }
-
     @Override
     public String getSourceName() {
         return "pornhub";
@@ -104,7 +100,7 @@ private AudioItem loadItemOnce(AudioReference reference) throws IOException {
         final String author = modelInfo.get("username").safeText();
         final int duration = Integer.parseInt(videoInfo.get("video_duration").safeText()) * 1000; // PornHub returns seconds
         final Matcher matcher = VIDEO_REGEX.matcher(reference.identifier);
-        final String identifier = matcher.matches() ? "https://www.pornhub.com/view_video.php?viewkey=" + matcher.group(matcher.groupCount()) : reference.identifier;
+        final String identifier = matcher.matches() ? matcher.group(matcher.groupCount()) : null;
         final String uri = reference.identifier;
         final String imageUrl = videoInfo.get("image_url").safeText();
 
@@ -167,7 +163,7 @@ private JsonBrowser getModelInfo(String html) throws IOException {
     private String loadHtml(String url) throws IOException {
         final HttpGet httpGet = new HttpGet(url);
 
-        httpGet.setHeader("Cookie", "platform=pc");
+        httpGet.setHeader("Cookie", "platform=pc;age_verified=1");
 
         try (final CloseableHttpResponse response = getHttpInterface().execute(httpGet)) {
             final int statusCode = response.getStatusLine().getStatusCode();
diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
index 61239b8..b98088b 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
@@ -29,14 +29,17 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.*;
 
 public class PornHubAudioTrack extends MpegTrack {
+    private static final String[] FORMAT_PREFIXES = {"media", "quality", "qualityItems"};
+    private static final String FORMAT_REGEX = String.format("(var\\s+(?:%s)_.+)", String.join("|", FORMAT_PREFIXES));
+    private static final Pattern FORMAT_PATTERN = Pattern.compile(FORMAT_REGEX);
     private static final Pattern MEDIA_STRING = Pattern.compile("(var\\s+?mediastring.+?)<\\/script>");
     private static final Pattern MEDIA_STRING_FILTER = Pattern.compile("\\/\\* \\+ [a-zA-Z0-9_]+ \\+ \\*\\/");
     private static final Pattern VIDEO_SHOW = Pattern.compile("var\\s+?VIDEO_SHOW\\s+?=\\s+?([^;]+);?<\\/script>");
@@ -54,8 +57,87 @@ protected String getPlaybackUrl() {
         }
     }
 
+    private String parseJsValue(String input, Map<String, String> jsVars) {
+        String inp = input.replaceAll("/\\*(?:(?!\\*/).)*?\\*/", "");
+
+        if (input.contains("+")) {
+            return Arrays.stream(input.split("\\+"))
+                .map(s -> parseJsValue(s, jsVars))
+                .collect(Collectors.joining(" "));
+        }
+
+        inp = inp.trim();
+
+        if (jsVars.containsKey(inp)) {
+            return jsVars.get(inp);
+        }
+
+
+        // can't remove quotes if less than 2 chars
+        if (inp.length() < 2) {
+            return inp;
+        }
+
+        // remove quotes
+        if (
+            (inp.charAt(0) == '"' && inp.charAt(inp.length() - 1) == '"') ||
+                (inp.charAt(0) == '\'' && inp.charAt(inp.length() - 1) == '\'')
+        ) {
+            return inp.substring(1, inp.length() - 1);
+        }
+
+        return inp;
+    }
+
+    private Map<String, String> extractJsVars(String html, Pattern pattern) {
+        final Matcher matcher = pattern.matcher(html);
+
+        if (!matcher.find()) {
+            return null;
+        }
+
+        final String[] assignments = matcher.group(1).split(";");
+        final Map<String, String> jsVars = new HashMap<>();
+
+        for (String assn : assignments) {
+            assn = assn.trim();
+
+            if (assn.isBlank()) {
+                continue;
+            }
+
+            assn = assn.replaceFirst("var\\s+", "");
+            final String[] parts = assn.split("=", 2);
+
+            jsVars.put(parts[0], parts[1]);
+        }
+
+        return jsVars;
+    }
+
     private String loadTrackUrl(AudioTrackInfo trackInfo, HttpInterface httpInterface) throws IOException {
-        final HttpGet httpGet = createGet(trackInfo.identifier);
+        final HttpGet httpGet = createGet("https://www.pornhub.com/view_video.php?viewkey=" + trackInfo.identifier);
+
+        try (final CloseableHttpResponse response = httpInterface.execute(httpGet)) {
+            final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+            final Map<String, String> jsVars = extractJsVars(html, FORMAT_PATTERN);
+
+            if (jsVars == null) {
+                throw new FriendlyException("Could not load media info", SUSPICIOUS, null);
+            }
+
+            for (final Map.Entry<String, String> entry : jsVars.entrySet()) {
+                if (entry.getKey().startsWith("qualityItems")) {
+                    //
+                }
+            }
+
+            return "";
+        }
+    }
+
+    private String loadTrackUrlOld(AudioTrackInfo trackInfo, HttpInterface httpInterface) throws IOException {
+        final HttpGet httpGet = createGet("https://www.pornhub.com/view_video.php?viewkey=" + trackInfo.identifier);
 
         try (final CloseableHttpResponse response = httpInterface.execute(httpGet)) {
             final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
@@ -137,7 +219,7 @@ private String extractVideoFromVideoShow(String obj, HttpInterface httpInterface
     private HttpGet createGet(String url) {
         final HttpGet httpGet = new HttpGet(url);
 
-        httpGet.setHeader("Cookie", "platform=tv");
+        httpGet.setHeader("Cookie", "platform=pc;age_verified=1");
 
         return httpGet;
     }

From 1e93639d0f607afbcb99ec2babeea7368d739b67 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 2 Apr 2021 22:32:04 +0200
Subject: [PATCH 32/76] Maybe this works

---
 .../pornhub/PornHubAudioTrack.java            | 91 +++++++++++--------
 1 file changed, 51 insertions(+), 40 deletions(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
index b98088b..1dcf8b7 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
@@ -20,12 +20,17 @@
 import com.dunctebot.sourcemanagers.MpegTrack;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
+import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
+import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 import org.apache.commons.io.IOUtils;
+import org.apache.http.client.CookieStore;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.cookie.BasicClientCookie;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -44,19 +49,59 @@ public class PornHubAudioTrack extends MpegTrack {
     private static final Pattern MEDIA_STRING_FILTER = Pattern.compile("\\/\\* \\+ [a-zA-Z0-9_]+ \\+ \\*\\/");
     private static final Pattern VIDEO_SHOW = Pattern.compile("var\\s+?VIDEO_SHOW\\s+?=\\s+?([^;]+);?<\\/script>");
 
+    private final HttpInterface httpInterface;
+
     public PornHubAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource sourceManager) {
         super(trackInfo, sourceManager);
+
+        final CookieStore cookieStore = new BasicCookieStore();
+
+        cookieStore.addCookie(new BasicClientCookie("platform", "tv"));
+        cookieStore.addCookie(new BasicClientCookie("age_verified", "1"));
+
+        final HttpInterfaceManager manager = HttpClientTools.createDefaultThreadLocalManager();
+        manager.configureBuilder(
+            (config) -> config.setDefaultCookieStore(cookieStore)
+        );
+
+        this.httpInterface = manager.getInterface();
     }
 
     @Override
     protected String getPlaybackUrl() {
         try {
-            return loadTrackUrl(this.trackInfo, this.getSourceManager().getHttpInterface());
+            return loadTrackUrl(this.trackInfo);
         } catch (IOException e) {
             throw new FriendlyException("Could not load PornHub video", SUSPICIOUS, e);
         }
     }
 
+    private String loadTrackUrl(AudioTrackInfo trackInfo) throws IOException {
+        final HttpGet httpGet = new HttpGet("https://www.pornhub.com/view_video.php?viewkey=" + trackInfo.identifier);
+
+        try (final CloseableHttpResponse response = this.httpInterface.execute(httpGet)) {
+            final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+            final Matcher matcher = MEDIA_STRING.matcher(html);
+
+            if (matcher.find()) {
+                final String js = matcher.group(matcher.groupCount());
+
+                return parseJsValueToUrl(html, js);
+            }
+
+            final Matcher videoMatcher = VIDEO_SHOW.matcher(html);
+
+            if (videoMatcher.find()) {
+                final String js = videoMatcher.group(videoMatcher.groupCount());
+
+                return extractVideoFromVideoShow(js, httpInterface);
+            }
+
+
+            throw new FriendlyException("Could not find media info", SUSPICIOUS, null);
+        }
+    }
+
     private String parseJsValue(String input, Map<String, String> jsVars) {
         String inp = input.replaceAll("/\\*(?:(?!\\*/).)*?\\*/", "");
 
@@ -109,16 +154,16 @@ private Map<String, String> extractJsVars(String html, Pattern pattern) {
             assn = assn.replaceFirst("var\\s+", "");
             final String[] parts = assn.split("=", 2);
 
-            jsVars.put(parts[0], parts[1]);
+            jsVars.put(parts[0], this.parseJsValue(parts[1], jsVars));
         }
 
         return jsVars;
     }
 
-    private String loadTrackUrl(AudioTrackInfo trackInfo, HttpInterface httpInterface) throws IOException {
-        final HttpGet httpGet = createGet("https://www.pornhub.com/view_video.php?viewkey=" + trackInfo.identifier);
+    private String loadTrackUrl_new(AudioTrackInfo trackInfo) throws IOException {
+        final HttpGet httpGet = new HttpGet("https://www.pornhub.com/view_video.php?viewkey=" + trackInfo.identifier);
 
-        try (final CloseableHttpResponse response = httpInterface.execute(httpGet)) {
+        try (final CloseableHttpResponse response = this.httpInterface.execute(httpGet)) {
             final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
             final Map<String, String> jsVars = extractJsVars(html, FORMAT_PATTERN);
 
@@ -136,32 +181,6 @@ private String loadTrackUrl(AudioTrackInfo trackInfo, HttpInterface httpInterfac
         }
     }
 
-    private String loadTrackUrlOld(AudioTrackInfo trackInfo, HttpInterface httpInterface) throws IOException {
-        final HttpGet httpGet = createGet("https://www.pornhub.com/view_video.php?viewkey=" + trackInfo.identifier);
-
-        try (final CloseableHttpResponse response = httpInterface.execute(httpGet)) {
-            final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
-            final Matcher matcher = MEDIA_STRING.matcher(html);
-
-            if (matcher.find()) {
-                final String js = matcher.group(matcher.groupCount());
-
-                return parseJsValueToUrl(html, js);
-            }
-
-            final Matcher videoMatcher = VIDEO_SHOW.matcher(html);
-
-            if (videoMatcher.find()) {
-                final String js = videoMatcher.group(videoMatcher.groupCount());
-
-                return extractVideoFromVideoShow(js, httpInterface);
-            }
-
-
-            throw new FriendlyException("Could not find media info", SUSPICIOUS, null);
-        }
-    }
-
     private String parseJsValueToUrl(String htmlPage, String js) {
         final String filteredJsValue = MEDIA_STRING_FILTER.matcher(js).replaceAll("");
         final String variables = filteredJsValue.split("=")[1].split(";")[0];
@@ -193,7 +212,7 @@ private String extractVideoFromVideoShow(String obj, HttpInterface httpInterface
 
         System.out.println("https://www.pornhub.com" + mediaUrl);
 
-        final HttpGet mediaGet = createGet("https://www.pornhub.com" + mediaUrl);
+        final HttpGet mediaGet = new HttpGet("https://www.pornhub.com" + mediaUrl);
 
         try (final CloseableHttpResponse response = httpInterface.execute(mediaGet)) {
             final String body = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
@@ -216,14 +235,6 @@ private String extractVideoFromVideoShow(String obj, HttpInterface httpInterface
         }
     }
 
-    private HttpGet createGet(String url) {
-        final HttpGet httpGet = new HttpGet(url);
-
-        httpGet.setHeader("Cookie", "platform=pc;age_verified=1");
-
-        return httpGet;
-    }
-
     @Override
     protected AudioTrack makeShallowClone() {
         return new PornHubAudioTrack(trackInfo, getSourceManager());

From 3cc9772b4e4a38b581a88f454c240251977c933a Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sat, 3 Apr 2021 22:32:06 +0200
Subject: [PATCH 33/76] Install lavaplayer from m2 dv8

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index ddcc46f..79fe81e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -31,7 +31,7 @@ val archivesBaseName = "sourcemanagers"
 repositories {
     mavenCentral()
     jcenter()
-    maven("https://dl.bintray.com/sedmelluq/com.sedmelluq")
+    maven("https://m2.dv8tion.net/releases")
 
     maven {
         url = uri("https://jitpack.io")

From bf32637c062694389d0dc137a2cd2c0095001a3c Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 4 Apr 2021 20:34:50 +0200
Subject: [PATCH 34/76] Dump html

---
 .../dunctebot/sourcemanagers/DuncteBotSources.java    |  4 ++--
 .../sourcemanagers/pornhub/PornHubAudioTrack.java     | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
index c75cf80..7434f24 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
@@ -33,9 +33,9 @@ public static void registerCustom(AudioPlayerManager playerManager, String speec
         final YoutubeAudioSourceManager youtubeSource = playerManager.source(YoutubeAudioSourceManager.class);
         youtubeSource.setPlaylistPageCount(playlistPageCount);
         youtubeSource.getMainHttpConfiguration()
-            .setHttpContextFilter(
+            /*.setHttpContextFilter(
                 YoutubeContextFilterOverride.getOrCreate(updateYoutubeData, youtubeSource.getHttpInterface())
-            );
+            )*/;
 
         playerManager.registerSourceManager(new GetyarnAudioSourceManager());
         playerManager.registerSourceManager(new ClypitAudioSourceManager());
diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
index 1dcf8b7..f981c2a 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
@@ -57,7 +57,7 @@ public PornHubAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource s
         final CookieStore cookieStore = new BasicCookieStore();
 
         cookieStore.addCookie(new BasicClientCookie("platform", "tv"));
-        cookieStore.addCookie(new BasicClientCookie("age_verified", "1"));
+//        cookieStore.addCookie(new BasicClientCookie("age_verified", "1"));
 
         final HttpInterfaceManager manager = HttpClientTools.createDefaultThreadLocalManager();
         manager.configureBuilder(
@@ -97,6 +97,7 @@ private String loadTrackUrl(AudioTrackInfo trackInfo) throws IOException {
                 return extractVideoFromVideoShow(js, httpInterface);
             }
 
+            System.out.println(html);
 
             throw new FriendlyException("Could not find media info", SUSPICIOUS, null);
         }
@@ -235,6 +236,14 @@ private String extractVideoFromVideoShow(String obj, HttpInterface httpInterface
         }
     }
 
+    private HttpGet makeGet(String url) {
+        final HttpGet httpGet = new HttpGet(url);
+
+        httpGet.setHeader("Cookie", "");
+
+        return httpGet;
+    }
+
     @Override
     protected AudioTrack makeShallowClone() {
         return new PornHubAudioTrack(trackInfo, getSourceManager());

From d2c449c88cc8dce32c9d3ba1d74fc68c95637f6f Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 4 Apr 2021 20:42:17 +0200
Subject: [PATCH 35/76] Work?

---
 .../pornhub/PornHubAudioTrack.java             | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
index f981c2a..d10bf8a 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
@@ -49,7 +49,7 @@ public class PornHubAudioTrack extends MpegTrack {
     private static final Pattern MEDIA_STRING_FILTER = Pattern.compile("\\/\\* \\+ [a-zA-Z0-9_]+ \\+ \\*\\/");
     private static final Pattern VIDEO_SHOW = Pattern.compile("var\\s+?VIDEO_SHOW\\s+?=\\s+?([^;]+);?<\\/script>");
 
-    private final HttpInterface httpInterface;
+    private final HttpInterfaceManager httpManager;
 
     public PornHubAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource sourceManager) {
         super(trackInfo, sourceManager);
@@ -64,7 +64,11 @@ public PornHubAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource s
             (config) -> config.setDefaultCookieStore(cookieStore)
         );
 
-        this.httpInterface = manager.getInterface();
+        this.httpManager = manager;
+    }
+
+    private HttpInterface getInterface() {
+        return this.httpManager.getInterface();
     }
 
     @Override
@@ -79,7 +83,9 @@ protected String getPlaybackUrl() {
     private String loadTrackUrl(AudioTrackInfo trackInfo) throws IOException {
         final HttpGet httpGet = new HttpGet("https://www.pornhub.com/view_video.php?viewkey=" + trackInfo.identifier);
 
-        try (final CloseableHttpResponse response = this.httpInterface.execute(httpGet)) {
+        httpGet.setHeader("Cookie", "platform=tv");
+
+        try (final CloseableHttpResponse response = this.getInterface().execute(httpGet)) {
             final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
             final Matcher matcher = MEDIA_STRING.matcher(html);
 
@@ -94,7 +100,7 @@ private String loadTrackUrl(AudioTrackInfo trackInfo) throws IOException {
             if (videoMatcher.find()) {
                 final String js = videoMatcher.group(videoMatcher.groupCount());
 
-                return extractVideoFromVideoShow(js, httpInterface);
+                return extractVideoFromVideoShow(js, getInterface());
             }
 
             System.out.println(html);
@@ -164,7 +170,7 @@ private Map<String, String> extractJsVars(String html, Pattern pattern) {
     private String loadTrackUrl_new(AudioTrackInfo trackInfo) throws IOException {
         final HttpGet httpGet = new HttpGet("https://www.pornhub.com/view_video.php?viewkey=" + trackInfo.identifier);
 
-        try (final CloseableHttpResponse response = this.httpInterface.execute(httpGet)) {
+        try (final CloseableHttpResponse response = this.getInterface().execute(httpGet)) {
             final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
             final Map<String, String> jsVars = extractJsVars(html, FORMAT_PATTERN);
 
@@ -239,7 +245,7 @@ private String extractVideoFromVideoShow(String obj, HttpInterface httpInterface
     private HttpGet makeGet(String url) {
         final HttpGet httpGet = new HttpGet(url);
 
-        httpGet.setHeader("Cookie", "");
+        httpGet.setHeader("Cookie", "platform=tv");
 
         return httpGet;
     }

From 68b727759a1f3a3bc66d8fb2184b342e3bfe7a1e Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 4 Apr 2021 20:54:03 +0200
Subject: [PATCH 36/76] This is driving me crazy

---
 .../sourcemanagers/pornhub/PornHubAudioTrack.java   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
index d10bf8a..e7de5c3 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
@@ -26,6 +26,7 @@
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 import org.apache.commons.io.IOUtils;
+import org.apache.http.NameValuePair;
 import org.apache.http.client.CookieStore;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -85,7 +86,7 @@ private String loadTrackUrl(AudioTrackInfo trackInfo) throws IOException {
 
         httpGet.setHeader("Cookie", "platform=tv");
 
-        try (final CloseableHttpResponse response = this.getInterface().execute(httpGet)) {
+        try (final CloseableHttpResponse response = this.getSourceManager().getHttpInterface().execute(httpGet)) {
             final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
             final Matcher matcher = MEDIA_STRING.matcher(html);
 
@@ -98,9 +99,13 @@ private String loadTrackUrl(AudioTrackInfo trackInfo) throws IOException {
             final Matcher videoMatcher = VIDEO_SHOW.matcher(html);
 
             if (videoMatcher.find()) {
+                System.out.println(Arrays.toString(response.getHeaders("Cookie")));
+                final String cookies = Arrays.stream(response.getHeaders("Cookie"))
+                    .map(NameValuePair::getValue)
+                    .collect(Collectors.joining(";"));
                 final String js = videoMatcher.group(videoMatcher.groupCount());
 
-                return extractVideoFromVideoShow(js, getInterface());
+                return extractVideoFromVideoShow(js, this.getSourceManager().getHttpInterface(), cookies);
             }
 
             System.out.println(html);
@@ -213,7 +218,7 @@ private String parseJsValueToUrl(String htmlPage, String js) {
         return String.join("", videoParts);
     }
 
-    private String extractVideoFromVideoShow(String obj, HttpInterface httpInterface) throws IOException {
+    private String extractVideoFromVideoShow(String obj, HttpInterface httpInterface, String cookie) throws IOException {
         final JsonBrowser browser = JsonBrowser.parse(obj);
         final String mediaUrl = browser.get("mediaUrl").safeText();
 
@@ -221,6 +226,8 @@ private String extractVideoFromVideoShow(String obj, HttpInterface httpInterface
 
         final HttpGet mediaGet = new HttpGet("https://www.pornhub.com" + mediaUrl);
 
+        mediaGet.setHeader("Cookie", cookie);
+
         try (final CloseableHttpResponse response = httpInterface.execute(mediaGet)) {
             final String body = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
 

From 321c2ccb0045d6d59066f1046c72ee49fea68f51 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 4 Apr 2021 21:15:36 +0200
Subject: [PATCH 37/76] Fetch setCookie header

---
 .../pornhub/PornHubAudioSourceManager.java    |  4 ++++
 .../pornhub/PornHubAudioTrack.java            | 20 ++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
index bcfaa51..1bb25f5 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
@@ -183,4 +183,8 @@ private String loadHtml(String url) throws IOException {
     private void notAvailable() {
         throw new FriendlyException("This video is not available", Severity.COMMON, null);
     }
+
+    public static String getPlayerPage(String id) {
+        return "https://www.pornhub.com/view_video.php?viewkey=" + id;
+    }
 }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
index e7de5c3..5b70b04 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
@@ -40,6 +40,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static com.dunctebot.sourcemanagers.pornhub.PornHubAudioSourceManager.getPlayerPage;
 import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.*;
 
 public class PornHubAudioTrack extends MpegTrack {
@@ -75,18 +76,18 @@ private HttpInterface getInterface() {
     @Override
     protected String getPlaybackUrl() {
         try {
-            return loadTrackUrl(this.trackInfo);
+            return loadTrackUrl();
         } catch (IOException e) {
             throw new FriendlyException("Could not load PornHub video", SUSPICIOUS, e);
         }
     }
 
-    private String loadTrackUrl(AudioTrackInfo trackInfo) throws IOException {
-        final HttpGet httpGet = new HttpGet("https://www.pornhub.com/view_video.php?viewkey=" + trackInfo.identifier);
+    private String loadTrackUrl() throws IOException {
+        final HttpGet httpGet = new HttpGet(getPlayerPage(this.trackInfo.identifier));
 
         httpGet.setHeader("Cookie", "platform=tv");
 
-        try (final CloseableHttpResponse response = this.getSourceManager().getHttpInterface().execute(httpGet)) {
+        try (final CloseableHttpResponse response = this.getInterface().execute(httpGet)) {
             final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
             final Matcher matcher = MEDIA_STRING.matcher(html);
 
@@ -99,13 +100,13 @@ private String loadTrackUrl(AudioTrackInfo trackInfo) throws IOException {
             final Matcher videoMatcher = VIDEO_SHOW.matcher(html);
 
             if (videoMatcher.find()) {
-                System.out.println(Arrays.toString(response.getHeaders("Cookie")));
-                final String cookies = Arrays.stream(response.getHeaders("Cookie"))
+                System.out.println(Arrays.toString(response.getHeaders("Set-Cookie")));
+                final String cookies = Arrays.stream(response.getHeaders("Set-Cookie"))
                     .map(NameValuePair::getValue)
-                    .collect(Collectors.joining(";"));
+                    .collect(Collectors.joining("; "));
                 final String js = videoMatcher.group(videoMatcher.groupCount());
 
-                return extractVideoFromVideoShow(js, this.getSourceManager().getHttpInterface(), cookies);
+                return extractVideoFromVideoShow(js, getInterface(), cookies);
             }
 
             System.out.println(html);
@@ -226,7 +227,8 @@ private String extractVideoFromVideoShow(String obj, HttpInterface httpInterface
 
         final HttpGet mediaGet = new HttpGet("https://www.pornhub.com" + mediaUrl);
 
-        mediaGet.setHeader("Cookie", cookie);
+        mediaGet.setHeader("Cookie", cookie + "; quality=720");
+        mediaGet.setHeader("Referer", getPlayerPage(this.trackInfo.identifier));
 
         try (final CloseableHttpResponse response = httpInterface.execute(mediaGet)) {
             final String body = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);

From aaf3d7426fc798bd275aa9962535ce35b091e553 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 4 Apr 2021 21:18:45 +0200
Subject: [PATCH 38/76] Print the cookie

---
 .../dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
index 5b70b04..90b4f97 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
@@ -224,10 +224,11 @@ private String extractVideoFromVideoShow(String obj, HttpInterface httpInterface
         final String mediaUrl = browser.get("mediaUrl").safeText();
 
         System.out.println("https://www.pornhub.com" + mediaUrl);
+        System.out.println("Cookie " + cookie + "; quality=720; platform=tv");
 
         final HttpGet mediaGet = new HttpGet("https://www.pornhub.com" + mediaUrl);
 
-        mediaGet.setHeader("Cookie", cookie + "; quality=720");
+        mediaGet.setHeader("Cookie", cookie + "; quality=720; platform=tv");
         mediaGet.setHeader("Referer", getPlayerPage(this.trackInfo.identifier));
 
         try (final CloseableHttpResponse response = httpInterface.execute(mediaGet)) {

From 1aacc5478082815d5b1f7cec1470e86d33caa7ba Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 4 Apr 2021 21:23:24 +0200
Subject: [PATCH 39/76] Fetch cookie values

---
 .../com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
index 90b4f97..b763314 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
@@ -103,6 +103,7 @@ private String loadTrackUrl() throws IOException {
                 System.out.println(Arrays.toString(response.getHeaders("Set-Cookie")));
                 final String cookies = Arrays.stream(response.getHeaders("Set-Cookie"))
                     .map(NameValuePair::getValue)
+                    .map((s) -> s.split(";", 2)[0])
                     .collect(Collectors.joining("; "));
                 final String js = videoMatcher.group(videoMatcher.groupCount());
 

From cda0ebb63059a482995dda1e47dbf96905690ab6 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 4 Apr 2021 21:36:16 +0200
Subject: [PATCH 40/76] Try the yt-dl way

---
 .../pornhub/PornHubAudioTrack.java            | 78 +++++++++++--------
 1 file changed, 44 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
index b763314..3827c3e 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
@@ -82,7 +82,7 @@ protected String getPlaybackUrl() {
         }
     }
 
-    private String loadTrackUrl() throws IOException {
+    private String loadTrackUrl_old() throws IOException {
         final HttpGet httpGet = new HttpGet(getPlayerPage(this.trackInfo.identifier));
 
         httpGet.setHeader("Cookie", "platform=tv");
@@ -100,7 +100,6 @@ private String loadTrackUrl() throws IOException {
             final Matcher videoMatcher = VIDEO_SHOW.matcher(html);
 
             if (videoMatcher.find()) {
-                System.out.println(Arrays.toString(response.getHeaders("Set-Cookie")));
                 final String cookies = Arrays.stream(response.getHeaders("Set-Cookie"))
                     .map(NameValuePair::getValue)
                     .map((s) -> s.split(";", 2)[0])
@@ -110,12 +109,53 @@ private String loadTrackUrl() throws IOException {
                 return extractVideoFromVideoShow(js, getInterface(), cookies);
             }
 
-            System.out.println(html);
-
             throw new FriendlyException("Could not find media info", SUSPICIOUS, null);
         }
     }
 
+    private String parseQualityItems(String json) throws IOException {
+        final JsonBrowser parse = JsonBrowser.parse(json);
+
+        if (!parse.isList()) {
+            return null;
+        }
+
+        final JsonBrowser url = parse.values().stream()
+            .filter((it) -> !it.get("url").safeText().isEmpty())
+            .findFirst().orElse(null);
+
+        if (url == null) {
+            return null;
+        }
+
+        return url.get("url").text();
+    }
+
+    private String loadTrackUrl() throws IOException {
+        final HttpGet httpGet = new HttpGet("https://www.pornhub.com/view_video.php?viewkey=" + this.trackInfo.identifier);
+
+        try (final CloseableHttpResponse response = this.getSourceManager().getHttpInterface().execute(httpGet)) {
+            final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+            final Map<String, String> jsVars = extractJsVars(html, FORMAT_PATTERN);
+
+            if (jsVars == null) {
+                throw new FriendlyException("Could not load js vars", SUSPICIOUS, null);
+            }
+
+            for (final Map.Entry<String, String> entry : jsVars.entrySet()) {
+                if (entry.getKey().startsWith("qualityItems")) {
+                    final String playbackUrl = parseQualityItems(entry.getValue());
+
+                    if (playbackUrl != null) {
+                        return playbackUrl;
+                    }
+                }
+            }
+
+            throw new FriendlyException("Could not extract video url", COMMON, null);
+        }
+    }
+
     private String parseJsValue(String input, Map<String, String> jsVars) {
         String inp = input.replaceAll("/\\*(?:(?!\\*/).)*?\\*/", "");
 
@@ -174,27 +214,6 @@ private Map<String, String> extractJsVars(String html, Pattern pattern) {
         return jsVars;
     }
 
-    private String loadTrackUrl_new(AudioTrackInfo trackInfo) throws IOException {
-        final HttpGet httpGet = new HttpGet("https://www.pornhub.com/view_video.php?viewkey=" + trackInfo.identifier);
-
-        try (final CloseableHttpResponse response = this.getInterface().execute(httpGet)) {
-            final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
-            final Map<String, String> jsVars = extractJsVars(html, FORMAT_PATTERN);
-
-            if (jsVars == null) {
-                throw new FriendlyException("Could not load media info", SUSPICIOUS, null);
-            }
-
-            for (final Map.Entry<String, String> entry : jsVars.entrySet()) {
-                if (entry.getKey().startsWith("qualityItems")) {
-                    //
-                }
-            }
-
-            return "";
-        }
-    }
-
     private String parseJsValueToUrl(String htmlPage, String js) {
         final String filteredJsValue = MEDIA_STRING_FILTER.matcher(js).replaceAll("");
         final String variables = filteredJsValue.split("=")[1].split(";")[0];
@@ -225,7 +244,6 @@ private String extractVideoFromVideoShow(String obj, HttpInterface httpInterface
         final String mediaUrl = browser.get("mediaUrl").safeText();
 
         System.out.println("https://www.pornhub.com" + mediaUrl);
-        System.out.println("Cookie " + cookie + "; quality=720; platform=tv");
 
         final HttpGet mediaGet = new HttpGet("https://www.pornhub.com" + mediaUrl);
 
@@ -253,14 +271,6 @@ private String extractVideoFromVideoShow(String obj, HttpInterface httpInterface
         }
     }
 
-    private HttpGet makeGet(String url) {
-        final HttpGet httpGet = new HttpGet(url);
-
-        httpGet.setHeader("Cookie", "platform=tv");
-
-        return httpGet;
-    }
-
     @Override
     protected AudioTrack makeShallowClone() {
         return new PornHubAudioTrack(trackInfo, getSourceManager());

From 5244c3f0079d63ae5018d2dc241adc198927b810 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Tue, 6 Apr 2021 09:06:17 +0200
Subject: [PATCH 41/76] Final fixes

---
 .../pornhub/PornHubAudioTrack.java            | 41 ++++++-------------
 1 file changed, 12 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
index 3827c3e..b68937c 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
@@ -20,18 +20,12 @@
 import com.dunctebot.sourcemanagers.MpegTrack;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.NameValuePair;
-import org.apache.http.client.CookieStore;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.cookie.BasicClientCookie;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -51,26 +45,8 @@ public class PornHubAudioTrack extends MpegTrack {
     private static final Pattern MEDIA_STRING_FILTER = Pattern.compile("\\/\\* \\+ [a-zA-Z0-9_]+ \\+ \\*\\/");
     private static final Pattern VIDEO_SHOW = Pattern.compile("var\\s+?VIDEO_SHOW\\s+?=\\s+?([^;]+);?<\\/script>");
 
-    private final HttpInterfaceManager httpManager;
-
     public PornHubAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource sourceManager) {
         super(trackInfo, sourceManager);
-
-        final CookieStore cookieStore = new BasicCookieStore();
-
-        cookieStore.addCookie(new BasicClientCookie("platform", "tv"));
-//        cookieStore.addCookie(new BasicClientCookie("age_verified", "1"));
-
-        final HttpInterfaceManager manager = HttpClientTools.createDefaultThreadLocalManager();
-        manager.configureBuilder(
-            (config) -> config.setDefaultCookieStore(cookieStore)
-        );
-
-        this.httpManager = manager;
-    }
-
-    private HttpInterface getInterface() {
-        return this.httpManager.getInterface();
     }
 
     @Override
@@ -87,7 +63,7 @@ private String loadTrackUrl_old() throws IOException {
 
         httpGet.setHeader("Cookie", "platform=tv");
 
-        try (final CloseableHttpResponse response = this.getInterface().execute(httpGet)) {
+        try (final CloseableHttpResponse response = this.getSourceManager().getHttpInterface().execute(httpGet)) {
             final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
             final Matcher matcher = MEDIA_STRING.matcher(html);
 
@@ -106,7 +82,7 @@ private String loadTrackUrl_old() throws IOException {
                     .collect(Collectors.joining("; "));
                 final String js = videoMatcher.group(videoMatcher.groupCount());
 
-                return extractVideoFromVideoShow(js, getInterface(), cookies);
+                return extractVideoFromVideoShow(js, cookies);
             }
 
             throw new FriendlyException("Could not find media info", SUSPICIOUS, null);
@@ -136,6 +112,11 @@ private String loadTrackUrl() throws IOException {
 
         try (final CloseableHttpResponse response = this.getSourceManager().getHttpInterface().execute(httpGet)) {
             final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+
+            if (Pattern.compile("<[^>]+\\bid=[\"']lockedPlayer").matcher(html).find()) {
+                throw new FriendlyException("Video " + this.trackInfo.identifier + " is locked.", COMMON, null);
+            }
+
             final Map<String, String> jsVars = extractJsVars(html, FORMAT_PATTERN);
 
             if (jsVars == null) {
@@ -149,7 +130,9 @@ private String loadTrackUrl() throws IOException {
                     if (playbackUrl != null) {
                         return playbackUrl;
                     }
-                }
+                }/* else if (entry.getKey().startsWith("media") || entry.getKey().startsWith("quality")) {
+                    // TODO: these are probably broken anyway
+                }*/
             }
 
             throw new FriendlyException("Could not extract video url", COMMON, null);
@@ -239,7 +222,7 @@ private String parseJsValueToUrl(String htmlPage, String js) {
         return String.join("", videoParts);
     }
 
-    private String extractVideoFromVideoShow(String obj, HttpInterface httpInterface, String cookie) throws IOException {
+    private String extractVideoFromVideoShow(String obj, String cookie) throws IOException {
         final JsonBrowser browser = JsonBrowser.parse(obj);
         final String mediaUrl = browser.get("mediaUrl").safeText();
 
@@ -250,7 +233,7 @@ private String extractVideoFromVideoShow(String obj, HttpInterface httpInterface
         mediaGet.setHeader("Cookie", cookie + "; quality=720; platform=tv");
         mediaGet.setHeader("Referer", getPlayerPage(this.trackInfo.identifier));
 
-        try (final CloseableHttpResponse response = httpInterface.execute(mediaGet)) {
+        try (final CloseableHttpResponse response = this.getSourceManager().getHttpInterface().execute(mediaGet)) {
             final String body = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
 
             System.out.println("body " + body);

From 64dea8ffd6fbe00aa867b5acf51e132ad0ea472a Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Tue, 6 Apr 2021 09:12:05 +0200
Subject: [PATCH 42/76] Bump version

---
 build.gradle.kts                                              | 4 ++--
 .../java/com/dunctebot/sourcemanagers/DuncteBotSources.java   | 2 --
 .../sourcemanagers/extra/YoutubeContextFilterOverride.java    | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 79fe81e..9fc19d4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.5.4"
+project.version = "1.5.5"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
@@ -41,7 +41,7 @@ repositories {
 dependencies {
     // build override for age-restricted videos
 //    implementation(group = "com.github.duncte123", name = "lavaplayer", version = "be6e364")
-    implementation(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.75")
+    implementation(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.76")
     implementation(group = "io.sentry", name = "sentry-logback", version = "1.7.17")
 
     implementation(group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2")
diff --git a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
index 7434f24..c347b2d 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
@@ -17,12 +17,10 @@
 package com.dunctebot.sourcemanagers;
 
 import com.dunctebot.sourcemanagers.clypit.ClypitAudioSourceManager;
-import com.dunctebot.sourcemanagers.extra.YoutubeContextFilterOverride;
 import com.dunctebot.sourcemanagers.getyarn.GetyarnAudioSourceManager;
 import com.dunctebot.sourcemanagers.pornhub.PornHubAudioSourceManager;
 import com.dunctebot.sourcemanagers.reddit.RedditAudioSourceManager;
 import com.dunctebot.sourcemanagers.speech.SpeechAudioSourceManager;
-import com.dunctebot.sourcemanagers.tiktok.TikTokAudioSourceManager;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
 import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
 
diff --git a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java b/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java
index 736526d..c530ca7 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java
@@ -17,7 +17,6 @@
 package com.dunctebot.sourcemanagers.extra;
 
 import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeHttpContextFilter;
-import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
 import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
 import io.sentry.Sentry;

From 875f9070bc6f38a7386c84062cde3b8ef23f4a1b Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 27 Aug 2021 08:47:00 +0200
Subject: [PATCH 43/76] Remove youtube overrides

---
 .../sourcemanagers/DuncteBotSources.java      |   8 +-
 .../extra/YoutubeContextFilterOverride.java   | 119 ------------------
 .../extra/YoutubeVersionData.java             |  70 -----------
 3 files changed, 1 insertion(+), 196 deletions(-)
 delete mode 100644 src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java
 delete mode 100644 src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeVersionData.java

diff --git a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
index c347b2d..d01d8cf 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
@@ -25,15 +25,9 @@
 import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
 
 public class DuncteBotSources {
-    public static void registerCustom(AudioPlayerManager playerManager, String speechLanguage,
-                                      int playlistPageCount, boolean updateYoutubeData) {
-
+    public static void registerCustom(AudioPlayerManager playerManager, String speechLanguage, int playlistPageCount) {
         final YoutubeAudioSourceManager youtubeSource = playerManager.source(YoutubeAudioSourceManager.class);
         youtubeSource.setPlaylistPageCount(playlistPageCount);
-        youtubeSource.getMainHttpConfiguration()
-            /*.setHttpContextFilter(
-                YoutubeContextFilterOverride.getOrCreate(updateYoutubeData, youtubeSource.getHttpInterface())
-            )*/;
 
         playerManager.registerSourceManager(new GetyarnAudioSourceManager());
         playerManager.registerSourceManager(new ClypitAudioSourceManager());
diff --git a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java b/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java
deleted file mode 100644
index c530ca7..0000000
--- a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeContextFilterOverride.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2021 Duncan "duncte123" Sterken
- *
- *    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.dunctebot.sourcemanagers.extra;
-
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeHttpContextFilter;
-import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import io.sentry.Sentry;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class YoutubeContextFilterOverride extends YoutubeHttpContextFilter implements Closeable {
-    private static final Logger logger = LoggerFactory.getLogger(YoutubeContextFilterOverride.class);
-    private static final Pattern YOUTUBE_INFO_REGEX = Pattern.compile("window\\.ytplayer=\\{\\};\\n?ytcfg\\.set\\((.*)\\);");
-    private YoutubeVersionData youtubeVersionData = null;
-    private final HttpInterface httpInterface;
-    private final ScheduledExecutorService dataUpdateThread = Executors.newSingleThreadScheduledExecutor((r) -> {
-        final Thread t = new Thread(r);
-        t.setName("YouTube-data-updater");
-        t.setDaemon(true);
-        return t;
-    });
-    private static YoutubeContextFilterOverride INSTANCE;
-
-    public synchronized static YoutubeContextFilterOverride getOrCreate(boolean shouldUpdate, HttpInterface httpInterface) {
-        if (INSTANCE == null) {
-            INSTANCE = new YoutubeContextFilterOverride(shouldUpdate, httpInterface);
-        }
-
-        return INSTANCE;
-    }
-
-    private YoutubeContextFilterOverride(boolean shouldUpdate, HttpInterface httpInterface) {
-        this.httpInterface = httpInterface;
-
-        if (shouldUpdate) {
-            dataUpdateThread.scheduleAtFixedRate(this::updateYoutubeData, 0L, 1L, TimeUnit.DAYS);
-        }
-    }
-
-    private void updateYoutubeData() {
-        try {
-            logger.info("Updating youtube version data");
-            this.youtubeVersionData = getYoutubeHeaderDetails();
-            logger.info("New youtube version data {}", this.youtubeVersionData);
-        } catch (IOException e) {
-            Sentry.capture(e);
-            logger.error("Failed to capture youtube data", e);
-        }
-    }
-
-    private YoutubeVersionData getYoutubeHeaderDetails() throws IOException {
-        final HttpGet httpGet = new HttpGet("https://www.youtube.com/");
-        httpGet.setHeader("User-Agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36");
-
-        try (final CloseableHttpResponse response = this.httpInterface.execute(httpGet)) {
-            final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
-
-            final Matcher matcher = YOUTUBE_INFO_REGEX.matcher(html);
-
-            if (matcher.find()) {
-                final String extracted = matcher.group(matcher.groupCount())
-                    .trim()
-                    .replaceAll("undefined", "null");
-                final JsonBrowser json = JsonBrowser.parse(extracted);
-
-                return YoutubeVersionData.fromBrowser(json);
-            }
-
-            return null;
-        }
-    }
-
-    @Override
-    public void onRequest(HttpClientContext context, HttpUriRequest request, boolean isRepetition) {
-        super.onRequest(context, request, isRepetition);
-
-        if (youtubeVersionData == null) {
-            return;
-        }
-
-        request.setHeader("x-youtube-client-version", youtubeVersionData.getVersion());
-        request.setHeader("x-youtube-page-cl", youtubeVersionData.getPageCl());
-        request.setHeader("x-youtube-page-label", youtubeVersionData.getLabel());
-    }
-
-    @Override
-    public void close() {
-        dataUpdateThread.shutdown();
-    }
-}
diff --git a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeVersionData.java b/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeVersionData.java
deleted file mode 100644
index 56f187c..0000000
--- a/src/main/java/com/dunctebot/sourcemanagers/extra/YoutubeVersionData.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2021 Duncan "duncte123" Sterken
- *
- *    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.dunctebot.sourcemanagers.extra;
-
-import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
-
-public class YoutubeVersionData {
-
-    /* INNERTUBE_CONTEXT_CLIENT_VERSION  x-youtube-client-version */
-    private final String version;
-    /* VARIANTS_CHECKSUM  x-youtube-variants-checksum */
-    //private final String checksum;
-    /* PAGE_BUILD_LABEL  x-youtube-page-label */
-    private final String label;
-    /* ID_TOKEN  x-youtube-identity-token */
-    // private final String idToken;
-    /* PAGE_CL  x-youtube-page-cl */
-    private final String pageCl;
-    /* DEVICE  x-youtube-device */
-//    private final String device;
-
-    public YoutubeVersionData(String version, String label, String pageCl) {
-        this.version = version;
-        this.label = label;
-        this.pageCl = pageCl;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public String getPageCl() {
-        return pageCl;
-    }
-
-    @Override
-    public String toString() {
-        return "YoutubeVersionData{" +
-                "version='" + version + '\'' +
-                ", label='" + label + '\'' +
-                ", pageCl='" + pageCl + '\'' +
-                '}';
-    }
-
-    public static YoutubeVersionData fromBrowser(JsonBrowser json) {
-        return new YoutubeVersionData(
-                json.get("INNERTUBE_CONTEXT_CLIENT_VERSION").safeText(),
-                json.get("PAGE_BUILD_LABEL").safeText(),
-                json.get("PAGE_CL").safeText()
-        );
-    }
-}

From ccdceca2a5c2c5a3ba97bb50ba6409f5820eb445 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 27 Aug 2021 08:47:38 +0200
Subject: [PATCH 44/76] Fix version

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9fc19d4..7edd2fd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.5.5"
+project.version = "1.5.6"
 val archivesBaseName = "sourcemanagers"
 
 repositories {

From 7aa49a4657a7ae791f1437ffcfa370e69ccf8d6b Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Thu, 9 Dec 2021 15:21:57 +0100
Subject: [PATCH 45/76] Set some items to compileonly

---
 build.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 7edd2fd..b6653c4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.5.6"
+project.version = "1.5.7"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
@@ -41,8 +41,8 @@ repositories {
 dependencies {
     // build override for age-restricted videos
 //    implementation(group = "com.github.duncte123", name = "lavaplayer", version = "be6e364")
-    implementation(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.76")
-    implementation(group = "io.sentry", name = "sentry-logback", version = "1.7.17")
+    commpileOnly(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.76")
+    commpileOnly(group = "io.sentry", name = "sentry-logback", version = "1.7.17")
 
     implementation(group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2")
 }

From 3e93e89eed846a02373b3455ee617ecaf6bf9485 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Thu, 9 Dec 2021 15:23:29 +0100
Subject: [PATCH 46/76] fix typo

---
 build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b6653c4..5bbce2b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -41,8 +41,8 @@ repositories {
 dependencies {
     // build override for age-restricted videos
 //    implementation(group = "com.github.duncte123", name = "lavaplayer", version = "be6e364")
-    commpileOnly(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.76")
-    commpileOnly(group = "io.sentry", name = "sentry-logback", version = "1.7.17")
+    compileOnly(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.76")
+    compileOnly(group = "io.sentry", name = "sentry-logback", version = "1.7.17")
 
     implementation(group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2")
 }

From cf0df28e2b94ff512007bf4b1cc3598e0c7547ca Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 10 Dec 2021 16:28:19 +0100
Subject: [PATCH 47/76] Add OCR to sourcemanagers

---
 build.gradle.kts                              |   3 +-
 .../sourcemanagers/DuncteBotSources.java      |   2 +
 .../ocremix/OCRemixAudioSourceManager.java    | 155 ++++++++++++++++++
 .../ocremix/OCRemixAudioTrack.java            |  62 +++++++
 4 files changed, 221 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioSourceManager.java
 create mode 100644 src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioTrack.java

diff --git a/build.gradle.kts b/build.gradle.kts
index 5bbce2b..09ef2f8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.5.7"
+project.version = "1.5.8"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
@@ -44,6 +44,7 @@ dependencies {
     compileOnly(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.76")
     compileOnly(group = "io.sentry", name = "sentry-logback", version = "1.7.17")
 
+    implementation(group = "org.jsoup", name = "jsoup", version = "1.13.1")
     implementation(group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2")
 }
 
diff --git a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
index d01d8cf..ccda9fd 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
@@ -18,6 +18,7 @@
 
 import com.dunctebot.sourcemanagers.clypit.ClypitAudioSourceManager;
 import com.dunctebot.sourcemanagers.getyarn.GetyarnAudioSourceManager;
+import com.dunctebot.sourcemanagers.ocremix.OCRemixAudioSourceManager;
 import com.dunctebot.sourcemanagers.pornhub.PornHubAudioSourceManager;
 import com.dunctebot.sourcemanagers.reddit.RedditAudioSourceManager;
 import com.dunctebot.sourcemanagers.speech.SpeechAudioSourceManager;
@@ -34,6 +35,7 @@ public static void registerCustom(AudioPlayerManager playerManager, String speec
         playerManager.registerSourceManager(new SpeechAudioSourceManager(speechLanguage));
         playerManager.registerSourceManager(new PornHubAudioSourceManager());
         playerManager.registerSourceManager(new RedditAudioSourceManager());
+        playerManager.registerSourceManager(new OCRemixAudioSourceManager());
         //playerManager.registerSourceManager(new TikTokAudioSourceManager());
 
     }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioSourceManager.java
new file mode 100644
index 0000000..82eed85
--- /dev/null
+++ b/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioSourceManager.java
@@ -0,0 +1,155 @@
+/*
+ * Skybot, a multipurpose discord bot
+ *      Copyright (C) 2017  Duncan "duncte123" Sterken & Ramid "ramidzkh" Khan & Maurice R S "Sanduhr32"
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.dunctebot.sourcemanagers.ocremix;
+
+import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
+import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
+import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
+import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
+import com.sedmelluq.discord.lavaplayer.track.AudioItem;
+import com.sedmelluq.discord.lavaplayer.track.AudioReference;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+
+import javax.annotation.Nullable;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+public class OCRemixAudioSourceManager extends AbstractDuncteBotHttpSource {
+    private static final Pattern REMIX_PATTERN = Pattern.compile("https?://(?:www\\.)?ocremix\\.org/remix/(?<id>OCR[\\d]+)(?:.*)?");
+
+    @Override
+    public String getSourceName() {
+        return "ocremix";
+    }
+
+    @Override
+    public AudioItem loadItem(AudioPlayerManager manager, AudioReference reference) {
+        final String identifier = reference.identifier;
+        final Matcher matcher = REMIX_PATTERN.matcher(identifier);
+
+        // TODO: check if starts with OCR?
+        if (!matcher.matches()) {
+            return null;
+        }
+
+        final String id = matcher.group("id");
+        // https://ocremix.org/remix/OCR03310?view=xml
+        final HttpGet httpGet = new HttpGet("https://ocremix.org/remix/"+id+"?view=xml");
+        try (final CloseableHttpResponse response = getHttpInterface().execute(httpGet)) {
+            final int statusCode = response.getStatusLine().getStatusCode();
+
+            if (statusCode != 200) {
+                throw new IOException("Unexpected status code for OCR page response: " + statusCode);
+            }
+
+            final String xml = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+            final Document jsoup = Jsoup.parse(xml);
+            final OCRTrackMeta meta = this.extractTrackData(jsoup);
+
+            if (meta == null) {
+                return null;
+            }
+
+            final AudioTrackInfo info = new AudioTrackInfo(
+                meta.name,
+                meta.remixers,
+                meta.trackLength,
+                meta.id,
+                false,
+                meta.fileName
+            );
+
+            return new OCRemixAudioTrack(info, this);
+        } catch (IOException e) {
+            throw ExceptionTools.wrapUnfriendlyExceptions("Something went wrong", FriendlyException.Severity.SUSPICIOUS, e);
+        }
+    }
+
+    @Override
+    public boolean isTrackEncodable(AudioTrack track) {
+        return true;
+    }
+
+    @Override
+    public void encodeTrack(AudioTrack track, DataOutput output) {
+        // nothing to encode
+    }
+
+    @Override
+    public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) {
+        return new OCRemixAudioTrack(trackInfo, this);
+    }
+
+    @Nullable
+    private OCRTrackMeta extractTrackData(Element elem) {
+        final Element remix = elem.selectFirst("remix");
+
+        if (remix == null) {
+            return null;
+        }
+
+        final String remixers = elem.selectFirst("remixers")
+            .children()
+            .stream()
+            .map((remixer) -> remixer.attr("name"))
+            .collect(Collectors.joining(", "));
+
+        return new OCRTrackMeta(
+            remix.attr("id"),
+            remix.attr("name"),
+            remix.attr("file_name"),
+            Long.parseLong(remix.attr("track_length")) * 1000, // convert from seconds
+            remixers
+        );
+    }
+
+    static final class OCRTrackMeta {
+        public final String id;
+        public final String name;
+        public final String fileName;
+        public final long trackLength;
+        public final String remixers;
+
+        OCRTrackMeta(
+            String id,
+            String name,
+            String fileName,
+            long trackLength, // seconds
+            String remixers
+        ) {
+            this.id = id;
+            this.name = name;
+            this.fileName = fileName;
+            this.trackLength = trackLength;
+            this.remixers = remixers;
+        }
+    }
+}
diff --git a/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioTrack.java
new file mode 100644
index 0000000..51979c2
--- /dev/null
+++ b/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioTrack.java
@@ -0,0 +1,62 @@
+/*
+ * Skybot, a multipurpose discord bot
+ *      Copyright (C) 2017  Duncan "duncte123" Sterken & Ramid "ramidzkh" Khan & Maurice R S "Sanduhr32"
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.dunctebot.sourcemanagers.ocremix;
+
+import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
+import com.dunctebot.sourcemanagers.Mp3Track;
+import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
+import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
+
+public class OCRemixAudioTrack extends Mp3Track {
+    private static final String[] MUSIC_HOSTS = {
+        "iterations.org",
+        "ocrmirror.org",
+        "ocr.blueblue.fr",
+    };
+    private int hostIndex = 0;
+
+    public OCRemixAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource manager) {
+        super(trackInfo, manager);
+    }
+
+    @Override
+    public void process(LocalAudioTrackExecutor executor) throws Exception {
+        // attempt to load all hosts if one fails
+        try (HttpInterface httpInterface = this.getSourceManager().getHttpInterface()) {
+            while (this.hostIndex < MUSIC_HOSTS.length) {
+                try {
+                    loadStream(executor, httpInterface);
+                    break;
+                } catch (Exception e) {
+                    this.hostIndex++;
+
+                    if ((this.hostIndex >= MUSIC_HOSTS.length)) {
+                        throw e;
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    protected String getPlaybackUrl() {
+        return "https://" + MUSIC_HOSTS[this.hostIndex] + this.trackInfo.uri;
+    }
+}

From d287a44e13a9190a1d391136a3eeea6bfe6201cd Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sat, 11 Dec 2021 16:52:12 +0100
Subject: [PATCH 48/76] Allow for OCR ids as well

---
 build.gradle.kts                              |  4 ++-
 jitpack.yml                                   |  2 ++
 .../IWillUseIdentifierInstead.java            | 20 +++++++++++
 .../ocremix/OCRemixAudioSourceManager.java    |  4 +--
 .../ocremix/OCRemixAudioTrack.java            |  3 +-
 src/test/java/OCRegexTest.java                | 34 +++++++++++++++++++
 6 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/com/dunctebot/sourcemanagers/IWillUseIdentifierInstead.java
 create mode 100644 src/test/java/OCRegexTest.java

diff --git a/build.gradle.kts b/build.gradle.kts
index 09ef2f8..e77bd76 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.5.8"
+project.version = "1.5.9"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
@@ -46,6 +46,8 @@ dependencies {
 
     implementation(group = "org.jsoup", name = "jsoup", version = "1.13.1")
     implementation(group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2")
+
+    testImplementation(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.76")
 }
 
 configure<JavaPluginConvention> {
diff --git a/jitpack.yml b/jitpack.yml
index f4bcb52..d08d908 100644
--- a/jitpack.yml
+++ b/jitpack.yml
@@ -1,2 +1,4 @@
 jdk:
     - openjdk11
+install:
+    - "./gradlew clean build publish -x test"
diff --git a/src/main/java/com/dunctebot/sourcemanagers/IWillUseIdentifierInstead.java b/src/main/java/com/dunctebot/sourcemanagers/IWillUseIdentifierInstead.java
new file mode 100644
index 0000000..50d9efd
--- /dev/null
+++ b/src/main/java/com/dunctebot/sourcemanagers/IWillUseIdentifierInstead.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2021 Duncan "duncte123" Sterken
+ *
+ *    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.dunctebot.sourcemanagers;
+
+public interface IWillUseIdentifierInstead {
+}
diff --git a/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioSourceManager.java
index 82eed85..70c808f 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioSourceManager.java
@@ -43,7 +43,7 @@
 import java.util.stream.Collectors;
 
 public class OCRemixAudioSourceManager extends AbstractDuncteBotHttpSource {
-    private static final Pattern REMIX_PATTERN = Pattern.compile("https?://(?:www\\.)?ocremix\\.org/remix/(?<id>OCR[\\d]+)(?:.*)?");
+    private static final Pattern REMIX_PATTERN = Pattern.compile("(?:https?://(?:www\\.)?ocremix\\.org/remix/)?(?<id>OCR[\\d]+)(?:.*)?");
 
     @Override
     public String getSourceName() {
@@ -82,7 +82,7 @@ public AudioItem loadItem(AudioPlayerManager manager, AudioReference reference)
                 meta.name,
                 meta.remixers,
                 meta.trackLength,
-                meta.id,
+                "https://ocremix.org/remix/" + meta.id,
                 false,
                 meta.fileName
             );
diff --git a/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioTrack.java
index 51979c2..cb79019 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioTrack.java
@@ -19,12 +19,13 @@
 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;
 import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
 
-public class OCRemixAudioTrack extends Mp3Track {
+public class OCRemixAudioTrack extends Mp3Track implements IWillUseIdentifierInstead {
     private static final String[] MUSIC_HOSTS = {
         "iterations.org",
         "ocrmirror.org",
diff --git a/src/test/java/OCRegexTest.java b/src/test/java/OCRegexTest.java
new file mode 100644
index 0000000..5cfb5e4
--- /dev/null
+++ b/src/test/java/OCRegexTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021 Duncan "duncte123" Sterken
+ *
+ *    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.
+ */
+
+import com.dunctebot.sourcemanagers.ocremix.OCRemixAudioSourceManager;
+import com.sedmelluq.discord.lavaplayer.track.AudioReference;
+
+public class OCRegexTest {
+
+    public static void main(String[] args) {
+        final var id1 = "OCR03310";
+        final var id2 = "https://ocremix.org/remix/OCR03310";
+
+        final var mngr = new OCRemixAudioSourceManager();
+
+        final var res1 = mngr.loadItem(null, new AudioReference(id1, ""));
+        final var res2 = mngr.loadItem(null, new AudioReference(id2, ""));
+
+        System.out.println(res1);
+        System.out.println(res2);
+    }
+}

From cf9a75740f8df53b5c9d2399d49ca4abd084dc7d Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sat, 11 Dec 2021 16:55:11 +0100
Subject: [PATCH 49/76] Exclude test

---
 .github/workflows/01-build.yml   | 2 +-
 .github/workflows/02-publish.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/01-build.yml b/.github/workflows/01-build.yml
index 2d784e6..cd7d983 100644
--- a/.github/workflows/01-build.yml
+++ b/.github/workflows/01-build.yml
@@ -23,4 +23,4 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew build
+        run: ./gradlew build -x test
diff --git a/.github/workflows/02-publish.yml b/.github/workflows/02-publish.yml
index dbd104d..42b67d2 100644
--- a/.github/workflows/02-publish.yml
+++ b/.github/workflows/02-publish.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew --no-daemon publish
+        run: ./gradlew --no-daemon publish -x test
         env:
             USERNAME: ${{ secrets.JFROG_USER }}
             PASSWORD: ${{ secrets.JFROG_PASS }}

From f0b3d57b528b21a14fae93eea8201b23b3e36da7 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Wed, 19 Jan 2022 10:44:42 +0100
Subject: [PATCH 50/76] Fix reddit audio source manager

---
 build.gradle.kts                                  |  5 ++---
 .../java/com/dunctebot/sourcemanagers/Utils.java  |  3 ++-
 .../reddit/RedditAudioSourceManager.java          | 15 ++++++++++-----
 .../sourcemanagers/reddit/RedditAudioTrack.java   |  9 ++++++++-
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e77bd76..53e48fb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.5.9"
+project.version = "1.5.9-DEV4"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
@@ -42,7 +42,6 @@ dependencies {
     // build override for age-restricted videos
 //    implementation(group = "com.github.duncte123", name = "lavaplayer", version = "be6e364")
     compileOnly(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.76")
-    compileOnly(group = "io.sentry", name = "sentry-logback", version = "1.7.17")
 
     implementation(group = "org.jsoup", name = "jsoup", version = "1.13.1")
     implementation(group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2")
@@ -57,7 +56,7 @@ configure<JavaPluginConvention> {
 
 tasks.withType<Wrapper> {
     distributionType = DistributionType.ALL
-    gradleVersion = "6.8"
+    gradleVersion = "7.3.3"
 }
 
 val jar: Jar by tasks
diff --git a/src/main/java/com/dunctebot/sourcemanagers/Utils.java b/src/main/java/com/dunctebot/sourcemanagers/Utils.java
index f352cf3..5fbcb21 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/Utils.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/Utils.java
@@ -19,6 +19,7 @@
 import org.apache.http.HttpRequest;
 
 public class Utils {
+    public static final String USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.71 Safari/537.36";
 
     public static boolean isURL(String url) {
         return url.matches("^https?:\\/\\/[-a-zA-Z0-9+&@#\\/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#\\/%=~_|]");
@@ -35,7 +36,7 @@ public static void fakeChrome(HttpRequest request) {
         request.setHeader("sec-fetch-dest", "video");
         request.setHeader("sec-fetch-mode", "no-cors");
         request.setHeader("sec-fetch-site", "cross-site");
-        request.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36");
+        request.setHeader("User-Agent", USER_AGENT);
     }
 
 }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioSourceManager.java
index 3f60b28..f851d74 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioSourceManager.java
@@ -39,6 +39,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static com.dunctebot.sourcemanagers.Utils.USER_AGENT;
 import static com.dunctebot.sourcemanagers.Utils.isURL;
 import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.COMMON;
 import static com.sedmelluq.discord.lavaplayer.tools.JsonBrowser.NULL_BROWSER;
@@ -50,7 +51,7 @@ public class RedditAudioSourceManager extends AbstractDuncteBotHttpSource {
 
     public RedditAudioSourceManager() {
         this.configureBuilder(
-            (builder) -> builder.setUserAgent("Mozilla/5.0 (compatible; https://github.com/DuncteBot/skybot-source-managers)")
+            (builder) -> builder.setUserAgent(USER_AGENT)
         );
     }
 
@@ -159,10 +160,10 @@ private boolean canPlayAudio(String id) {
         }
     }
 
-    private RedditAudioTrack buildTrack(@Nullable JsonBrowser data, String pageURl) {
+    private AudioItem buildTrack(@Nullable JsonBrowser data, String pageURl) {
         // If we don't have any data we can return null
         if (data == null) {
-            return null;
+            return AudioReference.NO_TRACK;
         }
 
         final String postHint = data.get("post_hint").safeText();
@@ -177,11 +178,15 @@ private RedditAudioTrack buildTrack(@Nullable JsonBrowser data, String pageURl)
         final JsonBrowser media = data.get("media").get("reddit_video");
         final String url = data.get("url").safeText();
 
+        if (media.get("is_gif").asBoolean(false)) {
+            throw new FriendlyException("Cannot play gifs", COMMON, null);
+        }
+
         final Matcher videoLink = VIDEO_LINK_REGEX.matcher(url);
 
         // This should never happen unless my regex is wrong
         if (!videoLink.matches()) {
-            return null;
+            return AudioReference.NO_TRACK;
         }
 
         final String videoId = videoLink.group(videoLink.groupCount());
@@ -202,7 +207,7 @@ private RedditAudioTrack buildTrack(@Nullable JsonBrowser data, String pageURl)
             new AudioTrackInfoWithImage(
                 data.get("title").safeText(),
                 "u/" + data.get("author").safeText(),
-                Long.parseLong(media.get("duration").safeText()) * 1000,
+                media.get("duration").asLong(1) * 1000,
                 videoId,
                 false,
                 pageURl,
diff --git a/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioTrack.java
index cb8a3a5..db6a98c 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioTrack.java
@@ -18,6 +18,7 @@
 
 import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
 import com.dunctebot.sourcemanagers.MpegTrack;
+import com.sedmelluq.discord.lavaplayer.tools.Units;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 
@@ -32,7 +33,13 @@ protected String getPlaybackUrl() {
     }
 
     static String getPlaybackUrl(String id) {
-        return "https://v.redd.it/" + id + "/audio?source=fallback";
+        return "https://v.redd.it/" + id + "/DASH_audio.mp4?source=fallback";
+    }
+
+    @Override
+    protected long getTrackDuration() {
+        // return unknown so we get a more accurate representation of the length
+        return Units.CONTENT_LENGTH_UNKNOWN;
     }
 
     @Override

From 9cf6c91311a8193c46032a804534f5dbb9ca0a4a Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Thu, 20 Jan 2022 15:13:04 +0100
Subject: [PATCH 51/76] Fix pornhub playback

---
 build.gradle.kts                              |   2 +-
 .../pornhub/PornHubAudioSourceManager.java    |   4 +-
 .../pornhub/PornHubAudioTrack.java            | 192 +++++----------
 .../pornhub/StoredForReference.java           | 233 ++++++++++++++++++
 4 files changed, 292 insertions(+), 139 deletions(-)
 create mode 100644 src/main/java/com/dunctebot/sourcemanagers/pornhub/StoredForReference.java

diff --git a/build.gradle.kts b/build.gradle.kts
index 53e48fb..2e2b15b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.5.9-DEV4"
+project.version = "1.5.10"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
index 1bb25f5..0a12a9e 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
@@ -42,7 +42,7 @@ public class PornHubAudioSourceManager extends AbstractDuncteBotHttpSource {
     private static final String DOMAIN_PATTERN = "https?://([a-z]+\\.)?pornhub\\.(com|net)";
     public static final Pattern DOMAIN_REGEX = Pattern.compile(DOMAIN_PATTERN);
     private static final Pattern VIDEO_REGEX = Pattern.compile("^" + DOMAIN_PATTERN + "/view_video\\.php\\?viewkey=([a-zA-Z0-9]+)(?:.*)$");
-    private static final Pattern VIDEO_INFO_REGEX = Pattern.compile("var flashvars_\\d+ = (\\{.+})");
+    public static final Pattern VIDEO_INFO_REGEX = Pattern.compile("var flashvars_\\d+ = (\\{.+})");
     private static final Pattern MODEL_INFO_REGEX = Pattern.compile("var MODEL_PROFILE = (\\{.+})");
 
     @Override
@@ -163,7 +163,7 @@ private JsonBrowser getModelInfo(String html) throws IOException {
     private String loadHtml(String url) throws IOException {
         final HttpGet httpGet = new HttpGet(url);
 
-        httpGet.setHeader("Cookie", "platform=pc;age_verified=1");
+        httpGet.setHeader("Cookie", "platform=pc; age_verified=1");
 
         try (final CloseableHttpResponse response = getHttpInterface().execute(httpGet)) {
             final int statusCode = response.getStatusLine().getStatusCode();
diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
index b68937c..f2c3dd8 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
@@ -34,16 +34,12 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static com.dunctebot.sourcemanagers.pornhub.PornHubAudioSourceManager.VIDEO_INFO_REGEX;
 import static com.dunctebot.sourcemanagers.pornhub.PornHubAudioSourceManager.getPlayerPage;
 import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.*;
 
 public class PornHubAudioTrack extends MpegTrack {
-    private static final String[] FORMAT_PREFIXES = {"media", "quality", "qualityItems"};
-    private static final String FORMAT_REGEX = String.format("(var\\s+(?:%s)_.+)", String.join("|", FORMAT_PREFIXES));
-    private static final Pattern FORMAT_PATTERN = Pattern.compile(FORMAT_REGEX);
-    private static final Pattern MEDIA_STRING = Pattern.compile("(var\\s+?mediastring.+?)<\\/script>");
     private static final Pattern MEDIA_STRING_FILTER = Pattern.compile("\\/\\* \\+ [a-zA-Z0-9_]+ \\+ \\*\\/");
-    private static final Pattern VIDEO_SHOW = Pattern.compile("var\\s+?VIDEO_SHOW\\s+?=\\s+?([^;]+);?<\\/script>");
 
     public PornHubAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource sourceManager) {
         super(trackInfo, sourceManager);
@@ -52,149 +48,73 @@ public PornHubAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource s
     @Override
     protected String getPlaybackUrl() {
         try {
-            return loadTrackUrl();
+            return loadFromMediaInfo();
         } catch (IOException e) {
             throw new FriendlyException("Could not load PornHub video", SUSPICIOUS, e);
         }
     }
 
-    private String loadTrackUrl_old() throws IOException {
+    private String loadFromMediaInfo() throws IOException {
         final HttpGet httpGet = new HttpGet(getPlayerPage(this.trackInfo.identifier));
 
-        httpGet.setHeader("Cookie", "platform=tv");
+        httpGet.setHeader("Cookie", "platform=pc; age_verified=1");
 
         try (final CloseableHttpResponse response = this.getSourceManager().getHttpInterface().execute(httpGet)) {
             final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
-            final Matcher matcher = MEDIA_STRING.matcher(html);
+            final Matcher matcher = VIDEO_INFO_REGEX.matcher(html);
 
             if (matcher.find()) {
                 final String js = matcher.group(matcher.groupCount());
-
-                return parseJsValueToUrl(html, js);
-            }
-
-            final Matcher videoMatcher = VIDEO_SHOW.matcher(html);
-
-            if (videoMatcher.find()) {
-                final String cookies = Arrays.stream(response.getHeaders("Set-Cookie"))
-                    .map(NameValuePair::getValue)
-                    .map((s) -> s.split(";", 2)[0])
-                    .collect(Collectors.joining("; "));
-                final String js = videoMatcher.group(videoMatcher.groupCount());
-
-                return extractVideoFromVideoShow(js, cookies);
-            }
-
-            throw new FriendlyException("Could not find media info", SUSPICIOUS, null);
-        }
-    }
-
-    private String parseQualityItems(String json) throws IOException {
-        final JsonBrowser parse = JsonBrowser.parse(json);
-
-        if (!parse.isList()) {
-            return null;
-        }
-
-        final JsonBrowser url = parse.values().stream()
-            .filter((it) -> !it.get("url").safeText().isEmpty())
-            .findFirst().orElse(null);
-
-        if (url == null) {
-            return null;
-        }
-
-        return url.get("url").text();
-    }
-
-    private String loadTrackUrl() throws IOException {
-        final HttpGet httpGet = new HttpGet("https://www.pornhub.com/view_video.php?viewkey=" + this.trackInfo.identifier);
-
-        try (final CloseableHttpResponse response = this.getSourceManager().getHttpInterface().execute(httpGet)) {
-            final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
-
-            if (Pattern.compile("<[^>]+\\bid=[\"']lockedPlayer").matcher(html).find()) {
-                throw new FriendlyException("Video " + this.trackInfo.identifier + " is locked.", COMMON, null);
-            }
-
-            final Map<String, String> jsVars = extractJsVars(html, FORMAT_PATTERN);
-
-            if (jsVars == null) {
-                throw new FriendlyException("Could not load js vars", SUSPICIOUS, null);
-            }
-
-            for (final Map.Entry<String, String> entry : jsVars.entrySet()) {
-                if (entry.getKey().startsWith("qualityItems")) {
-                    final String playbackUrl = parseQualityItems(entry.getValue());
-
-                    if (playbackUrl != null) {
-                        return playbackUrl;
+                final JsonBrowser videoInfo = JsonBrowser.parse(js);
+
+                if (videoInfo.get("video_unavailable_country").asBoolean(false)) {
+                    throw new FriendlyException("Video is not available in your country", COMMON, null);
+                }
+
+                final JsonBrowser defs = videoInfo.get("mediaDefinitions");
+
+                if (defs.isNull()) {
+                    throw new FriendlyException("Media info not present", COMMON, null);
+                }
+
+                int i = 0;
+                while (!defs.index(i).isNull()) {
+                    // we found the default quality
+                    if ("mp4".equalsIgnoreCase(defs.index(i).get("format").safeText())) {
+                        final String cookies = Arrays.stream(response.getHeaders("Set-Cookie"))
+                            .map(NameValuePair::getValue)
+                            .map((s) -> s.split(";", 2)[0])
+                            .collect(Collectors.joining("; "));
+                        final String getMedia = parseJsValueToUrl(
+                            html,
+                            scoupMediaVar(html, "media_" + i)
+                        );
+
+                        return loadMp4Url(getMedia, cookies);
                     }
-                }/* else if (entry.getKey().startsWith("media") || entry.getKey().startsWith("quality")) {
-                    // TODO: these are probably broken anyway
-                }*/
-            }
-
-            throw new FriendlyException("Could not extract video url", COMMON, null);
-        }
-    }
-
-    private String parseJsValue(String input, Map<String, String> jsVars) {
-        String inp = input.replaceAll("/\\*(?:(?!\\*/).)*?\\*/", "");
-
-        if (input.contains("+")) {
-            return Arrays.stream(input.split("\\+"))
-                .map(s -> parseJsValue(s, jsVars))
-                .collect(Collectors.joining(" "));
-        }
-
-        inp = inp.trim();
-
-        if (jsVars.containsKey(inp)) {
-            return jsVars.get(inp);
-        }
 
+                    i++;
+                }
 
-        // can't remove quotes if less than 2 chars
-        if (inp.length() < 2) {
-            return inp;
-        }
+                /*return parseJsValueToUrl(
+                    html,
+                    scoupMediaVar(html, "media_0") // fallback to first item (not mp4)
+                );*/
+            }
 
-        // remove quotes
-        if (
-            (inp.charAt(0) == '"' && inp.charAt(inp.length() - 1) == '"') ||
-                (inp.charAt(0) == '\'' && inp.charAt(inp.length() - 1) == '\'')
-        ) {
-            return inp.substring(1, inp.length() - 1);
+            throw new FriendlyException("Could not find media info", COMMON, null);
         }
-
-        return inp;
     }
 
-    private Map<String, String> extractJsVars(String html, Pattern pattern) {
+    private String scoupMediaVar(String html, String varName) {
+        final Pattern pattern = Pattern.compile("(var(?:\\s+)?" + varName + "(?:\\s+)?=(?:\\s+)?[^;]+;)");
         final Matcher matcher = pattern.matcher(html);
 
         if (!matcher.find()) {
-            return null;
+            throw new FriendlyException("Media var has changed, please contact developer", FAULT, null);
         }
 
-        final String[] assignments = matcher.group(1).split(";");
-        final Map<String, String> jsVars = new HashMap<>();
-
-        for (String assn : assignments) {
-            assn = assn.trim();
-
-            if (assn.isBlank()) {
-                continue;
-            }
-
-            assn = assn.replaceFirst("var\\s+", "");
-            final String[] parts = assn.split("=", 2);
-
-            jsVars.put(parts[0], this.parseJsValue(parts[1], jsVars));
-        }
-
-        return jsVars;
+        return matcher.group(matcher.groupCount());
     }
 
     private String parseJsValueToUrl(String htmlPage, String js) {
@@ -222,29 +142,29 @@ private String parseJsValueToUrl(String htmlPage, String js) {
         return String.join("", videoParts);
     }
 
-    private String extractVideoFromVideoShow(String obj, String cookie) throws IOException {
-        final JsonBrowser browser = JsonBrowser.parse(obj);
-        final String mediaUrl = browser.get("mediaUrl").safeText();
+    private String loadMp4Url(String jsonPage, String cookie) throws IOException {
+        final HttpGet mediaGet = new HttpGet(jsonPage);
 
-        System.out.println("https://www.pornhub.com" + mediaUrl);
-
-        final HttpGet mediaGet = new HttpGet("https://www.pornhub.com" + mediaUrl);
-
-        mediaGet.setHeader("Cookie", cookie + "; quality=720; platform=tv");
+        mediaGet.setHeader("Cookie", cookie + "; platform=pc; age_verified=1");
         mediaGet.setHeader("Referer", getPlayerPage(this.trackInfo.identifier));
 
         try (final CloseableHttpResponse response = this.getSourceManager().getHttpInterface().execute(mediaGet)) {
             final String body = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+            final JsonBrowser json = JsonBrowser.parse(body);
 
-            System.out.println("body " + body);
+            for (JsonBrowser info : json.values()) {
+                if (info.get("defaultQuality").asBoolean(false)) {
+                    return info.get("videoUrl").text();
+                }
+            }
 
-            final JsonBrowser json = JsonBrowser.parse(body);
+            final JsonBrowser firstItem = json.index(0);
 
-            if (!"OK".equals(json.get("status").safeText())) {
-                throw new FriendlyException("Pornhub video returned non OK status for video info", COMMON, null);
+            if (firstItem.isNull()) {
+                throw new FriendlyException("Video url missing on playback page", FAULT, null);
             }
 
-            final String videoUrl = json.get("videoUrl").text();
+            final String videoUrl = firstItem.get("videoUrl").text();
 
             if (videoUrl == null) {
                 throw new FriendlyException("Video url missing on playback page", FAULT, null);
diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/StoredForReference.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/StoredForReference.java
new file mode 100644
index 0000000..e898925
--- /dev/null
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/StoredForReference.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright 2022 Duncan "duncte123" Sterken
+ *
+ *    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.dunctebot.sourcemanagers.pornhub;
+
+import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
+import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
+import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import static com.dunctebot.sourcemanagers.pornhub.PornHubAudioSourceManager.getPlayerPage;
+import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.*;
+
+// stored for reference in case I need them in the future
+public class StoredForReference extends PornHubAudioTrack {
+
+    public StoredForReference(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource sourceManager) {
+        super(trackInfo, sourceManager);
+    }
+
+    private static final String[] FORMAT_PREFIXES = {"media", "quality", "qualityItems"};
+    private static final String FORMAT_REGEX = String.format("(var\\s+(?:%s)_.+)", String.join("|", FORMAT_PREFIXES));
+    private static final Pattern FORMAT_PATTERN = Pattern.compile(FORMAT_REGEX);
+    private static final Pattern MEDIA_STRING = Pattern.compile("(var\\s+?mediastring.+?)<\\/script>");
+    private static final Pattern VIDEO_SHOW = Pattern.compile("var\\s+?VIDEO_SHOW\\s+?=\\s+?([^;]+);?<\\/script>");
+
+
+    private String parseQualityItems(String json) throws IOException {
+        final JsonBrowser parse = JsonBrowser.parse(json);
+
+        if (!parse.isList()) {
+            return null;
+        }
+
+        final JsonBrowser url = parse.values().stream()
+            .filter((it) -> !it.get("url").safeText().isEmpty())
+            .findFirst().orElse(null);
+
+        if (url == null) {
+            return null;
+        }
+
+        return url.get("url").text();
+    }
+
+    private String parseJsValue(String input, Map<String, String> jsVars) {
+        String inp = input.replaceAll("/\\*(?:(?!\\*/).)*?\\*/", "");
+
+        if (input.contains("+")) {
+            return Arrays.stream(input.split("\\+"))
+                .map(s -> parseJsValue(s, jsVars))
+                .collect(Collectors.joining(" "));
+        }
+
+        inp = inp.trim();
+
+        if (jsVars.containsKey(inp)) {
+            return jsVars.get(inp);
+        }
+
+
+        // can't remove quotes if less than 2 chars
+        if (inp.length() < 2) {
+            return inp;
+        }
+
+        // remove quotes
+        if (
+            (inp.charAt(0) == '"' && inp.charAt(inp.length() - 1) == '"') ||
+                (inp.charAt(0) == '\'' && inp.charAt(inp.length() - 1) == '\'')
+        ) {
+            return inp.substring(1, inp.length() - 1);
+        }
+
+        return inp;
+    }
+
+    private String loadTrackUrl_old() throws IOException {
+        final HttpGet httpGet = new HttpGet(getPlayerPage(this.trackInfo.identifier));
+
+        httpGet.setHeader("Cookie", "platform=tv; age_verified=1");
+
+        try (final CloseableHttpResponse response = this.getSourceManager().getHttpInterface().execute(httpGet)) {
+            final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+            final Matcher matcher = MEDIA_STRING.matcher(html);
+
+            if (matcher.find()) {
+                final String js = matcher.group(matcher.groupCount());
+
+                return parseJsValueToUrl(html, js);
+            }
+
+            final Matcher videoMatcher = VIDEO_SHOW.matcher(html);
+
+            if (videoMatcher.find()) {
+                final String cookies = Arrays.stream(response.getHeaders("Set-Cookie"))
+                    .map(NameValuePair::getValue)
+                    .map((s) -> s.split(";", 2)[0])
+                    .collect(Collectors.joining("; "));
+                final String js = videoMatcher.group(videoMatcher.groupCount());
+
+                return extractVideoFromVideoShow(js, cookies);
+            }
+
+            throw new FriendlyException("Could not find media info", SUSPICIOUS, null);
+        }
+    }
+
+    private String loadTrackUrl() throws IOException {
+        final HttpGet httpGet = new HttpGet("https://www.pornhub.com/view_video.php?viewkey=" + this.trackInfo.identifier);
+
+        try (final CloseableHttpResponse response = this.getSourceManager().getHttpInterface().execute(httpGet)) {
+            final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+
+            if (Pattern.compile("<[^>]+\\bid=[\"']lockedPlayer").matcher(html).find()) {
+                throw new FriendlyException("Video " + this.trackInfo.identifier + " is locked.", COMMON, null);
+            }
+
+            final Map<String, String> jsVars = extractJsVars(html, FORMAT_PATTERN);
+
+            if (jsVars == null) {
+                throw new FriendlyException("Could not load js vars", SUSPICIOUS, null);
+            }
+
+            for (final Map.Entry<String, String> entry : jsVars.entrySet()) {
+                if (entry.getKey().startsWith("qualityItems")) {
+                    final String playbackUrl = parseQualityItems(entry.getValue());
+
+                    if (playbackUrl != null) {
+                        return playbackUrl;
+                    }
+                }/* else if (entry.getKey().startsWith("media") || entry.getKey().startsWith("quality")) {
+                // TODO: these are probably broken anyway
+            }*/
+        }
+
+        throw new FriendlyException("Could not extract video url", COMMON, null);
+    }
+}
+
+    private Map<String, String> extractJsVars(String html, Pattern pattern) {
+        final Matcher matcher = pattern.matcher(html);
+
+        if (!matcher.find()) {
+            return null;
+        }
+
+        final String[] assignments = matcher.group(1).split(";");
+        final Map<String, String> jsVars = new HashMap<>();
+
+        for (String assn : assignments) {
+            assn = assn.trim();
+
+            if (assn.isBlank()) {
+                continue;
+            }
+
+            assn = assn.replaceFirst("var\\s+", "");
+            final String[] parts = assn.split("=", 2);
+
+            jsVars.put(parts[0], this.parseJsValue(parts[1], jsVars));
+        }
+
+        return jsVars;
+    }
+
+
+    private String extractVideoFromVideoShow(String obj, String cookie) throws IOException {
+        final JsonBrowser browser = JsonBrowser.parse(obj);
+        final String mediaUrl = browser.get("mediaUrl").safeText();
+
+        System.out.println("https://www.pornhub.com" + mediaUrl);
+
+        final HttpGet mediaGet = new HttpGet("https://www.pornhub.com" + mediaUrl);
+
+        mediaGet.setHeader("Cookie", cookie + "; quality=720; platform=pc; age_verified=1");
+        mediaGet.setHeader("Referer", getPlayerPage(this.trackInfo.identifier));
+
+        try (final CloseableHttpResponse response = this.getSourceManager().getHttpInterface().execute(mediaGet)) {
+            final String body = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+
+            System.out.println("body " + body);
+
+            final JsonBrowser json = JsonBrowser.parse(body);
+
+            if (!"OK".equals(json.get("status").safeText())) {
+                throw new FriendlyException("Pornhub video returned non OK status for video info", COMMON, null);
+            }
+
+            final String videoUrl = json.get("videoUrl").text();
+
+            if (videoUrl == null) {
+                throw new FriendlyException("Video url missing on playback page", FAULT, null);
+            }
+
+            return videoUrl;
+        }
+    }
+
+
+    ////////
+    // Dummy methods
+
+    private String parseJsValueToUrl(String one, String two) {
+        return null;
+    }
+}

From d767aaf65be836172dc49ee7735e2a92558a2131 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sat, 22 Jan 2022 14:00:43 +0100
Subject: [PATCH 52/76] [ci skip] Add readme

---
 README.md | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..71b3427
--- /dev/null
+++ b/README.md
@@ -0,0 +1,39 @@
+# Skybot source managers
+A bunch of extra source managers for LavaPlayer:
+
+- ocremix.org
+- Clyp.it
+- Reddit
+- getyarn.io
+- Text To Speech (if prefixed with `speak:`)
+- TikTok (not functional yet)
+- PornHub
+
+## Lavalink users
+A lavalink plugin version of these source managers can be found here: https://github.com/DuncteBot/skybot-lavalink-plugin
+
+
+## Installation
+Installing this plugin can be done via gradle
+
+```gradle
+repositories {
+    maven("https://duncte123.jfrog.io/artifactory/maven")
+}
+
+dependencies {
+    implementation("com.dunctebot:sourcemanagers:VERSION")
+}
+```
+Replace version with the latest version: ![Maven metadata URL][VERSION]
+
+## Usage
+You are able to register all the source managers via the following code snippet:
+```java
+AudioPlayerManager playerManager = new DefaultAudioPlayerManager(); // Your lavaplayer player manager
+String ttsLange = "en-US"; // The language for the speak/tts item
+
+DuncteBotSources.registerCustom(playerManager, ttsLange, 6);
+```
+
+[VERSION]: https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Fduncte123.jfrog.io%2Fartifactory%2Fmaven%2Fcom%2Fdunctebot%2Fsourcemanagers%2Fmaven-metadata.xml

From 3f851daaa3436b149bde5cacd4ecfc5be11f5f76 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Tue, 25 Jan 2022 10:49:55 +0100
Subject: [PATCH 53/76] Deploy to custom repo

---
 .github/workflows/02-publish.yml | 4 ++--
 README.md                        | 2 +-
 build.gradle.kts                 | 9 ++++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/02-publish.yml b/.github/workflows/02-publish.yml
index 42b67d2..3e4ec6a 100644
--- a/.github/workflows/02-publish.yml
+++ b/.github/workflows/02-publish.yml
@@ -26,8 +26,8 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew --no-daemon publish -x test
         env:
-            USERNAME: ${{ secrets.JFROG_USER }}
-            PASSWORD: ${{ secrets.JFROG_PASS }}
+            USERNAME: ${{ secrets.M2_USER }}
+            PASSWORD: ${{ secrets.M2_PASS }}
 #      - name: Upload to github
 #        env:
 #            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.md b/README.md
index 71b3427..d403e0b 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Installing this plugin can be done via gradle
 
 ```gradle
 repositories {
-    maven("https://duncte123.jfrog.io/artifactory/maven")
+    maven("https://m2.duncte123.dev/releases")
 }
 
 dependencies {
diff --git a/build.gradle.kts b/build.gradle.kts
index 2e2b15b..46a6c39 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -81,16 +81,19 @@ build.apply {
 publishing {
     repositories {
         maven {
-            name = "jfrog"
-            url = uri("https://duncte123.jfrog.io/artifactory/maven/")
+            name = "duncte123-m2"
+            url = uri("https://m2.duncte123.dev/releases")
             credentials {
                 username = System.getenv("USERNAME")
                 password = System.getenv("PASSWORD")
             }
+            authentication {
+                create<BasicAuthentication>("basic")
+            }
         }
     }
     publications {
-        register<MavenPublication>("jfrog") {
+        register<MavenPublication>("duncte123-m2") {
             pom {
                 name.set(archivesBaseName)
                 description.set("Source managers for skybot")

From 9f89038d36f4a20ba6b579beaf199d3c528c09ff Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Tue, 25 Jan 2022 10:54:18 +0100
Subject: [PATCH 54/76] [ci skip] update version badge

---
 README.md                                | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d403e0b..619caa1 100644
--- a/README.md
+++ b/README.md
@@ -36,4 +36,4 @@ String ttsLange = "en-US"; // The language for the speak/tts item
 DuncteBotSources.registerCustom(playerManager, ttsLange, 6);
 ```
 
-[VERSION]: https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Fduncte123.jfrog.io%2Fartifactory%2Fmaven%2Fcom%2Fdunctebot%2Fsourcemanagers%2Fmaven-metadata.xml
+[VERSION]: https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Fm2.duncte123.dev%2Freleases%2Fcom%2Fdunctebot%2Fsourcemanagers%2Fmaven-metadata.xml
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 80cf08e..669386b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 61fd8137b0616e4b18fba69ddefad38246a407ee Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Mon, 7 Feb 2022 16:12:45 +0100
Subject: [PATCH 55/76] Push tiktok support

---
 README.md                                     |  2 +-
 build.gradle.kts                              |  4 +-
 .../AbstractDuncteBotHttpSource.java          |  8 +-
 .../dunctebot/sourcemanagers/Mp3Track.java    |  6 +-
 .../com/dunctebot/sourcemanagers/Pair.java    | 39 ++++++++
 .../com/dunctebot/sourcemanagers/Utils.java   | 20 ++--
 .../tiktok/TikTokAudioSourceManager.java      | 41 ++++----
 .../tiktok/TikTokAudioTrack.java              | 93 +++++++++++++++++--
 .../tiktok/TikTokAudioTrackHttpManager.java   | 11 ++-
 src/test/java/TikTokTesting.java              | 30 ++++++
 10 files changed, 208 insertions(+), 46 deletions(-)
 create mode 100644 src/main/java/com/dunctebot/sourcemanagers/Pair.java
 create mode 100644 src/test/java/TikTokTesting.java

diff --git a/README.md b/README.md
index 619caa1..46a3fc8 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ A bunch of extra source managers for LavaPlayer:
 - Reddit
 - getyarn.io
 - Text To Speech (if prefixed with `speak:`)
-- TikTok (not functional yet)
+- TikTok (in beta, works on _most_ videos)
 - PornHub
 
 ## Lavalink users
diff --git a/build.gradle.kts b/build.gradle.kts
index 46a6c39..2a3f32c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.5.10"
+project.version = "1.6.0"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
@@ -49,7 +49,7 @@ dependencies {
     testImplementation(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.76")
 }
 
-configure<JavaPluginConvention> {
+configure<JavaPluginExtension> {
     sourceCompatibility = JavaVersion.VERSION_11
     targetCompatibility = JavaVersion.VERSION_11
 }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java b/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java
index ea889cb..767e194 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/AbstractDuncteBotHttpSource.java
@@ -42,10 +42,14 @@ public AbstractDuncteBotHttpSource() {
     }
 
     public AbstractDuncteBotHttpSource(boolean withoutCookies) {
-        httpInterfaceManager = HttpClientTools.createDefaultThreadLocalManager();
+        this(HttpClientTools.createDefaultThreadLocalManager(), withoutCookies);
+    }
+
+    public AbstractDuncteBotHttpSource(HttpInterfaceManager httpInterfaceManager, boolean withoutCookies) {
+        this.httpInterfaceManager = httpInterfaceManager;
 
         if (withoutCookies) {
-            httpInterfaceManager.setHttpContextFilter(new FuckCookies());
+            this.httpInterfaceManager.setHttpContextFilter(new FuckCookies());
         }
     }
 
diff --git a/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java b/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
index 09911bf..d62f8b4 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
@@ -39,9 +39,13 @@ public Mp3Track(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource manager) {
         this.manager = manager;
     }
 
+    protected HttpInterface getHttpInterface() {
+        return this.manager.getHttpInterface();
+    }
+
     @Override
     public void process(LocalAudioTrackExecutor executor) throws Exception {
-        try (HttpInterface httpInterface = manager.getHttpInterface()) {
+        try (HttpInterface httpInterface = getHttpInterface()) {
             loadStream(executor, httpInterface);
         }
     }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/Pair.java b/src/main/java/com/dunctebot/sourcemanagers/Pair.java
new file mode 100644
index 0000000..0a463d8
--- /dev/null
+++ b/src/main/java/com/dunctebot/sourcemanagers/Pair.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2022 Duncan "duncte123" Sterken
+ *
+ *    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.dunctebot.sourcemanagers;
+
+public class Pair<L, R> {
+    private final L left;
+    private final R right;
+
+    public Pair(L left, R right) {
+        this.left = left;
+        this.right = right;
+    }
+
+    public L getLeft() {
+        return left;
+    }
+
+    public R getRight() {
+        return right;
+    }
+
+    public static <L, R> Pair<L, R> of(L left, R right) {
+        return new Pair<>(left, right);
+    }
+}
diff --git a/src/main/java/com/dunctebot/sourcemanagers/Utils.java b/src/main/java/com/dunctebot/sourcemanagers/Utils.java
index 5fbcb21..33779c3 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/Utils.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/Utils.java
@@ -19,23 +19,25 @@
 import org.apache.http.HttpRequest;
 
 public class Utils {
-    public static final String USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.71 Safari/537.36";
+    public static final String USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.99 Safari/537.36";
 
     public static boolean isURL(String url) {
         return url.matches("^https?:\\/\\/[-a-zA-Z0-9+&@#\\/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#\\/%=~_|]");
     }
 
     public static void fakeChrome(HttpRequest request) {
-        request.setHeader("dnt", "1");
-        request.setHeader("upgrade-insecure-requests", "1");
+        request.setHeader("Connection", "keep-alive");
+        request.setHeader("DNT", "1");
+        request.setHeader("Upgrade-Insecure-Requests", "1");
         request.setHeader("Accept", "*/*");
-        request.setHeader("Accept-Encoding", "identity;q=1, *;q=0");
+//        request.setHeader("Accept-Encoding", "gzip, deflate, br");
+        request.setHeader("Accept-Encoding", "none");
         request.setHeader("Accept-Language", "en-US,en;q=0.9");
-        request.setHeader("sec-ch-ua", "\"Chromium\";v=\"88\", \"Google Chrome\";v=\"88\", \";Not A Brand\";v=\"99\"");
-        request.setHeader("sec-ch-ua-mobile", "?0");
-        request.setHeader("sec-fetch-dest", "video");
-        request.setHeader("sec-fetch-mode", "no-cors");
-        request.setHeader("sec-fetch-site", "cross-site");
+        request.setHeader("Sec-Ch-Ua", "\" Not;A Brand\";v=\"99\", \"Google Chrome\";v=\"97\", \"Chromium\";v=\"97\"");
+        request.setHeader("Sec-Ch-Ua-Mobile", "?0");
+        request.setHeader("Sec-Fetch-Dest", "document");
+        request.setHeader("Sec-Fetch-Mode", "no-cors");
+        request.setHeader("Sec-Fetch-Site", "cross-site");
         request.setHeader("User-Agent", USER_AGENT);
     }
 
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
index ef773f0..630e39a 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
@@ -47,6 +47,8 @@ public class TikTokAudioSourceManager extends AbstractDuncteBotHttpSource {
     protected static final Pattern VIDEO_REGEX = Pattern.compile("^" + BASE + "\\/" + USER + "\\/video\\/" + VIDEO + "(?:.*)$");
     private static final Pattern JS_REGEX = Pattern.compile(
         "<script id=\"__NEXT_DATA__\" type=\"application/json\" crossorigin=\"anonymous\">(.*)<\\/script>");
+    private static final Pattern SIGI_REGEX = Pattern.compile(
+        "<script id=\"sigi-persisted-data\">(?:\n)?window\\[(?:'SIGI_STATE'|\"SIGI_STATE\")\\](?:\\s+)?=(?:\\s+)?(.*);(?:\\s+)?(?:.*)?<\\/script>");
 
     public TikTokAudioSourceManager() {
         super(false);
@@ -92,18 +94,11 @@ public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) {
         return new TikTokAudioTrack(trackInfo, this);
     }
 
-    private MetaData extractData(String userId, String videoId) throws IOException {
+    private MetaData extractData(String userId, String videoId) throws Exception {
         return extractData("https://www.tiktok.com/@" + userId + "/video/" + videoId);
     }
 
-    protected MetaData extractData(String url) throws IOException {
-        final JsonBrowser json = extractDataRaw(url);
-        final JsonBrowser base = json.get("props").get("pageProps").get("itemInfo").get("itemStruct");
-
-        return getMetaData(url, base);
-    }
-
-    protected JsonBrowser extractDataRaw(String url) throws IOException {
+    protected MetaData extractData(String url) throws Exception {
         final HttpGet httpGet = new HttpGet(url);
 
         fakeChrome(httpGet);
@@ -122,19 +117,31 @@ protected JsonBrowser extractDataRaw(String url) throws IOException {
             final String html = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
             final Matcher matcher = JS_REGEX.matcher(html);
 
-            if (!matcher.find()) {
-                // TODO: temp
-                System.out.println(html);
-                throw new FriendlyException("Failed to find data for tiktok video", Severity.SUSPICIOUS, null);
+            if (matcher.find()) {
+                final JsonBrowser json = JsonBrowser.parse(matcher.group(1).trim());
+                final JsonBrowser base = json.get("props").get("pageProps").get("itemInfo").get("itemStruct");
+
+                return getMetaData(url, base);
+            }
+
+            final Matcher sigiMatcher = SIGI_REGEX.matcher(html);
+
+            if (sigiMatcher.find()) {
+                final JsonBrowser json = JsonBrowser.parse(sigiMatcher.group(1).trim());
+                final String videoId = json.get("ItemList").get("video").get("keyword").text();
+                final JsonBrowser video = json.get("ItemModule").get(videoId);
+
+                return getMetaData(url, video);
             }
 
-            return JsonBrowser.parse(matcher.group(1).trim());
+            // TODO: temp
+            System.out.println(html);
+            throw new FriendlyException("Failed to find data for tiktok video", Severity.SUSPICIOUS, null);
         }
     }
 
     protected static MetaData getMetaData(String url, JsonBrowser base) {
         final MetaData metaData = new MetaData();
-
         final JsonBrowser videoJson = base.get("video");
 
         metaData.pageUrl = url;
@@ -142,15 +149,13 @@ protected static MetaData getMetaData(String url, JsonBrowser base) {
         metaData.cover = videoJson.get("cover").safeText();
         metaData.title = base.get("desc").safeText();
 
-        metaData.uri = videoJson.get("playAddr").safeText();
+        metaData.uri = videoJson.get("downloadAddr").safeText();
         metaData.duration = Integer.parseInt(videoJson.get("duration").safeText());
 
         final JsonBrowser author = base.get("author");
 
         metaData.uniqueId = author.get("uniqueId").safeText();
 
-        System.out.println(metaData);
-
         return metaData;
     }
 
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
index 8d73043..7978ee2 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
@@ -18,12 +18,15 @@
 
 import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
 import com.dunctebot.sourcemanagers.MpegTrack;
-import com.dunctebot.sourcemanagers.tiktok.TikTokAudioSourceManager.MetaData;
+import com.dunctebot.sourcemanagers.Pair;
+import com.sedmelluq.discord.lavaplayer.container.mp3.Mp3AudioTrack;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
+import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
+import com.sedmelluq.discord.lavaplayer.track.InternalAudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -31,15 +34,14 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.regex.Matcher;
 
 import static com.dunctebot.sourcemanagers.Utils.fakeChrome;
-import static com.dunctebot.sourcemanagers.tiktok.TikTokAudioSourceManager.VIDEO_REGEX;
-import static com.dunctebot.sourcemanagers.tiktok.TikTokAudioSourceManager.getMetaData;
 import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
 
 public class TikTokAudioTrack extends MpegTrack {
     private final TikTokAudioTrackHttpManager httpManager = new TikTokAudioTrackHttpManager();
+    private Pair<String, String> urlCache = null;
+    private boolean failedOnce = false;
 
     public TikTokAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource manager) {
         super(trackInfo, manager);
@@ -48,9 +50,15 @@ public TikTokAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource ma
     @Override
     protected String getPlaybackUrl() {
         try {
-            final MetaData metaData = extractFromJson(this.trackInfo.uri);
+            if (this.urlCache == null) {
+                this.urlCache = getPlaybackUrl(this.trackInfo.identifier);
+            }
+
+            if (this.failedOnce) {
+                return this.urlCache.getRight();
+            }
 
-            return metaData.uri;
+            return this.urlCache.getLeft();
         } catch (IOException e) {
             throw new FriendlyException("Could not load TikTok video", SUSPICIOUS, e);
         }
@@ -60,11 +68,25 @@ protected String getPlaybackUrl() {
     public void process(LocalAudioTrackExecutor executor) throws Exception {
         this.httpManager.loadCookies();
 
-        try (HttpInterface httpInterface = this.httpManager.getHttpInterface()) {
+        try (HttpInterface httpInterface = this.getHttpInterface()) {
             loadStream(executor, httpInterface);
         }
     }
 
+    @Override
+    protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface httpInterface) throws Exception {
+        try {
+            super.loadStream(localExecutor, httpInterface);
+        } catch (Exception e) {
+            if (this.failedOnce) {
+                throw e;
+            }
+
+            this.failedOnce = true;
+            super.loadStream(localExecutor, httpInterface);
+        }
+    }
+
     /*@Override
     protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface httpInterface) throws Exception {
         final String trackUrl = getPlaybackUrl();
@@ -82,7 +104,48 @@ protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface h
         }
     }*/
 
-    protected MetaData extractFromJson(String url) throws IOException {
+    protected Pair<String, String> getPlaybackUrl(String identifier) throws IOException {
+        final HttpGet httpGet = new HttpGet(
+            "https://api2.musical.ly/aweme/v1/aweme/detail/?aweme_id=" + identifier
+        );
+
+        fakeChrome(httpGet);
+
+        try (final HttpInterface httpInterface = this.httpManager.getHttpInterface()) {
+            try (final CloseableHttpResponse response = httpInterface.execute(httpGet)) {
+                final int statusCode = response.getStatusLine().getStatusCode();
+
+                if (statusCode != 200) {
+                    if (statusCode == 302) { // most likely a 404
+                        return null;
+                    }
+
+                    throw new IOException("Unexpected status code for video page response: " + statusCode);
+                }
+
+                final String string = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
+                final JsonBrowser json = JsonBrowser.parse(string);
+                final JsonBrowser detail = json.get("aweme_detail");
+
+                // video (always correct audio)
+                final JsonBrowser video = detail.get("video");
+                final JsonBrowser downloadAddr = video.get("download_addr");
+                final JsonBrowser videoUrl = downloadAddr.get("url_list").index(0);
+
+                // music, fallback (needs testing)
+                final JsonBrowser music = detail.get("music");
+                final JsonBrowser playUrl = music.get("play_url");
+                final JsonBrowser musicUrl = playUrl.get("url_list").index(0);
+
+                return Pair.of(
+                    videoUrl.text(),
+                    musicUrl.text()
+                );
+            }
+        }
+    }
+
+    /*protected MetaData extractFromJson(String url) throws IOException {
         final Matcher matcher = VIDEO_REGEX.matcher(url);
 
         if (!matcher.matches()) {
@@ -117,6 +180,20 @@ protected MetaData extractFromJson(String url) throws IOException {
                 return getMetaData(url, base);
             }
         }
+    }*/
+
+    @Override
+    protected InternalAudioTrack createAudioTrack(AudioTrackInfo trackInfo, SeekableInputStream stream) {
+        if (this.failedOnce && this.urlCache.getRight().contains(".mp3")) {
+            return new Mp3AudioTrack(trackInfo, stream);
+        }
+
+        return super.createAudioTrack(trackInfo, stream);
+    }
+
+    @Override
+    protected HttpInterface getHttpInterface() {
+        return this.httpManager.getHttpInterface();
     }
 
     @Override
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
index 4ee4215..0a7b8c1 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
@@ -41,7 +41,7 @@
 
 import static com.dunctebot.sourcemanagers.Utils.fakeChrome;
 
-public class TikTokAudioTrackHttpManager {
+public class TikTokAudioTrackHttpManager implements AutoCloseable {
     private String cookie = null;
 
     protected final HttpInterfaceManager httpInterfaceManager;
@@ -82,6 +82,11 @@ protected void loadCookies() throws IOException, MalformedCookieException {
         }
     }
 
+    @Override
+    public void close() throws Exception {
+        this.httpInterfaceManager.close();
+    }
+
     private class TikTokFilter implements HttpContextFilter {
         @Override
         public void onContextOpen(HttpClientContext context) {
@@ -105,10 +110,6 @@ public void onRequest(HttpClientContext context, HttpUriRequest request, boolean
                 .map((c) -> c.getName() + '=' + c.getValue())
                 .collect(Collectors.joining("; "));
 
-            System.out.println("test " + testCookie);
-
-            //request.setHeader("cookie", testCookie);
-
             if (cookie != null) {
                 request.setHeader("cookie", cookie);
             }
diff --git a/src/test/java/TikTokTesting.java b/src/test/java/TikTokTesting.java
new file mode 100644
index 0000000..4d9a00e
--- /dev/null
+++ b/src/test/java/TikTokTesting.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2022 Duncan "duncte123" Sterken
+ *
+ *    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.
+ */
+
+import com.dunctebot.sourcemanagers.tiktok.TikTokAudioSourceManager;
+import com.sedmelluq.discord.lavaplayer.track.AudioReference;
+
+public class TikTokTesting {
+    public static void main(String[] args) {
+        final var mngr = new TikTokAudioSourceManager();
+        final var ref = new AudioReference("https://www.tiktok.com/@nataliya_xoxo_love/video/6923984361150745862", "aaaaa");
+        final var load = mngr.loadItem(null, ref);
+
+        System.out.println(
+            load
+        );
+    }
+}

From 6901da3a4a4aeda5ad9b6dd975977b1a4464e95f Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Mon, 7 Feb 2022 16:25:02 +0100
Subject: [PATCH 56/76] Register tiktok in global source manager

---
 build.gradle.kts                                               | 2 +-
 .../java/com/dunctebot/sourcemanagers/DuncteBotSources.java    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2a3f32c..af860ee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.6.0"
+project.version = "1.6.1"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
diff --git a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
index ccda9fd..dc2530a 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
@@ -22,6 +22,7 @@
 import com.dunctebot.sourcemanagers.pornhub.PornHubAudioSourceManager;
 import com.dunctebot.sourcemanagers.reddit.RedditAudioSourceManager;
 import com.dunctebot.sourcemanagers.speech.SpeechAudioSourceManager;
+import com.dunctebot.sourcemanagers.tiktok.TikTokAudioSourceManager;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
 import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
 
@@ -36,7 +37,7 @@ public static void registerCustom(AudioPlayerManager playerManager, String speec
         playerManager.registerSourceManager(new PornHubAudioSourceManager());
         playerManager.registerSourceManager(new RedditAudioSourceManager());
         playerManager.registerSourceManager(new OCRemixAudioSourceManager());
-        //playerManager.registerSourceManager(new TikTokAudioSourceManager());
+        playerManager.registerSourceManager(new TikTokAudioSourceManager());
 
     }
 }

From 6d9089305d6da92538254d19ed01d5d386005b2e Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Tue, 8 Feb 2022 18:47:11 +0100
Subject: [PATCH 57/76] Mixcloud support

---
 README.md                                     |   1 +
 build.gradle.kts                              |   2 +-
 .../sourcemanagers/DuncteBotSources.java      |   2 +
 .../com/dunctebot/sourcemanagers/Utils.java   |  31 ++++
 .../mixcloud/MixcloudAudioSourceManager.java  | 157 ++++++++++++++++++
 .../mixcloud/MixcloudAudioTrack.java          |  48 ++++++
 6 files changed, 240 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioSourceManager.java
 create mode 100644 src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java

diff --git a/README.md b/README.md
index 46a3fc8..b0cad67 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # Skybot source managers
 A bunch of extra source managers for LavaPlayer:
 
+- Mixcloud
 - ocremix.org
 - Clyp.it
 - Reddit
diff --git a/build.gradle.kts b/build.gradle.kts
index af860ee..2341b89 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.6.1"
+project.version = "1.7.0"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
diff --git a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
index dc2530a..e6cdb14 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
@@ -18,6 +18,7 @@
 
 import com.dunctebot.sourcemanagers.clypit.ClypitAudioSourceManager;
 import com.dunctebot.sourcemanagers.getyarn.GetyarnAudioSourceManager;
+import com.dunctebot.sourcemanagers.mixcloud.MixcloudAudioSourceManager;
 import com.dunctebot.sourcemanagers.ocremix.OCRemixAudioSourceManager;
 import com.dunctebot.sourcemanagers.pornhub.PornHubAudioSourceManager;
 import com.dunctebot.sourcemanagers.reddit.RedditAudioSourceManager;
@@ -38,6 +39,7 @@ public static void registerCustom(AudioPlayerManager playerManager, String speec
         playerManager.registerSourceManager(new RedditAudioSourceManager());
         playerManager.registerSourceManager(new OCRemixAudioSourceManager());
         playerManager.registerSourceManager(new TikTokAudioSourceManager());
+        playerManager.registerSourceManager(new MixcloudAudioSourceManager());
 
     }
 }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/Utils.java b/src/main/java/com/dunctebot/sourcemanagers/Utils.java
index 33779c3..2871c78 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/Utils.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/Utils.java
@@ -18,9 +18,40 @@
 
 import org.apache.http.HttpRequest;
 
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
+
 public class Utils {
     public static final String USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.99 Safari/537.36";
 
+    public static String urlDecode(String in) {
+        return URLDecoder.decode(in, Charset.defaultCharset());
+    }
+
+    public static String urlEncode(String in) {
+        return URLEncoder.encode(in, Charset.defaultCharset());
+    }
+
+    public static String decryptXor(String input, String key) {
+        final StringBuilder sb = new StringBuilder();
+
+        while (key.length() < input.length()) {
+            key += key;
+        }
+
+        for (int i = 0; i < input.length(); i += 1) {
+            final int value1 = input.charAt(i);
+            final int value2 = key.charAt(i);
+
+            final int xorValue = value1 ^ value2;
+
+            sb.append((char) xorValue);
+        }
+
+        return sb.toString();
+    }
+
     public static boolean isURL(String url) {
         return url.matches("^https?:\\/\\/[-a-zA-Z0-9+&@#\\/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#\\/%=~_|]");
     }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioSourceManager.java
new file mode 100644
index 0000000..4e391a8
--- /dev/null
+++ b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioSourceManager.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2022 Duncan "duncte123" Sterken & devoxin
+ *
+ *    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.dunctebot.sourcemanagers.mixcloud;
+
+import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
+import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
+import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
+import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
+import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
+import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
+import com.sedmelluq.discord.lavaplayer.track.AudioItem;
+import com.sedmelluq.discord.lavaplayer.track.AudioReference;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static com.dunctebot.sourcemanagers.Utils.urlDecode;
+import static com.dunctebot.sourcemanagers.Utils.urlEncode;
+
+public class MixcloudAudioSourceManager extends AbstractDuncteBotHttpSource {
+    private static final String REQUEST_STRUCTURE = "audioLength\n" +
+        "    name\n" +
+        "    owner {\n" +
+        "      username\n" +
+        "    }\n" +
+        "    streamInfo {\n" +
+        "      dashUrl\n" +
+        "      hlsUrl\n" +
+        "      url\n" +
+        "    }";
+    private static final Pattern URL_REGEX = Pattern.compile("https?://(?:(?:www|beta|m)\\.)?mixcloud\\.com/([^/]+)/(?!stream|uploads|favorites|listens|playlists)([^/]+)/?");
+
+    @Override
+    public String getSourceName() {
+        return "mixcloud";
+    }
+
+    @Override
+    public AudioItem loadItem(AudioPlayerManager manager, AudioReference reference) {
+        final Matcher matcher = URL_REGEX.matcher(reference.identifier);
+
+        if (!matcher.matches()) {
+            return null;
+        }
+
+        // retry if possible
+        while (true) {
+            try {
+                return this.loadItemOnce(reference, matcher);
+            } catch (Exception e) {
+                if (!HttpClientTools.isRetriableNetworkException(e)) {
+                    throw ExceptionTools.wrapUnfriendlyExceptions(
+                        "Loading information for a MixCloud track failed.",
+                        FriendlyException.Severity.FAULT, e);
+                }
+            }
+        }
+    }
+
+    private AudioItem loadItemOnce(AudioReference reference, Matcher matcher) throws IOException {
+        final String username = urlDecode(matcher.group(1));
+        final String slug = urlDecode(matcher.group(2));
+        final JsonBrowser trackInfo = this.extractTrackInfoGraphQl(username, slug);
+
+        if (trackInfo == null) {
+            return AudioReference.NO_TRACK;
+        }
+
+        final String title = trackInfo.get("name").text();
+        final long duration = trackInfo.get("audioLength").as(Long.class) * 1000;
+        final String uploader = trackInfo.get("owner").get("username").text(); // displayName
+        final String encryptedUrl = trackInfo.get("streamInfo").get("url").text();
+
+        return new MixcloudAudioTrack(
+            new AudioTrackInfo(
+                title,
+                uploader,
+                duration,
+                reference.identifier,
+                false,
+                encryptedUrl
+            ),
+            this
+        );
+    }
+
+    private JsonBrowser extractTrackInfoGraphQl(String username, String slug) throws IOException {
+        final String slugFormatted = slug == null ? "" : String.format(", slug: \"%s\"", slug);
+        final String query = String.format(
+            "{\n  cloudcastLookup(lookup: {username: \"%s\"%s}) {\n    %s\n  }\n}",
+            username,
+            slugFormatted,
+            REQUEST_STRUCTURE
+        );
+        final String encodedQuery = urlEncode(query);
+        final HttpGet httpGet = new HttpGet("https://www.mixcloud.com/graphql?query=" + encodedQuery);
+
+        try (final CloseableHttpResponse res = getHttpInterface().execute(httpGet)) {
+            final int statusCode = res.getStatusLine().getStatusCode();
+
+            if (statusCode != 200) {
+                if (statusCode == 404) {
+                    return null;
+                }
+
+                throw new IOException("Invalid status code for Mixcloud track page response: " + statusCode);
+            }
+
+            final String content = IOUtils.toString(res.getEntity().getContent(), StandardCharsets.UTF_8);
+            final JsonBrowser json = JsonBrowser.parse(content).get("data").get("cloudcastLookup");
+
+            if (json.get("streamInfo").isNull()) {
+                return null;
+            }
+
+            return json;
+        }
+    }
+
+    @Override
+    public boolean isTrackEncodable(AudioTrack track) {
+        return true;
+    }
+
+    @Override
+    public void encodeTrack(AudioTrack track, DataOutput output) {
+        // nothing to encode
+    }
+
+    @Override
+    public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) {
+        return new MixcloudAudioTrack(trackInfo, this);
+    }
+}
diff --git a/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java
new file mode 100644
index 0000000..71728eb
--- /dev/null
+++ b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2022 Duncan "duncte123" Sterken & devoxin
+ *
+ *    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.dunctebot.sourcemanagers.mixcloud;
+
+import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
+import com.dunctebot.sourcemanagers.IWillUseIdentifierInstead;
+import com.dunctebot.sourcemanagers.MpegTrack;
+import com.sedmelluq.discord.lavaplayer.tools.Units;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
+
+import java.util.Base64;
+
+import static com.dunctebot.sourcemanagers.Utils.decryptXor;
+
+public class MixcloudAudioTrack extends MpegTrack implements IWillUseIdentifierInstead {
+    private static final String DECRYPTION_KEY = "IFYOUWANTTHEARTISTSTOGETPAIDDONOTDOWNLOADFROMMIXCLOUD";
+
+    public MixcloudAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource manager) {
+        super(trackInfo, manager);
+    }
+
+    @Override
+    protected long getTrackDuration() {
+        // supply an unknown content length so lavaplayer actually loads the file
+        return Units.CONTENT_LENGTH_UNKNOWN;
+    }
+
+    @Override
+    protected String getPlaybackUrl() {
+        final String xorUrl = new String(Base64.getDecoder().decode(this.trackInfo.uri));
+
+        return decryptXor(xorUrl, DECRYPTION_KEY);
+    }
+}

From e0b8d9ebe28de0e81fb25587eeb34ade0524a0a9 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Wed, 9 Feb 2022 19:17:45 +0100
Subject: [PATCH 58/76] Load mixcloud track before playback

---
 build.gradle.kts                              |  2 +-
 .../mixcloud/MixcloudAudioSourceManager.java  |  7 ++---
 .../mixcloud/MixcloudAudioTrack.java          | 29 ++++++++++++++++---
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2341b89..0645c9a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.7.0"
+project.version = "1.7.1"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
diff --git a/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioSourceManager.java
index 4e391a8..ead74f8 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioSourceManager.java
@@ -92,22 +92,21 @@ private AudioItem loadItemOnce(AudioReference reference, Matcher matcher) throws
         final String title = trackInfo.get("name").text();
         final long duration = trackInfo.get("audioLength").as(Long.class) * 1000;
         final String uploader = trackInfo.get("owner").get("username").text(); // displayName
-        final String encryptedUrl = trackInfo.get("streamInfo").get("url").text();
 
         return new MixcloudAudioTrack(
             new AudioTrackInfo(
                 title,
                 uploader,
                 duration,
-                reference.identifier,
+                slug,
                 false,
-                encryptedUrl
+                reference.identifier
             ),
             this
         );
     }
 
-    private JsonBrowser extractTrackInfoGraphQl(String username, String slug) throws IOException {
+    protected JsonBrowser extractTrackInfoGraphQl(String username, String slug) throws IOException {
         final String slugFormatted = slug == null ? "" : String.format(", slug: \"%s\"", slug);
         final String query = String.format(
             "{\n  cloudcastLookup(lookup: {username: \"%s\"%s}) {\n    %s\n  }\n}",
diff --git a/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java
index 71728eb..46ff150 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java
@@ -17,16 +17,19 @@
 package com.dunctebot.sourcemanagers.mixcloud;
 
 import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
-import com.dunctebot.sourcemanagers.IWillUseIdentifierInstead;
 import com.dunctebot.sourcemanagers.MpegTrack;
+import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
+import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.tools.Units;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 
+import java.io.IOException;
 import java.util.Base64;
 
 import static com.dunctebot.sourcemanagers.Utils.decryptXor;
+import static com.dunctebot.sourcemanagers.Utils.urlDecode;
 
-public class MixcloudAudioTrack extends MpegTrack implements IWillUseIdentifierInstead {
+public class MixcloudAudioTrack extends MpegTrack {
     private static final String DECRYPTION_KEY = "IFYOUWANTTHEARTISTSTOGETPAIDDONOTDOWNLOADFROMMIXCLOUD";
 
     public MixcloudAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource manager) {
@@ -41,8 +44,26 @@ protected long getTrackDuration() {
 
     @Override
     protected String getPlaybackUrl() {
-        final String xorUrl = new String(Base64.getDecoder().decode(this.trackInfo.uri));
+        try {
+            final var trackInfo = getSourceManager().extractTrackInfoGraphQl(
+                this.trackInfo.author,
+                urlDecode(this.trackInfo.identifier)
+            );
+            final String encryptedUrl = trackInfo.get("streamInfo").get("url").text();
+            final String xorUrl = new String(Base64.getDecoder().decode(encryptedUrl));
 
-        return decryptXor(xorUrl, DECRYPTION_KEY);
+            return decryptXor(xorUrl, DECRYPTION_KEY);
+        } catch (IOException e) {
+            throw ExceptionTools.wrapUnfriendlyExceptions(
+                "Playback of mixcloud track failed",
+                FriendlyException.Severity.SUSPICIOUS,
+                e
+            );
+        }
+    }
+
+    @Override
+    public MixcloudAudioSourceManager getSourceManager() {
+        return (MixcloudAudioSourceManager) super.getSourceManager();
     }
 }

From 3cd5e8963d25c619ff3cf87ab5231acd31e455d6 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Wed, 9 Feb 2022 20:05:02 +0100
Subject: [PATCH 59/76] publish beta

---
 .github/workflows/02-publish-snapshot.yml     | 35 +++++++++++++++++++
 .github/workflows/02-publish.yml              |  1 +
 build.gradle.kts                              |  7 ++--
 .../mixcloud/MixcloudAudioTrack.java          |  9 +++--
 src/test/java/MixcloudTest.java               | 30 ++++++++++++++++
 5 files changed, 78 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/02-publish-snapshot.yml
 create mode 100644 src/test/java/MixcloudTest.java

diff --git a/.github/workflows/02-publish-snapshot.yml b/.github/workflows/02-publish-snapshot.yml
new file mode 100644
index 0000000..f1a3d50
--- /dev/null
+++ b/.github/workflows/02-publish-snapshot.yml
@@ -0,0 +1,35 @@
+# This workflow will build a Java project with Gradle
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Publish package
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+            path: './'
+            fetch-depth: 0
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build with Gradle
+        run: ./gradlew --no-daemon publish -x test
+        env:
+            USERNAME: ${{ secrets.M2_USER }}
+            PASSWORD: ${{ secrets.M2_PASS }}
+            REPO: snapshots
+#      - name: Upload to github
+#        env:
+#            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        run: ./gradlew --no-daemon githubRelease
diff --git a/.github/workflows/02-publish.yml b/.github/workflows/02-publish.yml
index 3e4ec6a..5ca0340 100644
--- a/.github/workflows/02-publish.yml
+++ b/.github/workflows/02-publish.yml
@@ -28,6 +28,7 @@ jobs:
         env:
             USERNAME: ${{ secrets.M2_USER }}
             PASSWORD: ${{ secrets.M2_PASS }}
+            REPO: releases
 #      - name: Upload to github
 #        env:
 #            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/build.gradle.kts b/build.gradle.kts
index 0645c9a..1e8c48e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,8 +24,10 @@ plugins {
 //    id("com.github.breadmoirai.github-release") version "2.2.12"
 }
 
+val versionSuffix = if (System.getenv("REPO") == null) "" else "-beta.${System.getenv("GITHUB_RUN_NUMBER")}"
+
 project.group = "com.dunctebot"
-project.version = "1.7.1"
+project.version = "1.7.1$versionSuffix"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
@@ -82,7 +84,8 @@ publishing {
     repositories {
         maven {
             name = "duncte123-m2"
-            url = uri("https://m2.duncte123.dev/releases")
+//            url = uri("https://m2.duncte123.dev/releases")
+            url = uri("https://m2.duncte123.dev/${System.getenv("REPO")}")
             credentials {
                 username = System.getenv("USERNAME")
                 password = System.getenv("PASSWORD")
diff --git a/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java
index 46ff150..a459aa5 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java
@@ -43,7 +43,7 @@ protected long getTrackDuration() {
     }
 
     @Override
-    protected String getPlaybackUrl() {
+    public String getPlaybackUrl() {
         try {
             final var trackInfo = getSourceManager().extractTrackInfoGraphQl(
                 this.trackInfo.author,
@@ -51,8 +51,13 @@ protected String getPlaybackUrl() {
             );
             final String encryptedUrl = trackInfo.get("streamInfo").get("url").text();
             final String xorUrl = new String(Base64.getDecoder().decode(encryptedUrl));
+            final String s = decryptXor(xorUrl, DECRYPTION_KEY);
 
-            return decryptXor(xorUrl, DECRYPTION_KEY);
+            System.out.println("====================================");
+            System.out.println(s);
+            System.out.println("====================================");
+
+            return s;
         } catch (IOException e) {
             throw ExceptionTools.wrapUnfriendlyExceptions(
                 "Playback of mixcloud track failed",
diff --git a/src/test/java/MixcloudTest.java b/src/test/java/MixcloudTest.java
new file mode 100644
index 0000000..0643e69
--- /dev/null
+++ b/src/test/java/MixcloudTest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2022 Duncan "duncte123" Sterken
+ *
+ *    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.
+ */
+
+import com.dunctebot.sourcemanagers.mixcloud.MixcloudAudioSourceManager;
+import com.dunctebot.sourcemanagers.mixcloud.MixcloudAudioTrack;
+import com.sedmelluq.discord.lavaplayer.track.AudioReference;
+
+public class MixcloudTest {
+    public static void main(String[] args) {
+        final var url = "https://www.mixcloud.com/jordy-boesten2/the-egotripper-lets-walk-to-my-house-mix-259/";
+        final var mnrg = new MixcloudAudioSourceManager();
+        final var track = (MixcloudAudioTrack) mnrg.loadItem(null, new AudioReference(url, null));
+        final var playbackUrl = track.getPlaybackUrl();
+
+        System.out.println(playbackUrl);
+    }
+}

From 59bf328b9529c9640c8b59333a9bf784ef28f760 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Wed, 9 Feb 2022 20:07:26 +0100
Subject: [PATCH 60/76] Actually trigger it

---
 .github/workflows/02-publish-snapshot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/02-publish-snapshot.yml b/.github/workflows/02-publish-snapshot.yml
index f1a3d50..5641583 100644
--- a/.github/workflows/02-publish-snapshot.yml
+++ b/.github/workflows/02-publish-snapshot.yml
@@ -5,7 +5,7 @@ name: Publish package
 
 on:
   push:
-    branches: [ master ]
+    branches: [ develop ]
 
 jobs:
   build:

From c0289a98c26449f8662f1524b715544c4450b26a Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Wed, 9 Feb 2022 20:38:19 +0100
Subject: [PATCH 61/76] Un-beta

---
 .github/workflows/02-publish-snapshot.yml     | 35 -------------------
 build.gradle.kts                              |  7 ++--
 .../mixcloud/MixcloudAudioTrack.java          |  7 +---
 3 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 .github/workflows/02-publish-snapshot.yml

diff --git a/.github/workflows/02-publish-snapshot.yml b/.github/workflows/02-publish-snapshot.yml
deleted file mode 100644
index 5641583..0000000
--- a/.github/workflows/02-publish-snapshot.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-# This workflow will build a Java project with Gradle
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
-
-name: Publish package
-
-on:
-  push:
-    branches: [ develop ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-            path: './'
-            fetch-depth: 0
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Build with Gradle
-        run: ./gradlew --no-daemon publish -x test
-        env:
-            USERNAME: ${{ secrets.M2_USER }}
-            PASSWORD: ${{ secrets.M2_PASS }}
-            REPO: snapshots
-#      - name: Upload to github
-#        env:
-#            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#        run: ./gradlew --no-daemon githubRelease
diff --git a/build.gradle.kts b/build.gradle.kts
index 1e8c48e..0645c9a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,10 +24,8 @@ plugins {
 //    id("com.github.breadmoirai.github-release") version "2.2.12"
 }
 
-val versionSuffix = if (System.getenv("REPO") == null) "" else "-beta.${System.getenv("GITHUB_RUN_NUMBER")}"
-
 project.group = "com.dunctebot"
-project.version = "1.7.1$versionSuffix"
+project.version = "1.7.1"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
@@ -84,8 +82,7 @@ publishing {
     repositories {
         maven {
             name = "duncte123-m2"
-//            url = uri("https://m2.duncte123.dev/releases")
-            url = uri("https://m2.duncte123.dev/${System.getenv("REPO")}")
+            url = uri("https://m2.duncte123.dev/releases")
             credentials {
                 username = System.getenv("USERNAME")
                 password = System.getenv("PASSWORD")
diff --git a/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java
index a459aa5..582c87d 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java
@@ -51,13 +51,8 @@ public String getPlaybackUrl() {
             );
             final String encryptedUrl = trackInfo.get("streamInfo").get("url").text();
             final String xorUrl = new String(Base64.getDecoder().decode(encryptedUrl));
-            final String s = decryptXor(xorUrl, DECRYPTION_KEY);
 
-            System.out.println("====================================");
-            System.out.println(s);
-            System.out.println("====================================");
-
-            return s;
+            return decryptXor(xorUrl, DECRYPTION_KEY);
         } catch (IOException e) {
             throw ExceptionTools.wrapUnfriendlyExceptions(
                 "Playback of mixcloud track failed",

From abe3286b246c59987747d557e2339a33234d5663 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Mon, 7 Mar 2022 09:37:39 +0100
Subject: [PATCH 62/76] Add soundgasm

---
 README.md                                     |   2 +-
 build.gradle.kts                              |   2 +-
 .../sourcemanagers/DuncteBotSources.java      |  35 ++++-
 .../SoundGasmAudioSourceManager.java          | 137 ++++++++++++++++++
 .../soundgasm/SoundGasmAudioTrack.java        |  44 ++++++
 src/test/java/SoundGasmTest.java              |  30 ++++
 6 files changed, 245 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioSourceManager.java
 create mode 100644 src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioTrack.java
 create mode 100644 src/test/java/SoundGasmTest.java

diff --git a/README.md b/README.md
index b0cad67..1e3c936 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ You are able to register all the source managers via the following code snippet:
 AudioPlayerManager playerManager = new DefaultAudioPlayerManager(); // Your lavaplayer player manager
 String ttsLange = "en-US"; // The language for the speak/tts item
 
-DuncteBotSources.registerCustom(playerManager, ttsLange, 6);
+DuncteBotSources.registerAll(playerManager, ttsLange);
 ```
 
 [VERSION]: https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Fm2.duncte123.dev%2Freleases%2Fcom%2Fdunctebot%2Fsourcemanagers%2Fmaven-metadata.xml
diff --git a/build.gradle.kts b/build.gradle.kts
index 0645c9a..ca40664 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.7.1"
+project.version = "1.8.0"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
diff --git a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
index e6cdb14..4a997ef 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/DuncteBotSources.java
@@ -22,13 +22,43 @@
 import com.dunctebot.sourcemanagers.ocremix.OCRemixAudioSourceManager;
 import com.dunctebot.sourcemanagers.pornhub.PornHubAudioSourceManager;
 import com.dunctebot.sourcemanagers.reddit.RedditAudioSourceManager;
+import com.dunctebot.sourcemanagers.soundgasm.SoundGasmAudioSourceManager;
 import com.dunctebot.sourcemanagers.speech.SpeechAudioSourceManager;
 import com.dunctebot.sourcemanagers.tiktok.TikTokAudioSourceManager;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
 import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
 
 public class DuncteBotSources {
-    public static void registerCustom(AudioPlayerManager playerManager, String speechLanguage, int playlistPageCount) {
+    /**
+     * Registers all custom source managers onto the player manager
+     *
+     * @param playerManager Your lavalink player manager
+     * @param speechLanguage The default language for the TTS engine
+     */
+    public static void registerAll(AudioPlayerManager playerManager, String speechLanguage) {
+        playerManager.registerSourceManager(new GetyarnAudioSourceManager());
+        playerManager.registerSourceManager(new ClypitAudioSourceManager());
+        playerManager.registerSourceManager(new SpeechAudioSourceManager(speechLanguage));
+        playerManager.registerSourceManager(new PornHubAudioSourceManager());
+        playerManager.registerSourceManager(new RedditAudioSourceManager());
+        playerManager.registerSourceManager(new OCRemixAudioSourceManager());
+        playerManager.registerSourceManager(new TikTokAudioSourceManager());
+        playerManager.registerSourceManager(new MixcloudAudioSourceManager());
+        playerManager.registerSourceManager(new SoundGasmAudioSourceManager());
+    }
+
+    /**
+     * Registers only the sourcemanagers used on DuncteBot, missing sources are as follows
+     *
+     * <ul>
+     *     <li>Mixcloud: they banned my server's ips</li>
+     * </ul>
+     *
+     * @param playerManager Lavaplayer player manager
+     * @param speechLanguage Default language for tts
+     * @param playlistPageCount Overriding the youtube playlist count
+     */
+    public static void registerDuncteBot(AudioPlayerManager playerManager, String speechLanguage, int playlistPageCount) {
         final YoutubeAudioSourceManager youtubeSource = playerManager.source(YoutubeAudioSourceManager.class);
         youtubeSource.setPlaylistPageCount(playlistPageCount);
 
@@ -39,7 +69,6 @@ public static void registerCustom(AudioPlayerManager playerManager, String speec
         playerManager.registerSourceManager(new RedditAudioSourceManager());
         playerManager.registerSourceManager(new OCRemixAudioSourceManager());
         playerManager.registerSourceManager(new TikTokAudioSourceManager());
-        playerManager.registerSourceManager(new MixcloudAudioSourceManager());
-
+        playerManager.registerSourceManager(new SoundGasmAudioSourceManager());
     }
 }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioSourceManager.java
new file mode 100644
index 0000000..ac7a7bc
--- /dev/null
+++ b/src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioSourceManager.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2022 Duncan "duncte123" Sterken
+ *
+ *    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.dunctebot.sourcemanagers.soundgasm;
+
+import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
+import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
+import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
+import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
+import com.sedmelluq.discord.lavaplayer.tools.Units;
+import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
+import com.sedmelluq.discord.lavaplayer.track.AudioItem;
+import com.sedmelluq.discord.lavaplayer.track.AudioReference;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class SoundGasmAudioSourceManager extends AbstractDuncteBotHttpSource {
+    private static final Pattern URL_PATTERN = Pattern.compile("https?:\\/\\/soundgasm\\.net\\/u\\/(?<path>(?<author>[^\\/]+)\\/[^\\/]+)");
+    private static final Pattern SOUND_PATTERN = Pattern.compile("m4a:(?:\\s+)?[\"']https:\\/\\/media\\.soundgasm\\.net\\/sounds\\/([^.]+)\\.m4a[\"']");
+    private static final Pattern TITLE_PATTERN = Pattern.compile("<div class=\"jp-title\" aria-label=\"title\">([^<]+)<\\/div>");
+
+    @Override
+    public String getSourceName() {
+        return "soundgasm";
+    }
+
+    @Override
+    public AudioItem loadItem(AudioPlayerManager manager, AudioReference reference) {
+        final String url = reference.identifier;
+        final Matcher urlMatcher = URL_PATTERN.matcher(url);
+
+        if (!urlMatcher.matches()) {
+            return null;
+        }
+
+        final String fetchUrl = "https://soundgasm.net/u/" + urlMatcher.group("path");
+
+        while (true) {
+            try {
+                return loadItemOnce(fetchUrl, urlMatcher);
+            } catch (Exception e) {
+                if (!HttpClientTools.isRetriableNetworkException(e)) {
+                    throw ExceptionTools.wrapUnfriendlyExceptions(
+                        "Loading of soundgasm track went wrong",
+                        FriendlyException.Severity.FAULT,
+                        e
+                    );
+                }
+            }
+        }
+    }
+
+    private AudioItem loadItemOnce(String fetchUrl, Matcher urlMatcher) throws IOException {
+        final HttpGet httpGet = new HttpGet(fetchUrl);
+
+        try (final CloseableHttpResponse res = getHttpInterface().execute(httpGet)) {
+            final int statusCode = res.getStatusLine().getStatusCode();
+
+            if (statusCode != 200) {
+                if (statusCode == 404) {
+                    return AudioReference.NO_TRACK;
+                }
+
+                throw new IOException("Invalid status code for soundgasm track page response: " + statusCode);
+            }
+
+            final String content = IOUtils.toString(res.getEntity().getContent(), StandardCharsets.UTF_8);
+            final Matcher soundPatternMatcher = SOUND_PATTERN.matcher(content);
+
+            if (!soundPatternMatcher.find()) {
+                // TODO: throw? No sound file was found
+                return AudioReference.NO_TRACK;
+            }
+
+            final Matcher titleMatcher = TITLE_PATTERN.matcher(content);
+            final String title;
+
+            if (titleMatcher.find()) {
+                title = titleMatcher.group(titleMatcher.groupCount());
+            } else {
+                title = "Unknown title";
+            }
+
+            final String identifier = soundPatternMatcher.group(soundPatternMatcher.groupCount());
+
+            return new SoundGasmAudioTrack(
+                new AudioTrackInfo(
+                    title,
+                    urlMatcher.group("author"),
+                    Units.DURATION_MS_UNKNOWN,
+                    identifier,
+                    false,
+                    fetchUrl
+                ),
+                this
+            );
+        }
+    }
+
+    @Override
+    public boolean isTrackEncodable(AudioTrack track) {
+        return true;
+    }
+
+    @Override
+    public void encodeTrack(AudioTrack track, DataOutput output) {
+        // nothing to encode
+    }
+
+    @Override
+    public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) {
+        return new SoundGasmAudioTrack(trackInfo, this);
+    }
+}
diff --git a/src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioTrack.java
new file mode 100644
index 0000000..f537cb7
--- /dev/null
+++ b/src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioTrack.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2022 Duncan "duncte123" Sterken
+ *
+ *    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.dunctebot.sourcemanagers.soundgasm;
+
+import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
+import com.dunctebot.sourcemanagers.MpegTrack;
+import com.sedmelluq.discord.lavaplayer.tools.Units;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
+
+public class SoundGasmAudioTrack extends MpegTrack {
+    public SoundGasmAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource manager) {
+        super(trackInfo, manager);
+    }
+
+    @Override
+    protected long getTrackDuration() {
+        return Units.CONTENT_LENGTH_UNKNOWN;
+    }
+
+    @Override
+    protected String getPlaybackUrl() {
+        return "https://media.soundgasm.net/sounds/" + this.trackInfo.identifier + ".m4a";
+    }
+
+    @Override
+    protected AudioTrack makeShallowClone() {
+        return new SoundGasmAudioTrack(this.trackInfo, getSourceManager());
+    }
+}
diff --git a/src/test/java/SoundGasmTest.java b/src/test/java/SoundGasmTest.java
new file mode 100644
index 0000000..bfc9cee
--- /dev/null
+++ b/src/test/java/SoundGasmTest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2022 Duncan "duncte123" Sterken
+ *
+ *    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.
+ */
+
+import com.dunctebot.sourcemanagers.soundgasm.SoundGasmAudioSourceManager;
+import com.sedmelluq.discord.lavaplayer.track.AudioReference;
+
+public class SoundGasmTest {
+    public static void main(String[] args) {
+        final var id1 = "https://soundgasm.net/u/not_your_habibTEA/My-Power-is-Out-Can-I-Come-In";
+
+        final var mngr = new SoundGasmAudioSourceManager();
+
+        final var res1 = mngr.loadItem(null, new AudioReference(id1, ""));
+
+        System.out.println(res1);
+    }
+}

From dce02121bbdf9b0dd2b2db41101b2d27acd164e5 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Mon, 7 Mar 2022 10:20:47 +0100
Subject: [PATCH 63/76] Test pornhub extractor

---
 .../pornhub/PornHubAudioTrack.java            |  2 +-
 src/test/java/PHtest.java                     | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/PHtest.java

diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
index f2c3dd8..0557a33 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
@@ -54,7 +54,7 @@ protected String getPlaybackUrl() {
         }
     }
 
-    private String loadFromMediaInfo() throws IOException {
+    public String loadFromMediaInfo() throws IOException {
         final HttpGet httpGet = new HttpGet(getPlayerPage(this.trackInfo.identifier));
 
         httpGet.setHeader("Cookie", "platform=pc; age_verified=1");
diff --git a/src/test/java/PHtest.java b/src/test/java/PHtest.java
new file mode 100644
index 0000000..a5f42a6
--- /dev/null
+++ b/src/test/java/PHtest.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2022 Duncan "duncte123" Sterken
+ *
+ *    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.
+ */
+
+import com.dunctebot.sourcemanagers.pornhub.PornHubAudioSourceManager;
+import com.dunctebot.sourcemanagers.pornhub.PornHubAudioTrack;
+import com.sedmelluq.discord.lavaplayer.track.AudioReference;
+
+public class PHtest {
+    public static void main(String[] args) throws Exception {
+        final var link = "https://www.pornhub.com/view_video.php?viewkey=ph5fc5ef73cfc87";
+        final var mngr = new PornHubAudioSourceManager();
+
+        final var track = (PornHubAudioTrack) mngr.loadItem(null, new AudioReference(link, null));
+
+        System.out.println(
+            track.loadFromMediaInfo()
+        );
+    }
+}

From abab62e11a55e1d2808521ee61023b1e6768e722 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Tue, 29 Mar 2022 14:14:39 +0200
Subject: [PATCH 64/76] Merge master

---
 .../sourcemanagers/soundgasm/SoundGasmAudioSourceManager.java | 3 +--
 src/test/java/SoundGasmTest.java                              | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioSourceManager.java
index ac7a7bc..d19f351 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioSourceManager.java
@@ -29,7 +29,6 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
-
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
@@ -37,7 +36,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class SoundGasmAudioSourceManager extends AbstractDuncteBotHttpSource {
+public class SoundGasmAudioSourceManager extends AbstractDuncteBotHttpSource  {
     private static final Pattern URL_PATTERN = Pattern.compile("https?:\\/\\/soundgasm\\.net\\/u\\/(?<path>(?<author>[^\\/]+)\\/[^\\/]+)");
     private static final Pattern SOUND_PATTERN = Pattern.compile("m4a:(?:\\s+)?[\"']https:\\/\\/media\\.soundgasm\\.net\\/sounds\\/([^.]+)\\.m4a[\"']");
     private static final Pattern TITLE_PATTERN = Pattern.compile("<div class=\"jp-title\" aria-label=\"title\">([^<]+)<\\/div>");
diff --git a/src/test/java/SoundGasmTest.java b/src/test/java/SoundGasmTest.java
index bfc9cee..3cbd31a 100644
--- a/src/test/java/SoundGasmTest.java
+++ b/src/test/java/SoundGasmTest.java
@@ -19,10 +19,8 @@
 
 public class SoundGasmTest {
     public static void main(String[] args) {
-        final var id1 = "https://soundgasm.net/u/not_your_habibTEA/My-Power-is-Out-Can-I-Come-In";
-
+        final var id1 = "";
         final var mngr = new SoundGasmAudioSourceManager();
-
         final var res1 = mngr.loadItem(null, new AudioReference(id1, ""));
 
         System.out.println(res1);

From d23f6f65b43ccdc87accd555924ba27262843f97 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Tue, 28 Jun 2022 08:00:29 +0200
Subject: [PATCH 65/76] Fix tiktok playback

---
 build.gradle.kts                                             | 2 +-
 .../sourcemanagers/tiktok/TikTokAudioSourceManager.java      | 5 +++--
 .../dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java    | 2 +-
 src/test/java/TikTokTesting.java                             | 5 +++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index ca40664..7b390a4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.8.0"
+project.version = "1.8.1"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
index 630e39a..e1529c0 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
@@ -46,7 +46,7 @@ public class TikTokAudioSourceManager extends AbstractDuncteBotHttpSource {
     private static final String VIDEO = "(?<video>[0-9]+)";
     protected static final Pattern VIDEO_REGEX = Pattern.compile("^" + BASE + "\\/" + USER + "\\/video\\/" + VIDEO + "(?:.*)$");
     private static final Pattern JS_REGEX = Pattern.compile(
-        "<script id=\"__NEXT_DATA__\" type=\"application/json\" crossorigin=\"anonymous\">(.*)<\\/script>");
+        "<script id=\"SIGI_STATE\" type=\"application/json\">(.*)<\\/script>");
     private static final Pattern SIGI_REGEX = Pattern.compile(
         "<script id=\"sigi-persisted-data\">(?:\n)?window\\[(?:'SIGI_STATE'|\"SIGI_STATE\")\\](?:\\s+)?=(?:\\s+)?(.*);(?:\\s+)?(?:.*)?<\\/script>");
 
@@ -119,7 +119,8 @@ protected MetaData extractData(String url) throws Exception {
 
             if (matcher.find()) {
                 final JsonBrowser json = JsonBrowser.parse(matcher.group(1).trim());
-                final JsonBrowser base = json.get("props").get("pageProps").get("itemInfo").get("itemStruct");
+                final String videoId = json.get("ItemList").get("video").get("list").index(0).text();
+                final JsonBrowser base = json.get("ItemModule").get(videoId);
 
                 return getMetaData(url, base);
             }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
index 7978ee2..1c85d6a 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
@@ -48,7 +48,7 @@ public TikTokAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource ma
     }
 
     @Override
-    protected String getPlaybackUrl() {
+    public String getPlaybackUrl() {
         try {
             if (this.urlCache == null) {
                 this.urlCache = getPlaybackUrl(this.trackInfo.identifier);
diff --git a/src/test/java/TikTokTesting.java b/src/test/java/TikTokTesting.java
index 4d9a00e..c24464c 100644
--- a/src/test/java/TikTokTesting.java
+++ b/src/test/java/TikTokTesting.java
@@ -15,16 +15,17 @@
  */
 
 import com.dunctebot.sourcemanagers.tiktok.TikTokAudioSourceManager;
+import com.dunctebot.sourcemanagers.tiktok.TikTokAudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioReference;
 
 public class TikTokTesting {
     public static void main(String[] args) {
         final var mngr = new TikTokAudioSourceManager();
         final var ref = new AudioReference("https://www.tiktok.com/@nataliya_xoxo_love/video/6923984361150745862", "aaaaa");
-        final var load = mngr.loadItem(null, ref);
+        final TikTokAudioTrack load = (TikTokAudioTrack) mngr.loadItem(null, ref);
 
         System.out.println(
-            load
+            load.getPlaybackUrl()
         );
     }
 }

From a2eb45a0e33432ef62d476ecc5f15249b308ae3e Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Tue, 22 Nov 2022 16:43:53 +0100
Subject: [PATCH 66/76] fix soundgasm

---
 build.gradle.kts                                           | 7 ++++---
 .../soundgasm/SoundGasmAudioSourceManager.java             | 3 +--
 src/test/java/SoundGasmTest.java                           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 7b390a4..149fc5d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -41,12 +41,13 @@ repositories {
 dependencies {
     // build override for age-restricted videos
 //    implementation(group = "com.github.duncte123", name = "lavaplayer", version = "be6e364")
-    compileOnly(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.76")
+    compileOnly(group = "com.github.walkyst", name = "lavaplayer-fork", version = "1.3.99.1")
 
-    implementation(group = "org.jsoup", name = "jsoup", version = "1.13.1")
+    implementation("commons-io:commons-io:2.6")
+    implementation(group = "org.jsoup", name = "jsoup", version = "1.12.1")
     implementation(group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2")
 
-    testImplementation(group = "com.sedmelluq", name = "lavaplayer", version = "1.3.76")
+    testImplementation(group = "com.github.walkyst", name = "lavaplayer-fork", version = "1.3.99.1")
 }
 
 configure<JavaPluginExtension> {
diff --git a/src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioSourceManager.java
index d19f351..5efc1c9 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioSourceManager.java
@@ -90,8 +90,7 @@ private AudioItem loadItemOnce(String fetchUrl, Matcher urlMatcher) throws IOExc
             final Matcher soundPatternMatcher = SOUND_PATTERN.matcher(content);
 
             if (!soundPatternMatcher.find()) {
-                // TODO: throw? No sound file was found
-                return AudioReference.NO_TRACK;
+                throw new FriendlyException("Failed to extract audio file", FriendlyException.Severity.FAULT, null);
             }
 
             final Matcher titleMatcher = TITLE_PATTERN.matcher(content);
diff --git a/src/test/java/SoundGasmTest.java b/src/test/java/SoundGasmTest.java
index 3cbd31a..aeba41b 100644
--- a/src/test/java/SoundGasmTest.java
+++ b/src/test/java/SoundGasmTest.java
@@ -19,7 +19,7 @@
 
 public class SoundGasmTest {
     public static void main(String[] args) {
-        final var id1 = "";
+        final var id1 = "https://soundgasm.net/u/skearch/test-audio";
         final var mngr = new SoundGasmAudioSourceManager();
         final var res1 = mngr.loadItem(null, new AudioReference(id1, ""));
 

From fb9f93b01beafc73af0ba6d588bfb8244f5dff2e Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Tue, 22 Nov 2022 17:14:29 +0100
Subject: [PATCH 67/76] Very hacky very tiktok fix

---
 build.gradle.kts                              |  2 +-
 .../tiktok/TikTokAudioSourceManager.java      | 10 +++-
 .../tiktok/TikTokAudioTrack.java              | 55 ++++++-------------
 3 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 149fc5d..3119397 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.8.1"
+project.version = "1.8.2"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
index e1529c0..0cf943a 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
@@ -94,7 +94,7 @@ public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) {
         return new TikTokAudioTrack(trackInfo, this);
     }
 
-    private MetaData extractData(String userId, String videoId) throws Exception {
+    MetaData extractData(String userId, String videoId) throws Exception {
         return extractData("https://www.tiktok.com/@" + userId + "/video/" + videoId);
     }
 
@@ -147,12 +147,15 @@ protected static MetaData getMetaData(String url, JsonBrowser base) {
 
         metaData.pageUrl = url;
         metaData.videoId = videoJson.get("id").safeText();
+        metaData.videoUrl = videoJson.get("downloadAddr").text();
         metaData.cover = videoJson.get("cover").safeText();
         metaData.title = base.get("desc").safeText();
 
         metaData.uri = videoJson.get("downloadAddr").safeText();
         metaData.duration = Integer.parseInt(videoJson.get("duration").safeText());
 
+        metaData.musicUrl = base.get("music").get("playUrl").text();
+
         final JsonBrowser author = base.get("author");
 
         metaData.uniqueId = author.get("uniqueId").safeText();
@@ -165,10 +168,14 @@ protected static class MetaData {
         String cover; // image url
         String pageUrl;
         String videoId;
+        String videoUrl;
         String uri;
         int duration; // in seconds
         String title;
 
+        // backup
+        String musicUrl;
+
         // author
         String uniqueId;
 
@@ -191,6 +198,7 @@ public String toString() {
                 "cover='" + cover + '\'' +
                 ", pageUrl='" + pageUrl + '\'' +
                 ", videoId='" + videoId + '\'' +
+                ", videoUrl='" + videoUrl + '\'' +
                 ", uri='" + uri + '\'' +
                 ", duration=" + duration +
                 ", title='" + title + '\'' +
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
index 1c85d6a..44cfed6 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
@@ -51,7 +51,7 @@ public TikTokAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource ma
     public String getPlaybackUrl() {
         try {
             if (this.urlCache == null) {
-                this.urlCache = getPlaybackUrl(this.trackInfo.identifier);
+                this.urlCache = loadPlaybackUrl();
             }
 
             if (this.failedOnce) {
@@ -59,7 +59,7 @@ public String getPlaybackUrl() {
             }
 
             return this.urlCache.getLeft();
-        } catch (IOException e) {
+        } catch (Exception e) {
             throw new FriendlyException("Could not load TikTok video", SUSPICIOUS, e);
         }
     }
@@ -104,45 +104,17 @@ protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface h
         }
     }*/
 
-    protected Pair<String, String> getPlaybackUrl(String identifier) throws IOException {
-        final HttpGet httpGet = new HttpGet(
-            "https://api2.musical.ly/aweme/v1/aweme/detail/?aweme_id=" + identifier
-        );
+    protected Pair<String, String> loadPlaybackUrl() throws Exception {
 
-        fakeChrome(httpGet);
-
-        try (final HttpInterface httpInterface = this.httpManager.getHttpInterface()) {
-            try (final CloseableHttpResponse response = httpInterface.execute(httpGet)) {
-                final int statusCode = response.getStatusLine().getStatusCode();
-
-                if (statusCode != 200) {
-                    if (statusCode == 302) { // most likely a 404
-                        return null;
-                    }
-
-                    throw new IOException("Unexpected status code for video page response: " + statusCode);
-                }
+        final TikTokAudioSourceManager.MetaData metdata = this.getSourceManager().extractData(
+            this.trackInfo.author,
+            this.trackInfo.identifier
+        );
 
-                final String string = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
-                final JsonBrowser json = JsonBrowser.parse(string);
-                final JsonBrowser detail = json.get("aweme_detail");
-
-                // video (always correct audio)
-                final JsonBrowser video = detail.get("video");
-                final JsonBrowser downloadAddr = video.get("download_addr");
-                final JsonBrowser videoUrl = downloadAddr.get("url_list").index(0);
-
-                // music, fallback (needs testing)
-                final JsonBrowser music = detail.get("music");
-                final JsonBrowser playUrl = music.get("play_url");
-                final JsonBrowser musicUrl = playUrl.get("url_list").index(0);
-
-                return Pair.of(
-                    videoUrl.text(),
-                    musicUrl.text()
-                );
-            }
-        }
+        return new Pair<>(
+            metdata.videoUrl,
+            metdata.musicUrl
+        );
     }
 
     /*protected MetaData extractFromJson(String url) throws IOException {
@@ -196,6 +168,11 @@ protected HttpInterface getHttpInterface() {
         return this.httpManager.getHttpInterface();
     }
 
+    @Override
+    public TikTokAudioSourceManager getSourceManager() {
+        return (TikTokAudioSourceManager) super.getSourceManager();
+    }
+
     @Override
     protected AudioTrack makeShallowClone() {
         return new TikTokAudioTrack(this.trackInfo, getSourceManager());

From b0d344f166523ebffc34d2c361758e5dab3ba285 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Wed, 17 May 2023 19:32:30 +0200
Subject: [PATCH 68/76] Allow .org for pornhub

Fixes #3
---
 .../sourcemanagers/pornhub/PornHubAudioSourceManager.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
index 0a12a9e..5908c57 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
@@ -39,7 +39,7 @@
 import java.util.regex.Pattern;
 
 public class PornHubAudioSourceManager extends AbstractDuncteBotHttpSource {
-    private static final String DOMAIN_PATTERN = "https?://([a-z]+\\.)?pornhub\\.(com|net)";
+    private static final String DOMAIN_PATTERN = "https?://([a-z]+\\.)?pornhub\\.(com|net|org)";
     public static final Pattern DOMAIN_REGEX = Pattern.compile(DOMAIN_PATTERN);
     private static final Pattern VIDEO_REGEX = Pattern.compile("^" + DOMAIN_PATTERN + "/view_video\\.php\\?viewkey=([a-zA-Z0-9]+)(?:.*)$");
     public static final Pattern VIDEO_INFO_REGEX = Pattern.compile("var flashvars_\\d+ = (\\{.+})");

From fee27d5606a356b90d5a7212cb4af4e18db22424 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Wed, 17 May 2023 20:41:51 +0200
Subject: [PATCH 69/76] Fix tiktok playback

---
 build.gradle.kts                                      |  2 +-
 src/main/java/com/dunctebot/sourcemanagers/Pair.java  |  8 ++++++++
 src/main/java/com/dunctebot/sourcemanagers/Utils.java |  2 +-
 .../tiktok/TikTokAudioSourceManager.java              | 11 +++++------
 .../sourcemanagers/tiktok/TikTokAudioTrack.java       |  4 ++++
 src/test/java/TikTokTesting.java                      |  6 +++++-
 6 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3119397..ac61c90 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.8.2"
+project.version = "1.8.3"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
diff --git a/src/main/java/com/dunctebot/sourcemanagers/Pair.java b/src/main/java/com/dunctebot/sourcemanagers/Pair.java
index 0a463d8..6228970 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/Pair.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/Pair.java
@@ -36,4 +36,12 @@ public R getRight() {
     public static <L, R> Pair<L, R> of(L left, R right) {
         return new Pair<>(left, right);
     }
+
+    @Override
+    public String toString() {
+        return "Pair{" +
+            "left=" + left +
+            ", right=" + right +
+            '}';
+    }
 }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/Utils.java b/src/main/java/com/dunctebot/sourcemanagers/Utils.java
index 2871c78..1e3c0d9 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/Utils.java
+++ b/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 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.99 Safari/537.36";
+    public static final String USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36";
 
     public static String urlDecode(String in) {
         return URLDecoder.decode(in, Charset.defaultCharset());
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
index 0cf943a..de75d41 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
@@ -46,7 +46,7 @@ public class TikTokAudioSourceManager extends AbstractDuncteBotHttpSource {
     private static final String VIDEO = "(?<video>[0-9]+)";
     protected static final Pattern VIDEO_REGEX = Pattern.compile("^" + BASE + "\\/" + USER + "\\/video\\/" + VIDEO + "(?:.*)$");
     private static final Pattern JS_REGEX = Pattern.compile(
-        "<script id=\"SIGI_STATE\" type=\"application/json\">(.*)<\\/script>");
+        "<script id=\"SIGI_STATE\" type=\"application/json\">([^<]+)<\\/script>");
     private static final Pattern SIGI_REGEX = Pattern.compile(
         "<script id=\"sigi-persisted-data\">(?:\n)?window\\[(?:'SIGI_STATE'|\"SIGI_STATE\")\\](?:\\s+)?=(?:\\s+)?(.*);(?:\\s+)?(?:.*)?<\\/script>");
 
@@ -95,6 +95,7 @@ public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) {
     }
 
     MetaData extractData(String userId, String videoId) throws Exception {
+        System.out.println("userId: " + userId + ", videoId: " + videoId);
         return extractData("https://www.tiktok.com/@" + userId + "/video/" + videoId);
     }
 
@@ -105,7 +106,6 @@ protected MetaData extractData(String url) throws Exception {
 
         try (final CloseableHttpResponse response = getHttpInterface().execute(httpGet)) {
             final int statusCode = response.getStatusLine().getStatusCode();
-
             if (statusCode != 200) {
                 if (statusCode == 302) { // most likely a 404
                     return null;
@@ -146,19 +146,18 @@ protected static MetaData getMetaData(String url, JsonBrowser base) {
         final JsonBrowser videoJson = base.get("video");
 
         metaData.pageUrl = url;
-        metaData.videoId = videoJson.get("id").safeText();
+        metaData.videoId = base.get("id").safeText();
         metaData.videoUrl = videoJson.get("downloadAddr").text();
         metaData.cover = videoJson.get("cover").safeText();
         metaData.title = base.get("desc").safeText();
 
         metaData.uri = videoJson.get("downloadAddr").safeText();
+//        metaData.uri = videoJson.get("playAddr").safeText();
         metaData.duration = Integer.parseInt(videoJson.get("duration").safeText());
 
         metaData.musicUrl = base.get("music").get("playUrl").text();
 
-        final JsonBrowser author = base.get("author");
-
-        metaData.uniqueId = author.get("uniqueId").safeText();
+        metaData.uniqueId = base.get("author").safeText();
 
         return metaData;
     }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
index 44cfed6..f536bb9 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
@@ -47,6 +47,10 @@ public TikTokAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource ma
         super(trackInfo, manager);
     }
 
+    public Pair<String, String> getUrlCache() {
+        return urlCache;
+    }
+
     @Override
     public String getPlaybackUrl() {
         try {
diff --git a/src/test/java/TikTokTesting.java b/src/test/java/TikTokTesting.java
index c24464c..fc6b827 100644
--- a/src/test/java/TikTokTesting.java
+++ b/src/test/java/TikTokTesting.java
@@ -21,11 +21,15 @@
 public class TikTokTesting {
     public static void main(String[] args) {
         final var mngr = new TikTokAudioSourceManager();
-        final var ref = new AudioReference("https://www.tiktok.com/@nataliya_xoxo_love/video/6923984361150745862", "aaaaa");
+//        final var ref = new AudioReference("https://www.tiktok.com/@nataliya_xoxo_love/video/6923984361150745862", "aaaaa");
+        final var ref = new AudioReference("https://www.tiktok.com/@kallmekris/video/7229737213712436486?lang=en", "aaaaa");
         final TikTokAudioTrack load = (TikTokAudioTrack) mngr.loadItem(null, ref);
 
         System.out.println(
             load.getPlaybackUrl()
         );
+
+        System.out.println("Url cache");
+        System.out.println(load.getUrlCache());
     }
 }

From 7b73be1c754f1caaeca8e1742b292fe1be95b08c Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 7 Jul 2023 18:38:06 +0200
Subject: [PATCH 70/76] Attempt to fix tiktok

---
 .github/workflows/01-build.yml                |  4 +--
 .github/workflows/02-publish.yml              |  3 +-
 .../dunctebot/sourcemanagers/Mp3Track.java    |  2 +-
 .../getyarn/GetyarnAudioTrack.java            |  2 +-
 .../ocremix/OCRemixAudioTrack.java            |  2 +-
 .../pornhub/PornHubAudioTrack.java            |  2 +-
 .../reddit/RedditAudioTrack.java              |  2 +-
 .../soundgasm/SoundGasmAudioTrack.java        |  2 +-
 .../tiktok/TikTokAudioSourceManager.java      |  4 +--
 .../tiktok/TikTokAudioTrackHttpManager.java   |  3 +-
 src/test/java/TTSTest.java                    | 31 +++++++++++++++++++
 11 files changed, 44 insertions(+), 13 deletions(-)
 create mode 100644 src/test/java/TTSTest.java

diff --git a/.github/workflows/01-build.yml b/.github/workflows/01-build.yml
index cd7d983..0cf1d6c 100644
--- a/.github/workflows/01-build.yml
+++ b/.github/workflows/01-build.yml
@@ -5,9 +5,9 @@ name: Build library
 
 on:
   push:
-    branches-ignore: [ master ]
+    branches-ignore: [ not-master ]
   pull_request:
-    branches-ignore: [ master ]
+    branches-ignore: [ not-master ]
 
 jobs:
   build:
diff --git a/.github/workflows/02-publish.yml b/.github/workflows/02-publish.yml
index 5ca0340..8e417dd 100644
--- a/.github/workflows/02-publish.yml
+++ b/.github/workflows/02-publish.yml
@@ -4,8 +4,7 @@
 name: Publish package
 
 on:
-  push:
-    branches: [ master ]
+  workflow_dispatch:  {}
 
 jobs:
   build:
diff --git a/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java b/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
index d62f8b4..705a832 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
@@ -67,7 +67,7 @@ protected long getTrackDuration() {
         return this.trackInfo.length;
     }
 
-    protected String getPlaybackUrl() {
+    public String getPlaybackUrl() {
         return this.trackInfo.identifier;
     }
 
diff --git a/src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioTrack.java
index e1dab2b..d823bbe 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioTrack.java
@@ -33,7 +33,7 @@ public AudioTrack makeShallowClone() {
     }
 
     @Override
-    protected String getPlaybackUrl() {
+    public String getPlaybackUrl() {
         return "https://y.yarn.co/" + this.trackInfo.identifier + ".mp4?v=0";
     }
 }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioTrack.java
index cb79019..2278975 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/ocremix/OCRemixAudioTrack.java
@@ -57,7 +57,7 @@ public void process(LocalAudioTrackExecutor executor) throws Exception {
     }
 
     @Override
-    protected String getPlaybackUrl() {
+    public String getPlaybackUrl() {
         return "https://" + MUSIC_HOSTS[this.hostIndex] + this.trackInfo.uri;
     }
 }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
index 0557a33..a08fdb6 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioTrack.java
@@ -46,7 +46,7 @@ public PornHubAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource s
     }
 
     @Override
-    protected String getPlaybackUrl() {
+    public String getPlaybackUrl() {
         try {
             return loadFromMediaInfo();
         } catch (IOException e) {
diff --git a/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioTrack.java
index db6a98c..f26bb1d 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/reddit/RedditAudioTrack.java
@@ -28,7 +28,7 @@ public RedditAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource ma
     }
 
     @Override
-    protected String getPlaybackUrl() {
+    public String getPlaybackUrl() {
         return getPlaybackUrl(this.trackInfo.identifier);
     }
 
diff --git a/src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioTrack.java
index f537cb7..1d00c70 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/soundgasm/SoundGasmAudioTrack.java
@@ -33,7 +33,7 @@ protected long getTrackDuration() {
     }
 
     @Override
-    protected String getPlaybackUrl() {
+    public String getPlaybackUrl() {
         return "https://media.soundgasm.net/sounds/" + this.trackInfo.identifier + ".m4a";
     }
 
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
index de75d41..0c0a257 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
@@ -151,8 +151,8 @@ protected static MetaData getMetaData(String url, JsonBrowser base) {
         metaData.cover = videoJson.get("cover").safeText();
         metaData.title = base.get("desc").safeText();
 
-        metaData.uri = videoJson.get("downloadAddr").safeText();
-//        metaData.uri = videoJson.get("playAddr").safeText();
+//        metaData.uri = videoJson.get("downloadAddr").safeText();
+        metaData.uri = videoJson.get("playAddr").safeText();
         metaData.duration = Integer.parseInt(videoJson.get("duration").safeText());
 
         metaData.musicUrl = base.get("music").get("playUrl").text();
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
index 0a7b8c1..68643d7 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
@@ -33,6 +33,7 @@
 import org.apache.http.cookie.MalformedCookieException;
 import org.apache.http.impl.client.BasicCookieStore;
 import org.apache.http.impl.cookie.BrowserCompatSpec;
+import org.apache.http.impl.cookie.DefaultCookieSpec;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -45,7 +46,7 @@ public class TikTokAudioTrackHttpManager implements AutoCloseable {
     private String cookie = null;
 
     protected final HttpInterfaceManager httpInterfaceManager;
-    private final CookieSpec cookieSpec = new BrowserCompatSpec(); // DefaultCookieSpec does not parse
+    private final CookieSpec cookieSpec = new DefaultCookieSpec(); // DefaultCookieSpec does not parse (was BrowserCompatSpec)
     private final CookieStore cookieStore = new BasicCookieStore();
 
     public TikTokAudioTrackHttpManager() {
diff --git a/src/test/java/TTSTest.java b/src/test/java/TTSTest.java
new file mode 100644
index 0000000..cd70987
--- /dev/null
+++ b/src/test/java/TTSTest.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2023 Duncan "duncte123" Sterken
+ *
+ *    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.
+ */
+
+import com.dunctebot.sourcemanagers.IdentifiedAudioReference;
+import com.dunctebot.sourcemanagers.speech.SpeechAudioSourceManager;
+import com.sedmelluq.discord.lavaplayer.track.AudioReference;
+
+public class TTSTest {
+    public static void main(String[] args) {
+        final var mngr = new SpeechAudioSourceManager("en-US");
+        final var ref = new AudioReference("speak:I like trains", "aaaaa");
+        final IdentifiedAudioReference load = (IdentifiedAudioReference) mngr.loadItem(null, ref);
+
+        System.out.println(
+            load.identifier
+        );
+    }
+}

From d5bfdac8dd16f48bcb46666f6043e63334401184 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 7 Jul 2023 20:23:04 +0200
Subject: [PATCH 71/76] Some improvements

---
 .../clypit/ClypitAudioSourceManager.java              |  5 ++++-
 .../speech/SpeechAudioSourceManager.java              | 11 +++++++++--
 .../sourcemanagers/speech/SpeechAudioTrack.java       |  6 +++++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/dunctebot/sourcemanagers/clypit/ClypitAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/clypit/ClypitAudioSourceManager.java
index ea6eb5d..6ecf556 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/clypit/ClypitAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/clypit/ClypitAudioSourceManager.java
@@ -26,6 +26,7 @@
 import com.sedmelluq.discord.lavaplayer.track.AudioReference;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
+import com.sedmelluq.discord.lavaplayer.track.info.AudioTrackInfoBuilder;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -62,11 +63,13 @@ public AudioItem loadItem(AudioPlayerManager manager, AudioReference reference)
                 return AudioReference.NO_TRACK;
             }
 
-            return new IdentifiedAudioReference(
+            final IdentifiedAudioReference ref = new IdentifiedAudioReference(
                 json.get("Mp3Url").safeText(),
                 reference.identifier,
                 json.get("Title").safeText()
             );
+
+            return new ClypitAudioTrack(AudioTrackInfoBuilder.create(ref, null).build(), this);
         }
         catch (Exception e) {
             throw ExceptionTools.wrapUnfriendlyExceptions("Something went wrong", FriendlyException.Severity.SUSPICIOUS, e);
diff --git a/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioSourceManager.java
index 399cd40..510f8d3 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioSourceManager.java
@@ -17,8 +17,8 @@
 package com.dunctebot.sourcemanagers.speech;
 
 import com.dunctebot.sourcemanagers.AbstractDuncteBotHttpSource;
-import com.dunctebot.sourcemanagers.IdentifiedAudioReference;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
+import com.sedmelluq.discord.lavaplayer.tools.Units;
 import com.sedmelluq.discord.lavaplayer.track.AudioItem;
 import com.sedmelluq.discord.lavaplayer.track.AudioReference;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
@@ -75,7 +75,14 @@ public AudioItem loadItem(AudioPlayerManager manager, AudioReference reference)
             .replace("%query%", encoded);
 
         // Redirect to somewhere else
-        return new IdentifiedAudioReference(mp3URL, reference.identifier, "Speaking " + data);
+        return new SpeechAudioTrack(new AudioTrackInfo(
+            "Speaking " + data,
+            "TTS B0t",
+            Units.CONTENT_LENGTH_UNKNOWN,
+            reference.identifier,
+            false,
+            mp3URL
+        ), this);
     }
 
     @Override
diff --git a/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioTrack.java
index f4726e0..c44f3d9 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/speech/SpeechAudioTrack.java
@@ -22,11 +22,15 @@
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 
 public class SpeechAudioTrack extends Mp3Track {
-
     SpeechAudioTrack(AudioTrackInfo trackInfo, AbstractDuncteBotHttpSource manager) {
         super(trackInfo, manager);
     }
 
+    @Override
+    public String getPlaybackUrl() {
+        return this.trackInfo.uri;
+    }
+
     @Override
     public AudioTrack makeShallowClone() {
         return new SpeechAudioTrack(trackInfo, getSourceManager());

From 5883366ec2d3173064392d419354e25b40388651 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sat, 8 Jul 2023 20:27:11 +0200
Subject: [PATCH 72/76] Tiktok hates me, fuck this source manager

---
 build.gradle.kts                              |  2 +-
 .../tiktok/TikTokAudioSourceManager.java      |  7 ++++++
 .../tiktok/TikTokAudioTrack.java              | 22 +++++++++++--------
 .../tiktok/TikTokAudioTrackHttpManager.java   |  2 +-
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index ac61c90..3df518f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -41,7 +41,7 @@ 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.3.99.1")
+    compileOnly(group = "com.github.walkyst", name = "lavaplayer-fork", version = "1.4.2")
 
     implementation("commons-io:commons-io:2.6")
     implementation(group = "org.jsoup", name = "jsoup", version = "1.12.1")
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
index 0c0a257..26647a7 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioSourceManager.java
@@ -23,6 +23,7 @@
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity;
 import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
+import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
 import com.sedmelluq.discord.lavaplayer.track.AudioItem;
 import com.sedmelluq.discord.lavaplayer.track.AudioReference;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
@@ -41,6 +42,7 @@
 import static com.dunctebot.sourcemanagers.Utils.fakeChrome;
 
 public class TikTokAudioSourceManager extends AbstractDuncteBotHttpSource {
+    private final TikTokAudioTrackHttpManager httpManager = new TikTokAudioTrackHttpManager();
     private static final String BASE = "https:\\/\\/(?:www\\.|m\\.)?tiktok\\.com";
     private static final String USER = "@(?<user>[^/]+)";
     private static final String VIDEO = "(?<video>[0-9]+)";
@@ -99,6 +101,11 @@ MetaData extractData(String userId, String videoId) throws Exception {
         return extractData("https://www.tiktok.com/@" + userId + "/video/" + videoId);
     }
 
+    @Override
+    public HttpInterface getHttpInterface() {
+        return httpManager.getHttpInterface();
+    }
+
     protected MetaData extractData(String url) throws Exception {
         final HttpGet httpGet = new HttpGet(url);
 
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
index f536bb9..41b54a9 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
@@ -22,7 +22,9 @@
 import com.sedmelluq.discord.lavaplayer.container.mp3.Mp3AudioTrack;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
+import com.sedmelluq.discord.lavaplayer.tools.Units;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
+import com.sedmelluq.discord.lavaplayer.tools.io.PersistentHttpStream;
 import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
@@ -32,14 +34,17 @@
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 
+import java.io.File;
 import java.io.IOException;
+import java.net.URI;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 
 import static com.dunctebot.sourcemanagers.Utils.fakeChrome;
 import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
 
 public class TikTokAudioTrack extends MpegTrack {
-    private final TikTokAudioTrackHttpManager httpManager = new TikTokAudioTrackHttpManager();
     private Pair<String, String> urlCache = null;
     private boolean failedOnce = false;
 
@@ -70,14 +75,12 @@ public String getPlaybackUrl() {
 
     @Override
     public void process(LocalAudioTrackExecutor executor) throws Exception {
-        this.httpManager.loadCookies();
-
         try (HttpInterface httpInterface = this.getHttpInterface()) {
             loadStream(executor, httpInterface);
         }
     }
 
-    @Override
+    /*@Override
     protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface httpInterface) throws Exception {
         try {
             super.loadStream(localExecutor, httpInterface);
@@ -89,14 +92,15 @@ protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface h
             this.failedOnce = true;
             super.loadStream(localExecutor, httpInterface);
         }
-    }
+    }*/
 
-    /*@Override
+    // TODO: load the track url THROUGH the HTTP interface, see if that works
+    @Override
     protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface httpInterface) throws Exception {
         final String trackUrl = getPlaybackUrl();
         log.debug("Starting {} track from URL: {}", getSourceManager().getSourceName(), trackUrl);
         // Setting contentLength (last param) to null makes it default to Long.MAX_VALUE
-        try (final PersistentHttpStream stream = new PersistentHttpStream(httpInterface, new URI(trackUrl), this.getTrackDuration())) {
+        try (final PersistentHttpStream stream = new PersistentHttpStream(httpInterface, new URI(trackUrl), Units.CONTENT_LENGTH_UNKNOWN)) {
             // dump the stream
             Files.copy(
                 stream,
@@ -106,7 +110,7 @@ protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface h
 
             processDelegate(createAudioTrack(this.trackInfo, stream), localExecutor);
         }
-    }*/
+    }
 
     protected Pair<String, String> loadPlaybackUrl() throws Exception {
 
@@ -169,7 +173,7 @@ protected InternalAudioTrack createAudioTrack(AudioTrackInfo trackInfo, Seekable
 
     @Override
     protected HttpInterface getHttpInterface() {
-        return this.httpManager.getHttpInterface();
+        return this.getSourceManager().getHttpInterface();
     }
 
     @Override
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
index 68643d7..7404d10 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
@@ -46,7 +46,7 @@ public class TikTokAudioTrackHttpManager implements AutoCloseable {
     private String cookie = null;
 
     protected final HttpInterfaceManager httpInterfaceManager;
-    private final CookieSpec cookieSpec = new DefaultCookieSpec(); // DefaultCookieSpec does not parse (was BrowserCompatSpec)
+    private final CookieSpec cookieSpec = new BrowserCompatSpec(); // DefaultCookieSpec does not parse (was BrowserCompatSpec)
     private final CookieStore cookieStore = new BasicCookieStore();
 
     public TikTokAudioTrackHttpManager() {

From bfe630a302d993c0cd2389b37c7e89732e7e9414 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 9 Jul 2023 11:12:25 +0200
Subject: [PATCH 73/76] Potentially fix tiktok playback

---
 build.gradle.kts                              |  2 +-
 .../dunctebot/sourcemanagers/Mp3Track.java    |  4 ++
 .../com/dunctebot/sourcemanagers/Utils.java   | 23 +++++--
 .../tiktok/TikTokAudioTrack.java              | 67 +++----------------
 .../tiktok/TikTokAudioTrackHttpManager.java   | 29 ++------
 5 files changed, 38 insertions(+), 87 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3df518f..ad4125e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.8.3"
+project.version = "1.8.4"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
diff --git a/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java b/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
index 705a832..65c4636 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
@@ -63,6 +63,10 @@ protected InternalAudioTrack createAudioTrack(AudioTrackInfo trackInfo, Seekable
         return new Mp3AudioTrack(trackInfo, stream);
     }
 
+    /**
+     * A special helper to determine the length of the file in milliseconds.
+     * @return The clip length in milliseconds, for some sources this needs to be set to unknown for them to properly work.
+     */
     protected long getTrackDuration() {
         return this.trackInfo.length;
     }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/Utils.java b/src/main/java/com/dunctebot/sourcemanagers/Utils.java
index 1e3c0d9..496ca23 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/Utils.java
+++ b/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; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36";
+    public static final String USER_AGENT = "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/114.0";
 
     public static String urlDecode(String in) {
         return URLDecoder.decode(in, Charset.defaultCharset());
@@ -57,18 +57,27 @@ public static boolean isURL(String url) {
     }
 
     public static void fakeChrome(HttpRequest request) {
+        fakeChrome(request, false);
+    }
+
+    public static void fakeChrome(HttpRequest request, boolean isVideo) {
         request.setHeader("Connection", "keep-alive");
         request.setHeader("DNT", "1");
         request.setHeader("Upgrade-Insecure-Requests", "1");
-        request.setHeader("Accept", "*/*");
+        request.setHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,video/mp4,image/avif,image/webp,*/*;q=0.8");
 //        request.setHeader("Accept-Encoding", "gzip, deflate, br");
         request.setHeader("Accept-Encoding", "none");
+        request.setHeader("TE", "trailers");
         request.setHeader("Accept-Language", "en-US,en;q=0.9");
-        request.setHeader("Sec-Ch-Ua", "\" Not;A Brand\";v=\"99\", \"Google Chrome\";v=\"97\", \"Chromium\";v=\"97\"");
-        request.setHeader("Sec-Ch-Ua-Mobile", "?0");
-        request.setHeader("Sec-Fetch-Dest", "document");
-        request.setHeader("Sec-Fetch-Mode", "no-cors");
-        request.setHeader("Sec-Fetch-Site", "cross-site");
+
+        if (isVideo) {
+            request.setHeader("Sec-Fetch-Dest", "empty");
+        } else {
+            request.setHeader("Sec-Fetch-Dest", "document");
+        }
+
+        request.setHeader("Sec-Fetch-Mode", "cors");
+        request.setHeader("Sec-Fetch-Site", "same-site");
         request.setHeader("User-Agent", USER_AGENT);
     }
 
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
index 41b54a9..1ecd854 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrack.java
@@ -21,27 +21,14 @@
 import com.dunctebot.sourcemanagers.Pair;
 import com.sedmelluq.discord.lavaplayer.container.mp3.Mp3AudioTrack;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
 import com.sedmelluq.discord.lavaplayer.tools.Units;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.PersistentHttpStream;
 import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 import com.sedmelluq.discord.lavaplayer.track.InternalAudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
-
-import static com.dunctebot.sourcemanagers.Utils.fakeChrome;
+
 import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
 
 public class TikTokAudioTrack extends MpegTrack {
@@ -80,7 +67,7 @@ public void process(LocalAudioTrackExecutor executor) throws Exception {
         }
     }
 
-    /*@Override
+    @Override
     protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface httpInterface) throws Exception {
         try {
             super.loadStream(localExecutor, httpInterface);
@@ -92,10 +79,9 @@ protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface h
             this.failedOnce = true;
             super.loadStream(localExecutor, httpInterface);
         }
-    }*/
+    }
 
-    // TODO: load the track url THROUGH the HTTP interface, see if that works
-    @Override
+    /*@Override
     protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface httpInterface) throws Exception {
         final String trackUrl = getPlaybackUrl();
         log.debug("Starting {} track from URL: {}", getSourceManager().getSourceName(), trackUrl);
@@ -110,10 +96,9 @@ protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface h
 
             processDelegate(createAudioTrack(this.trackInfo, stream), localExecutor);
         }
-    }
+    }*/
 
     protected Pair<String, String> loadPlaybackUrl() throws Exception {
-
         final TikTokAudioSourceManager.MetaData metdata = this.getSourceManager().extractData(
             this.trackInfo.author,
             this.trackInfo.identifier
@@ -125,43 +110,6 @@ protected Pair<String, String> loadPlaybackUrl() throws Exception {
         );
     }
 
-    /*protected MetaData extractFromJson(String url) throws IOException {
-        final Matcher matcher = VIDEO_REGEX.matcher(url);
-
-        if (!matcher.matches()) {
-            throw new IOException("Url does not match tiktok anymore? wtf");
-        }
-
-        final String user = matcher.group("user");
-        final String video = matcher.group("video");
-
-        final HttpGet httpGet = new HttpGet(
-            "https://www.tiktok.com/node/share/video/@" + user + '/' + video
-        );
-
-        fakeChrome(httpGet);
-
-        try (final HttpInterface httpInterface = this.httpManager.getHttpInterface()) {
-            try (final CloseableHttpResponse response = httpInterface.execute(httpGet)) {
-                final int statusCode = response.getStatusLine().getStatusCode();
-
-                if (statusCode != 200) {
-                    if (statusCode == 302) { // most likely a 404
-                        return null;
-                    }
-
-                    throw new IOException("Unexpected status code for video page response: " + statusCode);
-                }
-
-                final String string = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
-                final JsonBrowser json = JsonBrowser.parse(string);
-                final JsonBrowser base = json.get("itemInfo").get("itemStruct");
-
-                return getMetaData(url, base);
-            }
-        }
-    }*/
-
     @Override
     protected InternalAudioTrack createAudioTrack(AudioTrackInfo trackInfo, SeekableInputStream stream) {
         if (this.failedOnce && this.urlCache.getRight().contains(".mp3")) {
@@ -171,6 +119,11 @@ protected InternalAudioTrack createAudioTrack(AudioTrackInfo trackInfo, Seekable
         return super.createAudioTrack(trackInfo, stream);
     }
 
+    @Override
+    protected long getTrackDuration() {
+        return Units.CONTENT_LENGTH_UNKNOWN;
+    }
+
     @Override
     protected HttpInterface getHttpInterface() {
         return this.getSourceManager().getHttpInterface();
diff --git a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
index 7404d10..601d654 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/tiktok/TikTokAudioTrackHttpManager.java
@@ -20,33 +20,21 @@
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
-import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.CookieStore;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.cookie.CookieOrigin;
-import org.apache.http.cookie.CookieSpec;
-import org.apache.http.cookie.MalformedCookieException;
 import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.cookie.BrowserCompatSpec;
-import org.apache.http.impl.cookie.DefaultCookieSpec;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.stream.Collectors;
 
 import static com.dunctebot.sourcemanagers.Utils.fakeChrome;
 
 public class TikTokAudioTrackHttpManager implements AutoCloseable {
-    private String cookie = null;
+//    private String cookie = null;
 
     protected final HttpInterfaceManager httpInterfaceManager;
-    private final CookieSpec cookieSpec = new BrowserCompatSpec(); // DefaultCookieSpec does not parse (was BrowserCompatSpec)
+//    private final CookieSpec cookieSpec = new BrowserCompatSpec(); // DefaultCookieSpec does not parse (was BrowserCompatSpec)
     private final CookieStore cookieStore = new BasicCookieStore();
 
     public TikTokAudioTrackHttpManager() {
@@ -63,7 +51,7 @@ public HttpInterface getHttpInterface() {
         return httpInterfaceManager.getInterface();
     }
 
-    protected void loadCookies() throws IOException, MalformedCookieException {
+    /*protected void loadCookies() throws IOException, MalformedCookieException {
         try (final HttpInterface httpInterface = httpInterfaceManager.getInterface()) {
             final HttpGet httpGet = new HttpGet("https://www.tiktok.com/");
 
@@ -81,7 +69,7 @@ protected void loadCookies() throws IOException, MalformedCookieException {
                     .collect(Collectors.joining("; "));
             }
         }
-    }
+    }*/
 
     @Override
     public void close() throws Exception {
@@ -102,19 +90,16 @@ public void onContextClose(HttpClientContext context) {
         @Override
         public void onRequest(HttpClientContext context, HttpUriRequest request, boolean isRepetition) {
             // set standard headers
-            fakeChrome(request);
+            final boolean isVideo = request.getURI().getPath().contains("video");
+            fakeChrome(request, isVideo);
 
-            // TODO: set these cookies instead?
             final String testCookie = context.getCookieStore()
                 .getCookies()
                 .stream()
                 .map((c) -> c.getName() + '=' + c.getValue())
                 .collect(Collectors.joining("; "));
 
-            if (cookie != null) {
-                request.setHeader("cookie", cookie);
-            }
-
+            request.setHeader("Cookie", testCookie);
             request.setHeader("Referer", "https://www.tiktok.com/");
         }
 

From 5117ccb1da4aa53943de8d38332cd1d597716c2e Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Wed, 22 Nov 2023 17:10:07 +0100
Subject: [PATCH 74/76] Fix mixcloud playback

Fixes https://github.com/DuncteBot/skybot-lavalink-plugin/issues/24
---
 build.gradle.kts                              |   8 +-
 .../mixcloud/MixcloudAudioSourceManager.java  |  89 +++-
 .../mixcloud/MixcloudAudioTrack.java          |   6 +
 .../mixcloud/MixcloudLookup.java              |  43 ++
 src/test/java/MixcloudTest.java               |  16 +-
 src/test/resources/mixcloud.graphql           | 381 ++++++++++++++++++
 src/test/resources/mixcloud_condensed.graphql |  44 ++
 .../resources/mixcloud_references.graphql     |   4 +
 8 files changed, 566 insertions(+), 25 deletions(-)
 create mode 100644 src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudLookup.java
 create mode 100644 src/test/resources/mixcloud.graphql
 create mode 100644 src/test/resources/mixcloud_condensed.graphql
 create mode 100644 src/test/resources/mixcloud_references.graphql

diff --git a/build.gradle.kts b/build.gradle.kts
index ad4125e..745b9d9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.8.4"
+project.version = "1.8.5"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
@@ -43,11 +43,11 @@ dependencies {
 //    implementation(group = "com.github.duncte123", name = "lavaplayer", version = "be6e364")
     compileOnly(group = "com.github.walkyst", name = "lavaplayer-fork", version = "1.4.2")
 
-    implementation("commons-io:commons-io:2.6")
-    implementation(group = "org.jsoup", name = "jsoup", version = "1.12.1")
+    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.3.99.1")
+    testImplementation(group = "com.github.walkyst", name = "lavaplayer-fork", version = "1.4.2")
 }
 
 configure<JavaPluginExtension> {
diff --git a/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioSourceManager.java
index ead74f8..5f1e72e 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioSourceManager.java
@@ -29,6 +29,9 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -41,16 +44,50 @@
 import static com.dunctebot.sourcemanagers.Utils.urlEncode;
 
 public class MixcloudAudioSourceManager extends AbstractDuncteBotHttpSource {
-    private static final String REQUEST_STRUCTURE = "audioLength\n" +
-        "    name\n" +
+    private static final String GRAPHQL_AUDIO_REQUEST = "query PlayerHeroQuery(\n" +
+        "    $lookup: CloudcastLookup!\n" +
+        ") {\n" +
+        "    cloudcast: cloudcastLookup(lookup: $lookup) {\n" +
+        "        id\n" +
+        "        name\n" +
+        "        owner {\n" +
+        "            ...AudioPageAvatar_user\n" +
+        "            id\n" +
+        "        }\n" +
+        "        restrictedReason\n" +
+        "        seekRestriction\n" +
+        "        ...PlayButton_cloudcast\n" +
+        "    }\n" +
+        "}\n" +
+        "\n" +
+        "fragment AudioPageAvatar_user on User {\n" +
+        "    displayName\n" +
+        "    username\n" +
+        "}\n" +
+        "\n" +
+        "fragment PlayButton_cloudcast on Cloudcast {\n" +
+        "    restrictedReason\n" +
         "    owner {\n" +
-        "      username\n" +
+        "        displayName\n" +
+        "        country\n" +
+        "        username\n" +
+        "        isSubscribedTo\n" +
+        "        isViewer\n" +
+        "        id\n" +
         "    }\n" +
+        "    slug\n" +
+        "    id\n" +
+        "    isDraft\n" +
+        "    isPlayable\n" +
         "    streamInfo {\n" +
-        "      dashUrl\n" +
-        "      hlsUrl\n" +
-        "      url\n" +
-        "    }";
+        "        hlsUrl\n" +
+        "        dashUrl\n" +
+        "        url\n" +
+        "        uuid\n" +
+        "    }\n" +
+        "    audioLength\n" +
+        "    seekRestriction\n" +
+        "}\n";
     private static final Pattern URL_REGEX = Pattern.compile("https?://(?:(?:www|beta|m)\\.)?mixcloud\\.com/([^/]+)/(?!stream|uploads|favorites|listens|playlists)([^/]+)/?");
 
     @Override
@@ -89,6 +126,16 @@ private AudioItem loadItemOnce(AudioReference reference, Matcher matcher) throws
             return AudioReference.NO_TRACK;
         }
 
+        final JsonBrowser restrictedReason = trackInfo.get("restrictedReason");
+
+        if (!restrictedReason.isNull()) {
+            throw new FriendlyException(
+                "Playback of this track is restricted.",
+                FriendlyException.Severity.COMMON,
+                new Exception(restrictedReason.text())
+            );
+        }
+
         final String title = trackInfo.get("name").text();
         final long duration = trackInfo.get("audioLength").as(Long.class) * 1000;
         final String uploader = trackInfo.get("owner").get("username").text(); // displayName
@@ -107,17 +154,23 @@ private AudioItem loadItemOnce(AudioReference reference, Matcher matcher) throws
     }
 
     protected JsonBrowser extractTrackInfoGraphQl(String username, String slug) throws IOException {
-        final String slugFormatted = slug == null ? "" : String.format(", slug: \"%s\"", slug);
-        final String query = String.format(
-            "{\n  cloudcastLookup(lookup: {username: \"%s\"%s}) {\n    %s\n  }\n}",
-            username,
-            slugFormatted,
-            REQUEST_STRUCTURE
-        );
-        final String encodedQuery = urlEncode(query);
-        final HttpGet httpGet = new HttpGet("https://www.mixcloud.com/graphql?query=" + encodedQuery);
+        final var body = JsonBrowser.newMap();
+
+        body.put("query", GRAPHQL_AUDIO_REQUEST);
+
+        final var variables = JsonBrowser.newMap();
+
+        variables.put("lookup", new MixcloudLookup(
+            slug, username
+        ));
+
+        body.put("variables", variables);
+
+        final HttpPost httpPost = new HttpPost("https://app.mixcloud.com/graphql");
+
+        httpPost.setEntity(new StringEntity(body.text(), ContentType.APPLICATION_JSON));
 
-        try (final CloseableHttpResponse res = getHttpInterface().execute(httpGet)) {
+        try (final CloseableHttpResponse res = getHttpInterface().execute(httpPost)) {
             final int statusCode = res.getStatusLine().getStatusCode();
 
             if (statusCode != 200) {
@@ -129,7 +182,7 @@ protected JsonBrowser extractTrackInfoGraphQl(String username, String slug) thro
             }
 
             final String content = IOUtils.toString(res.getEntity().getContent(), StandardCharsets.UTF_8);
-            final JsonBrowser json = JsonBrowser.parse(content).get("data").get("cloudcastLookup");
+            final JsonBrowser json = JsonBrowser.parse(content).get("data").get("cloudcast");
 
             if (json.get("streamInfo").isNull()) {
                 return null;
diff --git a/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java
index 582c87d..9383983 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioTrack.java
@@ -21,6 +21,7 @@
 import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.tools.Units;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 
 import java.io.IOException;
@@ -62,6 +63,11 @@ public String getPlaybackUrl() {
         }
     }
 
+    @Override
+    protected AudioTrack makeShallowClone() {
+        return new MixcloudAudioTrack(trackInfo, getSourceManager());
+    }
+
     @Override
     public MixcloudAudioSourceManager getSourceManager() {
         return (MixcloudAudioSourceManager) super.getSourceManager();
diff --git a/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudLookup.java b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudLookup.java
new file mode 100644
index 0000000..4485af7
--- /dev/null
+++ b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudLookup.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2023 Duncan "duncte123" Sterken
+ *
+ *    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.dunctebot.sourcemanagers.mixcloud;
+
+public class MixcloudLookup {
+    private String slug;
+    private String username;
+
+    public MixcloudLookup(String slug, String username) {
+        this.slug = slug;
+        this.username = username;
+    }
+
+    public String getSlug() {
+        return slug;
+    }
+
+    public void setSlug(String slug) {
+        this.slug = slug;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}
diff --git a/src/test/java/MixcloudTest.java b/src/test/java/MixcloudTest.java
index 0643e69..28580b8 100644
--- a/src/test/java/MixcloudTest.java
+++ b/src/test/java/MixcloudTest.java
@@ -16,14 +16,24 @@
 
 import com.dunctebot.sourcemanagers.mixcloud.MixcloudAudioSourceManager;
 import com.dunctebot.sourcemanagers.mixcloud.MixcloudAudioTrack;
+import com.sedmelluq.discord.lavaplayer.track.AudioItem;
 import com.sedmelluq.discord.lavaplayer.track.AudioReference;
 
 public class MixcloudTest {
     public static void main(String[] args) {
-        final var url = "https://www.mixcloud.com/jordy-boesten2/the-egotripper-lets-walk-to-my-house-mix-259/";
+//        System.out.println(MixcloudAudioSourceManager.GRAPHQL_AUDIO_REQUEST);
+
+//        final var url = "https://www.mixcloud.com/jordy-boesten2/the-egotripper-lets-walk-to-my-house-mix-259/";
+        final var url = "https://www.mixcloud.com/Hirockn/the-100-best-tracks-2020-hip-hop-rb-pops-etc-the-weeknd-dababy-dua-lipa-juice-wrld-etc/";
         final var mnrg = new MixcloudAudioSourceManager();
-        final var track = (MixcloudAudioTrack) mnrg.loadItem(null, new AudioReference(url, null));
-        final var playbackUrl = track.getPlaybackUrl();
+        final AudioItem track = mnrg.loadItem(null, new AudioReference(url, null));
+
+        if (track.equals(AudioReference.NO_TRACK)) {
+            return;
+        }
+
+        final var mixcloudTrack = (MixcloudAudioTrack) track;
+        final var playbackUrl = mixcloudTrack.getPlaybackUrl();
 
         System.out.println(playbackUrl);
     }
diff --git a/src/test/resources/mixcloud.graphql b/src/test/resources/mixcloud.graphql
new file mode 100644
index 0000000..dede46b
--- /dev/null
+++ b/src/test/resources/mixcloud.graphql
@@ -0,0 +1,381 @@
+query PlayerHeroQuery(
+    $lookup: CloudcastLookup!
+) {
+    cloudcast: cloudcastLookup(lookup: $lookup) {
+        id
+        name
+        picture {
+            isLight
+            primaryColor
+            darkPrimaryColor: primaryColor(darken: 60)
+            ...UGCImage_picture
+        }
+        ...AudioPageAvatar_cloudcast
+        owner {
+            ...AudioPageAvatar_user
+            id
+        }
+        restrictedReason
+        seekRestriction
+        ...HeaderActions_cloudcast
+        ...PlayButton_cloudcast
+        ...CloudcastBaseAutoPlayComponent_cloudcast
+        ...HeroWaveform_cloudcast
+        ...RepeatPlayUpsellBar_cloudcast
+        ...HeroAudioMeta_cloudcast
+        ...HeroChips_cloudcast
+    }
+    viewer {
+        restrictedPlayer: featureIsActive(switch: "restricted_player")
+        hasRepeatPlayFeature: featureIsActive(switch: "repeat_play")
+        ...HeroWaveform_viewer
+        ...HeroAudioMeta_viewer
+        ...HeaderActions_viewer
+        ...AudioPageAvatar_viewer
+        id
+    }
+}
+
+fragment AddToButton_cloudcast on Cloudcast {
+    id
+    isUnlisted
+    isPublic
+}
+
+fragment AudioPageAvatar_cloudcast on Cloudcast {
+    id
+    owner {
+        id
+    }
+    creatorAttributions(first: 2) {
+        totalCount
+        edges {
+            node {
+                displayName
+                followers {
+                    totalCount
+                }
+                hasPremiumFeatures
+                hasProFeatures
+                isStaff
+                username
+                picture {
+                    primaryColor
+                    urlRoot
+                }
+                id
+            }
+        }
+    }
+}
+
+fragment AudioPageAvatar_user on User {
+    displayName
+    followers {
+        totalCount
+    }
+    hasPremiumFeatures
+    hasProFeatures
+    isStaff
+    username
+    picture {
+        primaryColor
+        urlRoot
+    }
+    ...CTAButtons_user
+}
+
+fragment AudioPageAvatar_viewer on Viewer {
+    ...CTAButtons_viewer
+}
+
+fragment CTAButtons_user on User {
+    isSelect
+    ...ChannelSubscribeButton_user
+    ...ProfileFollowButton_user
+}
+
+fragment CTAButtons_viewer on Viewer {
+    ...ChannelSubscribeButton_viewer
+    ...ProfileFollowButton_viewer
+}
+
+fragment ChannelSubscribeButton_user on User {
+    username
+    displayName
+    isSelect
+    isViewer
+    isTippable
+    isSubscribedTo
+    isFollowing
+    selectUpsell {
+        valuePropsOffered
+        planInfo {
+            displayAmount
+        }
+    }
+}
+
+fragment ChannelSubscribeButton_viewer on Viewer {
+    me {
+        hasProFeatures
+        id
+    }
+}
+
+fragment CloudcastBaseAutoPlayComponent_cloudcast on Cloudcast {
+    id
+    streamInfo {
+        uuid
+        url
+        hlsUrl
+        dashUrl
+    }
+    audioLength
+    seekRestriction
+    currentPosition
+}
+
+fragment FavoriteButton_cloudcast on Cloudcast {
+    id
+    isFavorited
+    isPublic
+    hiddenStats
+    favorites {
+        totalCount
+    }
+    slug
+    owner {
+        id
+        isFollowing
+        username
+        isSelect
+        displayName
+        isViewer
+    }
+}
+
+fragment FavoriteButton_viewer on Viewer {
+    me {
+        id
+    }
+}
+
+fragment HeaderActions_cloudcast on Cloudcast {
+    owner {
+        isViewer
+        id
+    }
+    ...FavoriteButton_cloudcast
+    ...AddToButton_cloudcast
+    ...RepostButton_cloudcast
+    ...MoreMenu_cloudcast
+    ...ShareButton_cloudcast
+}
+
+fragment HeaderActions_viewer on Viewer {
+    ...FavoriteButton_viewer
+    ...RepostButton_viewer
+    ...MoreMenu_viewer
+}
+
+fragment HeroAudioMeta_cloudcast on Cloudcast {
+    slug
+    plays
+    publishDate
+    qualityScore
+    listenerMinutes
+    owner {
+        username
+        id
+    }
+    hiddenStats
+}
+
+fragment HeroAudioMeta_viewer on Viewer {
+    me {
+        isStaff
+        id
+    }
+}
+
+fragment HeroChips_cloudcast on Cloudcast {
+    isUnlisted
+    audioType
+    isExclusive
+    audioQuality
+    owner {
+        isViewer
+        id
+    }
+    restrictedReason
+    isAwaitingAudio
+    isDisabledCopyright
+}
+
+fragment HeroWaveform_cloudcast on Cloudcast {
+    id
+    audioType
+    waveformUrl
+    previewUrl
+    audioLength
+    isPlayable
+    streamInfo {
+        hlsUrl
+        dashUrl
+        url
+        uuid
+    }
+    restrictedReason
+    seekRestriction
+    currentPosition
+    ...SeekWarning_cloudcast
+}
+
+fragment HeroWaveform_viewer on Viewer {
+    restrictedPlayer: featureIsActive(switch: "restricted_player")
+}
+
+fragment MoreMenu_cloudcast on Cloudcast {
+    id
+    isSpam
+    owner {
+        isViewer
+        id
+    }
+}
+
+fragment MoreMenu_viewer on Viewer {
+    me {
+        id
+    }
+}
+
+fragment PlayButton_cloudcast on Cloudcast {
+    restrictedReason
+    owner {
+        displayName
+        country
+        username
+        isSubscribedTo
+        isViewer
+        id
+    }
+    slug
+    id
+    isAwaitingAudio
+    isDraft
+    isPlayable
+    streamInfo {
+        hlsUrl
+        dashUrl
+        url
+        uuid
+    }
+    audioLength
+    currentPosition
+    proportionListened
+    repeatPlayAmount
+    hasPlayCompleted
+    seekRestriction
+    previewUrl
+    isExclusivePreviewOnly
+    isExclusive
+}
+
+fragment ProfileFollowButton_user on User {
+    id
+    isFollowing
+    followers {
+        totalCount
+    }
+    username
+    isViewer
+    ...ProfileFollowingButton_user
+}
+
+fragment ProfileFollowButton_viewer on Viewer {
+    me {
+        id
+    }
+    ...ProfileFollowingButton_viewer
+}
+
+fragment ProfileFollowingButton_user on User {
+    id
+    receivesUploadNotifications
+}
+
+fragment ProfileFollowingButton_viewer on Viewer {
+    settings {
+        disableEmail
+        emailNotifications {
+            newUpload
+        }
+    }
+}
+
+fragment RepeatPlayUpsellBar_cloudcast on Cloudcast {
+    audioType
+    owner {
+        username
+        displayName
+        isSelect
+        id
+    }
+}
+
+fragment RepostButton_cloudcast on Cloudcast {
+    id
+    isReposted
+    isExclusive
+    isPublic
+    hiddenStats
+    reposts {
+        totalCount
+    }
+    owner {
+        isViewer
+        isSubscribedTo
+        id
+    }
+}
+
+fragment RepostButton_viewer on Viewer {
+    me {
+        id
+    }
+}
+
+fragment SeekWarning_cloudcast on Cloudcast {
+    owner {
+        displayName
+        isSelect
+        username
+        id
+    }
+    seekRestriction
+}
+
+fragment ShareButton_cloudcast on Cloudcast {
+    id
+    isUnlisted
+    isPublic
+    slug
+    description
+    audioType
+    picture {
+        urlRoot
+    }
+    owner {
+        displayName
+        isViewer
+        username
+        id
+    }
+}
+
+fragment UGCImage_picture on Picture {
+    urlRoot
+    primaryColor
+}
diff --git a/src/test/resources/mixcloud_condensed.graphql b/src/test/resources/mixcloud_condensed.graphql
new file mode 100644
index 0000000..3314cb8
--- /dev/null
+++ b/src/test/resources/mixcloud_condensed.graphql
@@ -0,0 +1,44 @@
+query PlayerHeroQuery(
+    $lookup: CloudcastLookup!
+) {
+    cloudcast: cloudcastLookup(lookup: $lookup) {
+        id
+        name
+        owner {
+            ...AudioPageAvatar_user
+            id
+        }
+        restrictedReason
+        seekRestriction
+        ...PlayButton_cloudcast
+    }
+}
+
+fragment AudioPageAvatar_user on User {
+    displayName
+    username
+}
+
+fragment PlayButton_cloudcast on Cloudcast {
+    restrictedReason
+    owner {
+        displayName
+        country
+        username
+        isSubscribedTo
+        isViewer
+        id
+    }
+    slug
+    id
+    isDraft
+    isPlayable
+    streamInfo {
+        hlsUrl
+        dashUrl
+        url
+        uuid
+    }
+    audioLength
+    seekRestriction
+}
diff --git a/src/test/resources/mixcloud_references.graphql b/src/test/resources/mixcloud_references.graphql
new file mode 100644
index 0000000..31e5076
--- /dev/null
+++ b/src/test/resources/mixcloud_references.graphql
@@ -0,0 +1,4 @@
+type CloudcastLookup {
+    slug: String
+    username: String
+}

From f14589b4a53f0017c23ae44ecbd1fa84407372f3 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 26 Nov 2023 11:02:53 +0100
Subject: [PATCH 75/76] Remove old audio track info for images

---
 README.md                                     |  4 +++
 build.gradle.kts                              |  6 ++--
 .../AudioTrackInfoWithImage.java              | 33 -------------------
 .../pornhub/PornHubAudioSourceManager.java    |  8 ++---
 .../reddit/RedditAudioSourceManager.java      |  8 ++---
 .../tiktok/TikTokAudioSourceManager.java      |  8 ++---
 6 files changed, 18 insertions(+), 49 deletions(-)
 delete mode 100644 src/main/java/com/dunctebot/sourcemanagers/AudioTrackInfoWithImage.java

diff --git a/README.md b/README.md
index 1e3c936..6b46e1c 100644
--- 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
index 745b9d9..45b7008 100644
--- 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
deleted file mode 100644
index ccb3679..0000000
--- a/src/main/java/com/dunctebot/sourcemanagers/AudioTrackInfoWithImage.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2021 Duncan "duncte123" Sterken
- *
- *    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.dunctebot.sourcemanagers;
-
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-
-public class AudioTrackInfoWithImage extends AudioTrackInfo {
-
-    private final String image;
-
-    public AudioTrackInfoWithImage(String title, String author, long length, String identifier, boolean isStream, String uri, String image) {
-        super(title, author, length, identifier, isStream, uri);
-        this.image = image;
-    }
-
-    public String getImage() {
-        return image;
-    }
-}
diff --git a/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
index 5908c57..00138e4 100644
--- 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
index f851d74..94f2435 100644
--- 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
index 26647a7..964d6e5 100644
--- 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
             );
         }
 

From ce03c81b9426e1f6c32c0eba8acccf447712fc4b Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 26 Nov 2023 11:17:28 +0100
Subject: [PATCH 76/76] Add as many thumbnails as possible

---
 build.gradle.kts                              |  7 ++++---
 .../getyarn/GetyarnAudioSourceManager.java    |  4 +++-
 .../mixcloud/MixcloudAudioSourceManager.java  | 19 ++++++++++++++++---
 src/test/java/MixcloudTest.java               |  4 ++--
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 45b7008..0cd98a0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,13 +25,13 @@ plugins {
 }
 
 project.group = "com.dunctebot"
-project.version = "1.8.5"
+project.version = "1.9.0"
 val archivesBaseName = "sourcemanagers"
 
 repositories {
     mavenCentral()
     jcenter()
-    maven("https://m2.dv8tion.net/releases")
+    maven("https://maven.lavalink.dev/releases")
 
     maven {
         url = uri("https://jitpack.io")
@@ -41,11 +41,12 @@ repositories {
 dependencies {
     compileOnly(group = "dev.arbjerg", name = "lavaplayer", version = "2.0.3")
 
+    implementation("org.slf4j:slf4j-api:2.0.7")
     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 = "dev.arbjerg", name = "lavaplayer", version = " 2.0.3")
+    testImplementation(group = "dev.arbjerg", name = "lavaplayer", version = "2.0.3")
 }
 
 configure<JavaPluginExtension> {
diff --git a/src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioSourceManager.java
index 82797b9..6e66008 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioSourceManager.java
@@ -55,7 +55,9 @@ public AudioItem loadItem(AudioPlayerManager manager, AudioReference reference)
         );
 
         return new GetyarnAudioTrack(
-            AudioTrackInfoBuilder.create(ref, null).build(),
+            AudioTrackInfoBuilder.create(ref, null)
+                .setArtworkUrl("https://y.yarn.co/" + videoId + "_screenshot.jpg")
+                .build(),
             this
         );
     }
diff --git a/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioSourceManager.java b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioSourceManager.java
index 5f1e72e..bfd113d 100644
--- a/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioSourceManager.java
+++ b/src/main/java/com/dunctebot/sourcemanagers/mixcloud/MixcloudAudioSourceManager.java
@@ -28,7 +28,6 @@
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
@@ -41,15 +40,21 @@
 import java.util.regex.Pattern;
 
 import static com.dunctebot.sourcemanagers.Utils.urlDecode;
-import static com.dunctebot.sourcemanagers.Utils.urlEncode;
 
 public class MixcloudAudioSourceManager extends AbstractDuncteBotHttpSource {
+    private static final String THUMBNAILER_BASE = "https://thumbnailer.mixcloud.com/unsafe/390x390/";
     private static final String GRAPHQL_AUDIO_REQUEST = "query PlayerHeroQuery(\n" +
         "    $lookup: CloudcastLookup!\n" +
         ") {\n" +
         "    cloudcast: cloudcastLookup(lookup: $lookup) {\n" +
         "        id\n" +
         "        name\n" +
+        "        picture {\n" +
+        "            isLight\n" +
+        "            primaryColor\n" +
+        "            darkPrimaryColor: primaryColor(darken: 60)\n" +
+        "            ...UGCImage_picture\n" +
+        "        }\n" +
         "        owner {\n" +
         "            ...AudioPageAvatar_user\n" +
         "            id\n" +
@@ -87,6 +92,11 @@ public class MixcloudAudioSourceManager extends AbstractDuncteBotHttpSource {
         "    }\n" +
         "    audioLength\n" +
         "    seekRestriction\n" +
+        "}\n" +
+        "\n" +
+        "fragment UGCImage_picture on Picture {\n" +
+        "    urlRoot\n" +
+        "    primaryColor\n" +
         "}\n";
     private static final Pattern URL_REGEX = Pattern.compile("https?://(?:(?:www|beta|m)\\.)?mixcloud\\.com/([^/]+)/(?!stream|uploads|favorites|listens|playlists)([^/]+)/?");
 
@@ -136,6 +146,7 @@ private AudioItem loadItemOnce(AudioReference reference, Matcher matcher) throws
             );
         }
 
+        final String picturePath = trackInfo.get("picture").get("urlRoot").text();
         final String title = trackInfo.get("name").text();
         final long duration = trackInfo.get("audioLength").as(Long.class) * 1000;
         final String uploader = trackInfo.get("owner").get("username").text(); // displayName
@@ -147,7 +158,9 @@ private AudioItem loadItemOnce(AudioReference reference, Matcher matcher) throws
                 duration,
                 slug,
                 false,
-                reference.identifier
+                reference.identifier,
+                THUMBNAILER_BASE + picturePath,
+                null
             ),
             this
         );
diff --git a/src/test/java/MixcloudTest.java b/src/test/java/MixcloudTest.java
index 28580b8..88476a0 100644
--- a/src/test/java/MixcloudTest.java
+++ b/src/test/java/MixcloudTest.java
@@ -23,8 +23,8 @@ public class MixcloudTest {
     public static void main(String[] args) {
 //        System.out.println(MixcloudAudioSourceManager.GRAPHQL_AUDIO_REQUEST);
 
-//        final var url = "https://www.mixcloud.com/jordy-boesten2/the-egotripper-lets-walk-to-my-house-mix-259/";
-        final var url = "https://www.mixcloud.com/Hirockn/the-100-best-tracks-2020-hip-hop-rb-pops-etc-the-weeknd-dababy-dua-lipa-juice-wrld-etc/";
+        final var url = "https://www.mixcloud.com/jordy-boesten2/the-egotripper-lets-walk-to-my-house-mix-259/";
+//        final var url = "https://www.mixcloud.com/Hirockn/the-100-best-tracks-2020-hip-hop-rb-pops-etc-the-weeknd-dababy-dua-lipa-juice-wrld-etc/";
         final var mnrg = new MixcloudAudioSourceManager();
         final AudioItem track = mnrg.loadItem(null, new AudioReference(url, null));