fix: remove Google Cache and Yahoo Cache

Closes #90.

src/assets/locales/en/messages-firefox.json

@@ -1,9 +1,4 @@
 {
-  "engineName_googleText": {
-    "message": "Google (Text-Only)",
-    "description": "Name of the search engine."
-  },
-
   "engineName_archiveIsAll": {
     "message": "Archive.is (All)",
     "description": "Name of the search engine."
@@ -14,11 +9,6 @@
     "description": "Name of the search engine."
   },
 
-  "menuItemTitle_googleText": {
-    "message": "Google (Text-Only)",
-    "description": "Name of the search engine."
-  },
-
   "menuItemTitle_archiveIsAll": {
     "message": "Archive.is (All)",
     "description": "Name of the search engine."
@@ -45,7 +35,7 @@
     "placeholders": {
       "engine": {
         "content": "$1",
-        "example": "Google"
+        "example": "Wayback Machine"
       }
     }
   },
@@ -60,11 +50,6 @@
     "description": "Title of the options section."
   },
 
-  "optionTitle_googleText": {
-    "message": "Google Cache (Text-Only)",
-    "description": "Title of the option."
-  },
-
   "optionTitle_archiveOrgAll": {
     "message": "Wayback Machine (All)",
     "description": "Title of the option."

src/assets/locales/en/messages-safari.json

@@ -4,11 +4,6 @@
     "description": "Description of the extension."
   },
 
-  "engineName_googleText": {
-    "message": "Google (Text-Only)",
-    "description": "Name of the search engine."
-  },
-
   "engineName_archiveIsAll": {
     "message": "Archive.is (All)",
     "description": "Name of the search engine."
@@ -19,11 +14,6 @@
     "description": "Name of the search engine."
   },
 
-  "menuItemTitle_googleText": {
-    "message": "Google (Text-Only)",
-    "description": "Title of the menu item."
-  },
-
   "menuItemTitle_archiveIsAll": {
     "message": "Archive.is (All)",
     "description": "Title of the menu item."
@@ -50,7 +40,7 @@
     "placeholders": {
       "engine": {
         "content": "$1",
-        "example": "Google"
+        "example": "Wayback Machine"
       }
     }
   },
@@ -65,11 +55,6 @@
     "description": "Title of the options section."
   },
 
-  "optionTitle_googleText": {
-    "message": "Google Cache (Text-Only)",
-    "description": "Title of the option."
-  },
-
   "optionTitle_archiveOrgAll": {
     "message": "Wayback Machine (All)",
     "description": "Title of the option."

src/assets/locales/en/messages.json

@@ -5,20 +5,10 @@
   },
 
   "extensionDescription": {
-    "message": "View archived and cached versions of web pages on 10+ search engines, such as the Wayback Machine, Archive.is and Google.",
+    "message": "View archived and cached versions of web pages on 10+ search engines, such as the Wayback Machine and Archive.is.",
     "description": "Description of the extension."
   },
 
-  "engineName_google": {
-    "message": "Google",
-    "description": "Name of the search engine."
-  },
-
-  "engineName_googleText": {
-    "message": "Google (text-only)",
-    "description": "Name of the search engine."
-  },
-
   "engineName_bing": {
     "message": "Bing",
     "description": "Name of the search engine."
@@ -59,11 +49,6 @@
     "description": "Name of the search engine."
   },
 
-  "engineName_yahoo": {
-    "message": "Yahoo",
-    "description": "Name of the search engine."
-  },
-
   "engineName_permacc": {
     "message": "Perma.cc",
     "description": "Name of the search engine."
@@ -95,21 +80,11 @@
     "placeholders": {
       "engine": {
         "content": "$1",
-        "example": "Google"
+        "example": "Wayback Machine"
       }
     }
   },
 
-  "menuItemTitle_google": {
-    "message": "Google",
-    "description": "Title of the menu item."
-  },
-
-  "menuItemTitle_googleText": {
-    "message": "Google (text-only)",
-    "description": "Title of the menu item."
-  },
-
   "menuItemTitle_bing": {
     "message": "Bing",
     "description": "Title of the menu item."
@@ -150,11 +125,6 @@
     "description": "Title of the menu item."
   },
 
-  "menuItemTitle_yahoo": {
-    "message": "Yahoo",
-    "description": "Title of the menu item."
-  },
-
   "menuItemTitle_permacc": {
     "message": "Perma.cc",
     "description": "Title of the menu item."
@@ -186,7 +156,7 @@
     "placeholders": {
       "engine": {
         "content": "$1",
-        "example": "Google"
+        "example": "Wayback Machine"
       }
     }
   },
