From ab1b07fe44a72715b5e573410f7e7a5eaf5c1fdc Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Sun, 7 Jul 2024 15:14:12 +0000
Subject: [PATCH 01/25] rutube: pick closest quality to requested quality

---
 src/modules/processing/services/rutube.js | 24 ++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/modules/processing/services/rutube.js b/src/modules/processing/services/rutube.js
index a8d0abbe..325e9ccc 100644
--- a/src/modules/processing/services/rutube.js
+++ b/src/modules/processing/services/rutube.js
@@ -10,6 +10,8 @@ async function requestJSON(url) {
     } catch {}
 }
 
+const delta = (a, b) => Math.abs(a - b);
+
 export default async function(obj) {
     if (obj.yappyId) {
         const yappy = await requestJSON(
@@ -25,7 +27,7 @@ export default async function(obj) {
         }
     }
 
-    const quality = obj.quality === "max" ? "9000" : obj.quality;
+    const quality = Number(obj.quality) || 9000;
 
     const requestURL = new URL(`https://rutube.ru/api/play/options/${obj.id}/?no_404=true&referer&pver=v2`);
     if (obj.key) requestURL.searchParams.set('p', obj.key);
@@ -45,12 +47,16 @@ export default async function(obj) {
 
     if (!m3u8) return { error: 'ErrorCouldntFetch' };
 
-    m3u8 = HLS.parse(m3u8).variants.sort((a, b) => Number(b.bandwidth) - Number(a.bandwidth));
+    m3u8 = HLS.parse(m3u8).variants;
 
-    let bestQuality = m3u8[0];
-    if (Number(quality) < bestQuality.resolution.height) {
-        bestQuality = m3u8.find((i) => (Number(quality) === i.resolution.height));
-    }
+    const matchingQuality = m3u8.reduce((prev, next) => {
+        const diff = {
+            prev: delta(quality, prev.resolution.height),
+            next: delta(quality, next.resolution.height)
+        };
+
+        return diff.prev < diff.next ? prev : next;
+    });
 
     const fileMetadata = {
         title: cleanString(play.title.trim()),
@@ -58,15 +64,15 @@ export default async function(obj) {
     }
 
     return {
-        urls: bestQuality.uri,
+        urls: matchingQuality.uri,
         isM3U8: true,
         filenameAttributes: {
             service: "rutube",
             id: obj.id,
             title: fileMetadata.title,
             author: fileMetadata.artist,
-            resolution: `${bestQuality.resolution.width}x${bestQuality.resolution.height}`,
-            qualityLabel: `${bestQuality.resolution.height}p`,
+            resolution: `${matchingQuality.resolution.width}x${matchingQuality.resolution.height}`,
+            qualityLabel: `${matchingQuality.resolution.height}p`,
             extension: "mp4"
         },
         fileMetadata: fileMetadata

From 87783a4c862e980d0c964943e909c1f21aed2d8a Mon Sep 17 00:00:00 2001
From: jj <log@riseup.net>
Date: Sun, 7 Jul 2024 17:23:42 +0200
Subject: [PATCH 02/25] CONTRIBUTING: replace "message" with "title" when
 talking about amends

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

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index dd2140eb..2668242b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -26,7 +26,7 @@ the scope is not strictly defined, you can write whatever you find most fitting
 
 if you think a change deserves further explanation, we encourage you to write a short explanation in the commit message ([example](https://github.com/imputnet/cobalt/commit/d2e5b6542f71f3809ba94d56c26f382b5cb62762)), which will save both you and us time having to enquire about the change, and you explaining the reason behind it.
 
-if your contribution has uninformative commit messages, you may be asked to interactively rebase your branch and amend each commit to include a meaningful message.
+if your contribution has uninformative commit titles, you may be asked to interactively rebase your branch and amend each commit to include a meaningful title.
 
 ### clean commit history
 if your branch is out of date and/or has some merge conflicts with the `current` branch, you should **rebase** it instead of merging. this prevents meaningless merge commits from being included in your branch, which would then end up in the cobalt git history.

From cfce04bbd00e36ca222aed1d0b7d997ed791c726 Mon Sep 17 00:00:00 2001
From: hyperdefined <contact@hyper.lol>
Date: Mon, 8 Jul 2024 18:03:03 -0400
Subject: [PATCH 03/25] tests: fix broken twitter links (#604)

---
 src/util/tests.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/util/tests.json b/src/util/tests.json
index 982d99cb..ba79970c 100644
--- a/src/util/tests.json
+++ b/src/util/tests.json
@@ -1,7 +1,7 @@
 {
     "twitter": [{
         "name": "regular video",
-        "url": "https://twitter.com/TwitterSpaces/status/1526955853743546372?s=20",
+        "url": "https://twitter.com/X/status/1697304622749086011",
         "params": {
             "aFormat": "mp3",
             "isAudioOnly": false,
@@ -14,7 +14,7 @@
     },
     {
         "name": "video with mobile web mediaviewer",
-        "url": "https://twitter.com/XSpaces/status/1526955853743546372/mediaViewer?currentTweet=1526955853743546372&currentTweetUser=XSpaces&currentTweet=1526955853743546372&currentTweetUser=XSpaces",
+        "url": "https://twitter.com/X/status/1697304622749086011/mediaViewer?currentTweet=1697304622749086011&currentTweetUser=X&currentTweet=1697304622749086011&currentTweetUser=X",
         "params": {},
         "expected": {
             "code": 200,
@@ -34,7 +34,7 @@
         }
     }, {
         "name": "mixed media (image + gif)",
-        "url": "https://twitter.com/Twitter/status/1580661436132757506?s=20",
+        "url": "https://twitter.com/sky_mj26/status/1807756010712428565",
         "params": {
             "aFormat": "mp3",
             "isAudioOnly": false,

From bcb8ab101f170fb870bc74528f6f39b33b0763e7 Mon Sep 17 00:00:00 2001
From: ihatespawn <168680471+ihatespawn@users.noreply.github.com>
Date: Tue, 9 Jul 2024 15:17:09 +0200
Subject: [PATCH 04/25] tests: fix broken links, correct expected responses
 (#618)

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

diff --git a/src/util/tests.json b/src/util/tests.json
index ba79970c..d3e5ec07 100644
--- a/src/util/tests.json
+++ b/src/util/tests.json
@@ -650,23 +650,23 @@
         }
     }, {
         "name": "1080p dash parcel",
-        "url": "https://vimeo.com/774694040",
+        "url": "https://vimeo.com/967252742",
         "params": {
             "vQuality": "1440"
         },
         "expected": {
             "code": 200,
-            "status": "stream"
+            "status": "redirect"
         }
     }, {
         "name": "720p dash parcel",
-        "url": "https://vimeo.com/774694040",
+        "url": "https://vimeo.com/967252742",
         "params": {
             "vQuality": "360"
         },
         "expected": {
             "code": 200,
-            "status": "stream"
+            "status": "redirect"
         }
     }, {
         "name": "private video",
@@ -947,7 +947,7 @@
     }],
     "streamable": [{
         "name": "regular video",
-        "url": "https://streamable.com/03r3c2",
+        "url": "https://streamable.com/p9cln4",
         "params": {},
         "expected": {
             "code": 200,
@@ -963,7 +963,7 @@
         }
     }, {
         "name": "regular video (isAudioOnly)",
-        "url": "https://streamable.com/03r3c2",
+        "url": "https://streamable.com/p9cln4",
         "params": {
             "isAudioOnly": true
         },
@@ -973,7 +973,7 @@
         }
     }, {
         "name": "regular video (isAudioMuted)",
-        "url": "https://streamable.com/03r3c2",
+        "url": "https://streamable.com/p9cln4",
         "params": {
             "isAudioMuted": true
         },
@@ -1042,8 +1042,8 @@
         "url": "https://rutube.ru/video/b521653b4f71ece57b8ff54e57ca9b82/",
         "params": {},
         "expected": {
-            "code": 200,
-            "status": "stream"
+            "code": 400,
+            "status": "error"
         }
     }, {
         "name": "vertical video",
@@ -1055,7 +1055,7 @@
         }
     }, {
         "name": "yappy",
-        "url": "https://rutube.ru/yappy/f1771e86294748eea8ecb2ac88e55740/",
+        "url": "https://rutube.ru/yappy/a06b1bf53bce403b9a069107f23c47eb/",
         "params": {},
         "expected": {
             "code": 200,
@@ -1157,8 +1157,8 @@
             "isAudioOnly": true
         },
         "expected": {
-            "code": 200,
-            "status": "stream"
+            "code": 400,
+            "status": "error"
         }
     }]
 }

From 33fa653ee54e0cade6090a85e5081ba3374b6b97 Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Tue, 9 Jul 2024 13:55:29 +0000
Subject: [PATCH 05/25] package: bump version to 7.14.6

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9c5434d9..6e4ea4f3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "cobalt",
-    "version": "7.14.5",
+    "version": "7.14.6",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "cobalt",
-            "version": "7.14.5",
+            "version": "7.14.6",
             "license": "AGPL-3.0",
             "dependencies": {
                 "content-disposition-header": "0.6.0",
diff --git a/package.json b/package.json
index b2224a50..75c8228c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "cobalt",
     "description": "save what you love",
-    "version": "7.14.5",
+    "version": "7.14.6",
     "author": "imput",
     "exports": "./src/cobalt.js",
     "type": "module",

From 404cad711f5f0da12919e1198650a54762c99048 Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Wed, 10 Jul 2024 14:13:56 +0000
Subject: [PATCH 06/25] youtube: bump youtubei.js to v10.1.0

---
 package-lock.json                          | 22 +++++++--------
 package.json                               |  2 +-
 src/modules/processing/services/youtube.js | 33 ++++++++++++++--------
 3 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6e4ea4f3..4917de2d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,7 +24,7 @@
                 "set-cookie-parser": "2.6.0",
                 "undici": "^5.19.1",
                 "url-pattern": "1.0.3",
-                "youtubei.js": "^9.3.0"
+                "youtubei.js": "^10.1.0"
             },
             "engines": {
                 "node": ">=18"
@@ -73,9 +73,9 @@
             }
         },
         "node_modules/acorn": {
-            "version": "8.11.3",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
-            "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+            "version": "8.12.1",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+            "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
             "bin": {
                 "acorn": "bin/acorn"
             },
@@ -683,9 +683,9 @@
             }
         },
         "node_modules/jintr": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/jintr/-/jintr-1.1.0.tgz",
-            "integrity": "sha512-Tu9wk3BpN2v+kb8yT6YBtue+/nbjeLFv4vvVC4PJ7oCidHKbifWhvORrAbQfxVIQZG+67am/mDagpiGSVtvrZg==",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/jintr/-/jintr-2.0.0.tgz",
+            "integrity": "sha512-RiVlevxttZ4eHEYB2dXKXDXluzHfRuw0DJQGsYuKCc5IvZj5/GbOakeqVX+Bar/G9kTty9xDJREcxukurkmYLA==",
             "funding": [
                 "https://github.com/sponsors/LuanRT"
             ],
@@ -1123,14 +1123,14 @@
             }
         },
         "node_modules/youtubei.js": {
-            "version": "9.4.0",
-            "resolved": "https://registry.npmjs.org/youtubei.js/-/youtubei.js-9.4.0.tgz",
-            "integrity": "sha512-8plCOZD2WabqWSEgZU3RjzigIIeR7sF028EERJENYrC9xO/6awpLMZfeoE1gNrNEbKcA+bzbMvonqlvBdxGdKg==",
+            "version": "10.1.0",
+            "resolved": "https://registry.npmjs.org/youtubei.js/-/youtubei.js-10.1.0.tgz",
+            "integrity": "sha512-MokZMAnpWH11VYvWuW6qjPiiPmgRl5rfDgPQOpif9qXcVHoVw1hi8ePuRSD0AZSZ+uvWGe8rvas2dzp+Jv5JKQ==",
             "funding": [
                 "https://github.com/sponsors/LuanRT"
             ],
             "dependencies": {
-                "jintr": "^1.1.0",
+                "jintr": "^2.0.0",
                 "tslib": "^2.5.0",
                 "undici": "^5.19.1"
             }
diff --git a/package.json b/package.json
index 75c8228c..bcba1894 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
         "set-cookie-parser": "2.6.0",
         "undici": "^5.19.1",
         "url-pattern": "1.0.3",
-        "youtubei.js": "^9.3.0"
+        "youtubei.js": "^10.1.0"
     },
     "optionalDependencies": {
         "freebind": "^0.2.2"
diff --git a/src/modules/processing/services/youtube.js b/src/modules/processing/services/youtube.js
index 1c86b4ed..b3a405e7 100644
--- a/src/modules/processing/services/youtube.js
+++ b/src/modules/processing/services/youtube.js
@@ -28,20 +28,24 @@ const transformSessionData = (cookie) => {
     if (!cookie)
         return;
 
-    const values = cookie.values();
+    const values = { ...cookie.values() };
     const REQUIRED_VALUES = [
         'access_token', 'refresh_token',
-        'client_id', 'client_secret',
-        'expires'
+        'client_id', 'client_secret'
     ];
 
     if (REQUIRED_VALUES.some(x => typeof values[x] !== 'string')) {
         return;
     }
-    return {
-        ...values,
-        expires: new Date(values.expires),
-    };
+
+    if (values.expires) {
+        values.expiry_date = values.expires;
+        delete values.expires;
+    } else if (!values.expiry_date) {
+        return;
+    }
+
+    return values;
 }
 
 const cloneInnertube = async (customFetch) => {
@@ -70,14 +74,19 @@ const cloneInnertube = async (customFetch) => {
     }
 
     if (session.logged_in) {
-        await session.oauth.refreshIfRequired();
-        const oldExpiry = new Date(cookie.values().expires);
-        const newExpiry = session.oauth.credentials.expires;
+        if (session.oauth.shouldRefreshToken()) {
+            await session.oauth.refreshAccessToken();
+        }
+
+        const cookieValues = cookie.values();
+        const oldExpiry = new Date(cookieValues.expiry_date);
+        const newExpiry = new Date(session.oauth.oauth2_tokens.expiry_date);
 
         if (oldExpiry.getTime() !== newExpiry.getTime()) {
             updateCookieValues(cookie, {
-                ...session.oauth.credentials,
-                expires: session.oauth.credentials.expires.toISOString()
+                ...session.oauth.client_id,
+                ...session.oauth.oauth2_tokens,
+                expiry_date: newExpiry.toISOString()
             });
         }
     }

From 20c409cdb308bcdd7e3e5ddffa97cc026ee2ab47 Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Wed, 10 Jul 2024 15:14:28 +0000
Subject: [PATCH 07/25] generate-youtube-tokens: update response format

---
 src/util/generate-youtube-tokens.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/util/generate-youtube-tokens.js b/src/util/generate-youtube-tokens.js
index 924afb13..ab877f96 100644
--- a/src/util/generate-youtube-tokens.js
+++ b/src/util/generate-youtube-tokens.js
@@ -20,9 +20,9 @@ tube.session.once(
 );
 
 tube.session.once('auth-error', (err) => bail('An error occurred:', err));
-tube.session.once('auth', ({ status, credentials, ...rest }) => {
-    if (status !== 'SUCCESS') {
-        bail('something went wrong', rest);
+tube.session.once('auth', ({ credentials }) => {
+    if (!credentials.access_token) {
+        bail('something went wrong');
     }
 
     console.log(

From 2f4e43f78f84ca53458c7e14d9a0a96fd5b1f7c1 Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Thu, 11 Jul 2024 07:56:13 +0000
Subject: [PATCH 08/25] youtube: client_id/client_secret is optional in session
 data

---
 src/modules/processing/services/youtube.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/modules/processing/services/youtube.js b/src/modules/processing/services/youtube.js
index b3a405e7..7beca2b4 100644
--- a/src/modules/processing/services/youtube.js
+++ b/src/modules/processing/services/youtube.js
@@ -29,10 +29,7 @@ const transformSessionData = (cookie) => {
         return;
 
     const values = { ...cookie.values() };
-    const REQUIRED_VALUES = [
-        'access_token', 'refresh_token',
-        'client_id', 'client_secret'
-    ];
+    const REQUIRED_VALUES = [ 'access_token', 'refresh_token' ];
 
     if (REQUIRED_VALUES.some(x => typeof values[x] !== 'string')) {
         return;

From d68ce2f490a8cfaf35499150844b81c29e516a43 Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Fri, 12 Jul 2024 00:01:18 +0000
Subject: [PATCH 09/25] stream/types: only use `nice` if parsed
 `processingPriority` is a number

for some reason, isNaN(true) -> false, which is technically correct,
but what the fuck...
---
 src/modules/stream/types.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/stream/types.js b/src/modules/stream/types.js
index af4aa2e5..071cb6d0 100644
--- a/src/modules/stream/types.js
+++ b/src/modules/stream/types.js
@@ -25,7 +25,7 @@ function killProcess(p) {
 }
 
 function getCommand(args) {
-    if (!isNaN(env.processingPriority)) {
+    if (typeof env.processingPriority === 'number' && !isNaN(env.processingPriority)) {
         return ['nice', ['-n', env.processingPriority.toString(), ffmpeg, ...args]]
     }
     return [ffmpeg, args]

From 31e1fa5c5ce47bb603d3286e3d6eb77cbad0783a Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Sat, 20 Jul 2024 12:53:59 +0200
Subject: [PATCH 10/25] run-an-instance: remove slash from end of CORS_URL
 example

it's somewhat misleading, since this specifies the origin
(https://html.spec.whatwg.org/multipage/browsers.html#concept-origin-tuple) and not a full URL
---
 docs/run-an-instance.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/run-an-instance.md b/docs/run-an-instance.md
index a440d11d..1faafb91 100644
--- a/docs/run-an-instance.md
+++ b/docs/run-an-instance.md
@@ -57,7 +57,7 @@ sudo service nscd start
 | `API_URL`             | ➖        | `https://api.cobalt.tools/` | changes url from which api server is accessible. <br> ***REQUIRED TO RUN THE API***. |
 | `API_NAME`            | `unknown` | `ams-1`                 | api server name that is shown in `/api/serverInfo`. |
 | `CORS_WILDCARD`       | `1`       | `0`                     | toggles cross-origin resource sharing. <br> `0`: disabled. `1`: enabled. |
-| `CORS_URL`            | not used  | `https://cobalt.tools/` | cross-origin resource sharing url. api will be available only from this url if `CORS_WILDCARD` is set to `0`. |
+| `CORS_URL`            | not used  | `https://cobalt.tools`  | cross-origin resource sharing url. api will be available only from this url if `CORS_WILDCARD` is set to `0`. |
 | `COOKIE_PATH`         | not used  | `/cookies.json`         | path for cookie file relative to main folder. |
 | `PROCESSING_PRIORITY` | not used  | `10`                    | changes `nice` value* for ffmpeg subprocess. available only on unix systems. |
 | `FREEBIND_CIDR`       | ➖        | `2001:db8::/32`         | IPv6 prefix used for randomly assigning addresses to cobalt requests. only supported on linux systems. see below for more info. |

From c77ee2eb449bb4ca1726cc5846eb85a34590f453 Mon Sep 17 00:00:00 2001
From: Brama Udi <brama@udi.my.id>
Date: Wed, 24 Jul 2024 22:05:21 +0700
Subject: [PATCH 11/25] services: add facebook support (#403)

* feat: add facebook support

* chore: fix fail check

* chore: minor fix

* chore: add service in README.md

* chore: cleaning post-merge code

* facebook: add shared link pattern

* chore: clean up removing unnecessarily code

* fix: facebook shared link pattern

* matchActionDecider: redirect to facebook video instead of rendering

* facebook: pass sourceUrl in object

* url: fix botched lint

* fix: facebook shared link pattern with clean up

* test: change facebook test response to redirect

---------

Co-authored-by: dumbmoron <log@riseup.net>
---
 README.md                                     |  2 +
 src/modules/processing/match.js               |  6 ++
 src/modules/processing/matchActionDecider.js  |  1 +
 src/modules/processing/services/facebook.js   | 62 +++++++++++++++++++
 src/modules/processing/servicesConfig.json    | 13 ++++
 .../processing/servicesPatternTesters.js      | 10 ++-
 src/modules/processing/url.js                 | 10 +++
 src/util/tests.json                           | 57 +++++++++++++++++
 8 files changed, 159 insertions(+), 2 deletions(-)
 create mode 100644 src/modules/processing/services/facebook.js

diff --git a/README.md b/README.md
index d2bb064c..9d6bb9a9 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ this list is not final and keeps expanding over time. if support for a service y
 | bilibili.com & bilibili.tv     | ✅            | ✅         | ✅         | ➖         | ➖              |
 | dailymotion                    | ✅            | ✅         | ✅         | ✅         | ✅              |
 | instagram posts & reels        | ✅            | ✅         | ✅         | ➖         | ➖              |
+| facebook videos                | ✅            | ❌         | ❌         | ➖         | ➖              |
 | loom                           | ✅            | ❌         | ✅         | ✅         | ➖              |
 | ok video                       | ✅            | ❌         | ✅         | ✅         | ✅              |
 | pinterest                      | ✅            | ✅         | ✅         | ➖         | ➖              |
@@ -45,6 +46,7 @@ this list is not final and keeps expanding over time. if support for a service y
 | service    | notes or features                                                                                                    |
 | :--------  | :-----                                                                                                               |
 | instagram  | supports reels, photos, and videos. lets you pick what to save from multi-media posts.                               |
+| facebook   | supports public accessible videos content only.                                                                      |
 | pinterest  | supports photos, gifs, videos and stories.                                                                           |
 | reddit     | supports gifs and videos.                                                                                            |
 | rutube     | supports yappy & private links.                                                                                      |
diff --git a/src/modules/processing/match.js b/src/modules/processing/match.js
index 3e38c4db..59bc2dd9 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 facebook from "./services/facebook.js";
 
 let freebind;
 
@@ -192,6 +193,11 @@ export default async function(host, patternMatch, lang, obj) {
                 r = await loom({
                     id: patternMatch.id
                 });
+            case "facebook":
+                r = await facebook({
+                    ...patternMatch,
+                    sourceUrl: url.href
+                });
                 break;
             default:
                 return createResponse("error", {
diff --git a/src/modules/processing/matchActionDecider.js b/src/modules/processing/matchActionDecider.js
index 74f0f8c7..74f0ec49 100644
--- a/src/modules/processing/matchActionDecider.js
+++ b/src/modules/processing/matchActionDecider.js
@@ -130,6 +130,7 @@ export default function(r, host, userFormat, isAudioOnly, lang, isAudioMuted, di
                     params = { type: "bridge" };
                     break;
 
+                case "facebook":
                 case "vine":
                 case "instagram":
                 case "tumblr":
diff --git a/src/modules/processing/services/facebook.js b/src/modules/processing/services/facebook.js
new file mode 100644
index 00000000..45d31b5f
--- /dev/null
+++ b/src/modules/processing/services/facebook.js
@@ -0,0 +1,62 @@
+import { genericUserAgent } from "../../config.js";
+
+const headers = {
+    'User-Agent': genericUserAgent,
+    'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8',
+    'Accept-Language': 'en-US,en;q=0.5',
+    'Accept-Encoding': 'gzip, deflate, br',
+    'Sec-Fetch-Mode': 'navigate',
+    'Sec-Fetch-Site': 'none',
+}
+
+function resolveUrl(url) {
+    return fetch(url, { headers })
+        .then(r => {
+            if (r.headers.get('location')) {
+                return decodeURIComponent(r.headers.get('location'))
+            }
+            if (r.headers.get('link')) {
+                const linkMatch = r.headers.get('link').match(/<(.*?)\/>/)
+                return decodeURIComponent(linkMatch[1])
+            }
+            return false
+        })
+        .catch(() => false)
+}
+
+export default async function({ sourceUrl, shortLink, username, id }) {
+    const isShortLink = !!shortLink?.length
+    const isSharedLink = !!sourceUrl.match(/\/share\/\w\//)?.length
+
+    let url = isShortLink
+        ? `https://fb.watch/${shortLink}`
+        : `https://web.facebook.com/${username}/videos/${id}`
+
+    if (isShortLink) url = await resolveUrl(url)
+    if (isSharedLink) url = sourceUrl
+
+    const html = await fetch(url, { headers })
+        .then(r => r.text())
+        .catch(() => false)
+
+    if (!html) return { error: 'ErrorCouldntFetch' };
+
+    const urls = []
+    const hd = html.match('"browser_native_hd_url":(".*?")')
+    const sd = html.match('"browser_native_sd_url":(".*?")')
+
+    if (hd?.[1]) urls.push(JSON.parse(hd[1]))
+    if (sd?.[1]) urls.push(JSON.parse(sd[1]))
+
+    if (!urls.length) {
+        return { error: 'ErrorEmptyDownload' };
+    }
+
+    let filename = `facebook_${id || shortLink}.mp4`
+
+    return {
+        urls: urls[0],
+        filename,
+        audioFilename: `${filename.slice(0, -4)}_audio`,
+    };
+}
\ No newline at end of file
diff --git a/src/modules/processing/servicesConfig.json b/src/modules/processing/servicesConfig.json
index d727b9a5..b6c62cf2 100644
--- a/src/modules/processing/servicesConfig.json
+++ b/src/modules/processing/servicesConfig.json
@@ -118,6 +118,19 @@
             "alias": "loom videos",
             "patterns": ["share/:id"],
             "enabled": true
+        },
+        "facebook": {
+            "alias": "facebook videos",
+            "altDomains": ["fb.watch"],
+            "subdomains": ["web"],
+            "patterns": [
+                "_shortLink/:shortLink",
+                ":username/videos/:caption/:id",
+                ":username/videos/:id",
+                "reel/:id",
+                "share/:shortLink/:id"
+            ],
+            "enabled": true
         }
     }
 }
diff --git a/src/modules/processing/servicesPatternTesters.js b/src/modules/processing/servicesPatternTesters.js
index ddeea31f..0fed8723 100644
--- a/src/modules/processing/servicesPatternTesters.js
+++ b/src/modules/processing/servicesPatternTesters.js
@@ -1,5 +1,5 @@
 export const testers = {
-    "bilibili": (patternMatch) => 
+    "bilibili": (patternMatch) =>
         patternMatch.comId?.length <= 12 || patternMatch.comShortLink?.length <= 16
         || patternMatch.tvId?.length <= 24,
 
@@ -27,7 +27,7 @@ export const testers = {
         patternMatch.id?.length === 32 || patternMatch.yappyId?.length === 32,
 
     "soundcloud": (patternMatch) =>
-        (patternMatch.author?.length <= 255 && patternMatch.song?.length <= 255) 
+        (patternMatch.author?.length <= 255 && patternMatch.song?.length <= 255)
         || patternMatch.shortLink?.length <= 32,
 
     "streamable": (patternMatch) =>
@@ -58,4 +58,10 @@ export const testers = {
 
     "youtube": (patternMatch) =>
         patternMatch.id?.length <= 11,
+
+    "facebook": (patternMatch) =>
+        patternMatch.shortLink?.length <= 11
+        || patternMatch.username?.length <= 30
+        || patternMatch.caption?.length <= 255
+        || patternMatch.id?.length <= 20,
 }
diff --git a/src/modules/processing/url.js b/src/modules/processing/url.js
index 111f1f6f..180ec6ee 100644
--- a/src/modules/processing/url.js
+++ b/src/modules/processing/url.js
@@ -64,7 +64,17 @@ function aliasURL(url) {
             if (url.hostname === 'dai.ly' && parts.length === 2) {
                 url = new URL(`https://dailymotion.com/video/${parts[1]}`)
             }
+
+        case "facebook":
+        case "fb":
+            if (url.searchParams.get('v')) {
+                url = new URL(`https://web.facebook.com/user/videos/${url.searchParams.get('v')}`)
+            }
+            if (url.hostname === 'fb.watch') {
+                url = new URL(`https://web.facebook.com/_shortLink/${parts[1]}`)
+            }
             break;
+
         case "ddinstagram":
             if (services.instagram.altDomains.includes(host.domain) && [null, 'd', 'g'].includes(host.subdomain)) {
                 url.hostname = 'instagram.com';
diff --git a/src/util/tests.json b/src/util/tests.json
index d3e5ec07..89e02daf 100644
--- a/src/util/tests.json
+++ b/src/util/tests.json
@@ -1160,5 +1160,62 @@
             "code": 400,
             "status": "error"
         }
+    }],
+    "facebook": [{
+        "name": "direct video with username and id",
+        "url": "https://web.facebook.com/100048111287134/videos/1157798148685638/",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "redirect"
+        }
+    }, {
+        "name": "direct video with id as query param",
+        "url": "https://web.facebook.com/watch/?v=883839773514682&ref=sharing",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "redirect"
+        }
+    }, {
+        "name": "direct video with caption",
+        "url": "https://web.facebook.com/wood57/videos/𝐒𝐞𝐛𝐚𝐬𝐤𝐨𝐦-𝐟𝐮𝐥𝐥/883839773514682",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "redirect"
+        }
+    }, {
+        "name": "shortlink video",
+        "url": "https://fb.watch/r1K6XHMfGT/",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "redirect"
+        }
+    }, {
+        "name": "reel video",
+        "url": "https://web.facebook.com/reel/730293269054758",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "redirect"
+        }
+    }, {
+        "name": "shared video link",
+        "url": "https://www.facebook.com/share/v/NEf87jbPTvFE8LsL/",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "redirect"
+        }
+    }, {
+        "name": "shared video link v2",
+        "url": "https://web.facebook.com/share/r/JFZfPVgLkiJQmWrr/",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "redirect"
+        }
     }]
 }

From 4080cd45812240c0aee621ae9784aea4eaed15ea Mon Sep 17 00:00:00 2001
From: Snazzah <7025343+Snazzah@users.noreply.github.com>
Date: Wed, 24 Jul 2024 10:06:10 -0500
Subject: [PATCH 12/25] services: add snapchat support (#429)

* feat: snapchat support

* chore: remove redundancy

* chore: a bit of better matching

* chore: update readme

* refactor(snapchat): refactor story matching to use pickers

* fix: small fix to directly linked stories

* fix(snapchat): fix filenames

* chore: update readme

* ref(snapchat): rewrite service, new test, split redirects into a util

* fix(snapchat): small fixes

* chore: deepscan error fixed

* fix: remove debug logging

* fix(snapchat): fix merge, clean up code with new utils

* fix(snapchat): update with suggested changes

---------

Signed-off-by: Snazzah <7025343+Snazzah@users.noreply.github.com>
Co-authored-by: jj <log@riseup.net>
---
 README.md                                     |  2 +
 src/modules/processing/match.js               |  9 ++
 src/modules/processing/matchActionDecider.js  |  2 +
 src/modules/processing/services/snapchat.js   | 96 +++++++++++++++++++
 src/modules/processing/servicesConfig.json    |  6 ++
 .../processing/servicesPatternTesters.js      |  5 +
 src/modules/sub/utils.js                      |  7 ++
 src/util/tests.json                           | 27 +++++-
 8 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 src/modules/processing/services/snapchat.js

diff --git a/README.md b/README.md
index 9d6bb9a9..d5fe8164 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ this list is not final and keeps expanding over time. if support for a service y
 | pinterest                      | ✅            | ✅         | ✅         | ➖         | ➖              |
 | reddit                         | ✅            | ✅         | ✅         | ❌         | ❌              |
 | rutube                         | ✅            | ✅         | ✅         | ✅         | ✅              |
+| snapchat stories & spotlights  | ✅            | ✅         | ✅         | ➖         | ➖              |
 | soundcloud                     | ➖            | ✅         | ➖         | ✅         | ✅              |
 | streamable                     | ✅            | ✅         | ✅         | ➖         | ➖              |
 | tiktok                         | ✅            | ✅         | ✅         | ❌         | ❌              |
@@ -49,6 +50,7 @@ this list is not final and keeps expanding over time. if support for a service y
 | facebook   | supports public accessible videos content only.                                                                      |
 | pinterest  | supports photos, gifs, videos and stories.                                                                           |
 | reddit     | supports gifs and videos.                                                                                            |
+| snapchat   | supports spotlights and stories. lets you pick what to save from stories.                                            |
 | rutube     | supports yappy & private links.                                                                                      |
 | soundcloud | supports private links.                                                                                              |
 | tiktok     | supports videos with or without watermark, images from slideshow without watermark, and full (original) audios.      |
diff --git a/src/modules/processing/match.js b/src/modules/processing/match.js
index 59bc2dd9..3c16a75b 100644
--- a/src/modules/processing/match.js
+++ b/src/modules/processing/match.js
@@ -24,6 +24,7 @@ import streamable from "./services/streamable.js";
 import twitch from "./services/twitch.js";
 import rutube from "./services/rutube.js";
 import dailymotion from "./services/dailymotion.js";
+import snapchat from "./services/snapchat.js";
 import loom from "./services/loom.js";
 import facebook from "./services/facebook.js";
 
@@ -189,6 +190,14 @@ export default async function(host, patternMatch, lang, obj) {
             case "dailymotion":
                 r = await dailymotion(patternMatch);
                 break;
+            case "snapchat":
+                r = await snapchat({
+                    url,
+                    username: patternMatch.username,
+                    storyId: patternMatch.storyId,
+                    spotlightId: patternMatch.spotlightId,
+                    shortLink: patternMatch.shortLink || false
+                });
             case "loom":
                 r = await loom({
                     id: patternMatch.id
diff --git a/src/modules/processing/matchActionDecider.js b/src/modules/processing/matchActionDecider.js
index 74f0ec49..7643d491 100644
--- a/src/modules/processing/matchActionDecider.js
+++ b/src/modules/processing/matchActionDecider.js
@@ -73,6 +73,7 @@ export default function(r, host, userFormat, isAudioOnly, lang, isAudioMuted, di
             switch (host) {
                 case "instagram":
                 case "twitter":
+                case "snapchat":
                     params = { picker: r.picker };
                     break;
                 case "tiktok":
@@ -136,6 +137,7 @@ export default function(r, host, userFormat, isAudioOnly, lang, isAudioMuted, di
                 case "tumblr":
                 case "pinterest":
                 case "streamable":
+                case "snapchat":
                 case "loom":
                     responseType = "redirect";
                     break;
diff --git a/src/modules/processing/services/snapchat.js b/src/modules/processing/services/snapchat.js
new file mode 100644
index 00000000..44a2b84e
--- /dev/null
+++ b/src/modules/processing/services/snapchat.js
@@ -0,0 +1,96 @@
+import { genericUserAgent } from "../../config.js";
+import { getRedirectingURL } from "../../sub/utils.js";
+import { extract, normalizeURL } from "../url.js";
+
+const SPOTLIGHT_VIDEO_REGEX = /<link data-react-helmet="true" rel="preload" href="(https:\/\/cf-st\.sc-cdn\.net\/d\/[\w.?=]+&amp;uc=\d+)" as="video"\/>/;
+const NEXT_DATA_REGEX = /<script id="__NEXT_DATA__" type="application\/json">({.+})<\/script><\/body><\/html>$/;
+
+async function getSpotlight(id) {
+    const html = await fetch(`https://www.snapchat.com/spotlight/${id}`, {
+        headers: { 'User-Agent': genericUserAgent }
+    }).then((r) => r.text()).catch(() => null);
+    if (!html) {  
+        return { error: 'ErrorCouldntFetch' };  
+    }
+
+    const videoURL = html.match(SPOTLIGHT_VIDEO_REGEX)?.[1];
+    if (videoURL) {
+        return {
+            urls: videoURL,
+            filename: `snapchat_${id}.mp4`,
+            audioFilename: `snapchat_${id}_audio`
+        }
+    }
+}
+
+async function getStory(username, storyId) {
+    const html = await fetch(`https://www.snapchat.com/add/${username}${storyId ? `/${storyId}` : ''}`, {
+        headers: { 'User-Agent': genericUserAgent }
+    }).then((r) => r.text()).catch(() => null);
+    if (!html) {  
+        return { error: 'ErrorCouldntFetch' };  
+    }  
+
+    const nextDataString = html.match(NEXT_DATA_REGEX)?.[1];
+    if (nextDataString) {
+        const data = JSON.parse(nextDataString);
+        const storyIdParam = data.query.profileParams[1];
+
+        if (storyIdParam && data.props.pageProps.story) {
+            const story = data.props.pageProps.story.snapList.find((snap) => snap.snapId.value === storyIdParam);
+            if (story) {
+                if (story.snapMediaType === 0) {
+                    return {
+                        urls: story.snapUrls.mediaUrl,
+                        isPhoto: true
+                    }
+                }
+
+                return {
+                    urls: story.snapUrls.mediaUrl,
+                    filename: `snapchat_${storyId}.mp4`,
+                    audioFilename: `snapchat_${storyId}_audio`
+                }
+            }
+        }
+
+        const defaultStory = data.props.pageProps.curatedHighlights[0];
+        if (defaultStory) {
+            return {
+                picker: defaultStory.snapList.map((snap) => ({
+                    type: snap.snapMediaType === 0 ? 'photo' : 'video',
+                    url: snap.snapUrls.mediaUrl,
+                    thumb: snap.snapUrls.mediaPreviewUrl.value
+                }))
+            }
+        }
+    }
+}
+
+export default async function(obj) {
+    let params = obj;
+    if (obj.url.hostname === 't.snapchat.com' && obj.shortLink) {
+        const link = await getRedirectingURL(`https://t.snapchat.com/${obj.shortLink}`);
+    
+        if (!link?.startsWith('https://www.snapchat.com/')) {  
+            return { error: 'ErrorCouldntFetch' };  
+        }  
+
+        const extractResult = extract(normalizeURL(link));
+        if (extractResult?.host !== 'snapchat') {  
+            return { error: 'ErrorCouldntFetch' };  
+        }
+
+        params = extractResult.patternMatch;
+    }
+
+    if (params.spotlightId) {
+        const result = await getSpotlight(params.spotlightId);
+        if (result) return result;
+    } else if (params.username) {
+        const result = await getStory(params.username, params.storyId);
+        if (result) return result;
+    }
+
+    return { error: 'ErrorCouldntFetch' };
+}
diff --git a/src/modules/processing/servicesConfig.json b/src/modules/processing/servicesConfig.json
index b6c62cf2..9161117a 100644
--- a/src/modules/processing/servicesConfig.json
+++ b/src/modules/processing/servicesConfig.json
@@ -114,6 +114,12 @@
             "patterns": ["video/:id"],
             "enabled": true
         },
+        "snapchat": {
+            "alias": "snapchat stories & spotlights",
+            "subdomains": ["t", "story"],
+            "patterns": [":shortLink", "spotlight/:spotlightId", "add/:username/:storyId", "u/:username/:storyId", "add/:username", "u/:username"],
+            "enabled": true
+        },
         "loom": {
             "alias": "loom videos",
             "patterns": ["share/:id"],
diff --git a/src/modules/processing/servicesPatternTesters.js b/src/modules/processing/servicesPatternTesters.js
index 0fed8723..9f4e0f91 100644
--- a/src/modules/processing/servicesPatternTesters.js
+++ b/src/modules/processing/servicesPatternTesters.js
@@ -30,6 +30,11 @@ export const testers = {
         (patternMatch.author?.length <= 255 && patternMatch.song?.length <= 255)
         || patternMatch.shortLink?.length <= 32,
 
+    "snapchat": (patternMatch) =>
+        (patternMatch.username?.length <= 32 && (!patternMatch.storyId || patternMatch.storyId?.length <= 255)) 
+        || patternMatch.spotlightId?.length <= 255 
+        || patternMatch.shortLink?.length <= 16,
+
     "streamable": (patternMatch) =>
         patternMatch.id?.length === 6,
 
diff --git a/src/modules/sub/utils.js b/src/modules/sub/utils.js
index 4a75bc0f..05192d97 100644
--- a/src/modules/sub/utils.js
+++ b/src/modules/sub/utils.js
@@ -45,6 +45,13 @@ export function cleanHTML(html) {
     return clean
 }
 
+export function getRedirectingURL(url) {
+    return fetch(url, { redirect: 'manual' }).then((r) => {
+        if ([301, 302, 303].includes(r.status) && r.headers.has('location'))
+            return r.headers.get('location');
+    }).catch(() => null);
+}
+
 export function merge(a, b) {
     for (const k of Object.keys(b)) {
         if (Array.isArray(b[k])) {
diff --git a/src/util/tests.json b/src/util/tests.json
index 89e02daf..b34783bd 100644
--- a/src/util/tests.json
+++ b/src/util/tests.json
@@ -1132,6 +1132,31 @@
             "status": "stream"
         }
     }],
+    "snapchat": [{
+        "name": "spotlight",
+        "url": "https://www.snapchat.com/spotlight/W7_EDlXWTBiXAEEniNoMPwAAYdWxucG9pZmNqAY46j0a5AY46j0YbAAAAAQ",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "redirect"
+        }
+    }, {
+        "name": "shortlinked spotlight",
+        "url": "https://t.snapchat.com/4ZsiBLDi",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "redirect"
+        }
+    }, {
+        "name": "story",
+        "url": "https://www.snapchat.com/add/bazerkmakane",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "picker"
+        }
+    }],
     "loom": [{
         "name": "1080p video",
         "url": "https://www.loom.com/share/313bf71d20ca47b2a35b6634cefdb761",
@@ -1218,4 +1243,4 @@
             "status": "redirect"
         }
     }]
-}
+}
\ No newline at end of file

From b516033f09ad6e38f1c076a3364979b69e98dfa5 Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Wed, 24 Jul 2024 15:17:58 +0000
Subject: [PATCH 13/25] match: clean up snapchat call & add missing `break`s

---
 src/modules/processing/match.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/modules/processing/match.js b/src/modules/processing/match.js
index 3c16a75b..b7d46333 100644
--- a/src/modules/processing/match.js
+++ b/src/modules/processing/match.js
@@ -193,15 +193,14 @@ export default async function(host, patternMatch, lang, obj) {
             case "snapchat":
                 r = await snapchat({
                     url,
-                    username: patternMatch.username,
-                    storyId: patternMatch.storyId,
-                    spotlightId: patternMatch.spotlightId,
-                    shortLink: patternMatch.shortLink || false
+                    ...patternMatch
                 });
+                break;
             case "loom":
                 r = await loom({
                     id: patternMatch.id
                 });
+                break;
             case "facebook":
                 r = await facebook({
                     ...patternMatch,

From 85e376bffd85e4ec2f8a8d2c99eedf611be61085 Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Wed, 24 Jul 2024 17:27:26 +0200
Subject: [PATCH 14/25] api: move accept header check into handler, simplify
 error handling (#614)

---
 src/core/api.js                    | 37 +++++++++++-------------------
 src/localization/languages/en.json |  3 ++-
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/src/core/api.js b/src/core/api.js
index 8eb4cb40..aaad0887 100644
--- a/src/core/api.js
+++ b/src/core/api.js
@@ -26,7 +26,7 @@ const corsConfig = env.corsWildcard ? {} : {
 export function runAPI(express, app, gitCommit, gitBranch, __dirname) {
     const startTime = new Date();
     const startTimestamp = startTime.getTime();
-    
+
     const serverInfo = {
         version: version,
         commit: gitCommit,
@@ -81,38 +81,23 @@ export function runAPI(express, app, gitCommit, gitBranch, __dirname) {
     app.use((req, res, next) => {
         try {
             decodeURIComponent(req.path)
-        } catch { 
+        } catch {
             return res.redirect('/')
         }
         next();
     })
 
-    app.use('/api/json', express.json({
-        verify: (req, res, buf) => {
-            if (String(req.header('Accept')) === "application/json") {
-                if (buf.length > 720) throw new Error();
-                JSON.parse(buf);
-            } else {
-                throw new Error();
-            }
-        }
-    }))
-
-    // handle express.json errors properly (https://github.com/expressjs/express/issues/4065)
-    app.use('/api/json', (err, req, res, next) => {
-        let errorText = "invalid json body";
-        const acceptHeader = String(req.header('Accept')) !== "application/json";
-
-        if (err || acceptHeader) {
-            if (acceptHeader) errorText = "invalid accept header";
+    app.use('/api/json', express.json({ limit: 1024 }));
+    app.use('/api/json', (err, _, res, next) => {
+        if (err) {
             return res.status(400).json({
                 status: "error",
-                text: errorText
+                text: "invalid json body"
             });
-        } else {
-            next();
         }
-    })
+
+        next();
+    });
 
     app.post('/api/json', async (req, res) => {
         const request = req.body;
@@ -123,6 +108,10 @@ export function runAPI(express, app, gitCommit, gitBranch, __dirname) {
             res.status(status).json(body);
         }
 
+        if (!acceptRegex.test(req.header('Accept'))) {
+            return fail('ErrorInvalidAcceptHeader');
+        }
+
         if (!acceptRegex.test(req.header('Content-Type'))) {
             return fail('ErrorInvalidContentType');
         }
diff --git a/src/localization/languages/en.json b/src/localization/languages/en.json
index eecd9ac1..2b10f41d 100644
--- a/src/localization/languages/en.json
+++ b/src/localization/languages/en.json
@@ -159,6 +159,7 @@
         "UpdateOneMillion": "1 million users and blazing speed",
         "ErrorYTAgeRestrict": "this youtube video is age-restricted, so i can't see it. try another one!",
         "ErrorYTLogin": "couldn't get this youtube video because it requires an account to view.\n\nthis limitation is done by google to seemingly stop scraping, affecting all 3rd party tools and even their own clients.\n\ntry again, but if issue persists, {ContactLink}.",
-        "ErrorYTRateLimit": "i got rate limited by youtube. try again in a few seconds, but if issue persists, {ContactLink}."
+        "ErrorYTRateLimit": "i got rate limited by youtube. try again in a few seconds, but if issue persists, {ContactLink}.",
+        "ErrorInvalidAcceptHeader": "invalid accept header"
     }
 }

From a6623567e29c4dd6ce1d385d14eba16322bf79de Mon Sep 17 00:00:00 2001
From: alina sireneva <alina@tei.su>
Date: Wed, 24 Jul 2024 08:49:47 -0700
Subject: [PATCH 15/25] feat: support external proxies (#588)

---
 docs/run-an-instance.md | 1 +
 src/core/api.js         | 9 +++++++++
 src/modules/config.js   | 4 +++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/run-an-instance.md b/docs/run-an-instance.md
index 1faafb91..d31a67f5 100644
--- a/docs/run-an-instance.md
+++ b/docs/run-an-instance.md
@@ -56,6 +56,7 @@ sudo service nscd start
 | `API_LISTEN_ADDRESS`  | `0.0.0.0` | `127.0.0.1`             | changes address from which api server is accessible. **if you are using docker, you usually don't need to configure this.** |
 | `API_URL`             | ➖        | `https://api.cobalt.tools/` | changes url from which api server is accessible. <br> ***REQUIRED TO RUN THE API***. |
 | `API_NAME`            | `unknown` | `ams-1`                 | api server name that is shown in `/api/serverInfo`. |
+| `API_EXTERNAL_PROXY`  | ➖        | `http://user:password@127.0.0.1:8080`| url of the proxy that will be passed to [`ProxyAgent`](https://undici.nodejs.org/#/docs/api/ProxyAgent) and used for all external requests. HTTP(S) only. |
 | `CORS_WILDCARD`       | `1`       | `0`                     | toggles cross-origin resource sharing. <br> `0`: disabled. `1`: enabled. |
 | `CORS_URL`            | not used  | `https://cobalt.tools`  | cross-origin resource sharing url. api will be available only from this url if `CORS_WILDCARD` is set to `0`. |
 | `COOKIE_PATH`         | not used  | `/cookies.json`         | path for cookie file relative to main folder. |
diff --git a/src/core/api.js b/src/core/api.js
index aaad0887..5f4ee804 100644
--- a/src/core/api.js
+++ b/src/core/api.js
@@ -1,5 +1,6 @@
 import cors from "cors";
 import rateLimit from "express-rate-limit";
+import { setGlobalDispatcher, ProxyAgent } from "undici";
 
 import { env, version } from "../modules/config.js";
 
@@ -208,6 +209,14 @@ export function runAPI(express, app, gitCommit, gitBranch, __dirname) {
     randomizeCiphers();
     setInterval(randomizeCiphers, 1000 * 60 * 30); // shuffle ciphers every 30 minutes
 
+    if (env.externalProxy) {
+        if (env.freebindCIDR) {
+            throw new Error('Freebind is not available when external proxy is enabled')
+        }
+
+        setGlobalDispatcher(new ProxyAgent(env.externalProxy))
+    }
+
     app.listen(env.apiPort, env.listenAddress, () => {
         console.log(`\n` +
             `${Cyan("cobalt")} API ${Bright(`v.${version}-${gitCommit} (${gitBranch})`)}\n` +
diff --git a/src/modules/config.js b/src/modules/config.js
index 530c5f0b..662d8b05 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -48,7 +48,9 @@ const
 
         processingPriority: process.platform !== 'win32'
                                 && process.env.PROCESSING_PRIORITY
-                                && parseInt(process.env.PROCESSING_PRIORITY)
+                                && parseInt(process.env.PROCESSING_PRIORITY),
+
+        externalProxy: process.env.API_EXTERNAL_PROXY,
     }
 
 export const

From 0fe85b2ae94766630aee72f91c73f3b9039ef274 Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Wed, 24 Jul 2024 15:52:09 +0000
Subject: [PATCH 16/25] services/ok: fallback to compilation title if author
 name is missing

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

diff --git a/src/modules/processing/services/ok.js b/src/modules/processing/services/ok.js
index 97bbcf82..33847cd8 100644
--- a/src/modules/processing/services/ok.js
+++ b/src/modules/processing/services/ok.js
@@ -45,7 +45,7 @@ export default async function(o) {
 
     let fileMetadata = {
         title: cleanString(videoData.movie.title.trim()),
-        author: cleanString(videoData.author.name.trim()),
+        author: cleanString((videoData.author?.name || videoData.compilationTitle).trim()),
     }
 
     if (bestVideo) return {

From cdb2b401ced4b357c882e81b02db684ccc20934d Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Tue, 9 Jul 2024 18:30:24 +0000
Subject: [PATCH 17/25] ci: test services in github actions

---
 .github/workflows/test.yml | 24 +++++++++++
 src/modules/test.js        | 42 ++++++++++++++++++++
 src/util/test-ci.js        | 81 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 147 insertions(+)
 create mode 100644 src/modules/test.js
 create mode 100644 src/util/test-ci.js

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 193ddd01..4ac2daf3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -36,3 +36,27 @@ jobs:
         uses: actions/checkout@v4
       - name: Run test script
         run: .github/test.sh api
+
+  check-services:
+    name: test service functionality
+    runs-on: ubuntu-latest
+    outputs:
+      services: ${{ steps.checkServices.outputs.service_list }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - id: checkServices
+        run: npm ci && echo "service_list=$(node src/util/test-ci get-services)" >> "$GITHUB_OUTPUT"
+
+  test-services:
+    needs: check-services
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        service: ${{ fromJson(needs.check-services.outputs.services) }}
+    name: "test service: ${{ matrix.service }}"
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - run: npm ci && node src/util/test-ci run-tests-for ${{ matrix.service }}
\ No newline at end of file
diff --git a/src/modules/test.js b/src/modules/test.js
new file mode 100644
index 00000000..75bdab26
--- /dev/null
+++ b/src/modules/test.js
@@ -0,0 +1,42 @@
+import { normalizeRequest } from "../modules/processing/request.js";
+import match from "./processing/match.js";
+import { extract } from "./processing/url.js";
+
+export async function runTest(url, params, expect) {
+    const normalized = normalizeRequest({ url, ...params });
+    if (!normalized) {
+        throw "invalid request";
+    }
+
+    const parsed = extract(normalized.url);
+    if (parsed === null) {
+        throw `invalid url: ${normalized.url}`;
+    }
+
+    const result = await match(
+        parsed.host, parsed.patternMatch, "en", normalized
+    );
+
+    let error = [];
+    if (expect.status !== result.body.status) {
+        const detail = `${expect.status} (expected) != ${result.body.status} (actual)`;
+        error.push(`status mismatch: ${detail}`);
+    }
+
+    if (expect.code !== result.status) {
+        const detail = `${expect.code} (expected) != ${result.status} (actual)`;
+        error.push(`status code mismatch: ${detail}`);
+    }
+
+    if (error.length) {
+        if (result.body.text) {
+            error.push(`error message: ${result.body.text}`);
+        }
+
+        throw error.join('\n');
+    }
+
+    if (result.body.status === 'stream') {
+        // TODO: stream testing
+    }
+}
\ No newline at end of file
diff --git a/src/util/test-ci.js b/src/util/test-ci.js
new file mode 100644
index 00000000..ed6962c7
--- /dev/null
+++ b/src/util/test-ci.js
@@ -0,0 +1,81 @@
+import { env } from "../modules/config.js";
+import { runTest } from "../modules/test.js";
+import { loadLoc } from "../localization/manager.js";
+import { loadJSON } from "../modules/sub/loadFromFs.js";
+import { Red, Bright } from "../modules/sub/consoleText.js";
+
+const tests = loadJSON('./src/util/tests.json');
+const services = loadJSON('./src/modules/processing/servicesConfig.json');
+
+// services that are known to frequently fail due to external
+// factors (e.g. rate limiting)
+const finnicky = new Set(['bilibili', 'instagram', 'youtube'])
+
+const action = process.argv[2];
+switch (action) {
+    case "get-services":
+        const fromConfig = Object.keys(services.config);
+
+        const missingTests = fromConfig.filter(
+            service => !tests[service] || tests[service].length === 0
+        );
+
+        if (missingTests.length) {
+            console.error('services have no tests:', missingTests);
+            console.log('[]');
+            process.exitCode = 1;
+            break;
+        }
+
+        console.log(JSON.stringify(fromConfig));
+        break;
+
+    case "run-tests-for":
+        const service = process.argv[3];
+        let failed = false;
+
+        if (!tests[service]) {
+            console.error('no such service:', service);
+        }
+
+        await loadLoc();
+        env.streamLifespan = 10000;
+        env.apiURL = 'http://x';
+
+        for (const test of tests[service]) {
+            const { name, url, params, expected } = test;
+            const canFail = test.canFail || finnicky.has(service);
+
+            try {
+                await runTest(url, params, expected);
+                console.log(`${service}/${name}: ok`);
+
+            } catch(e) {
+                failed = !canFail;
+
+                let failText = canFail ? `${Red('FAIL')} (ignored)` : Bright(Red('FAIL'));
+                if (canFail && process.env.GITHUB_ACTION) {
+                    console.log(`::warning title=${service}/${name.replace(/,/g, ';')}::failed and was ignored`);
+                }
+
+                console.error(`${service}/${name}: ${failText}`);
+                const errorString = e.toString().split('\n');
+                let c = '┃';
+                errorString.forEach((line, index) => {
+                    line = line.replace('!=', Red('!='));
+
+                    if (index === errorString.length - 1) {
+                        c = '┗';
+                    }
+
+                    console.error(`   ${c}`, line);
+                });
+            }
+        }
+
+        process.exitCode = Number(failed);
+        break;
+    default:
+        console.error('invalid action:', action);
+        process.exitCode = 1;
+}
\ No newline at end of file

From 93c27f262b34585d473cdaf1691707b15ff15a17 Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Tue, 9 Jul 2024 18:45:16 +0000
Subject: [PATCH 18/25] tests/twitter: fix incorrect status, expect age
 restricted test to fail

---
 src/util/tests.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/util/tests.json b/src/util/tests.json
index b34783bd..902ec00a 100644
--- a/src/util/tests.json
+++ b/src/util/tests.json
@@ -42,7 +42,7 @@
         },
         "expected": {
             "code": 200,
-            "status": "redirect"
+            "status": "picker"
         }
     }, {
         "name": "picker: mixed media (3 videos)",
@@ -113,9 +113,10 @@
             "status": "redirect"
         }
     }, {
-        "name": "age-restricted video",
+        "name": "age restricted video",
         "url": "https://twitter.com/FckyeahCharli/status/1650987582749065220",
         "params": {},
+        "canFail": true,
         "expected": {
             "code": 200,
             "status": "redirect"

From 27a6310357da8dd474be4a48498672d6b0f77357 Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Tue, 9 Jul 2024 19:04:52 +0000
Subject: [PATCH 19/25] ci/test: update basic test to use more reliable example
 link

---
 .github/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/test.sh b/.github/test.sh
index 85683b91..80de1fcd 100755
--- a/.github/test.sh
+++ b/.github/test.sh
@@ -18,7 +18,7 @@ test_api() {
          -X POST \
          -H "Accept: application/json" \
          -H "Content-Type: application/json" \
-         -d '{"url":"https://www.youtube.com/watch?v=jNQXAC9IVRw"}')
+         -d '{"url":"https://vine.co/v/huwVJIEJW50", "isAudioOnly": true}')
 
     echo "$API_RESPONSE"
     STATUS=$(echo "$API_RESPONSE" | jq -r .status)

From 9bf6cd36b57417d5a7321ab4c5f704eaee185a0e Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Wed, 24 Jul 2024 15:56:50 +0000
Subject: [PATCH 20/25] tests: add canFail to facebook shortlink test

---
 src/util/tests.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/util/tests.json b/src/util/tests.json
index 902ec00a..39ca17e1 100644
--- a/src/util/tests.json
+++ b/src/util/tests.json
@@ -1214,6 +1214,7 @@
     }, {
         "name": "shortlink video",
         "url": "https://fb.watch/r1K6XHMfGT/",
+        "canFail": true,
         "params": {},
         "expected": {
             "code": 200,
@@ -1244,4 +1245,4 @@
             "status": "redirect"
         }
     }]
-}
\ No newline at end of file
+}

From faeb96848bd8d90bce0565011bc5a6979c11b50c Mon Sep 17 00:00:00 2001
From: ihatespawn <168680471+ihatespawn@users.noreply.github.com>
Date: Wed, 24 Jul 2024 19:46:29 +0200
Subject: [PATCH 21/25] tests: add mature video vimeo test (#628)

---
 src/util/tests.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/util/tests.json b/src/util/tests.json
index 39ca17e1..ac65bf0b 100644
--- a/src/util/tests.json
+++ b/src/util/tests.json
@@ -677,6 +677,14 @@
             "code": 200,
             "status": "redirect"
         }
+    }, {
+        "name": "mature video",
+        "url": "https://vimeo.com/973212054",
+        "params": {},
+        "expected": {
+            "code": 200,
+            "status": "redirect"
+        }
     }],
     "reddit": [{
         "name": "video with audio",

From 83af16bb12c19371b458947d7a49f634eb980b63 Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Thu, 25 Jul 2024 11:57:02 +0600
Subject: [PATCH 22/25] facebook: do not request the source url & clean up

fixed a vulnerability, removed useless variables, and cleaned up

thankfully we haven't built the image yesterday
---
 src/modules/processing/match.js               |  3 +-
 src/modules/processing/services/facebook.js   | 46 ++++++++-----------
 src/modules/processing/servicesConfig.json    |  2 +-
 .../processing/servicesPatternTesters.js      |  3 +-
 4 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/src/modules/processing/match.js b/src/modules/processing/match.js
index b7d46333..ec052e60 100644
--- a/src/modules/processing/match.js
+++ b/src/modules/processing/match.js
@@ -203,8 +203,7 @@ export default async function(host, patternMatch, lang, obj) {
                 break;
             case "facebook":
                 r = await facebook({
-                    ...patternMatch,
-                    sourceUrl: url.href
+                    ...patternMatch
                 });
                 break;
             default:
diff --git a/src/modules/processing/services/facebook.js b/src/modules/processing/services/facebook.js
index 45d31b5f..17dedab4 100644
--- a/src/modules/processing/services/facebook.js
+++ b/src/modules/processing/services/facebook.js
@@ -4,59 +4,53 @@ const headers = {
     'User-Agent': genericUserAgent,
     'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8',
     'Accept-Language': 'en-US,en;q=0.5',
-    'Accept-Encoding': 'gzip, deflate, br',
     'Sec-Fetch-Mode': 'navigate',
     'Sec-Fetch-Site': 'none',
 }
 
-function resolveUrl(url) {
+const resolveUrl = (url) => {
     return fetch(url, { headers })
         .then(r => {
             if (r.headers.get('location')) {
-                return decodeURIComponent(r.headers.get('location'))
+                return decodeURIComponent(r.headers.get('location'));
             }
             if (r.headers.get('link')) {
-                const linkMatch = r.headers.get('link').match(/<(.*?)\/>/)
-                return decodeURIComponent(linkMatch[1])
+                const linkMatch = r.headers.get('link').match(/<(.*?)\/>/);
+                return decodeURIComponent(linkMatch[1]);
             }
-            return false
+            return false;
         })
-        .catch(() => false)
+        .catch(() => false);
 }
 
-export default async function({ sourceUrl, shortLink, username, id }) {
-    const isShortLink = !!shortLink?.length
-    const isSharedLink = !!sourceUrl.match(/\/share\/\w\//)?.length
+export default async function({ id, shareType, shortLink }) {
+    let url = `https://web.facebook.com/i/videos/${id}`;
 
-    let url = isShortLink
-        ? `https://fb.watch/${shortLink}`
-        : `https://web.facebook.com/${username}/videos/${id}`
-
-    if (isShortLink) url = await resolveUrl(url)
-    if (isSharedLink) url = sourceUrl
+    if (shareType) url = `https://web.facebook.com/share/${shareType}/${id}`;
+    if (shortLink) url = await resolveUrl(`https://fb.watch/${shortLink}`);
 
     const html = await fetch(url, { headers })
         .then(r => r.text())
-        .catch(() => false)
+        .catch(() => false);
 
     if (!html) return { error: 'ErrorCouldntFetch' };
 
-    const urls = []
-    const hd = html.match('"browser_native_hd_url":(".*?")')
-    const sd = html.match('"browser_native_sd_url":(".*?")')
+    const urls = [];
+    const hd = html.match('"browser_native_hd_url":(".*?")');
+    const sd = html.match('"browser_native_sd_url":(".*?")');
 
-    if (hd?.[1]) urls.push(JSON.parse(hd[1]))
-    if (sd?.[1]) urls.push(JSON.parse(sd[1]))
+    if (hd?.[1]) urls.push(JSON.parse(hd[1]));
+    if (sd?.[1]) urls.push(JSON.parse(sd[1]));
 
     if (!urls.length) {
         return { error: 'ErrorEmptyDownload' };
     }
 
-    let filename = `facebook_${id || shortLink}.mp4`
+    const baseFilename = `facebook_${id || shortLink}`;
 
     return {
         urls: urls[0],
-        filename,
-        audioFilename: `${filename.slice(0, -4)}_audio`,
+        filename: `${baseFilename}.mp4`,
+        audioFilename: `${baseFilename}_audio`,
     };
-}
\ No newline at end of file
+}
diff --git a/src/modules/processing/servicesConfig.json b/src/modules/processing/servicesConfig.json
index 9161117a..6955a946 100644
--- a/src/modules/processing/servicesConfig.json
+++ b/src/modules/processing/servicesConfig.json
@@ -134,7 +134,7 @@
                 ":username/videos/:caption/:id",
                 ":username/videos/:id",
                 "reel/:id",
-                "share/:shortLink/:id"
+                "share/:shareType/:id"
             ],
             "enabled": true
         }
diff --git a/src/modules/processing/servicesPatternTesters.js b/src/modules/processing/servicesPatternTesters.js
index 9f4e0f91..48f953c1 100644
--- a/src/modules/processing/servicesPatternTesters.js
+++ b/src/modules/processing/servicesPatternTesters.js
@@ -68,5 +68,6 @@ export const testers = {
         patternMatch.shortLink?.length <= 11
         || patternMatch.username?.length <= 30
         || patternMatch.caption?.length <= 255
-        || patternMatch.id?.length <= 20,
+        || patternMatch.id?.length <= 20 && !patternMatch.shareType
+        || patternMatch.id?.length <= 20 && patternMatch.shareType?.length === 1,
 }

From a388839e15dd1002cb781dcec12bf2112ac4617e Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Thu, 25 Jul 2024 11:58:43 +0600
Subject: [PATCH 23/25] snapchat: clean up

---
 src/modules/processing/match.js             |  2 +-
 src/modules/processing/services/snapchat.js | 26 ++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/modules/processing/match.js b/src/modules/processing/match.js
index ec052e60..6e600cf0 100644
--- a/src/modules/processing/match.js
+++ b/src/modules/processing/match.js
@@ -192,7 +192,7 @@ export default async function(host, patternMatch, lang, obj) {
                 break;
             case "snapchat":
                 r = await snapchat({
-                    url,
+                    hostname: url.hostname,
                     ...patternMatch
                 });
                 break;
diff --git a/src/modules/processing/services/snapchat.js b/src/modules/processing/services/snapchat.js
index 44a2b84e..a93f0933 100644
--- a/src/modules/processing/services/snapchat.js
+++ b/src/modules/processing/services/snapchat.js
@@ -9,8 +9,8 @@ async function getSpotlight(id) {
     const html = await fetch(`https://www.snapchat.com/spotlight/${id}`, {
         headers: { 'User-Agent': genericUserAgent }
     }).then((r) => r.text()).catch(() => null);
-    if (!html) {  
-        return { error: 'ErrorCouldntFetch' };  
+    if (!html) {
+        return { error: 'ErrorCouldntFetch' };
     }
 
     const videoURL = html.match(SPOTLIGHT_VIDEO_REGEX)?.[1];
@@ -27,9 +27,9 @@ async function getStory(username, storyId) {
     const html = await fetch(`https://www.snapchat.com/add/${username}${storyId ? `/${storyId}` : ''}`, {
         headers: { 'User-Agent': genericUserAgent }
     }).then((r) => r.text()).catch(() => null);
-    if (!html) {  
-        return { error: 'ErrorCouldntFetch' };  
-    }  
+    if (!html) {
+        return { error: 'ErrorCouldntFetch' };
+    }
 
     const nextDataString = html.match(NEXT_DATA_REGEX)?.[1];
     if (nextDataString) {
@@ -67,18 +67,18 @@ async function getStory(username, storyId) {
     }
 }
 
-export default async function(obj) {
+export default async function (obj) {
     let params = obj;
-    if (obj.url.hostname === 't.snapchat.com' && obj.shortLink) {
+    if (obj.hostname === 't.snapchat.com' && obj.shortLink) {
         const link = await getRedirectingURL(`https://t.snapchat.com/${obj.shortLink}`);
-    
-        if (!link?.startsWith('https://www.snapchat.com/')) {  
-            return { error: 'ErrorCouldntFetch' };  
-        }  
+
+        if (!link?.startsWith('https://www.snapchat.com/')) {
+            return { error: 'ErrorCouldntFetch' };
+        }
 
         const extractResult = extract(normalizeURL(link));
-        if (extractResult?.host !== 'snapchat') {  
-            return { error: 'ErrorCouldntFetch' };  
+        if (extractResult?.host !== 'snapchat') {
+            return { error: 'ErrorCouldntFetch' };
         }
 
         params = extractResult.patternMatch;

From 8ab0661f1aa7e4229fbc2bfc02b46ef633e7c589 Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Thu, 25 Jul 2024 12:08:37 +0600
Subject: [PATCH 24/25] tests: update rutube yappy link

---
 src/util/tests.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/tests.json b/src/util/tests.json
index ac65bf0b..6399d8ac 100644
--- a/src/util/tests.json
+++ b/src/util/tests.json
@@ -1064,7 +1064,7 @@
         }
     }, {
         "name": "yappy",
-        "url": "https://rutube.ru/yappy/a06b1bf53bce403b9a069107f23c47eb/",
+        "url": "https://rutube.ru/yappy/c8c32bf7aee04412837656ea26c2b25b/",
         "params": {},
         "expected": {
             "code": 200,

From cb2bde5b5175089bdd32c0d3d1552637393c0547 Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Thu, 25 Jul 2024 12:14:25 +0600
Subject: [PATCH 25/25] tests: allow facebook reel test to fail

---
 src/util/tests.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/util/tests.json b/src/util/tests.json
index 6399d8ac..1093d75c 100644
--- a/src/util/tests.json
+++ b/src/util/tests.json
@@ -1231,6 +1231,7 @@
     }, {
         "name": "reel video",
         "url": "https://web.facebook.com/reel/730293269054758",
+        "canFail": true,
         "params": {},
         "expected": {
             "code": 200,