From e73ad62b787b1c5bcabbac5e03f71efb7523ebea Mon Sep 17 00:00:00 2001
From: Snazzah <me@snazzah.com>
Date: Sun, 16 Jun 2024 00:50:07 -0500
Subject: [PATCH 01/10] feat: threads support

---
 README.md                                     |   2 +
 src/modules/processing/match.js               |   8 ++
 src/modules/processing/matchActionDecider.js  |   2 +
 src/modules/processing/services/threads.js    | 106 ++++++++++++++++++
 src/modules/processing/servicesConfig.json    |   6 +
 .../processing/servicesPatternTesters.js      |   3 +
 src/util/tests.json                           |  25 +++++
 7 files changed, 152 insertions(+)
 create mode 100644 src/modules/processing/services/threads.js

diff --git a/README.md b/README.md
index d2bb064c8..1ea7c26e5 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ this list is not final and keeps expanding over time. if support for a service y
 | rutube                         | ✅            | ✅         | ✅         | ✅         | ✅              |
 | soundcloud                     | ➖            | ✅         | ➖         | ✅         | ✅              |
 | streamable                     | ✅            | ✅         | ✅         | ➖         | ➖              |
+| threads posts                  | ✅            | ✅         | ✅         | ✅         | ✅              |
 | tiktok                         | ✅            | ✅         | ✅         | ❌         | ❌              |
 | tumblr                         | ✅            | ✅         | ✅         | ➖         | ➖              |
 | twitch clips                   | ✅            | ✅         | ✅         | ✅         | ✅              |
@@ -49,6 +50,7 @@ this list is not final and keeps expanding over time. if support for a service y
 | reddit     | supports gifs and videos.                                                                                            |
 | rutube     | supports yappy & private links.                                                                                      |
 | soundcloud | supports private links.                                                                                              |
+| threads    | supports photos and videos. lets you pick what to save from multi-media posts.                                       |
 | tiktok     | supports videos with or without watermark, images from slideshow without watermark, and full (original) audios.      |
 | twitter/x  | lets you pick what to save from multi-media posts. may not be 100% reliable due to current management.               |
 | vimeo      | audio downloads are only available for dash.                                                                         |
diff --git a/src/modules/processing/match.js b/src/modules/processing/match.js
index 3e38c4db2..c3ceb5872 100644
--- a/src/modules/processing/match.js
+++ b/src/modules/processing/match.js
@@ -25,6 +25,7 @@ import twitch from "./services/twitch.js";
 import rutube from "./services/rutube.js";
 import dailymotion from "./services/dailymotion.js";
 import loom from "./services/loom.js";
+import threads from "./services/threads.js";
 
 let freebind;
 
@@ -193,6 +194,13 @@ export default async function(host, patternMatch, lang, obj) {
                     id: patternMatch.id
                 });
                 break;