@@ -206,16 +176,6 @@
     "description": "Description of the options section."
   },
 
-  "optionTitle_google": {
-    "message": "Google Cache",
-    "description": "Title of the option."
-  },
-
-  "optionTitle_googleText": {
-    "message": "Google Cache (text-only)",
-    "description": "Title of the option."
-  },
-
   "optionTitle_bing": {
     "message": "Bing Cache",
     "description": "Title of the option."
@@ -256,11 +216,6 @@
     "description": "Title of the option."
   },
 
-  "optionTitle_yahoo": {
-    "message": "Yahoo Cache",
-    "description": "Title of the option."
-  },
-
   "optionTitle_permacc": {
     "message": "Perma.cc",
     "description": "Title of the option."
@@ -552,7 +507,7 @@
     "placeholders": {
       "engine": {
         "content": "$1",
-        "example": "Google"
+        "example": "Wayback Machine"
       }
     }
   },
@@ -563,7 +518,7 @@
     "placeholders": {
       "engine": {
         "content": "$1",
-        "example": "Google"
+        "example": "Wayback Machine"
       }
     }
   },

src/background/main.js

@@ -45,7 +45,6 @@ import {
   pageArchiveHosts,
   linkArchiveHosts,
   linkArchiveUrlRx,
-  chromeMobileUA,
   chromeDesktopUA
 } from 'utils/data';
 import {targetEnv, mv3} from 'utils/config';
@@ -625,11 +624,7 @@ async function setTabUserAgent({tabId, tabUrl, userAgent, beaconToken} = {}) {
 
 async function getRequiredUserAgent(engine) {
   if (await isMobile()) {
-    // Google only works with a Chrome user agent on Firefox for Android,
-    // while other search engines may need a desktop user agent.
-    if (targetEnv === 'firefox' && ['google', 'googleText'].includes(engine)) {
-      return chromeMobileUA;
-    } else if (['yandex', 'bing', 'yahoo'].includes(engine)) {
+    if (['yandex', 'bing'].includes(engine)) {
       return chromeDesktopUA;
     }
   }
@@ -653,14 +648,7 @@ async function openCurrentDoc({linkUrl} = {}) {
     for (const [engine, rx] of Object.entries(linkArchiveUrlRx)) {
       const match = linkUrl.match(rx);
       if (match) {
-        if (engine === 'google') {
-          const data = new URL(linkUrl).searchParams.get('q');
-          if (data) {
-            docUrl = data.replace(/^cache.*?(https?:\/\/.*)$/, '$1').trim();
-          }
-        } else {
-          docUrl = match[1].trim();
-        }
+        docUrl = match[1].trim();
 
         break;
       }

src/storage/config.json

@@ -17,10 +17,9 @@
       "20230715152710_add_ghostarchive",
       "20230718120215_add_webcite",
       "20240514170322_add_appversion",
-      "20240619180111_add_menuchangeevent"
+      "20240619180111_add_menuchangeevent",
+      "20240928183956_remove_search_engines"
     ],
-    "session": [
-      "20240514122825_initial_version"
-    ]
+    "session": ["20240514122825_initial_version"]
   }
 }

src/storage/revisions/local/20240928183956_remove_search_engines.js

@@ -0,0 +1,30 @@
+const message = 'Remove search engines';
+
+const revision = '20240928183956_remove_search_engines';
+
+async function upgrade(context) {
+  const changes = {};
+  const {engines, disabledEngines} = await browser.storage.local.get([
+    'engines',
+    'disabledEngines'
+  ]);
+
+  const removeEngines = ['google', 'googleText', 'yahoo'];
+  const enableEngines = [];
+
+  if (context.install) {
+    enableEngines.push('ghostarchive', 'webcite');
+  }
+
+  changes.engines = engines.filter(function (item) {
+    return !removeEngines.includes(item);
+  });
+  changes.disabledEngines = disabledEngines.filter(function (item) {
+    return !removeEngines.includes(item) && !enableEngines.includes(item);
+  });
+
+  changes.storageVersion = revision;
+  return browser.storage.local.set(changes);
+}
+
+export {message, revision, upgrade};

src/tools/main.js

@@ -31,10 +31,6 @@ function main() {
           docUrl = document.querySelector(
             '#HEADER form[action*="/search/"] input[type=text]'
           )?.value;
-        } else if (engine === 'google') {
-          docUrl = document.querySelector(
-            '[id*="google-cache-hdr"] > div > span > a'
-          )?.href;
         } else if (engine === 'bing') {
           docUrl = document.querySelector(
             'div.b_vPanel > div > strong > a[h*="ID=SERP"]'