From 8276e51dbcc7afb8b3da7538a0185b6bb29db40a Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Thu, 4 Jul 2024 11:28:17 +0000
Subject: [PATCH 01/13] ci: add fast-forward merge action

---
 .github/workflows/fast-forward.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .github/workflows/fast-forward.yml

diff --git a/.github/workflows/fast-forward.yml b/.github/workflows/fast-forward.yml
new file mode 100644
index 00000000..adda8f35
--- /dev/null
+++ b/.github/workflows/fast-forward.yml
@@ -0,0 +1,22 @@
+name: fast-forward
+on:
+  issue_comment:
+    types: [created, edited]
+jobs:
+  fast-forward:
+    # Only run if the comment contains the /fast-forward command.
+    if: ${{ contains(github.event.comment.body, '/fast-forward')
+            && github.event.issue.pull_request }}
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      pull-requests: write
+      issues: write
+
+    steps:
+      - name: Fast forwarding
+        uses: sequoia-pgp/fast-forward@v1
+        with:
+          merge: true
+          comment: 'on-error'
\ No newline at end of file

From 0fefc4ac27a980befd047426c6069c7ba3a81a94 Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Sat, 6 Jul 2024 08:23:20 +0000
Subject: [PATCH 02/13] services/ok: fix video data extraction

closes #589
---
 src/modules/processing/services/ok.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/modules/processing/services/ok.js b/src/modules/processing/services/ok.js
index 295d5b81..97bbcf82 100644
--- a/src/modules/processing/services/ok.js
+++ b/src/modules/processing/services/ok.js
@@ -20,14 +20,15 @@ export default async function(o) {
     }).then(r => r.text()).catch(() => {});
 
     if (!html) return { error: 'ErrorCouldntFetch' };
