diff options
| -rw-r--r-- | src/assets/javascripts/helpers/youtube/youtube.js | 7 | ||||
| -rw-r--r-- | src/pages/background/background.js | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/assets/javascripts/helpers/youtube/youtube.js b/src/assets/javascripts/helpers/youtube/youtube.js index 8b4677da..49a3b31f 100644 --- a/src/assets/javascripts/helpers/youtube/youtube.js +++ b/src/assets/javascripts/helpers/youtube/youtube.js @@ -5,9 +5,11 @@ import commonHelper from '../common.js' window.browser = window.browser || window.chrome; const targets = [ + "studio.youtube.com", "m.youtube.com", "youtube.com", "img.youtube.com", + "i.ytimg.com", "www.youtube.com", "youtube-nocookie.com", "www.youtube-nocookie.com", @@ -243,7 +245,7 @@ function redirect(url, initiator, type) { return null; if (url.host.split(".")[0] === "studio") return null;// Avoid `studio.youtube.com` - + if (url.pathname.match(/iframe_api/) || url.pathname.match(/www-widgetapi/)) return null; // Don't redirect YouTube Player API. if (frontend == 'freeTube' && type === "main_frame") @@ -271,8 +273,6 @@ function redirect(url, initiator, type) { let randomInstance = commonHelper.getRandomInstance(redirects.piped.normal); - console.log(" redirects.invidious.normal.includes(url.hostname)", redirects.invidious.normal.includes(url.hostname)) - if ( url.hostname.endsWith("youtube.com") || url.hostname.endsWith("youtube-nocookie.com") || @@ -284,6 +284,7 @@ function redirect(url, initiator, type) { return `${randomInstance}/watch?v=${url.pathname.substring(1)}`; } + return 'CANCEL'; } export default { diff --git a/src/pages/background/background.js b/src/pages/background/background.js index 30d7ae32..ca1f1f19 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -58,8 +58,14 @@ browser.webRequest.onBeforeRequest.addListener( else if (wikipediaHelper.isWikipedia(url)) newUrl = wikipediaHelper.redirect(url, initiator); if (newUrl) { - console.info("Redirecting", url.href, "=>", newUrl); - return { redirectUrl: newUrl }; + if (newUrl == 'CANCEL') { + console.log(`Canceled ${url}`); + return { cancel: true }; + } + else { + console.info("Redirecting", url.href, "=>", newUrl); + return { redirectUrl: newUrl }; + } } return null; }, |