devol/libredirect
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed always preferred bug in youtube

Browse Source
This commit is contained in:
ManeraKai 2022-02-19 01:14:26 +03:00
parent f92f9bc47c
commit 07cd02d356
No known key found for this signature in database
GPG Key ID: 5ABC31FFD562E337
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/assets/javascripts/helpers/youtube/youtube.js
View File

@ -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;
}

2
src/pages/options/youtube/youtube.js
View File

@ -117,5 +117,5 @@ youtubeHelper.init().then(() => {
let freetubeFrontend = youtubeHelper.getFreetubeFrontend()
freetubeFrontendElement.value = freetubeFrontend
changeFreetubeFrontendsSettings(freetubeFrontend);
if (frontend == "freetube") changeFreetubeFrontendsSettings(freetubeFrontend);
});