diff options
author | ManeraKai <manerakai@protonmail.com> | 2022-02-19 01:14:26 +0300 |
---|---|---|
committer | ManeraKai <manerakai@protonmail.com> | 2022-02-19 01:14:26 +0300 |
commit | 07cd02d3563bd7e86210490c274156becfe15345 (patch) | |
tree | 9b2d3a6bde8fb1d75ec106a9d8939e9c8e98933c /src/assets | |
parent | Fixed wikipedia redirect not working (diff) | |
download | libredirect-07cd02d3563bd7e86210490c274156becfe15345.zip |
Fixed always preferred bug in youtube
Diffstat (limited to 'src/assets')
-rw-r--r-- | src/assets/javascripts/helpers/youtube/youtube.js | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/assets/javascripts/helpers/youtube/youtube.js b/src/assets/javascripts/helpers/youtube/youtube.js index 38d7be49..0432dc4c 100644 --- a/src/assets/javascripts/helpers/youtube/youtube.js +++ b/src/assets/javascripts/helpers/youtube/youtube.js @@ -224,26 +224,30 @@ function isYoutube(url, initiator) { ) ) return false; - let pipedInstancesList = [...pipedRedirectsChecks, ...pipedCustomRedirects]; - let invidiousInstancesList = [...invidiousRedirectsChecks, ...invidiousCustomRedirects]; let isTargets = targets.some((rx) => rx.test(url.href)); let protocolHost = `${url.protocol}//${url.host}`; let isInvidious = redirects.invidious.normal.includes(protocolHost); - if (isInvidious) for (const iterator of invidiousInstancesList) if (iterator.indexOf(protocolHost) === 0) isInvidious = false; + if (isInvidious) { + let myInvidiousInstances = [...invidiousRedirectsChecks, ...invidiousCustomRedirects]; + for (const item of myInvidiousInstances) if (item == protocolHost) isInvidious = false; + } let isPiped = redirects.piped.normal.includes(protocolHost); - if (isPiped) for (const iterator of pipedInstancesList) if (iterator.indexOf(protocolHost) === 0) isPiped = false; + if (isPiped) { + let myPipedInstances = [...pipedRedirectsChecks, ...pipedCustomRedirects]; + for (const item of myPipedInstances) if (item == protocolHost) isPiped = false; + } if (frontend == 'invidious') { if (alwaysusePreferred) - return isTargets | isPiped | isInvidious; + return isTargets | redirects.piped.normal.includes(protocolHost) | isInvidious; else return isTargets | isPiped; } if (frontend == 'piped') { if (alwaysusePreferred) - return isTargets | isPiped | isInvidious; + return isTargets | isPiped | redirects.invidious.normal.includes(protocolHost); else return isTargets | isInvidious; } |