Prepare for release 1.1.47

.nvmrc

@@ -0,0 +1 @@
+lts/fermium

README.md

@@ -12,7 +12,8 @@
 
 [![Donate](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/SimonBrazell/donate) [![Buy me a coffee](src/assets/images/buy-me-a-coffee.png)](https://www.buymeacoffee.com/SimonBrazell)
 
-- **BTC:** 3JZWooswwmmqQKw5iW6AYFfK5gcWTrvueE
+- **BTC:** `3JZWooswwmmqQKw5iW6AYFfK5gcWTrvueE`
+- **ETH:** `0x90049dc59365dF683451319Aa4632aC61193dFA7`
 
 <img src="https://img.shields.io/liberapay/receives/SimonBrazell.svg?logo=liberapay">
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "privacy-redirect",
-  "description": "Redirects Twitter, YouTube, Instagram & Google Maps requests to privacy friendly alternatives.",
+  "description": "Redirects Twitter, YouTube, Instagram and more to privacy friendly alternatives.",
   "engines": {
     "node": ">=10.0.0",
     "npm": ">=5.6.0"
@@ -14,12 +14,12 @@
     "url": "git+https://github.com/SimonBrazell/privacy-redirect.git"
   },
   "author": "SimonBrazell",
-  "license": "GPLv3",
+  "license": "GPL-3.0-only",
   "bugs": {
     "url": "https://github.com/SimonBrazell/privacy-redirect/issues"
   },
   "homepage": "https://github.com/SimonBrazell/privacy-redirect#readme",
   "devDependencies": {
-    "web-ext": "^5.4.1"
+    "web-ext": "^6.0.0"
   }
 }

src/_locales/en/messages.json

@@ -4,7 +4,7 @@
     "description": "Name of the extension."
   },
   "extensionDescription": {
-    "message": "Redirects Twitter, YouTube, Instagram, Google Maps, Reddit & Google Search requests to privacy friendly alternatives.",
+    "message": "Redirects Twitter, YouTube, Instagram and more to privacy friendly alternatives.",
     "description": "Description of the extension."
   },
   "nitterInstance": {

src/assets/javascripts/helpers/google-search.js

@@ -15,6 +15,7 @@ const redirects = [
   { link: "https://engine.presearch.org", q: "/search" },
   { link: "https://searx.silkky.cloud", q: "/" },
   { link: "https://search.trom.tf", q: "/" },
+  { link: "https://whooglesearch.net", q: "/search" },
   { link: "https://whoogle.sdf.org", q: "/search" },
   { link: "https://whoogle.himiko.cloud", q: "/search" },
   { link: "https://whoogle-search.zeet.app", q: "/search" },

src/assets/javascripts/helpers/google-translate.js

@@ -1,12 +1,8 @@
-const targets = [
+const targets = ["translate.google.com"];
-  "translate.google.com"
-];
 
-const redirects = [
+const redirects = ["https://translate.metalune.xyz"];
-  "https://translate.metalune.xyz"
-];
 
 export default {
   targets,
   redirects,
-}
+};

src/assets/javascripts/helpers/instagram.js

@@ -13,7 +13,7 @@ const redirects = [
   "https://bibliogram.hamster.dance",
   "https://bibliogram.kavin.rocks",
   "https://insta.trom.tf",
-  "https://bibliogram.hamster.dance"
+  "https://bibliogram.hamster.dance",
 ];
 const reservedPaths = [
   "about",

src/assets/javascripts/helpers/twitter.js

@@ -1,5 +1,5 @@
 /*
-    Please remember to also update the manifest.json file 
+    Please remember to also update the src/manifest.json file 
     (content_scripts > matches, 'remove-twitter-sw.js') 
     when updating this list:
   */
@@ -10,6 +10,11 @@ const targets = [
   "pbs.twimg.com",
   "video.twimg.com",
 ];
+/*
+    Please remember to also update the 
+    src/assets/javascripts/remove-twitter-sw.js file 
+    (const nitterInstances) when updating this list:
+  */
 const redirects = [
   "https://nitter.net",
   "https://nitter.snopyta.org",

src/assets/javascripts/persist-invidious-prefs.js

@@ -1,23 +1,23 @@
-'use strict';
+"use strict";
 
 window.browser = window.browser || window.chrome;
 
 function getCookie() {
-  let ca = document.cookie.split(';');
+  let ca = document.cookie.split(";");
   for (let i = 0; i < ca.length; i++) {
     let c = ca[i];
-    while (c.charAt(0) == ' ') c = c.substring(1, c.length);
+    while (c.charAt(0) == " ") c = c.substring(1, c.length);
-    if (c.indexOf('PREFS=') == 0) {
+    if (c.indexOf("PREFS=") == 0) {
       return JSON.parse(
-        decodeURIComponent(c.substring('PREFS='.length, c.length))
+        decodeURIComponent(c.substring("PREFS=".length, c.length))
-      )
+      );
-    };
+    }
   }
   return {};
 }
 
 browser.storage.sync.get(
-  ['alwaysProxy', 'videoQuality', 'invidiousDarkMode', 'persistInvidiousPrefs'],
+  ["alwaysProxy", "videoQuality", "invidiousDarkMode", "persistInvidiousPrefs"],
   (result) => {
     if (result.persistInvidiousPrefs) {
       const prefs = getCookie();
@@ -27,4 +27,4 @@ browser.storage.sync.get(
       document.cookie = `PREFS=${encodeURIComponent(JSON.stringify(prefs))}`;
     }
   }
-);
+);

src/assets/javascripts/remove-twitter-sw.js

@@ -16,9 +16,9 @@ const nitterInstances = [
   "https://nitter.kavin.rocks",
   "https://tweet.lambda.dance",
   "https://nitter.cc",
-  "https://nitter.weaponizedhumiliation.com",
   "https://nitter.vxempire.xyz",
   "https://nitter.unixfox.eu",
+  "https://bird.trom.tf",
 ];
 
 let disableNitter;

src/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_extensionName__",
   "description": "__MSG_extensionDescription__",
-  "version": "1.1.46",
+  "version": "1.1.47",
   "manifest_version": 2,
   "background": {
     "page": "pages/background/background.html",
@@ -57,10 +57,8 @@
         "*://invidious.tinfoil-hat.net/*",
         "*://invidious.namazso.eu/*",
         "*://vid.puffyan.us/*",
-        "*://invidious.048596.xyz/*",
         "*://dev.viewtube.io/*",
-	      "*://fz253lmuao3strwbfbmx46yu7acac2jz27iwtorgmbqlkurlclmancad.onion/*",
+        "*://invidious.048596.xyz/*",
-        "*://invidious.048596.yxz/*",
         "*://fz253lmuao3strwbfbmx46yu7acac2jz27iwtorgmbqlkurlclmancad.onion/*",
         "*://qklhadlycap4cnod.onion/*",
         "*://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion/*",
@@ -77,7 +75,8 @@
   "web_accessible_resources": ["assets/javascripts/helpers/*"],
   "browser_specific_settings": {
     "gecko": {
-      "strict_min_version": "60.0"
+      "id": "{b7f9d2cd-d772-4302-8c3f-eb941af36f76}",
+      "strict_min_version": "67.0"
     }
   }
 }

src/pages/background/background.js

@@ -101,7 +101,8 @@ browser.storage.sync.get(
     osmInstance = result.osmInstance || osmDefault;
     redditInstance = result.redditInstance || redditDefault;
     searchEngineInstance = result.searchEngineInstance;
-    simplyTranslateInstance = result.simplyTranslateInstance || simplyTranslateDefault;
+    simplyTranslateInstance =
+      result.simplyTranslateInstance || simplyTranslateDefault;
     disableNitter = result.disableNitter;
     disableInvidious = result.disableInvidious;
     disableBibliogram = result.disableBibliogram;
@@ -149,7 +150,8 @@ browser.storage.onChanged.addListener((changes) => {
     osmInstance = changes.osmInstance.newValue || osmDefault;
   }
   if ("simplyTranslateInstance" in changes) {
-    simplyTranslateInstance = changes.simplyTranslateInstance.newValue || simplyTranslateDefault;
+    simplyTranslateInstance =
+      changes.simplyTranslateInstance.newValue || simplyTranslateDefault;
   }
   if ("redditInstance" in changes) {
     redditInstance = changes.redditInstance.newValue || redditDefault;
@@ -547,7 +549,7 @@ browser.webRequest.onBeforeRequest.addListener(
     } else if (googleTranslateDomains.includes(url.host)) {
       redirect = {
         redirectUrl: redirectGoogleTranslate(url, initiator),
-      }
+      };
     }
     if (redirect && redirect.redirectUrl) {
       console.info(
@@ -567,13 +569,21 @@ browser.webRequest.onBeforeRequest.addListener(
 );
 
 browser.runtime.onInstalled.addListener((details) => {
-  browser.storage.sync.get(["disableSearchEngine"], (result) => {
+  browser.storage.sync.get(
-    if (result.disableSearchEngine === undefined) {
+    ["disableSearchEngine", "disableSimplyTranslate"],
-      browser.storage.sync.set({
+    (result) => {
-        disableSearchEngine: true,
+      if (result.disableSearchEngine === undefined) {
-      });
+        browser.storage.sync.set({
+          disableSearchEngine: true,
+        });
+      }
+      if (result.disableSimplyTranslate === undefined) {
+        browser.storage.sync.set({
+          disableSimplyTranslate: true,
+        });
+      }
     }
-  });
+  );
   if (details.reason === "update") {
     browser.storage.sync.get(
       ["whitelist", "exceptions", "invidiousInstance", "disableSearchEngine"],

src/pages/options/options.html

@@ -147,7 +147,7 @@
           <tbody>
             <tr>
               <td>
-                <h1 data-localise="__MSG_disableSearchEngine__" class="new-badge" data-new-badge>
+                <h1 data-localise="__MSG_disableSearchEngine__">
                   Search Engine Redirects
                 </h1>
               </td>

src/pages/popup/popup.html

@@ -142,11 +142,7 @@
         <tbody>
           <tr>
             <td>
-              <h1
+              <h1 data-localise="__MSG_disableSearchEngine__">
-                data-localise="__MSG_disableSearchEngine__"
-                class="new-badge"
-                data-new-badge
-              >
                 Search Engine Redirects
               </h1>
             </td>
@@ -183,7 +179,10 @@
                 id="disable-simplyTranslate"
                 type="checkbox"
               />&nbsp;
-              <label for="disable-simplyTranslate" class="checkbox-label"></label>
+              <label
+                for="disable-simplyTranslate"
+                class="checkbox-label"
+              ></label>
             </td>
           </tr>
         </tbody>