From 13c2884a413c90f7d86cffe4a54e6e5aff3a0995 Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Sat, 17 Dec 2022 17:22:39 +0600
Subject: [PATCH] updated readme and fixed some things

---
 README.md                          | 29 ++++++++++++++++-------------
 src/modules/services/bilibili.js   |  2 +-
 src/modules/services/reddit.js     |  2 +-
 src/modules/services/soundcloud.js |  8 ++++----
 src/modules/services/tiktok.js     |  4 ++--
 src/modules/services/tumblr.js     |  2 +-
 src/modules/services/twitter.js    | 12 ++++++------
 src/modules/services/vimeo.js      |  4 ++--
 src/modules/services/vk.js         |  2 +-
 9 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 30363a3..f8d86b4 100644
--- a/README.md
+++ b/README.md
@@ -13,19 +13,22 @@ cobalt is social media downloader with zero bullshit. It's friendly, accessible,
 It preserves original media quality so you get best downloads possible (unless you change that in settings).
 
 ## Supported services
-| Service | Video + Audio | Only audio | Additional features |
-| --------          | :---:  | :---: | :----- |
-| Twitter           | ✅    | ✅ | Ability to save multiple videos/GIFs from a single tweet. |
-| Twitter Spaces    | ❌️    | ✅ | Audio metadata. |
-| YouTube & Shorts  | ✅    | ✅ | Support for 8K, 4K, HDR, and high FPS videos. |
-| YouTube Music     | ❌    | ✅ | Audio metadata. |
-| Reddit            | ✅    | ✅ |  |
-| TikTok & douyin   | ✅    | ✅ | Video downloads with or without watermark; image slideshow downloads without watermarks. |
-| SoundCloud        | ❌    | ✅ | Audio metadata. |
-| bilibili.com      | ✅    | ✅ |  |
-| Tumblr            | ✅    | ✅ |  |
-| Vimeo             | ✅    | ❌️ |  |
-| VK Videos & Clips | ✅    | ❌️ |  |
+| Service           | Video + Audio | Only audio | Additional features                                                                      |
+| --------          | :---:         | :---:      | :-----                                                                                   |
+| Twitter           | ✅           | ✅         | Ability to save multiple videos/GIFs from a single tweet.                                |
+| Twitter Spaces    | ❌️           | ✅         | Audio metadata.                                                                          |
+| YouTube & Shorts  | ✅           | ✅         | Support for 8K, 4K, HDR, and high FPS videos.                                            |
+| YouTube Music     | ❌           | ✅         | Audio metadata.                                                                          |
+| Reddit            | ✅           | ✅         |                                                                                          |
+| TikTok & douyin   | ✅           | ✅         | Video downloads with or without watermark; image slideshow downloads without watermarks. |
+| SoundCloud        | ❌           | ✅         | Audio metadata.                                                                          |
+| bilibili.com      | ✅           | ✅         |                                                                                          |
+| Tumblr            | ✅           | ✅         |                                                                                          |
+| Vimeo             | ✅           | ❌️         |                                                                                          |
+| VK Videos & Clips | ✅           | ❌️         |                                                                                          |
+
+## cobalt API
+cobalt has an open API that you can use for free. It's pretty straightforward in use, [check out the docs](https://github.com/wukko/cobalt/blob/current/docs/API.md) and see for yourself.
 
 ## How to contribute translations
 You can translate cobalt to any language you want on [cobalt's crowdin](https://crowdin-co.wukko.me/). Feel free to ignore QA errors if you think you know better. If you don't see a language you want to translate cobalt to, open an issue, and I'll add it to crowdin.
diff --git a/src/modules/services/bilibili.js b/src/modules/services/bilibili.js
index 367e538..5d1902f 100644
--- a/src/modules/services/bilibili.js
+++ b/src/modules/services/bilibili.js
@@ -4,7 +4,7 @@ export default async function(obj) {
     try {
         let html = await fetch(`https://bilibili.com/video/${obj.id}`, {
             headers: {"user-agent": genericUserAgent}
-        }).then(async (r) => {return r.text()}).catch(() => {return false});
+        }).then((r) => {return r.text()}).catch(() => {return false});
         if (!html) return { error: 'ErrorCouldntFetch' };
 
         if (html.includes('<script>window.__playinfo__=') && html.includes('"video_codecid"')) {
diff --git a/src/modules/services/reddit.js b/src/modules/services/reddit.js
index 7a9158b..2323a02 100644
--- a/src/modules/services/reddit.js
+++ b/src/modules/services/reddit.js
@@ -2,7 +2,7 @@ import { maxVideoDuration } from "../config.js";
 
 export default async function(obj) {
     try {
-        let data = await fetch(`https://www.reddit.com/r/${obj.sub}/comments/${obj.id}/${obj.name}.json`).then(async (r) => {return r.json()}).catch(() => {return false});
+        let data = await fetch(`https://www.reddit.com/r/${obj.sub}/comments/${obj.id}/${obj.name}.json`).then((r) => {return r.json()}).catch(() => {return false});
         if (!data) return { error: 'ErrorCouldntFetch' };
         data = data[0]["data"]["children"][0]["data"];
 
diff --git a/src/modules/services/soundcloud.js b/src/modules/services/soundcloud.js
index 6ff9dbb..ee9392f 100644
--- a/src/modules/services/soundcloud.js
+++ b/src/modules/services/soundcloud.js
@@ -4,7 +4,7 @@ let cachedID = {}
 
 async function findClientID() {
     try {
-        let sc = await fetch('https://soundcloud.com/').then(async (r) => {return r.text()}).catch(() => {return false});
+        let sc = await fetch('https://soundcloud.com/').then((r) => {return r.text()}).catch(() => {return false});
         let sc_version = String(sc.match(/<script>window\.__sc_version="[0-9]{10}"<\/script>/)[0].match(/[0-9]{10}/));
 
         if (cachedID.version == sc_version) {
@@ -17,7 +17,7 @@ async function findClientID() {
     
                 if (url && !url.startsWith('https://a-v2.sndcdn.com')) return;
     
-                let scrf = await fetch(url).then(async (r) => {return r.text()}).catch(() => {return false});
+                let scrf = await fetch(url).then((r) => {return r.text()}).catch(() => {return false});
                 let id = scrf.match(/\("client_id=[A-Za-z0-9]{32}"\)/);
     
                 if (id && typeof id[0] === 'string') {
@@ -41,12 +41,12 @@ export default async function(obj) {
         if (!obj.author && !obj.song && obj.shortLink) {
             html = await fetch(`https://soundcloud.app.goo.gl/${obj.shortLink}/`, {
                 headers: {"user-agent": genericUserAgent}
-            }).then(async (r) => {return r.text()}).catch(() => {return false});
+            }).then((r) => {return r.text()}).catch(() => {return false});
         }
         if (obj.author && obj.song) {
             html = await fetch(`https://soundcloud.com/${obj.author}/${obj.song}`, {
                 headers: {"user-agent": genericUserAgent}
-            }).then(async (r) => {return r.text()}).catch(() => {return false});
+            }).then((r) => {return r.text()}).catch(() => {return false});
         }
         if (!html) return { error: 'ErrorCouldntFetch'};
         if (html.includes('<script>window.__sc_hydration = ') && html.includes('"format":{"protocol":"progressive","mime_type":"audio/mpeg"},') && html.includes('{"hydratable":"sound","data":')) {
diff --git a/src/modules/services/tiktok.js b/src/modules/services/tiktok.js
index 72e548b..ec1b1ce 100644
--- a/src/modules/services/tiktok.js
+++ b/src/modules/services/tiktok.js
@@ -32,7 +32,7 @@ export default async function(obj) {
             let html = await fetch(`${config[obj.host]["short"]}${obj.id}`, {
                 redirect: "manual",
                 headers: { "user-agent": userAgent }
-            }).then(async (r) => {return r.text()}).catch(() => {return false});
+            }).then((r) => {return r.text()}).catch(() => {return false});
             if (!html) return { error: 'ErrorCouldntFetch' };
             
             if (html.slice(0, 17) === '<a href="https://' && html.includes('/video/')) {
@@ -46,7 +46,7 @@ export default async function(obj) {
         let detail;
         detail = await fetch(config[obj.host]["api"].replace("{postId}", obj.postId), {
             headers: {"user-agent": "TikTok 26.2.0 rv:262018 (iPhone; iOS 14.4.2; en_US) Cronet"}
-        }).then(async (r) => {return r.json()}).catch(() => {return false});
+        }).then((r) => {return r.json()}).catch(() => {return false});
         
         detail = selector(detail, obj.host, obj.postId);
 
diff --git a/src/modules/services/tumblr.js b/src/modules/services/tumblr.js
index 2959289..78b9b6a 100644
--- a/src/modules/services/tumblr.js
+++ b/src/modules/services/tumblr.js
@@ -5,7 +5,7 @@ export default async function(obj) {
         let user = obj.user ? obj.user : obj.url.split('.')[0].replace('https://', '');
         let html = await fetch(`https://${user}.tumblr.com/post/${obj.id}`, {
             headers: {"user-agent": genericUserAgent}
-        }).then(async (r) => {return r.text()}).catch(() => {return false});
+        }).then((r) => {return r.text()}).catch(() => {return false});
         if (!html) return { error: 'ErrorCouldntFetch' };
         if (html.includes('property="og:video" content="https://va.media.tumblr.com/')) {
             return { urls: `https://va.media.tumblr.com/${html.split('property="og:video" content="https://va.media.tumblr.com/')[1].split('"/>')[0]}`, audioFilename: `tumblr_${obj.id}_audio` }
diff --git a/src/modules/services/twitter.js b/src/modules/services/twitter.js
index 4298378..c9766c2 100644
--- a/src/modules/services/twitter.js
+++ b/src/modules/services/twitter.js
@@ -15,13 +15,13 @@ export default async function(obj) {
         let req_act = await fetch(`${apiURL}/guest/activate.json`, {
             method: "POST",
             headers: _headers
-        }).then(async (r) => { return r.status == 200 ? r.json() : false;}).catch(() => {return false});
+        }).then((r) => { return r.status == 200 ? r.json() : false;}).catch(() => {return false});
         
         if (!req_act) return { error: 'ErrorCouldntFetch' };
         _headers["x-guest-token"] = req_act["guest_token"];
         let showURL = `${apiURL}/statuses/show/${obj.id}.json?tweet_mode=extended&include_user_entities=0&trim_user=1&include_entities=0&cards_platform=Web-12&include_cards=1`
         if (!obj.spaceId) {
-            let req_status = await fetch(showURL, { headers: _headers }).then(async (r) => { return r.status == 200 ? r.json() : false;}).catch((e) => { return false});
+            let req_status = await fetch(showURL, { headers: _headers }).then((r) => { return r.status == 200 ? r.json() : false;}).catch((e) => { return false});
             if (!req_status) {
                 _headers.authorization = "Bearer AAAAAAAAAAAAAAAAAAAAAPYXBAAAAAAACLXUNDekMxqa8h%2F40K4moUkGsoc%3DTYfbDKbT3jJPCEVnMYqilB28NHfOPqkca3qaAxGfsyKCs0wRbw";
                 delete _headers["x-guest-token"]
@@ -29,11 +29,11 @@ export default async function(obj) {
                 req_act = await fetch(`${apiURL}/guest/activate.json`, {
                     method: "POST",
                     headers: _headers
-                }).then(async (r) => { return r.status == 200 ? r.json() : false;}).catch(() => {return false});
+                }).then((r) => { return r.status == 200 ? r.json() : false;}).catch(() => {return false});
                 if (!req_act) return { error: 'ErrorCouldntFetch' };
 
                 _headers["x-guest-token"] = req_act["guest_token"];
-                req_status = await fetch(showURL, { headers: _headers }).then(async (r) => { return r.status == 200 ? r.json() : false;}).catch(() => {return false});
+                req_status = await fetch(showURL, { headers: _headers }).then((r) => { return r.status == 200 ? r.json() : false;}).catch(() => {return false});
             }
             if (!req_status) return { error: 'ErrorCouldntFetch' }
             if (req_status["extended_entities"] && req_status["extended_entities"]["media"]) {
@@ -63,13 +63,13 @@ export default async function(obj) {
                 variables: {"id": obj.spaceId,"isMetatagsQuery":true,"withSuperFollowsUserFields":true,"withDownvotePerspective":false,"withReactionsMetadata":false,"withReactionsPerspective":false,"withSuperFollowsTweetFields":true,"withReplays":true}, features: {"spaces_2022_h2_clipping":true,"spaces_2022_h2_spaces_communities":true,"verified_phone_label_enabled":false,"tweetypie_unmention_optimization_enabled":true,"responsive_web_uc_gql_enabled":true,"vibe_api_enabled":true,"responsive_web_edit_tweet_api_enabled":true,"graphql_is_translatable_rweb_tweet_is_translatable_enabled":true,"standardized_nudges_misinfo":true,"tweet_with_visibility_results_prefer_gql_limited_actions_policy_enabled":false,"responsive_web_graphql_timeline_navigation_enabled":false,"interactive_text_enabled":true,"responsive_web_text_conversations_enabled":false,"responsive_web_enhance_cards_enabled":true}
             }
 
-            let AudioSpaceById = await fetch(`https://twitter.com/i/api/graphql/wJ5g4zf7v8qPHSQbaozYuw/AudioSpaceById?variables=${new URLSearchParams(JSON.stringify(query.variables)).toString().slice(0, -1)}&features=${new URLSearchParams(JSON.stringify(query.features)).toString().slice(0, -1)}`, { headers: _headers }).then(async (r) => {
+            let AudioSpaceById = await fetch(`https://twitter.com/i/api/graphql/wJ5g4zf7v8qPHSQbaozYuw/AudioSpaceById?variables=${new URLSearchParams(JSON.stringify(query.variables)).toString().slice(0, -1)}&features=${new URLSearchParams(JSON.stringify(query.features)).toString().slice(0, -1)}`, { headers: _headers }).then((r) => {
                 return r.status == 200 ? r.json() : false;
             }).catch((e) => {return false});
 
             if (AudioSpaceById) {
                 if (AudioSpaceById.data.audioSpace.metadata.is_space_available_for_replay === true) {
-                    let streamStatus = await fetch(`https://twitter.com/i/api/1.1/live_video_stream/status/${AudioSpaceById.data.audioSpace.metadata.media_key}`, { headers: _headers }).then(async (r) => {return r.status == 200 ? r.json() : false;}).catch(() => {return false;});
+                    let streamStatus = await fetch(`https://twitter.com/i/api/1.1/live_video_stream/status/${AudioSpaceById.data.audioSpace.metadata.media_key}`, { headers: _headers }).then((r) => {return r.status == 200 ? r.json() : false;}).catch(() => {return false;});
                     if (!streamStatus) return { error: 'ErrorCouldntFetch' };
     
                     let participants = AudioSpaceById.data.audioSpace.participants.speakers
diff --git a/src/modules/services/vimeo.js b/src/modules/services/vimeo.js
index b1ca763..a5e88f3 100644
--- a/src/modules/services/vimeo.js
+++ b/src/modules/services/vimeo.js
@@ -2,7 +2,7 @@ import { quality, services } from "../config.js";
 
 export default async function(obj) {
     try {
-        let api = await fetch(`https://player.vimeo.com/video/${obj.id}/config`).then(async (r) => {return r.json()}).catch(() => {return false});
+        let api = await fetch(`https://player.vimeo.com/video/${obj.id}/config`).then((r) => {return r.json()}).catch(() => {return false});
         if (!api) return { error: 'ErrorCouldntFetch' };
 
         let downloadType = "";
@@ -32,7 +32,7 @@ export default async function(obj) {
                 return { urls: best["url"], filename: `tumblr_${obj.id}.mp4` };
             case "dash":
                 let masterJSONURL = api["request"]["files"]["dash"]["cdns"]["akfire_interconnect_quic"]["url"];
-                let masterJSON = await fetch(masterJSONURL).then(async (r) => {return r.json()}).catch(() => {return false});
+                let masterJSON = await fetch(masterJSONURL).then((r) => {return r.json()}).catch(() => {return false});
                 if (!masterJSON) return { error: 'ErrorCouldntFetch' };
                 if (masterJSON.video) {
                     let type = "";
diff --git a/src/modules/services/vk.js b/src/modules/services/vk.js
index eb66361..ca2d826 100644
--- a/src/modules/services/vk.js
+++ b/src/modules/services/vk.js
@@ -7,7 +7,7 @@ export default async function(obj) {
         let html;
         html = await fetch(`https://vk.com/video-${obj.userId}_${obj.videoId}`, {
             headers: {"user-agent": genericUserAgent}
-        }).then(async (r) => {return r.text()}).catch(() => {return false});
+        }).then((r) => {return r.text()}).catch(() => {return false});
         if (!html) return { error: 'ErrorCouldntFetch' };
         if (html.includes(`{"lang":`)) {
             let js = JSON.parse('{"lang":' + html.split(`{"lang":`)[1].split(']);')[0]);