From 56c452280fc23e22f92e70f2524abd65ba59e2bc Mon Sep 17 00:00:00 2001 From: blueb Date: Mon, 21 Aug 2023 19:27:45 -0400 Subject: [PATCH 01/11] add servers & css for them --- src/front/cobalt.css | 18 +++++++++++++++++ src/localization/languages/en.json | 2 ++ src/modules/pageRender/elements.js | 24 +++++++++++++++++++++-- src/modules/pageRender/page.js | 31 ++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 2 deletions(-) diff --git a/src/front/cobalt.css b/src/front/cobalt.css index 8e666dde..8cad317b 100644 --- a/src/front/cobalt.css +++ b/src/front/cobalt.css @@ -1192,4 +1192,22 @@ button:active, .popup-title { line-height: inherit; } +} + +.switches-vertical { + display: flex; + width: auto; + flex-direction: column; + flex-wrap: nowrap; + overflow-x: scroll; +} +.switch-vertical.first { + border-top-left-radius: 5px 6px!important; + border-top-right-radius: 5px 6px!important; + border-bottom-left-radius: 0px; +} +.switch-vertical.last { + border-bottom-left-radius: 5px 6px!important; + border-bottom-right-radius: 5px 6px!important; + border-top-right-radius: 0px; } \ No newline at end of file diff --git a/src/localization/languages/en.json b/src/localization/languages/en.json index b087f998..3c7fec7d 100644 --- a/src/localization/languages/en.json +++ b/src/localization/languages/en.json @@ -41,6 +41,8 @@ "SettingsThemeLight": "light", "SettingsThemeDark": "dark", "SettingsKeepDownloadButton": "keep >> visible", + "SettingsServerPicker": "server picker", + "SettingsServerPickerDescription": "choose which server to download from", "AccessibilityKeepDownloadButton": "keep the download button always visible", "SettingsEnableDownloadPopup": "ask how to save", "AccessibilityEnableDownloadPopup": "ask what to do with downloads", diff --git a/src/modules/pageRender/elements.js b/src/modules/pageRender/elements.js index 66e6de19..b445b7fb 100644 --- a/src/modules/pageRender/elements.js +++ b/src/modules/pageRender/elements.js @@ -13,6 +13,13 @@ export function switcher(obj) { let items = ``; if (obj.name === "download") { items = obj.items; + } else if (obj.vertical) { + for (let i = 0; i < obj.items.length; i++) { + let classes = obj.items[i]["classes"] ? obj.items[i]["classes"] : []; + if (i === 0) classes.push("first"); + if (i === (obj.items.length - 1)) classes.push("last"); + items += `` + } } else { for (let i = 0; i < obj.items.length; i++) { let classes = obj.items[i]["classes"] ? obj.items[i]["classes"] : []; @@ -22,12 +29,25 @@ export function switcher(obj) { } } - if (obj.noParent) return `
${items}
`; - return `
+ if (obj.noParent && obj.vertical) { + return `
${items}
` + } else if (obj.noParent) { + return `
${items}
` + } + + if (obj.vertical) { + return `
+ ${obj.subtitle ? `
${obj.subtitle}
` : ``} +
${items}
+ ${obj.explanation ? `
${obj.explanation}
` : ``} +
` + } else { + return `
${obj.subtitle ? `
${obj.subtitle}
` : ``}
${items}
${obj.explanation ? `
${obj.explanation}
` : ``}
` + } } export function checkbox(obj) { let paddings = ["bottom-margin", "top-margin", "no-margin", "top-margin-only"]; diff --git a/src/modules/pageRender/page.js b/src/modules/pageRender/page.js index 50d756f5..ba7bbf8f 100644 --- a/src/modules/pageRender/page.js +++ b/src/modules/pageRender/page.js @@ -451,6 +451,37 @@ export default function(obj) { aria: t("AccessibilityEnableDownloadPopup") }]) }) + + settingsCategory({ + name: "serverpicker", + title: t('SettingsServerPicker'), + explanation: t('SettingsServerPickerDescription'), + body: switcher({ + name: "serverpicker", + vertical: true, + items: [{ + action: "co.wuk.sh", + text: "co.wuk.sh" + }, { + action: "api.c0ba.lt", + text: "api.c0ba.lt" + }, { + action: "co-api.blueb.me", + text: "co-api.blueb.me" + }, { + action: "wukko.wolfdo.gg", + text: "wukko.wolfdo.gg" + }, { + action: "api.co.749.city", + text: "api.co.749.city" + }, { + action: "cobalt-api.fluffy.tools", + text: "cobalt-api.fluffy.tools" + }, { + action: "capi.oak.li", + text: "capi.oak.li" + }] + }) + }) }], })} ${popupWithBottomButtons({ From 2d2a60cb1e5a23dc9330049159fa94817807a8a1 Mon Sep 17 00:00:00 2001 From: blueb Date: Mon, 21 Aug 2023 19:53:01 -0400 Subject: [PATCH 02/11] add js for server picker --- src/front/cobalt.js | 13 +++++++++++-- src/modules/pageRender/page.js | 3 ++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/front/cobalt.js b/src/front/cobalt.js index ca309511..8bbf3160 100644 --- a/src/front/cobalt.js +++ b/src/front/cobalt.js @@ -16,7 +16,8 @@ const switchers = { "aFormat": ["mp3", "best", "ogg", "wav", "opus"], "dubLang": ["original", "auto"], "vimeoDash": ["false", "true"], - "audioMode": ["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"] }; const checkboxes = ["disableTikTokWatermark", "fullTikTokAudio", "muteAudio", "reduceTransparency", "disableAnimations"]; const exceptions = { // used for mobile devices @@ -253,7 +254,15 @@ function popup(type, action, text) { eid(`popup-${type}`).focus(); } function changeSwitcher(li, b) { - if (b) { + if (switchers.serverPicker.includes(b)) { + if (!switchers[li].includes(b)) b = switchers[li][0]; + changeAPI("https://"+b); + console.log(b); + sSet(li, "https://"+b); + for (let i in switchers[li]) { + (switchers[li][i] === b) ? enable(`${li}-${b}`) : disable(`${li}-${switchers[li][i]}`) + } + } else if (b) { if (!switchers[li].includes(b)) b = switchers[li][0]; sSet(li, b); for (let i in switchers[li]) { diff --git a/src/modules/pageRender/page.js b/src/modules/pageRender/page.js index ba7bbf8f..b58f2087 100644 --- a/src/modules/pageRender/page.js +++ b/src/modules/pageRender/page.js @@ -456,7 +456,8 @@ export default function(obj) { title: t('SettingsServerPicker'), explanation: t('SettingsServerPickerDescription'), body: switcher({ - name: "serverpicker", + name: "serverPicker", + explanation: t(['SettingsServerPickerDescription']), vertical: true, items: [{ action: "co.wuk.sh", From e906904645b60d6b78a04eeaeb9eec7c12cb4cbf Mon Sep 17 00:00:00 2001 From: blueb Date: Mon, 21 Aug 2023 19:54:58 -0400 Subject: [PATCH 03/11] remove console.log from apiurl changer --- src/front/cobalt.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/front/cobalt.js b/src/front/cobalt.js index 8bbf3160..5d7f99d9 100644 --- a/src/front/cobalt.js +++ b/src/front/cobalt.js @@ -257,7 +257,6 @@ function changeSwitcher(li, b) { if (switchers.serverPicker.includes(b)) { if (!switchers[li].includes(b)) b = switchers[li][0]; changeAPI("https://"+b); - console.log(b); sSet(li, "https://"+b); for (let i in switchers[li]) { (switchers[li][i] === b) ? enable(`${li}-${b}`) : disable(`${li}-${switchers[li][i]}`) From 2250d23e199e78ceb27ede616b7e5132b1fae310 Mon Sep 17 00:00:00 2001 From: blueb Date: Mon, 21 Aug 2023 21:03:01 -0400 Subject: [PATCH 04/11] 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) : ''}'; From de8d1835777ac964600c203e98ffccf1ec48be1c Mon Sep 17 00:00:00 2001 From: blueb Date: Mon, 21 Aug 2023 21:44:43 -0400 Subject: [PATCH 05/11] make default say the url instead --- src/localization/languages/en.json | 3 +-- src/modules/pageRender/page.js | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/localization/languages/en.json b/src/localization/languages/en.json index 5b4a307c..8cb19ac5 100644 --- a/src/localization/languages/en.json +++ b/src/localization/languages/en.json @@ -40,10 +40,9 @@ "SettingsThemeAuto": "auto", "SettingsThemeLight": "light", "SettingsThemeDark": "dark", - "SettingsKeepDownloadButton": "keep >> visible", "SettingsServerPicker": "server picker", - "SettingsServerPickerDefault": "default", "SettingsServerPickerDescription": "choose which server to download from", + "SettingsKeepDownloadButton": "keep >> visible", "AccessibilityKeepDownloadButton": "keep the download button always visible", "SettingsEnableDownloadPopup": "ask how to save", "AccessibilityEnableDownloadPopup": "ask what to do with downloads", diff --git a/src/modules/pageRender/page.js b/src/modules/pageRender/page.js index 0b0aae47..d3204d4b 100644 --- a/src/modules/pageRender/page.js +++ b/src/modules/pageRender/page.js @@ -28,6 +28,8 @@ for (let i in donations["crypto"]) { extr = ' top-margin' } +let defaultApiURL = process.env.apiURL ? process.env.apiURL.slice(0, -1) : ''; + export default function(obj) { const t = (str, replace) => { return loc(obj.lang, str, replace) }; @@ -460,8 +462,8 @@ export default function(obj) { explanation: t(['SettingsServerPickerDescription']), vertical: true, items: [{ - action: process.env.apiURL ? process.env.apiURL.slice(0, -1) : '', - text: t('SettingsServerPickerDefault') + action: defaultApiURL, + text: defaultApiURL.replace("https://","") }, { action: "https://co.wuk.sh", text: "co.wuk.sh" From aeb14b207106eb259e77c20bd65968f10188f524 Mon Sep 17 00:00:00 2001 From: blueb Date: Mon, 21 Aug 2023 21:48:25 -0400 Subject: [PATCH 06/11] add default to explination too --- src/localization/languages/en.json | 2 +- src/modules/pageRender/page.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/localization/languages/en.json b/src/localization/languages/en.json index 8cb19ac5..b57692c4 100644 --- a/src/localization/languages/en.json +++ b/src/localization/languages/en.json @@ -41,7 +41,7 @@ "SettingsThemeLight": "light", "SettingsThemeDark": "dark", "SettingsServerPicker": "server picker", - "SettingsServerPickerDescription": "choose which server to download from", + "SettingsServerPickerDescription": "choose which server to download from. default is ", "SettingsKeepDownloadButton": "keep >> visible", "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 d3204d4b..e0d942f6 100644 --- a/src/modules/pageRender/page.js +++ b/src/modules/pageRender/page.js @@ -459,7 +459,7 @@ export default function(obj) { explanation: t('SettingsServerPickerDescription'), body: switcher({ name: "serverPicker", - explanation: t(['SettingsServerPickerDescription']), + explanation: t(['SettingsServerPickerDescription'])+defaultApiURL.replace("https://","")+".", vertical: true, items: [{ action: defaultApiURL, From e39cbf26a4937b1154ad8c3f6e5499259670e3b7 Mon Sep 17 00:00:00 2001 From: blueb Date: Mon, 21 Aug 2023 22:25:29 -0400 Subject: [PATCH 07/11] fix safari wobble --- src/front/cobalt.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/front/cobalt.css b/src/front/cobalt.css index 8cad317b..fdae5962 100644 --- a/src/front/cobalt.css +++ b/src/front/cobalt.css @@ -665,6 +665,9 @@ button:active, .popup-tab-content[data-enabled="false"] { display: none; } +.popup-tab-content { + overflow-x: hidden!important; +} #popup-tabs { z-index: 999; bottom: 0; @@ -1199,7 +1202,7 @@ button:active, width: auto; flex-direction: column; flex-wrap: nowrap; - overflow-x: scroll; + overflow-x: hidden!important; } .switch-vertical.first { border-top-left-radius: 5px 6px!important; @@ -1210,4 +1213,5 @@ button:active, border-bottom-left-radius: 5px 6px!important; border-bottom-right-radius: 5px 6px!important; border-top-right-radius: 0px; -} \ No newline at end of file +} + From a1646480fb7d7ffe9e81de2b0884e09e79adc686 Mon Sep 17 00:00:00 2001 From: blueb Date: Tue, 22 Aug 2023 01:04:27 -0400 Subject: [PATCH 08/11] move servers into config.json for page.js --- src/config.json | 3 ++- src/front/cobalt.css | 3 +-- src/modules/config.js | 1 + src/modules/pageRender/page.js | 35 +++++++++++----------------------- 4 files changed, 15 insertions(+), 27 deletions(-) diff --git a/src/config.json b/src/config.json index 6337654f..fc001b73 100644 --- a/src/config.json +++ b/src/config.json @@ -69,5 +69,6 @@ "copy": ["-c:a", "copy"], "audio": ["-ar", "48000", "-ac", "2", "-b:a", "320k"], "m4a": ["-movflags", "frag_keyframe+empty_moov"] - } + }, + "otherServers": ["default", "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"] } diff --git a/src/front/cobalt.css b/src/front/cobalt.css index fdae5962..ee6f2e7d 100644 --- a/src/front/cobalt.css +++ b/src/front/cobalt.css @@ -1213,5 +1213,4 @@ button:active, border-bottom-left-radius: 5px 6px!important; border-bottom-right-radius: 5px 6px!important; border-top-right-radius: 0px; -} - +} \ No newline at end of file diff --git a/src/modules/config.js b/src/modules/config.js index 5268b8dd..0f068213 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -15,5 +15,6 @@ export const donations = config.donations, ffmpegArgs = config.ffmpegArgs, supportedAudio = config.supportedAudio, + otherServers = config.otherServers, celebrations = config.celebrations, links = config.links diff --git a/src/modules/pageRender/page.js b/src/modules/pageRender/page.js index e0d942f6..4094cfec 100644 --- a/src/modules/pageRender/page.js +++ b/src/modules/pageRender/page.js @@ -1,5 +1,5 @@ import { checkbox, collapsibleList, explanation, footerButtons, multiPagePopup, popup, popupWithBottomButtons, sep, settingsCategory, switcher, socialLink, urgentNotice, keyboardShortcuts } from "./elements.js"; -import { services as s, authorInfo, version, repo, donations, supportedAudio } from "../config.js"; +import { services as s, authorInfo, version, repo, donations, supportedAudio, otherServers } from "../config.js"; import { getCommitInfo } from "../sub/currentCommit.js"; import loc from "../../localization/manager.js"; import emoji from "../emoji.js"; @@ -7,6 +7,8 @@ import changelogManager from "../changelog/changelogManager.js"; let com = getCommitInfo(); +let defaultApiURL = process.env.apiURL ? process.env.apiURL.slice(0, -1) : ''; + let enabledServices = Object.keys(s).filter((p) => { if (s[p].enabled) return true; }).sort().map((p) => { @@ -28,7 +30,13 @@ for (let i in donations["crypto"]) { extr = ' top-margin' } -let defaultApiURL = process.env.apiURL ? process.env.apiURL.slice(0, -1) : ''; +let servers = otherServers.map((p) => { + if (p === "default") { + return { "action": defaultApiURL, "text": defaultApiURL.replace("https://","") } + } else { + return { "action": p, "text": p.replace("https://","") } + } +}) export default function(obj) { const t = (str, replace) => { return loc(obj.lang, str, replace) }; @@ -461,28 +469,7 @@ export default function(obj) { name: "serverPicker", explanation: t(['SettingsServerPickerDescription'])+defaultApiURL.replace("https://","")+".", vertical: true, - items: [{ - action: defaultApiURL, - text: defaultApiURL.replace("https://","") - }, { - action: "https://co.wuk.sh", - text: "co.wuk.sh" - }, { - action: "https://api.c0ba.lt", - text: "api.c0ba.lt" - }, { - action: "https://wukko.wolfdo.gg", - text: "wukko.wolfdo.gg" - }, { - action: "https://api.co.749.city", - text: "api.co.749.city" - }, { - action: "https://cobalt-api.fluffy.tools", - text: "cobalt-api.fluffy.tools" - }, { - action: "https://capi.oak.li", - text: "capi.oak.li" - }] + items: servers }) }) }], From 9401c03ed47157596d0f2c8cb3ae5ba1abbc8422 Mon Sep 17 00:00:00 2001 From: blueb Date: Tue, 22 Aug 2023 01:13:37 -0400 Subject: [PATCH 09/11] add comma in serverpicker description --- src/localization/languages/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/localization/languages/en.json b/src/localization/languages/en.json index b57692c4..b571ec91 100644 --- a/src/localization/languages/en.json +++ b/src/localization/languages/en.json @@ -41,7 +41,7 @@ "SettingsThemeLight": "light", "SettingsThemeDark": "dark", "SettingsServerPicker": "server picker", - "SettingsServerPickerDescription": "choose which server to download from. default is ", + "SettingsServerPickerDescription": "choose which server to download from, default is ", "SettingsKeepDownloadButton": "keep >> visible", "AccessibilityKeepDownloadButton": "keep the download button always visible", "SettingsEnableDownloadPopup": "ask how to save", From 793f0c87038878a31658cd211fc87a02c35285eb Mon Sep 17 00:00:00 2001 From: blueb <118416443+ihateblueb@users.noreply.github.com> Date: Tue, 22 Aug 2023 02:17:54 -0400 Subject: [PATCH 10/11] Update config.json --- src/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.json b/src/config.json index fc001b73..f9561ef0 100644 --- a/src/config.json +++ b/src/config.json @@ -70,5 +70,5 @@ "audio": ["-ar", "48000", "-ac", "2", "-b:a", "320k"], "m4a": ["-movflags", "frag_keyframe+empty_moov"] }, - "otherServers": ["default", "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"] + "otherServers": ["default", "https://co.wuk.sh", "https://api.c0ba.lt", "https://co-api.blueb.me", "https://wukko.wolfdo.gg", "https://api.co.749.city", "https://cobalt-api.fluffy.tools", "https://capi.oak.li"] } From 4910a2b04b224c6556a99209769d14bc34169f43 Mon Sep 17 00:00:00 2001 From: blueb Date: Tue, 22 Aug 2023 02:24:53 -0400 Subject: [PATCH 11/11] add default api url back --- src/localization/languages/en.json | 1 + src/modules/pageRender/page.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/localization/languages/en.json b/src/localization/languages/en.json index b571ec91..56b7295f 100644 --- a/src/localization/languages/en.json +++ b/src/localization/languages/en.json @@ -41,6 +41,7 @@ "SettingsThemeLight": "light", "SettingsThemeDark": "dark", "SettingsServerPicker": "server picker", + "SettingsServerPickerDefault": "default", "SettingsServerPickerDescription": "choose which server to download from, default is ", "SettingsKeepDownloadButton": "keep >> visible", "AccessibilityKeepDownloadButton": "keep the download button always visible", diff --git a/src/modules/pageRender/page.js b/src/modules/pageRender/page.js index 4094cfec..69aba62a 100644 --- a/src/modules/pageRender/page.js +++ b/src/modules/pageRender/page.js @@ -32,7 +32,7 @@ for (let i in donations["crypto"]) { let servers = otherServers.map((p) => { if (p === "default") { - return { "action": defaultApiURL, "text": defaultApiURL.replace("https://","") } + return { "action": defaultApiURL } } else { return { "action": p, "text": p.replace("https://","") } } @@ -48,6 +48,7 @@ export default function(obj) { let platform = isMobile ? "m" : "p"; if (isMobile && isIOS) platform = "i"; + servers[0]["text"] = t('SettingsServerPickerDefault'); audioFormats[0]["text"] = t('SettingsAudioFormatBest'); try {