From 2250d23e199e78ceb27ede616b7e5132b1fae310 Mon Sep 17 00:00:00 2001 From: blueb Date: Mon, 21 Aug 2023 21:03:01 -0400 Subject: [PATCH] add default url option --- src/front/cobalt.js | 9 ++++++--- src/localization/languages/en.json | 1 + src/modules/pageRender/page.js | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/front/cobalt.js b/src/front/cobalt.js index 5d7f99d9..152a02cf 100644 --- a/src/front/cobalt.js +++ b/src/front/cobalt.js @@ -17,7 +17,7 @@ const switchers = { "dubLang": ["original", "auto"], "vimeoDash": ["false", "true"], "audioMode": ["false", "true"], - "serverPicker": ["co.wuk.sh", "api.c0ba.lt", "co-api.blueb.me", "wukko.wolfdo.gg", "api.co.749.city", "cobalt-api.fluffy.tools", "capi.oak.li"] + "serverPicker": [getDefaultAPI(), "https://co.wuk.sh", "https://api.c0ba.lt", "https://wukko.wolfdo.gg", "https://api.co.749.city", "https://cobalt-api.fluffy.tools", "https://capi.oak.li"] }; const checkboxes = ["disableTikTokWatermark", "fullTikTokAudio", "muteAudio", "reduceTransparency", "disableAnimations"]; const exceptions = { // used for mobile devices @@ -31,6 +31,9 @@ function changeAPI(url) { apiURL = url; return true } +function getDefaultAPI() { + return defaultApiURL; +} function eid(id) { return document.getElementById(id) } @@ -256,8 +259,8 @@ function popup(type, action, text) { function changeSwitcher(li, b) { if (switchers.serverPicker.includes(b)) { if (!switchers[li].includes(b)) b = switchers[li][0]; - changeAPI("https://"+b); - sSet(li, "https://"+b); + changeAPI(b); + sSet(li, b); for (let i in switchers[li]) { (switchers[li][i] === b) ? enable(`${li}-${b}`) : disable(`${li}-${switchers[li][i]}`) } diff --git a/src/localization/languages/en.json b/src/localization/languages/en.json index 3c7fec7d..5b4a307c 100644 --- a/src/localization/languages/en.json +++ b/src/localization/languages/en.json @@ -42,6 +42,7 @@ "SettingsThemeDark": "dark", "SettingsKeepDownloadButton": "keep >> visible", "SettingsServerPicker": "server picker", + "SettingsServerPickerDefault": "default", "SettingsServerPickerDescription": "choose which server to download from", "AccessibilityKeepDownloadButton": "keep the download button always visible", "SettingsEnableDownloadPopup": "ask how to save", diff --git a/src/modules/pageRender/page.js b/src/modules/pageRender/page.js index b58f2087..0b0aae47 100644 --- a/src/modules/pageRender/page.js +++ b/src/modules/pageRender/page.js @@ -460,25 +460,25 @@ export default function(obj) { explanation: t(['SettingsServerPickerDescription']), vertical: true, items: [{ - action: "co.wuk.sh", + action: process.env.apiURL ? process.env.apiURL.slice(0, -1) : '', + text: t('SettingsServerPickerDefault') + }, { + action: "https://co.wuk.sh", text: "co.wuk.sh" }, { - action: "api.c0ba.lt", + action: "https://api.c0ba.lt", text: "api.c0ba.lt" }, { - action: "co-api.blueb.me", - text: "co-api.blueb.me" - }, { - action: "wukko.wolfdo.gg", + action: "https://wukko.wolfdo.gg", text: "wukko.wolfdo.gg" }, { - action: "api.co.749.city", + action: "https://api.co.749.city", text: "api.co.749.city" }, { - action: "cobalt-api.fluffy.tools", + action: "https://cobalt-api.fluffy.tools", text: "cobalt-api.fluffy.tools" }, { - action: "capi.oak.li", + action: "https://capi.oak.li", text: "capi.oak.li" }] }) @@ -598,7 +598,7 @@ export default function(obj) { clipboardErrorNoPermission: ` + "`" + t('ClipboardErrorNoPermission') + "`" + `, clipboardErrorFirefox: ` + "`" + t('ClipboardErrorFirefox') + "`" + `, }; - let apiURL = '${process.env.apiURL ? process.env.apiURL.slice(0, -1) : ''}'; + let defaultApiURL = '${process.env.apiURL ? process.env.apiURL.slice(0, -1) : ''}';