From ea092ab7f9fa95beac3e2c675522692ca3d08613 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Wed, 16 Feb 2022 22:23:22 +0300 Subject: Fixed a duplicating url parameters bug + typo --- src/assets/javascripts/helpers/common.js | 2 +- src/assets/javascripts/helpers/youtube/youtube.js | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/assets/javascripts/helpers') diff --git a/src/assets/javascripts/helpers/common.js b/src/assets/javascripts/helpers/common.js index 07bbccb5..05ad60ff 100644 --- a/src/assets/javascripts/helpers/common.js +++ b/src/assets/javascripts/helpers/common.js @@ -49,7 +49,7 @@ async function wholeInit() { } async function updateInstances() { - const apiEndpoint = 'https://raw.githubusercontent.com/libredirect/instances/main/data.json'; + const apiEndpoint = 'https://raw.githubusercontent.com/libredirect/libredirect/master/instances/data.json'; let request = new XMLHttpRequest(); request.open('GET', apiEndpoint, false); request.send(null); diff --git a/src/assets/javascripts/helpers/youtube/youtube.js b/src/assets/javascripts/helpers/youtube/youtube.js index a7a7cad5..8934747a 100644 --- a/src/assets/javascripts/helpers/youtube/youtube.js +++ b/src/assets/javascripts/helpers/youtube/youtube.js @@ -258,14 +258,14 @@ function redirect(url, type) { if (instancesList.length === 0) return null; let randomInstance = commonHelper.getRandomInstance(instancesList); - if (theme != "DEFAULT") url.searchParams.append("dark_mode", theme); - if (volume != "--") url.searchParams.append("volume", volume); - if (autoplay != "DEFAULT") url.searchParams.append("autoplay", autoplay); + if (!url.searchParams.has("dark_mode")) if (theme != "DEFAULT") url.searchParams.append("dark_mode", theme); + if (!url.searchParams.has("volume")) if (volume != "--") url.searchParams.append("volume", volume); + if (!url.searchParams.has("autoplay")) if (autoplay != "DEFAULT") url.searchParams.append("autoplay", autoplay); - if (invidiousAlwaysProxy != "DEFAULT") url.searchParams.append("local", invidiousAlwaysProxy); - if (invidiousVideoQuality != "DEFAULT") url.searchParams.append("quality", invidiousVideoQuality); - if (invidiousPlayerStyle != "DEFAULT") url.searchParams.append("player_style", invidiousPlayerStyle); - if (invidiousSubtitles.trim() != '') url.searchParams.append("subtitles", invidiousSubtitles); + if (!url.searchParams.has("local")) if (invidiousAlwaysProxy != "DEFAULT") url.searchParams.append("local", invidiousAlwaysProxy); + if (!url.searchParams.has("quality")) if (invidiousVideoQuality != "DEFAULT") url.searchParams.append("quality", invidiousVideoQuality); + if (!url.searchParams.has("player_style")) if (invidiousPlayerStyle != "DEFAULT") url.searchParams.append("player_style", invidiousPlayerStyle); + if (!url.searchParams.has("subtitles")) if (invidiousSubtitles.trim() != '') url.searchParams.append("subtitles", invidiousSubtitles); return `${randomInstance}${url.pathname.replace("/shorts/", "/watch?v=")}${url.search}`; @@ -278,9 +278,9 @@ function redirect(url, type) { if (instancesList.length === 0) return null; let randomInstance = commonHelper.getRandomInstance(instancesList); - if (theme != "DEFAULT") url.searchParams.append("theme", theme); - if (volume != "--") url.searchParams.append("volume", volume / 100); - if (autoplay != "DEFAULT") url.searchParams.append("playerAutoPlay", autoplay); + if (!url.searchParams.has("theme")) if (theme != "DEFAULT") url.searchParams.append("theme", theme); + if (!url.searchParams.has("volume")) if (volume != "--") url.searchParams.append("volume", volume / 100); + if (!url.searchParams.has("playerAutoPlay")) if (autoplay != "DEFAULT") url.searchParams.append("playerAutoPlay", autoplay); return `${randomInstance}${url.pathname.replace("/shorts/", "/watch?v=")}${url.search}`; } -- cgit 1.4.1