Fixed alwaysUsePreferred bug #96. Added way to customize Popup. Added oldReddit to targets

5 files changed, 52 insertions, 12 deletions

diff --git a/src/assets/javascripts/helpers/common.js b/src/assets/javascripts/helpers/common.js
index 34539e69..f51bab36 100644
--- a/src/assets/javascripts/helpers/common.js
+++ b/src/assets/javascripts/helpers/common.js
@@ -121,7 +121,7 @@ function processDefaultCustomInstances(
     ].join('\n<hr>\n');
 
   calcNameCheckBoxes();
-  document.getElementById(`${name}-${protocol}-toogle-all`).addEventListener("change", (event) => {
+  document.getElementById(`${name}-${protocol}-toogle-all`).addEventListener("change", event => {
     if (event.target.checked)
       nameDefaultRedirects = [...nameHelper.getRedirects()[name][protocol]];
     else
diff --git a/src/assets/javascripts/helpers/general.js b/src/assets/javascripts/helpers/general.js
index fd14f534..66edf93e 100644
--- a/src/assets/javascripts/helpers/general.js
+++ b/src/assets/javascripts/helpers/general.js
@@ -55,6 +55,7 @@ async function init() {
                 "alwaysUsePreferred",
                 "theme",
                 "applyThemeToSites",
+                "popupFrontends"
             ],
             r => { // r = result
                 if (r.exceptions) exceptions = r.exceptions;
@@ -63,12 +64,52 @@ async function init() {
                 theme = r.theme ?? "DEFAULT"
                 applyThemeToSites = r.applyThemeToSites ?? false;
 
+                popupFrontends = r.popupFrontends ?? [
+                    "youtube",
+                    "youtubeMusic",
+                    "twitter",
+                    "instagram",
+                    "tikTok",
+                    "imgur",
+                    "reddit",
+                    "search",
+                    "translate",
+                    "maps",
+                    "wikipedia",
+                    "medium",
+                ];
                 resolve();
             }
         )
     )
 }
 
+
+let popupFrontends;
+const getPopupFrontends = () => popupFrontends;
+function setPopupFrontends(val) {
+    popupFrontends = val;
+    browser.storage.local.set({ popupFrontends })
+    console.log("popupFrontends: ", val)
+}
+
+let allPopupFrontends = [
+    "youtube",
+    "youtubeMusic",
+    "twitter",
+    "instagram",
+    "tikTok",
+    "imgur",
+    "reddit",
+    "pixiv",
+    "search",
+    "translate",
+    "maps",
+    "wikipedia",
+    "medium",
+];
+
+
 export default {
     getExceptions,
     setExceptions,
@@ -79,6 +120,11 @@ export default {
     getApplyThemeToSites,
     setApplyThemeToSites,
 
+    getPopupFrontends,
+    setPopupFrontends,
+
+    allPopupFrontends,
+
     getTheme,
     setTheme,
 
diff --git a/src/assets/javascripts/helpers/reddit.js b/src/assets/javascripts/helpers/reddit.js
index db8820eb..926d79e2 100644
--- a/src/assets/javascripts/helpers/reddit.js
+++ b/src/assets/javascripts/helpers/reddit.js
@@ -3,13 +3,8 @@ window.browser = window.browser || window.chrome;
 import commonHelper from './common.js'
 
 const targets = [
-  /^https?:\/\/reddit\.com/,
-  /^https?:\/\/www\.reddit\.com/,
-  /^https?:\/\/np\.reddit\.com/,
-  /^https?:\/\/new\.reddit\.com/,
-  /^https?:\/\/amp\.reddit\.com/,
-  /^https?:\/\/i\.redd\.it/,
-  /^https?:\/\/redd\.it/,
+  /^https?:\/\/(www\.|old\.|np\.|new\.|amp\.|)reddit\.com/,
+  /^https?:\/\/(i\.|)redd\.it/,
 ];
 let redirects = {
   // modern UI
@@ -397,7 +392,7 @@ async function init() {
 
           bypassWatchOnReddit = result.bypassWatchOnReddit ?? true;
 
-          alwaysUsePreferred = result.alwaysUsePreferred ?? true;
+          alwaysUsePreferred = result.alwaysUsePreferred ?? false;
 
           redirects.teddit = dataJson.teddit;
           if (result.redditRedirects) redirects = result.redditRedirects;
diff --git a/src/assets/javascripts/helpers/twitter.js b/src/assets/javascripts/helpers/twitter.js
index 68266328..caf6541d 100644
--- a/src/assets/javascripts/helpers/twitter.js
+++ b/src/assets/javascripts/helpers/twitter.js
@@ -245,7 +245,7 @@ async function init() {
 
           bypassWatchOnTwitter = r.bypassWatchOnTwitter ?? true;
 
-          alwaysUsePreferred = r.alwaysUsePreferred ?? true;
+          alwaysUsePreferred = r.alwaysUsePreferred ?? false;
 
           theme = r.theme ?? 'DEFAULT';
           applyThemeToSites = r.applyThemeToSites ?? false;
diff --git a/src/assets/javascripts/helpers/youtube/youtube.js b/src/assets/javascripts/helpers/youtube/youtube.js
index 919cec17..50a16024 100644
--- a/src/assets/javascripts/helpers/youtube/youtube.js
+++ b/src/assets/javascripts/helpers/youtube/youtube.js
@@ -618,7 +618,6 @@ function addUrlParams(url) {
   else return;
 }
 
-
 function initPipedLocalStorage(tabId) {
   browser.tabs.executeScript(
     tabId,
@@ -736,7 +735,7 @@ async function init() {
 
           persistInvidiousPrefs = r.persistInvidiousPrefs ?? false;
 
-          alwaysUsePreferred = r.alwaysUsePreferred ?? true;
+          alwaysUsePreferred = r.alwaysUsePreferred ?? false;
 
           bypassWatchOnYoutube = r.bypassWatchOnYoutube ?? true;