summaryrefslogtreecommitdiffstats
path: root/background.js
diff options
context:
space:
mode:
Diffstat (limited to 'background.js')
-rw-r--r--background.js14
1 files changed, 8 insertions, 6 deletions
diff --git a/background.js b/background.js
index 33ff7a8..166f694 100644
--- a/background.js
+++ b/background.js
@@ -173,13 +173,10 @@ function redirectYouTube(url, initiator, type) {
}
}
-function redirectTwitter(url, initiator) {
+function redirectTwitter(url) {
if (disableNitter) {
return null;
}
- if (initiator && (initiator.origin === nitterInstance || twitterDomains.includes(initiator.host))) {
- return null;
- }
if (url.host.split('.')[0] === 'pbs') {
return `${nitterInstance}/pic/${encodeURIComponent(url.href)}`;
} else if (url.host.split('.')[0] === 'video') {
@@ -288,7 +285,12 @@ function redirectGoogleMaps(url) {
browser.webRequest.onBeforeRequest.addListener(
details => {
const url = new URL(details.url);
- let initiator = details.initiator && new URL(details.initiator);
+ let initiator;
+ if (details.initiator) {
+ initiator = new URL(details.initiator);
+ } else if (details.originUrl) {
+ initiator = new URL(details.originUrl);
+ }
let redirect;
if (youtubeDomains.includes(url.host)) {
redirect = {
@@ -296,7 +298,7 @@ browser.webRequest.onBeforeRequest.addListener(
};
} else if (twitterDomains.includes(url.host)) {
redirect = {
- redirectUrl: redirectTwitter(url, initiator)
+ redirectUrl: redirectTwitter(url)
};
} else if (url.host.match(instagramRegex)) {
redirect = {