From b62c79adf867d4fe9401d82d22c4a00b3e292da7 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Sun, 14 Aug 2022 15:11:50 +0300 Subject: [PATCH] Removed embedded only https://github.com/libredirect/libredirect/issues/410 --- src/assets/javascripts/lbry.js | 2 +- src/assets/javascripts/twitter.js | 1 - src/assets/javascripts/youtube/youtube.js | 3 +-- src/pages/background/background.js | 3 +-- src/pages/options/index.html | 3 --- src/pages/options/widgets/lbry.pug | 1 - src/pages/options/widgets/twitter.pug | 1 - src/pages/options/widgets/youtube.pug | 1 - 8 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/assets/javascripts/lbry.js b/src/assets/javascripts/lbry.js index 5819d13..698517a 100644 --- a/src/assets/javascripts/lbry.js +++ b/src/assets/javascripts/lbry.js @@ -152,7 +152,7 @@ function redirect(url, type, initiator, disableOverride) { if (disableLbryTargets && !disableOverride) return if (initiator && (all().includes(initiator.origin) || targets.includes(initiator.host))) return if (!targets.some(rx => rx.test(url.href))) return - if ((type == "main_frame" && lbryRedirectType == "sub_frame") || (type == "sub_frame" && lbryRedirectType == "main_frame")) return + if (type == "sub_frame" && lbryRedirectType == "main_frame") return const instancesList = getInstancesList() switch (type) { diff --git a/src/assets/javascripts/twitter.js b/src/assets/javascripts/twitter.js index 2f68dfc..5704d25 100644 --- a/src/assets/javascripts/twitter.js +++ b/src/assets/javascripts/twitter.js @@ -97,7 +97,6 @@ function redirect(url, type, initiator, disableOverride) { if (!targets.some(rx => rx.test(url.href))) return if (url.pathname.split("/").includes("home")) return if (initiator && all().includes(initiator.origin)) return "BYPASSTAB" - if (twitterRedirectType == "sub_frame" && type == "main_frame") return if (twitterRedirectType == "main_frame" && type != "main_frame") return let instancesList = [] diff --git a/src/assets/javascripts/youtube/youtube.js b/src/assets/javascripts/youtube/youtube.js index c344224..7b21570 100644 --- a/src/assets/javascripts/youtube/youtube.js +++ b/src/assets/javascripts/youtube/youtube.js @@ -327,14 +327,13 @@ function getInstanceList(type) { return instancesList } -function redirect(url, type, initiator, disableOverride) { +function redirect(url, type, tabId, initiator, disableOverride) { if (disableYoutube && !disableOverride) return if (!targets.some(rx => rx.test(url.href))) return if (initiator && all().includes(initiator.origin)) return "BYPASSTAB" if (type != ("main_frame" || "sub_frame")) return if (url.pathname.match(/iframe_api/) || url.pathname.match(/www-widgetapi/)) return // Don't redirect YouTube Player API. - if (onlyEmbeddedVideo == "onlyEmbedded" && type == "main_frame") return if (onlyEmbeddedVideo == "onlyNotEmbedded" && type == "sub_frame") return if (type == "main_frame") { diff --git a/src/pages/background/background.js b/src/pages/background/background.js index 39c1005..7e37bad 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -26,7 +26,6 @@ import frontend from "../../assets/javascripts/frontend.js" window.browser = window.browser || window.chrome - browser.runtime.onInstalled.addListener(details => { function initDefaults() { fetch("/instances/blacklist.json") @@ -90,7 +89,7 @@ browser.webRequest.onBeforeRequest.addListener( } let newUrl = youtubeMusicHelper.redirect(url, details.type) - if (!newUrl) newUrl = youtubeHelper.redirect(url, details.type, initiator) + if (!newUrl) newUrl = youtubeHelper.redirect(url, details.type, details.tabId, initiator) if (!newUrl) newUrl = twitterHelper.redirect(url, details.type, initiator) if (!newUrl) newUrl = instagramHelper.redirect(url, details.type, initiator) if (!newUrl) newUrl = mapsHelper.redirect(url, initiator) diff --git a/src/pages/options/index.html b/src/pages/options/index.html index b8541ff..af41740 100644 --- a/src/pages/options/index.html +++ b/src/pages/options/index.html @@ -312,7 +312,6 @@

Redirect Type

@@ -925,7 +924,6 @@

Redirect Type

@@ -2220,7 +2218,6 @@

Redirect Type

diff --git a/src/pages/options/widgets/lbry.pug b/src/pages/options/widgets/lbry.pug index e427843..327c938 100644 --- a/src/pages/options/widgets/lbry.pug +++ b/src/pages/options/widgets/lbry.pug @@ -16,7 +16,6 @@ section#lbry_page.option-block h4(data-localise="__MSG_redirectType__") Redirect Type select#lbry-redirect_type option(value="both" data-localise="__MSG_both__") both - option(value="sub_frame" data-localise="__MSG_onlyEmbedded__") Only Embedded option(value="main_frame" data-localise="__MSG_onlyNotEmbedded__") Only Not Embedded #librarian diff --git a/src/pages/options/widgets/twitter.pug b/src/pages/options/widgets/twitter.pug index 6e61054..137e1ef 100644 --- a/src/pages/options/widgets/twitter.pug +++ b/src/pages/options/widgets/twitter.pug @@ -10,7 +10,6 @@ section#twitter_page.option-block h4(data-localise="__MSG_redirectType__") Redirect Type select#twitter-redirect_type option(value="both" data-localise="__MSG_both__") both - option(value="sub_frame" data-localise="__MSG_onlyEmbedded__") Only Embedded option(value="main_frame" data-localise="__MSG_onlyNotEmbedded__") Only Not Embedded #nitter diff --git a/src/pages/options/widgets/youtube.pug b/src/pages/options/widgets/youtube.pug index 33a43c3..66faa60 100644 --- a/src/pages/options/widgets/youtube.pug +++ b/src/pages/options/widgets/youtube.pug @@ -29,7 +29,6 @@ section#youtube_page.option-block h4(data-localise="__MSG_redirectType__") Redirect Type select#youtube-redirect_type option(value="both" data-localise="__MSG_both__") both - option(value="onlyEmbedded" data-localise="__MSG_onlyEmbedded__") Only Embedded option(value="onlyNotEmbedded" data-localise="__MSG_onlyNotEmbedded__") Only Not Embedded #invidious