+            case "threads":
+                r = await threads({
+                    ...patternMatch,
+                    quality: obj.vQuality,
+                    dispatcher
+                })
+                break;
             default:
                 return createResponse("error", {
                     t: loc(lang, 'ErrorUnsupported')
diff --git a/src/modules/processing/matchActionDecider.js b/src/modules/processing/matchActionDecider.js
index f7ed3da91..c19136fdf 100644
--- a/src/modules/processing/matchActionDecider.js
+++ b/src/modules/processing/matchActionDecider.js
@@ -67,6 +67,7 @@ export default function(r, host, userFormat, isAudioOnly, lang, isAudioMuted, di
             switch (host) {
                 case "instagram":
                 case "twitter":
+                case "threads":
                     params = { picker: r.picker };
                     break;
                 case "tiktok":
@@ -130,6 +131,7 @@ export default function(r, host, userFormat, isAudioOnly, lang, isAudioMuted, di
                 case "pinterest":
                 case "streamable":
                 case "loom":
+                case "threads":
                     responseType = "redirect";
                     break;
             }
diff --git a/src/modules/processing/services/threads.js b/src/modules/processing/services/threads.js
new file mode 100644
index 000000000..1bc8c047b
--- /dev/null
+++ b/src/modules/processing/services/threads.js
@@ -0,0 +1,106 @@
+import { createStream } from "../../stream/manage.js";
+import { getCookie, updateCookie } from "../cookie/manager.js";
+
+const commonHeaders = {
+    "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8",
+    "Accept-Language": "en-US,en;q=0.7",
+    "Cache-Control": "no-cache",
+    "Dnt": "1",
+    "Priority": "u=0, i",
+    "Sec-Ch-Ua": '"Not/A)Brand";v="8", "Chromium";v="126", "Brave";v="126"',
+    "Sec-Ch-Ua-Mobile": "?0",
+    "Sec-Ch-Ua-Model": '""',
+    "Sec-Ch-Ua-Platform": '"Windows"',
+    "Sec-Ch-Ua-Platform-Version": '"15.0.0"',
+    "Sec-Fetch-Dest": "document",
+    "Sec-Fetch-Mode": "navigate",
+    "Sec-Fetch-Site": "same-origin",
+    "Sec-Gpc": "1",
+    "Upgrade-Insecure-Requests": "1",
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36",
+};
+
+const DATA_REGEX = /<script type="application\/json"  data-content-len="\d+" data-sjs>({"require":\[\["ScheduledServerJS","handle",null,\[{"__bbox":{"require":\[\["RelayPrefetchedStreamCache(?:(?:@|\\u0040)[0-9a-f]{32})?","next",\[],\["adp_BarcelonaPostPageQueryRelayPreloader_[0-9a-f]{23}",[^\n]+})<\/script>\n/;
+
+export default async function({ user, id, quality, dispatcher }) {
+    const cookie = getCookie('threads');
+    const response = await fetch(`https://www.threads.net/${user}/post/${id}`, {
+        headers: {
+            ...commonHeaders,
+            cookie
+        },
+        dispatcher
+    });
+    if (cookie) updateCookie(cookie, data.headers);
+
+    if (response.status !== 200) {
+        return { error: 'ErrorCouldntFetch' };
+    }
+    const html = await response.text();
+    const dataString = html.match(DATA_REGEX)?.[1];
+    if (!dataString) {
+        return { error: 'ErrorCouldntFetch' };
+    }
+
+    const data = JSON.parse(dataString);
+    const post = data?.require?.[0]?.[3]?.[0]?.__bbox?.require?.[0]?.[3]?.[1]?.__bbox?.result?.data?.data?.edges[0]?.node?.thread_items[0]?.post;
+    if (!post) {
+        return { error: 'ErrorCouldntFetch' };
+    }
+
+    // Video
+    if (post.media_type === 2) {
+        if (!post.video_versions) {
+            return { error: 'ErrorEmptyDownload' };
+        }
+
+        // types: 640p = 101, 480p = 102, 480p-low = 103
+        const selectedQualityType = quality === 'max' ? 101 : parseInt(quality) > 480 ? 102 : 101;
+        const video = post.video_versions.find((v) => v.type === selectedQualityType) || post.video_versions.sort((a, b) => a.type - b.type)[0];
+        if (!video) {
+            return { error: 'ErrorEmptyDownload' };
+        }
+
+        return {
+            urls: video.url,
+            filename: `threads_${user}_${id}.mp4`,
+            audioFilename: `threads_${user}_${id}_audio`
+        }
+    }
+
+    // Photo
+    if (post.media_type === 1) {
+        if (!post.image_versions2?.candidates) {
+            return { error: 'ErrorEmptyDownload' };
+        }
+
+        return {
+            urls: post.image_versions2.candidates[0].url,
+            isPhoto: true
+        }
+    }
+
+    // Mixed
+    if (post.media_type === 8) {
+        if (!post.carousel_media) {
+            return { error: 'ErrorEmptyDownload' };
+        }
+
+        return {
+            picker: post.carousel_media.map((media) => ({
+                type: media.video_versions ? 'video' : 'photo',
+                url: media.video_versions ? media.video_versions[0].url : media.image_versions2.candidates[0].url,
+                /* thumbnails have `Cross-Origin-Resource-Policy`
+                ** set to `same-origin`, so we need to proxy them */
+                thumb: createStream({
+                    service: "instagram",
+                    type: "default",
+                    u: media.image_versions2.candidates[0].url,
+                    filename: "image.jpg"
+                })
+            }))
+        }
+    }
+
+    return { error: 'ErrorUnsupported' };
+}
\ No newline at end of file
diff --git a/src/modules/processing/servicesConfig.json b/src/modules/processing/servicesConfig.json
index ae4cd9f08..5bc8ff72d 100644
--- a/src/modules/processing/servicesConfig.json
+++ b/src/modules/processing/servicesConfig.json
@@ -117,6 +117,12 @@
             "alias": "loom videos",
             "patterns": ["share/:id"],
             "enabled": true
+        },
+        "threads": {
+            "alias": "threads posts",
+            "tld": "net",
+            "patterns": [":user/post/:id"],
+            "enabled": true
         }
     }
 }
diff --git a/src/modules/processing/servicesPatternTesters.js b/src/modules/processing/servicesPatternTesters.js
index ddeea31fb..c1ce09c95 100644
--- a/src/modules/processing/servicesPatternTesters.js
+++ b/src/modules/processing/servicesPatternTesters.js
@@ -33,6 +33,9 @@ export const testers = {
     "streamable": (patternMatch) =>
         patternMatch.id?.length === 6,
 
+    "threads": (patternMatch) =>
+        patternMatch.user?.length <= 33 && patternMatch.id?.length <= 32,
+
     "tiktok": (patternMatch) =>
         patternMatch.postId?.length <= 21 || patternMatch.id?.length <= 13,
 
diff --git a/src/util/tests.json b/src/util/tests.json
index 501ac2c03..660de0fe4 100644
--- a/src/util/tests.json
+++ b/src/util/tests.json
@@ -1160,5 +1160,30 @@
             "code": 200,
             "status": "stream"
         }
+    }],
+    "threads": [{
+        "name": "video",
+        "url": "https://www.threads.net/@zuck/post/CzecNnZPaxr",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "redirect"
+        }
+    }, {
+        "name": "photo",
+        "url": "https://www.threads.net/@soren.iverson/post/C8PdJ59pMLr",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "redirect"
+        }
+    }, {
+        "name": "mixed media",
+        "url": "https://www.threads.net/@snazzahguy/post/C8Q7UZDseWz",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "picker"
+        }
     }]
 }

From 6db3b696393b7e862d9f1aaf2c428dae30f86a74 Mon Sep 17 00:00:00 2001
From: Snazzah <me@snazzah.com>
Date: Sun, 16 Jun 2024 01:02:45 -0500
Subject: [PATCH 02/10] fix(threads): whoops

---
 src/modules/processing/services/instagram.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/processing/services/instagram.js b/src/modules/processing/services/instagram.js
index 2fc533d83..e9231ac66 100644
--- a/src/modules/processing/services/instagram.js
+++ b/src/modules/processing/services/instagram.js
@@ -218,7 +218,7 @@ export default function(obj) {
                         /* thumbnails have `Cross-Origin-Resource-Policy`
                         ** set to `same-origin`, so we need to proxy them */
                         thumb: createStream({
-                            service: "instagram",
+                            service: "threads",
                             type: "default",
                             u: imageUrl,
                             filename: "image.jpg"

From 0e8e4284858e2a391d182a509a5bef8b0dfad050 Mon Sep 17 00:00:00 2001
From: Snazzah <me@snazzah.com>
Date: Sun, 16 Jun 2024 01:04:30 -0500
Subject: [PATCH 03/10] fix(threads): deepscan fixes

---
 src/modules/processing/services/threads.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/processing/services/threads.js b/src/modules/processing/services/threads.js
index 1bc8c047b..cfd239749 100644
--- a/src/modules/processing/services/threads.js
+++ b/src/modules/processing/services/threads.js
@@ -20,7 +20,7 @@ const commonHeaders = {
     "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36",
 };
 
-const DATA_REGEX = /<script type="application\/json"  data-content-len="\d+" data-sjs>({"require":\[\["ScheduledServerJS","handle",null,\[{"__bbox":{"require":\[\["RelayPrefetchedStreamCache(?:(?:@|\\u0040)[0-9a-f]{32})?","next",\[],\["adp_BarcelonaPostPageQueryRelayPreloader_[0-9a-f]{23}",[^\n]+})<\/script>\n/;
+const DATA_REGEX = /<script type="application\/json" {2}data-content-len="\d+" data-sjs>({"require":\[\["ScheduledServerJS","handle",null,\[{"__bbox":{"require":\[\["RelayPrefetchedStreamCache(?:(?:@|\\u0040)[0-9a-f]{32})?","next",\[],\["adp_BarcelonaPostPageQueryRelayPreloader_[0-9a-f]{23}",[^\n]+})<\/script>\n/;
 
 export default async function({ user, id, quality, dispatcher }) {
     const cookie = getCookie('threads');
@@ -31,7 +31,7 @@ export default async function({ user, id, quality, dispatcher }) {
         },
         dispatcher
     });
-    if (cookie) updateCookie(cookie, data.headers);
+    if (cookie) updateCookie(cookie, response.headers);
 
     if (response.status !== 200) {
         return { error: 'ErrorCouldntFetch' };

From e16dff3c841800a3a6946426f092396522e63618 Mon Sep 17 00:00:00 2001
From: Snazzah <me@snazzah.com>
Date: Sun, 16 Jun 2024 01:23:40 -0500
Subject: [PATCH 04/10] fix: i changed the wrong file

---
 src/modules/processing/services/instagram.js | 2 +-
 src/modules/processing/services/threads.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/processing/services/instagram.js b/src/modules/processing/services/instagram.js
index e9231ac66..2fc533d83 100644
--- a/src/modules/processing/services/instagram.js
+++ b/src/modules/processing/services/instagram.js
@@ -218,7 +218,7 @@ export default function(obj) {
                         /* thumbnails have `Cross-Origin-Resource-Policy`
                         ** set to `same-origin`, so we need to proxy them */
                         thumb: createStream({
-                            service: "threads",
+                            service: "instagram",
                             type: "default",
                             u: imageUrl,
                             filename: "image.jpg"
diff --git a/src/modules/processing/services/threads.js b/src/modules/processing/services/threads.js
index cfd239749..5a6535343 100644
--- a/src/modules/processing/services/threads.js
+++ b/src/modules/processing/services/threads.js
@@ -93,7 +93,7 @@ export default async function({ user, id, quality, dispatcher }) {
                 /* thumbnails have `Cross-Origin-Resource-Policy`
                 ** set to `same-origin`, so we need to proxy them */
                 thumb: createStream({
-                    service: "instagram",
+                    service: "threads",
                     type: "default",
                     u: media.image_versions2.candidates[0].url,
                     filename: "image.jpg"

From 64d9f29209e87df374016e350a8f4b5f60480a11 Mon Sep 17 00:00:00 2001
From: Snazzah <me@snazzah.com>
Date: Sun, 16 Jun 2024 19:24:26 -0500
Subject: [PATCH 05/10] fix(threads): small fix to quality selection

---
 src/modules/processing/services/threads.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/processing/services/threads.js b/src/modules/processing/services/threads.js
index 5a6535343..2944929a6 100644
--- a/src/modules/processing/services/threads.js
+++ b/src/modules/processing/services/threads.js
@@ -55,7 +55,7 @@ export default async function({ user, id, quality, dispatcher }) {
         }
 
         // types: 640p = 101, 480p = 102, 480p-low = 103
-        const selectedQualityType = quality === 'max' ? 101 : parseInt(quality) > 480 ? 102 : 101;
+        const selectedQualityType = quality === 'max' ? 101 : quality && parseInt(quality) <= 480 ? 102 : 101;
         const video = post.video_versions.find((v) => v.type === selectedQualityType) || post.video_versions.sort((a, b) => a.type - b.type)[0];
         if (!video) {
             return { error: 'ErrorEmptyDownload' };

From bc642f4e3fd09696744499a6442d75dbead433e0 Mon Sep 17 00:00:00 2001
From: Snazzah <me@snazzah.com>
Date: Tue, 18 Jun 2024 00:15:19 -0500
Subject: [PATCH 06/10] chore: update readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1ea7c26e5..55c5ee3c2 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ this list is not final and keeps expanding over time. if support for a service y
 | rutube                         | ✅            | ✅         | ✅         | ✅         | ✅              |
 | soundcloud                     | ➖            | ✅         | ➖         | ✅         | ✅              |
 | streamable                     | ✅            | ✅         | ✅         | ➖         | ➖              |
-| threads posts                  | ✅            | ✅         | ✅         | ✅         | ✅              |
+| threads posts                  | ✅            | ✅         | ✅         | ➖         | ➖              |
 | tiktok                         | ✅            | ✅         | ✅         | ❌         | ❌              |
 | tumblr                         | ✅            | ✅         | ✅         | ➖         | ➖              |
 | twitch clips                   | ✅            | ✅         | ✅         | ✅         | ✅              |

From 687649a5e45907f03ade40e6a58470bd7d9183d9 Mon Sep 17 00:00:00 2001
From: Snazzah <me@snazzah.com>
Date: Tue, 8 Oct 2024 15:09:59 -0500
Subject: [PATCH 07/10] wow that did not merge well

---
 api/src/processing/match.js                   |  2 +-
 api/src/processing/service-config.js          |  4 +++
 api/src/processing/service-patterns.js        |  3 +++
 api/src/processing/services/threads.js        | 21 +++++++--------
 api/src/util/tests.json                       | 27 ++++++++++++++++++-
 src/modules/processing/servicesConfig.json    |  0
 .../processing/servicesPatternTesters.js      |  0
 src/util/tests.json                           |  0
 8 files changed, 44 insertions(+), 13 deletions(-)
 delete mode 100644 src/modules/processing/servicesConfig.json
 delete mode 100644 src/modules/processing/servicesPatternTesters.js
 delete mode 100644 src/util/tests.json

diff --git a/api/src/processing/match.js b/api/src/processing/match.js
index e6c03a9ed..e5cc5523f 100644
--- a/api/src/processing/match.js
+++ b/api/src/processing/match.js
@@ -234,7 +234,7 @@ export default async function({ host, patternMatch, params }) {
             case "threads":
                 r = await threads({
                     ...patternMatch,
-                    quality: obj.vQuality,
+                    quality: params.videoQuality,
                     dispatcher
                 });
                 break;
diff --git a/api/src/processing/service-config.js b/api/src/processing/service-config.js
index 8d8bf4ac9..c48000d30 100644
--- a/api/src/processing/service-config.js
+++ b/api/src/processing/service-config.js
@@ -108,6 +108,10 @@ export const services = {
             "s/:id"
         ],
     },
+    threads: {
+        patterns: [":user/post/:id"],
+        tld: "net",
+    },
     tiktok: {
         patterns: [
             ":user/video/:postId",
diff --git a/api/src/processing/service-patterns.js b/api/src/processing/service-patterns.js
index 2105a563c..723ab8a1c 100644
--- a/api/src/processing/service-patterns.js
+++ b/api/src/processing/service-patterns.js
@@ -38,6 +38,9 @@ export const testers = {
     "streamable": pattern =>
         pattern.id?.length === 6,
 
+    "threads": pattern =>
+        pattern.user?.length <= 33 && pattern.id?.length <= 32,
+
     "tiktok": pattern =>
         pattern.postId?.length <= 21 || pattern.id?.length <= 13,
 
diff --git a/api/src/processing/services/threads.js b/api/src/processing/services/threads.js
index ba620ed66..279de16c4 100644
--- a/api/src/processing/services/threads.js
+++ b/api/src/processing/services/threads.js
@@ -34,31 +34,31 @@ export default async function({ user, id, quality, dispatcher }) {
     if (cookie) updateCookie(cookie, response.headers);
 
     if (response.status !== 200) {
-        return { error: 'ErrorCouldntFetch' };
+        return { error: 'fetch.fail' };
     }
     const html = await response.text();
     const dataString = html.match(DATA_REGEX)?.[1];
     if (!dataString) {
-        return { error: 'ErrorCouldntFetch' };
+        return { error: 'fetch.fail' };
     }
 
     const data = JSON.parse(dataString);
     const post = data?.require?.[0]?.[3]?.[0]?.__bbox?.require?.[0]?.[3]?.[1]?.__bbox?.result?.data?.data?.edges[0]?.node?.thread_items[0]?.post;
     if (!post) {
-        return { error: 'ErrorCouldntFetch' };
+        return { error: 'fetch.fail' };
     }
 
     // Video
     if (post.media_type === 2) {
         if (!post.video_versions) {
-            return { error: 'ErrorEmptyDownload' };
+            return { error: 'fetch.empty' };
         }
 
         // types: 640p = 101, 480p = 102, 480p-low = 103
         const selectedQualityType = quality === 'max' ? 101 : quality && parseInt(quality) <= 480 ? 102 : 101;
         const video = post.video_versions.find((v) => v.type === selectedQualityType) || post.video_versions.sort((a, b) => a.type - b.type)[0];
         if (!video) {
-            return { error: 'ErrorEmptyDownload' };
+            return { error: 'fetch.empty' };
         }
 
         return {
@@ -71,7 +71,7 @@ export default async function({ user, id, quality, dispatcher }) {
     // Photo
     if (post.media_type === 1) {
         if (!post.image_versions2?.candidates) {
-            return { error: 'ErrorEmptyDownload' };
+            return { error: 'fetch.empty' };
         }
 
         return {
@@ -83,7 +83,7 @@ export default async function({ user, id, quality, dispatcher }) {
     // Mixed
     if (post.media_type === 8) {
         if (!post.carousel_media) {
-            return { error: 'ErrorEmptyDownload' };
+            return { error: 'fetch.empty' };
         }
 
         return {
@@ -94,13 +94,12 @@ export default async function({ user, id, quality, dispatcher }) {
                 ** set to `same-origin`, so we need to proxy them */
                 thumb: createStream({
                     service: "threads",
-                    type: "default",
-                    u: media.image_versions2.candidates[0].url,
-                    filename: "image.jpg"
+                    type: "proxy",
+                    u: media.image_versions2.candidates[0].url
                 })
             }))
         }
     }
 
-    return { error: 'ErrorUnsupported' };
+    return { error: 'fetch.fail' };
 }
diff --git a/api/src/util/tests.json b/api/src/util/tests.json
index 94005c0a0..ce9b3fe7b 100644
--- a/api/src/util/tests.json
+++ b/api/src/util/tests.json
@@ -1493,5 +1493,30 @@
                 "status": "error"
             }
         }
-    ]
+    ],
+    "threads": [{
+        "name": "video",
+        "url": "https://www.threads.net/@zuck/post/CzecNnZPaxr",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "redirect"
+        }
+    }, {
+        "name": "photo",
+        "url": "https://www.threads.net/@soren.iverson/post/C8PdJ59pMLr",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "redirect"
+        }
+    }, {
+        "name": "mixed media",
+        "url": "https://www.threads.net/@snazzahguy/post/C8Q7UZDseWz",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "picker"
+        }
+    }]
 }
diff --git a/src/modules/processing/servicesConfig.json b/src/modules/processing/servicesConfig.json
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/modules/processing/servicesPatternTesters.js b/src/modules/processing/servicesPatternTesters.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/util/tests.json b/src/util/tests.json
deleted file mode 100644
index e69de29bb..000000000

From 1dd490370095bb63e870063af5ba6c36d7f01853 Mon Sep 17 00:00:00 2001
From: Snazzah <me@snazzah.com>
Date: Tue, 8 Oct 2024 15:23:29 -0500
Subject: [PATCH 08/10] support alwaysProxy in threads

---
 api/src/processing/match.js            |  1 +
 api/src/processing/services/threads.js | 59 ++++++++++++++++----------
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/api/src/processing/match.js b/api/src/processing/match.js
index e5cc5523f..63c2df98b 100644
--- a/api/src/processing/match.js
+++ b/api/src/processing/match.js
@@ -235,6 +235,7 @@ export default async function({ host, patternMatch, params }) {
                 r = await threads({
                     ...patternMatch,
                     quality: params.videoQuality,
+                    alwaysProxy: params.alwaysProxy,
                     dispatcher
                 });
                 break;
diff --git a/api/src/processing/services/threads.js b/api/src/processing/services/threads.js
index 279de16c4..a7682e623 100644
--- a/api/src/processing/services/threads.js
+++ b/api/src/processing/services/threads.js
@@ -22,8 +22,8 @@ const commonHeaders = {
 
 const DATA_REGEX = /<script type="application\/json" {2}data-content-len="\d+" data-sjs>({"require":\[\["ScheduledServerJS","handle",null,\[{"__bbox":{"require":\[\["RelayPrefetchedStreamCache(?:(?:@|\\u0040)[0-9a-f]{32})?","next",\[],\["adp_BarcelonaPostPageQueryRelayPreloader_[0-9a-f]{23}",[^\n]+})<\/script>\n/;
 
-export default async function({ user, id, quality, dispatcher }) {
-    const cookie = getCookie('threads');
+export default async function({ user, id, quality, alwaysProxy, dispatcher }) {
+    const cookie = getCookie("threads");
     const response = await fetch(`https://www.threads.net/${user}/post/${id}`, {
         headers: {
             ...commonHeaders,
@@ -34,44 +34,46 @@ export default async function({ user, id, quality, dispatcher }) {
     if (cookie) updateCookie(cookie, response.headers);
 
     if (response.status !== 200) {
-        return { error: 'fetch.fail' };
+        return { error: "fetch.fail" };
     }
     const html = await response.text();
     const dataString = html.match(DATA_REGEX)?.[1];
     if (!dataString) {
-        return { error: 'fetch.fail' };
+        return { error: "fetch.fail" };
     }
 
     const data = JSON.parse(dataString);
     const post = data?.require?.[0]?.[3]?.[0]?.__bbox?.require?.[0]?.[3]?.[1]?.__bbox?.result?.data?.data?.edges[0]?.node?.thread_items[0]?.post;
     if (!post) {
-        return { error: 'fetch.fail' };
+        return { error: "fetch.fail" };
     }
 
+    const filenameBase = `threads_${post.user.username}_${post.code}`;
+
     // Video
     if (post.media_type === 2) {
         if (!post.video_versions) {
-            return { error: 'fetch.empty' };
+            return { error: "fetch.empty" };
         }
 
         // types: 640p = 101, 480p = 102, 480p-low = 103
-        const selectedQualityType = quality === 'max' ? 101 : quality && parseInt(quality) <= 480 ? 102 : 101;
+        const selectedQualityType = quality === "max" ? 101 : quality && parseInt(quality) <= 480 ? 102 : 101;
         const video = post.video_versions.find((v) => v.type === selectedQualityType) || post.video_versions.sort((a, b) => a.type - b.type)[0];
         if (!video) {
-            return { error: 'fetch.empty' };
+            return { error: "fetch.empty" };
         }
 
         return {
             urls: video.url,
-            filename: `threads_${user}_${id}.mp4`,
-            audioFilename: `threads_${user}_${id}_audio`
+            filename: `${filenameBase}.mp4`,
+            audioFilename: `${filenameBase}_audio`
         }
     }
 
     // Photo
     if (post.media_type === 1) {
         if (!post.image_versions2?.candidates) {
-            return { error: 'fetch.empty' };
+            return { error: "fetch.empty" };
         }
 
         return {
@@ -83,23 +85,36 @@ export default async function({ user, id, quality, dispatcher }) {
     // Mixed
     if (post.media_type === 8) {
         if (!post.carousel_media) {
-            return { error: 'fetch.empty' };
+            return { error: "fetch.empty" };
         }
 
         return {
-            picker: post.carousel_media.map((media) => ({
-                type: media.video_versions ? 'video' : 'photo',
-                url: media.video_versions ? media.video_versions[0].url : media.image_versions2.candidates[0].url,
-                /* thumbnails have `Cross-Origin-Resource-Policy`
-                ** set to `same-origin`, so we need to proxy them */
-                thumb: createStream({
+            picker: post.carousel_media.map((media, i) => {
+                const type = media.video_versions ? "video" : "photo";
+                let url = media.video_versions ? media.video_versions[0].url : media.image_versions2.candidates[0].url;
+                const thumbProxy = createStream({
                     service: "threads",
                     type: "proxy",
-                    u: media.image_versions2.candidates[0].url
-                })
-            }))
+                    u: media.image_versions2.candidates[0].url,
+                    filename: `${filenameBase}_${i}.jpg`,
+                });
+                if (alwaysProxy) {
+                    url = type === 'photo' ? thumbProxy : createStream({
+                        service: "threads",
+                        type: "proxy",
+                        u: media.video_versions[0].url,
+                        filename: `${filenameBase}_${i}.mp4`,
+                    });
+                }
+
+                return {
+                    type,
+                    url,
+                    thumb: thumbProxy
+                }
+            })
         }
     }
 
-    return { error: 'fetch.fail' };
+    return { error: "fetch.fail" };
 }

From 33ec74a1249364f1d03ab1170e8ba38a56af537b Mon Sep 17 00:00:00 2001
From: Snazzah <me@snazzah.com>
Date: Tue, 8 Oct 2024 15:24:32 -0500
Subject: [PATCH 09/10] chore: format tests

---
 api/src/util/tests.json | 52 ++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/api/src/util/tests.json b/api/src/util/tests.json
index ce9b3fe7b..ec1d14538 100644
--- a/api/src/util/tests.json
+++ b/api/src/util/tests.json
@@ -1494,29 +1494,33 @@
             }
         }
     ],
-    "threads": [{
-        "name": "video",
-        "url": "https://www.threads.net/@zuck/post/CzecNnZPaxr",
-        "params": {},
-        "expected": {
-            "code": 200,
-            "status": "redirect"
-        }
-    }, {
-        "name": "photo",
-        "url": "https://www.threads.net/@soren.iverson/post/C8PdJ59pMLr",
-        "params": {},
-        "expected": {
-            "code": 200,
-            "status": "redirect"
-        }
-    }, {
-        "name": "mixed media",
-        "url": "https://www.threads.net/@snazzahguy/post/C8Q7UZDseWz",
-        "params": {},
-        "expected": {
-            "code": 200,
-            "status": "picker"
+    "threads": [
+        {
+            "name": "video",
+            "url": "https://www.threads.net/@zuck/post/CzecNnZPaxr",
+            "params": {},
+            "expected": {
+                "code": 200,
+                "status": "redirect"
+            }
+        },
+        {
+            "name": "photo",
+            "url": "https://www.threads.net/@soren.iverson/post/C8PdJ59pMLr",
+            "params": {},
+            "expected": {
+                "code": 200,
+                "status": "redirect"
+            }
+        },
+        {
+            "name": "mixed media",
+            "url": "https://www.threads.net/@snazzahguy/post/C8Q7UZDseWz",
+            "params": {},
+            "expected": {
+                "code": 200,
+                "status": "picker"
+            }
         }
-    }]
+    ]
 }

From 58f729e3218199f093bcd904bba4223b9abbaa53 Mon Sep 17 00:00:00 2001
From: Snazzah <me@snazzah.com>
Date: Wed, 9 Oct 2024 00:12:49 -0500
Subject: [PATCH 10/10] fix(threads): add filename for photos

---
 api/src/processing/services/threads.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/src/processing/services/threads.js b/api/src/processing/services/threads.js
index a7682e623..0cac4d485 100644
--- a/api/src/processing/services/threads.js
+++ b/api/src/processing/services/threads.js
@@ -78,6 +78,7 @@ export default async function({ user, id, quality, alwaysProxy, dispatcher }) {
 
         return {
             urls: post.image_versions2.candidates[0].url,
+            filename: `${filenameBase}.jpg`,
             isPhoto: true
         }
     }