-    if (!html.includes(`<div data-module="OKVideo" data-options="{`)) {
+
+    let videoData = html.match(/<div data-module="OKVideo" .*? data-options="({.*?})"( .*?)>/)
+                        ?.[1]
+                        ?.replaceAll("&quot;", '"');
+
+    if (!videoData) {
         return { error: 'ErrorEmptyDownload' };
     }
 
-    let videoData = html.split(`<div data-module="OKVideo" data-options="`)[1]
-                        .split('" data-')[0]
-                        .replaceAll("&quot;", '"');
-
     videoData = JSON.parse(JSON.parse(videoData).flashvars.metadata);
 
     if (videoData.provider !== "UPLOADED_ODKL")

From 4daeaa31074b27a727f4014d1f27cb326f4c3f7c Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Sat, 6 Jul 2024 08:33:02 +0000
Subject: [PATCH 03/13] services/soundcloud: properly check script hostname

---
 src/modules/processing/services/soundcloud.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/modules/processing/services/soundcloud.js b/src/modules/processing/services/soundcloud.js
index 389eaf6c..c36ec61d 100644
--- a/src/modules/processing/services/soundcloud.js
+++ b/src/modules/processing/services/soundcloud.js
@@ -12,17 +12,19 @@ async function findClientID() {
         let scVersion = String(sc.match(/<script>window\.__sc_version="[0-9]{10}"<\/script>/)[0].match(/[0-9]{10}/));
 
         if (cachedID.version === scVersion) return cachedID.id;
-        
+
         let scripts = sc.matchAll(/<script.+src="(.+)">/g);
         let clientid;
         for (let script of scripts) {
             let url = script[1];
-    
-            if (url && !url.startsWith('https://a-v2.sndcdn.com')) return;
-    
+
+            if (!url?.startsWith('https://a-v2.sndcdn.com/')) {
+                return;
+            }
+
             let scrf = await fetch(url).then(r => r.text()).catch(() => {});
             let id = scrf.match(/\("client_id=[A-Za-z0-9]{32}"\)/);
-    
+
             if (id && typeof id[0] === 'string') {
                 clientid = id[0].match(/[A-Za-z0-9]{32}/)[0];
                 break;

From 479e14778de6822eff4ee9421ce2db5120e3e60b Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Sat, 6 Jul 2024 08:55:48 +0000
Subject: [PATCH 04/13] services/pinterest: stricter hostname check on video
 regex

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

diff --git a/src/modules/processing/services/pinterest.js b/src/modules/processing/services/pinterest.js
index f823d6bb..3e9e1d32 100644
--- a/src/modules/processing/services/pinterest.js
+++ b/src/modules/processing/services/pinterest.js
@@ -1,6 +1,6 @@
 import { genericUserAgent } from "../../config.js";
 
-const videoRegex = /"url":"(https:\/\/v1.pinimg.com\/videos\/.*?)"/g;
+const videoRegex = /"url":"(https:\/\/v1\.pinimg\.com\/videos\/.*?)"/g;
 const imageRegex = /src="(https:\/\/i\.pinimg\.com\/.*\.(jpg|gif))"/g;
 
 export default async function(o) {

From 315ddb17c1de9c90da4d43788b12e42301731448 Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Sat, 6 Jul 2024 08:59:02 +0000
Subject: [PATCH 05/13] web/onDemand: check blockId is string, early return if
 not

---
 src/core/web.js | 69 +++++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/core/web.js b/src/core/web.js
index 9a281c47..d892c56c 100644
--- a/src/core/web.js
+++ b/src/core/web.js
@@ -26,45 +26,46 @@ export async function runWeb(express, app, gitCommit, gitBranch, __dirname) {
 
     app.get('/onDemand', (req, res) => {
         try {
-            if (req.query.blockId) {
-                let blockId = req.query.blockId.slice(0, 3);
-                let blockData;
-                switch(blockId) {
-                    // changelog history
-                    case "0":
-                        let history = changelogHistory();
-                        if (history) {
-                            blockData = createResponse("success", { t: history })
-                        } else {
-                            blockData = createResponse("error", {
-                                t: "couldn't render this block, please try again!"
-                            })
-                        }
-                        break;
-                    // celebrations emoji
-                    case "1":
-                        let celebration = celebrationsEmoji();
-                        if (celebration) {
-                            blockData = createResponse("success", { t: celebration })
-                        }
-                        break;
-                    default:
-                        blockData = createResponse("error", {
-                            t: "couldn't find a block with this id"
-                        })
-                        break;
-                }
-                if (blockData?.body) {
-                    return res.status(blockData.status).json(blockData.body);
-                } else {
-                    return res.status(204).end();
-                }
-            } else {
+            if (typeof req.query.blockId !== 'string') {
                 return res.status(400).json({
                     status: "error",
                     text: "couldn't render this block, please try again!"
                 });
             }
+
+            let blockId = req.query.blockId.slice(0, 3);
+            let blockData;
+            switch(blockId) {
+                // changelog history
+                case "0":
+                    let history = changelogHistory();
+                    if (history) {
+                        blockData = createResponse("success", { t: history })
+                    } else {
+                        blockData = createResponse("error", {
+                            t: "couldn't render this block, please try again!"
+                        })
+                    }
+                    break;
+                // celebrations emoji
+                case "1":
+                    let celebration = celebrationsEmoji();
+                    if (celebration) {
+                        blockData = createResponse("success", { t: celebration })
+                    }
+                    break;
+                default:
+                    blockData = createResponse("error", {
+                        t: "couldn't find a block with this id"
+                    })
+                    break;
+            }
+
+            if (blockData?.body) {
+                return res.status(blockData.status).json(blockData.body);
+            } else {
+                return res.status(204).end();
+            }
         } catch {
             return res.status(400).json({
                 status: "error",

From 3096bc9df03e6f493de27f679a34b3e1343b3992 Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Sat, 6 Jul 2024 11:36:25 +0000
Subject: [PATCH 06/13] api: use Map for internal stream headers instead of
 plain object

---
 src/core/api.js              | 8 ++++----
 src/modules/stream/manage.js | 7 ++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/core/api.js b/src/core/api.js
index a366ad09..cf5b51a5 100644
--- a/src/core/api.js
+++ b/src/core/api.js
@@ -196,10 +196,10 @@ export function runAPI(express, app, gitCommit, gitBranch, __dirname) {
             return res.sendStatus(404);
         }
 
-        streamInfo.headers = {
-            ...streamInfo.headers,
-            ...req.headers
-        };
+        streamInfo.headers = new Map([
+            streamInfo.headers || {},
+            req.headers
+        ]);
 
         return stream(res, { type: 'internal', ...streamInfo });
     })
diff --git a/src/modules/stream/manage.js b/src/modules/stream/manage.js
index 06c73a6b..af041a67 100644
--- a/src/modules/stream/manage.js
+++ b/src/modules/stream/manage.js
@@ -87,10 +87,15 @@ export function createInternalStream(url, obj = {}) {
         setMaxListeners(Infinity, controller.signal);
     }
 
+    let headers;
+    if (obj.headers) {
+        headers = new Map(Object.entries(obj.headers));
+    }
+
     internalStreamCache[streamID] = {
         url,
         service: obj.service,
-        headers: obj.headers,
+        headers,
         controller,
         dispatcher
     };

From 92f3d2366cf8d974220e233449631cfb5adc5c84 Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Sat, 6 Jul 2024 11:40:41 +0000
Subject: [PATCH 07/13] api: use spread operator for merging headers

---
 src/core/api.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/api.js b/src/core/api.js
index cf5b51a5..8eb4cb40 100644
--- a/src/core/api.js
+++ b/src/core/api.js
@@ -197,8 +197,8 @@ export function runAPI(express, app, gitCommit, gitBranch, __dirname) {
         }
 
         streamInfo.headers = new Map([
-            streamInfo.headers || {},
-            req.headers
+            ...(streamInfo.headers || []),
+            ...Object.entries(req.headers)
         ]);
 
         return stream(res, { type: 'internal', ...streamInfo });

From eb65e816af2fa9ce40c686da709130d27739d4c7 Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Sat, 6 Jul 2024 23:15:15 +0600
Subject: [PATCH 08/13] stream/internal: convert headers to iterable object

---
 src/modules/stream/internal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/stream/internal.js b/src/modules/stream/internal.js
index 8ab2ec76..7a155a9a 100644
--- a/src/modules/stream/internal.js
+++ b/src/modules/stream/internal.js
@@ -85,7 +85,7 @@ async function handleGenericStream(streamInfo, res) {
     try {
         const req = await request(streamInfo.url, {
             headers: {
-                ...streamInfo.headers,
+                ...Object.fromEntries(streamInfo.headers),
                 host: undefined
             },
             dispatcher: streamInfo.dispatcher,

From 216529bfdfcef3c45471769f2bc41b5e63490705 Mon Sep 17 00:00:00 2001
From: jj <log@riseup.net>
Date: Sun, 7 Jul 2024 14:25:17 +0200
Subject: [PATCH 09/13] vimeo: use api to get video info, direct download if
 possible (#612)

---
 src/modules/processing/services/vimeo.js | 121 ++++++++++++++++++-----
 src/modules/sub/utils.js                 |  14 +++
 src/util/tests.json                      |   2 +-
 3 files changed, 111 insertions(+), 26 deletions(-)

diff --git a/src/modules/processing/services/vimeo.js b/src/modules/processing/services/vimeo.js
index d79d2e92..30ee3368 100644
--- a/src/modules/processing/services/vimeo.js
+++ b/src/modules/processing/services/vimeo.js
@@ -1,5 +1,5 @@
 import { env } from "../../config.js";
-import { cleanString } from '../../sub/utils.js';
+import { cleanString, merge } from '../../sub/utils.js';
 
 import HLS from "hls-parser";
 
@@ -16,32 +16,70 @@ const resolutionMatch = {
     "426": 240
 }
 
-export default async function(obj) {
-    let quality = obj.quality === "max" ? 9000 : Number(obj.quality);
-    if (quality < 240) quality = 240;
-    if (!quality || obj.isAudioOnly) quality = 9000;
-
-    const url = new URL(`https://player.vimeo.com/video/${obj.id}/config`);
-    if (obj.password) {
-        url.searchParams.set('h', obj.password);
+const requestApiInfo = (videoId, password) => {
+    if (password) {
+        videoId += `:${password}`
     }
 
-    const api = await fetch(url)
+    return fetch(
+        `https://api.vimeo.com/videos/${videoId}`,
+        {
+            headers: {
+                Accept: 'application/vnd.vimeo.*+json; version=3.4.2',
+                'User-Agent': 'Vimeo/10.19.0 (com.vimeo; build:101900.57.0; iOS 17.5.1) Alamofire/5.9.0 VimeoNetworking/5.0.0',
+                Authorization: 'Basic MTMxNzViY2Y0NDE0YTQ5YzhjZTc0YmU0NjVjNDQxYzNkYWVjOWRlOTpHKzRvMmgzVUh4UkxjdU5FRW80cDNDbDhDWGR5dVJLNUJZZ055dHBHTTB4V1VzaG41bEx1a2hiN0NWYWNUcldSSW53dzRUdFRYZlJEZmFoTTArOTBUZkJHS3R4V2llYU04Qnl1bERSWWxUdXRidjNqR2J4SHFpVmtFSUcyRktuQw==',
+                'Accept-Language': 'en'
+            }
+        }
+    )
+    .then(a => a.json())
+    .catch(() => {});
+}
+
+const compareQuality = (rendition, requestedQuality) => {
+    const quality = parseInt(rendition);
+    return Math.abs(quality - requestedQuality);
+}
+
+const getDirectLink = (data, quality) => {
+    if (!data.files) return;
+
+    const match = data.files
+        .filter(f => f.rendition?.endsWith('p'))
+        .reduce((prev, next) => {
+            const delta = {
+                prev: compareQuality(prev.rendition, quality),
+                next: compareQuality(next.rendition, quality)
+            };
+
+            return delta.prev < delta.next ? prev : next;
+        });
+
+    if (!match) return;
+
+    return {
+        urls: match.link,
+        filenameAttributes: {
+            resolution: `${match.width}x${match.height}`,
+            qualityLabel: match.rendition,
+            extension: "mp4"
+        }
+    }
+}
+
+const getHLS = async (configURL, obj) => {
+    if (!configURL) return;
+
+    const api = await fetch(configURL)
                     .then(r => r.json())
                     .catch(() => {});
-
     if (!api) return { error: 'ErrorCouldntFetch' };
 
-    const fileMetadata = {
-        title: cleanString(api.video.title.trim()),
-        artist: cleanString(api.video.owner.name.trim()),
+    if (api.video?.duration > env.durationLimit) {
+        return { error: ['ErrorLengthLimit', env.durationLimit / 60] };
     }
 
-    if (api.video?.duration > env.durationLimit)
-        return { error: ['ErrorLengthLimit', env.durationLimit / 60] };
-
     const urlMasterHLS = api.request?.files?.hls?.cdns?.akfire_interconnect_quic?.url;
-
     if (!urlMasterHLS) return { error: 'ErrorCouldntFetch' }
 
     const masterHLS = await fetch(urlMasterHLS)
@@ -57,9 +95,9 @@ export default async function(obj) {
 
     let bestQuality;
 
-    if (quality < resolutionMatch[variants[0]?.resolution?.width]) {
+    if (obj.quality < resolutionMatch[variants[0]?.resolution?.width]) {
         bestQuality = variants.find(v =>
-            (quality === resolutionMatch[v.resolution.width])
+            (obj.quality === resolutionMatch[v.resolution.width])
         );
     }
 
@@ -84,15 +122,48 @@ export default async function(obj) {
     return {
         urls,
         isM3U8: true,
-        fileMetadata: fileMetadata,
         filenameAttributes: {
-            service: "vimeo",
-            id: obj.id,
-            title: fileMetadata.title,
-            author: fileMetadata.artist,
             resolution: `${bestQuality.resolution.width}x${bestQuality.resolution.height}`,
             qualityLabel: `${resolutionMatch[bestQuality.resolution.width]}p`,
             extension: "mp4"
         }
     }
 }
+
+export default async function(obj) {
+    let quality = obj.quality === "max" ? 9000 : Number(obj.quality);
+    if (quality < 240) quality = 240;
+    if (!quality || obj.isAudioOnly) quality = 9000;
+
+    const info = await requestApiInfo(obj.id, obj.password);
+    let response;
+
+    if (obj.isAudioOnly) {
+        response = await getHLS(info.config_url, { ...obj, quality });
+    }
+
+    if (!response) response = getDirectLink(info, quality);
+    if (!response) response = { error: 'ErrorEmptyDownload' };
+
+    if (response.error) {
+        return response;
+    }
+
+    const fileMetadata = {
+        title: cleanString(info.name),
+        artist: cleanString(info.user.name),
+    };
+
+    return merge(
+        {
+            fileMetadata,
+            filenameAttributes: {
+                service: "vimeo",
+                id: obj.id,
+                title: fileMetadata.title,
+                author: fileMetadata.artist,
+            }
+        },
+        response
+    );
+}
diff --git a/src/modules/sub/utils.js b/src/modules/sub/utils.js
index 678eb70e..4a75bc0f 100644
--- a/src/modules/sub/utils.js
+++ b/src/modules/sub/utils.js
@@ -44,3 +44,17 @@ export function cleanHTML(html) {
     clean = clean.replace(/\n/g, '');
     return clean
 }
+
+export function merge(a, b) {
+    for (const k of Object.keys(b)) {
+        if (Array.isArray(b[k])) {
+            a[k] = [...(a[k] ?? []), ...b[k]];
+        } else if (typeof b[k] === 'object') {
+            a[k] = merge(a[k], b[k]);
+        } else {
+            a[k] = b[k];
+        }
+    }
+
+    return a;
+}
diff --git a/src/util/tests.json b/src/util/tests.json
index 501ac2c0..982d99cb 100644
--- a/src/util/tests.json
+++ b/src/util/tests.json
@@ -674,7 +674,7 @@
         "params": {},
         "expected": {
             "code": 200,
-            "status": "stream"
+            "status": "redirect"
         }
     }],
     "reddit": [{

From 5d122be4515018a3cc3ede0a356749e627127127 Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Sun, 7 Jul 2024 13:11:04 +0000
Subject: [PATCH 10/13] repo: add CONTRIBUTING.md file

Co-authored-by: wukko <me@wukko.me>
---
 CONTRIBUTING.md | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..dd2140eb
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,39 @@
+# contributing to cobalt
+if you're reading this, you are probably interested in contributing to cobalt, which we are very thankful for :3
+
+this document serves as a guide to help you make contributions that we can merge into the cobalt codebase.
+
+## translations
+currently, we are **not accepting** translations of cobalt. this is because we are making significant changes to the frontend, and the currently used localization structure is being completely reworked. if this changes, this document will be updated.
+
+## adding features or support for services
+before putting in the effort to implement a feature, it's worth considering whether it would be appropriate to add it to cobalt. the cobalt api is built to assist people **only with downloading freely accessible content**. other functionality, such as:
+- downloading paid / not publicly accessible content
+- downloading content protected by DRM
+- scraping unrelated information & exposing it outside of file metadata
+
+will not be reviewed or merged.
+
+if you plan on adding a feature or support for a service, but are unsure whether it would be appropriate, it's best to open an issue and discuss it beforehand.
+
+## git
+when contributing code to cobalt, there are a few guidelines in place to ensure that the code history is readable and comprehensible.
+
+### clean commit messages
+internally, we use a format similar to [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/) - the first part signifies which part of the code you are changing (the *scope*), and the second part explains the change. for inspiration on how to write appropriate commit titles, you can take a look at the [commit history](https://github.com/imputnet/cobalt/commits/).
+
+the scope is not strictly defined, you can write whatever you find most fitting for the particular change. suppose you are changing a small part of a more significant part of the codebase. in that case, you can specify both the larger and smaller scopes in the commit message for clarity (e.g., if you were changing something in internal streams, the commit could be something like `stream/internal: fix object not being handled properly`).
+
+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.
+
+### 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.
+
+if you find a mistake or bug in your code before it's merged or reviewed, instead of making a brand new commit to fix it, it would be preferable to amend that specific commit where the mistake was first introduced. this also helps us easily revert a commit if we discover that it introduced a bug or some unwanted behavior.
+- if the commit you are fixing is the latest one, you can add your files to staging and then use `git commit --amend` to apply the change.
+- if the commit is somewhere deeper in your branch, you can use `git commit --fixup=HASH`, where *`HASH`* is the commit you are fixing.
+    - afterward, you must interactively rebase your branch with `git rebase -i current --autosquash`.
+      this will open up an editor, but you don't need to do anything else except save the file and exit.
+- once you do either of these things, you will need to do a **force push** to your branch with `git push --force-with-lease`.

From 2f4a013a2a1c401e9ea1dc590e1920e5666951f6 Mon Sep 17 00:00:00 2001
From: jj <log@riseup.net>
Date: Sun, 7 Jul 2024 15:31:55 +0200
Subject: [PATCH 11/13] docs/api: use js-specific type for `cors` in serverInfo
 response

there is no such thing as an int in js
---
 docs/api.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api.md b/docs/api.md
index 87ef2489..b63c9216 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -73,5 +73,5 @@ response body type: `application/json`
 | `branch`    | `string` | git branch        |
 | `name`      | `string` | server name       |
 | `url`       | `string` | server url        |
-| `cors`      | `int`    | cors status       |
+| `cors`      | `number` | cors status       |
 | `startTime` | `string` | server start time |

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 12/13] 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 13/13] 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.