Disable Bibliogram support in "Privacy Redirect".

5 files changed, 50 insertions, 43 deletions

diff --git a/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/background/background.js b/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/background/background.js
index 9b8c3a1..c08d7b4 100644
--- a/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/background/background.js
+++ b/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/background/background.js
@@ -595,10 +595,17 @@ browser.webRequest.onBeforeRequest.addListener(
       redirect = {
         redirectUrl: redirectTwitter(url, initiator),
       };
-    } else if (instagramDomains.includes(url.host)) {
-      redirect = {
-        redirectUrl: redirectInstagram(url, initiator, details.type),
-      };
+//
+// Bibliogram has been discontinued.
+// See <https://cadence.moe/blog/2022-09-01-discontinuing-bibliogram>
+// We'll keep this code in case the project is resurrected, but for
+// now we disable Bibliogram redirects and hide the associated UI.
+//
+//  } else if (instagramDomains.includes(url.host)) {
+//    redirect = {
+//      redirectUrl: redirectInstagram(url, initiator, details.type),
+//    };
+//
     } else if (url.href.match(googleMapsRegex)) {
       redirect = {
         redirectUrl: redirectGoogleMaps(url, initiator),
diff --git a/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/options/options.html b/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/options/options.html
index 2cf5699..c5d0096 100644
--- a/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/options/options.html
+++ b/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/options/options.html
@@ -76,7 +76,7 @@
           </tbody>
         </table>
       </section>
-      <section class="settings-block">
+<!--  <section class="settings-block">
         <table class="option" aria-label="Toggle Bibliogram redirects">
           <tbody>
             <tr>
@@ -97,7 +97,7 @@
             </tr>
           </tbody>
         </table>
-      </section>
+      </section>  -->
       <section class="settings-block">
         <table class="option" aria-label="Toggle OpenStreetMap redirects">
           <tbody>
@@ -225,7 +225,7 @@
           />
         </div>
       </section>
-      <section class="settings-block">
+<!--  <section class="settings-block">
         <h1 data-localise="__MSG_bibliogramInstance__">Bibliogram Instance</h1>
         <div class="autocomplete">
           <input
@@ -235,7 +235,7 @@
             placeholder="Random instance (none selected)"
           />
         </div>
-      </section>
+      </section>  -->
       <section class="settings-block">
         <h1 data-localise="__MSG_osmInstance__">OpenStreetMap Instance</h1>
         <div class="autocomplete">
@@ -543,7 +543,7 @@
         </section>
         <hr>
       </div>
-      <button type="button" class="collapsible">
+<!--  <button type="button" class="collapsible">
         Bibliogram
       </button>
       <div class="collapsible-content">
@@ -558,7 +558,7 @@
           />
         </section>
         <hr>
-      </div>
+      </div>  -->
     </div>
 
     <div id="exceptions" class="tabcontent">
diff --git a/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/options/options.js b/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/options/options.js
index 91e7ac0..8309aab 100644
--- a/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/options/options.js
+++ b/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/options/options.js
@@ -21,7 +21,7 @@ const wikipediaInstances = wikipediaHelper.redirects;
 const autocompletes = [
   { id: "nitter-instance", instances: nitterInstances },
   { id: "invidious-instance", instances: invidiousInstances },
-  { id: "bibliogram-instance", instances: bibliogramInstances },
+//  { id: "bibliogram-instance", instances: bibliogramInstances },
   { id: "osm-instance", instances: osmInstances },
   { id: "reddit-instance", instances: redditInstances },
   {
@@ -35,7 +35,7 @@ const domparser = new DOMParser();
 
 let nitterInstance = document.getElementById("nitter-instance");
 let invidiousInstance = document.getElementById("invidious-instance");
-let bibliogramInstance = document.getElementById("bibliogram-instance");
+// let bibliogramInstance = document.getElementById("bibliogram-instance");
 let osmInstance = document.getElementById("osm-instance");
 let redditInstance = document.getElementById("reddit-instance");
 let searchEngineInstance = document.getElementById("search-engine-instance");
@@ -45,7 +45,7 @@ let simplyTranslateInstance = document.getElementById(
 let wikipediaInstance = document.getElementById("wikipedia-instance");
 let disableNitter = document.getElementById("disable-nitter");
 let disableInvidious = document.getElementById("disable-invidious");
-let disableBibliogram = document.getElementById("disable-bibliogram");
+// let disableBibliogram = document.getElementById("disable-bibliogram");
 let disableOsm = document.getElementById("disable-osm");
 let disableReddit = document.getElementById("disable-reddit");
 let disableSearchEngine = document.getElementById("disable-search-engine");
@@ -67,7 +67,7 @@ let theme = document.getElementById("theme");
 let useFreeTube = document.getElementById("use-freetube");
 let nitterRandomPool = document.getElementById("nitter-random-pool");
 let invidiousRandomPool = document.getElementById("invidious-random-pool");
-let bibliogramRandomPool = document.getElementById("bibliogram-random-pool");
+// let bibliogramRandomPool = document.getElementById("bibliogram-random-pool");
 let exceptions;
 
 window.browser = window.browser || window.chrome;
@@ -136,7 +136,7 @@ browser.storage.sync.get(
     if (result.theme) document.body.classList.add(result.theme);
     nitterInstance.value = result.nitterInstance || "";
     invidiousInstance.value = result.invidiousInstance || "";
-    bibliogramInstance.value = result.bibliogramInstance || "";
+//    bibliogramInstance.value = result.bibliogramInstance || "";
     osmInstance.value = result.osmInstance || "";
     redditInstance.value = result.redditInstance || "";
     searchEngineInstance.value =
@@ -145,7 +145,7 @@ browser.storage.sync.get(
     wikipediaInstance.value = result.wikipediaInstance || "";
     disableNitter.checked = !result.disableNitter;
     disableInvidious.checked = !result.disableInvidious;
-    disableBibliogram.checked = !result.disableBibliogram;
+//    disableBibliogram.checked = !result.disableBibliogram;
     disableOsm.checked = !result.disableOsm;
     disableReddit.checked = !result.disableReddit;
     disableSearchEngine.checked = !result.disableSearchEngine;
@@ -172,9 +172,9 @@ browser.storage.sync.get(
     invidiousRandomPool.value =
       result.invidiousRandomPool ||
       commonHelper.filterInstances(invidiousInstances);
-    bibliogramRandomPool.value =
-      result.bibliogramRandomPool ||
-      commonHelper.filterInstances(bibliogramInstances);
+//    bibliogramRandomPool.value =
+//      result.bibliogramRandomPool ||
+//      commonHelper.filterInstances(bibliogramInstances);
   }
 );
 
@@ -284,14 +284,14 @@ const invidiousInstanceChange = debounce(() => {
 }, 500);
 invidiousInstance.addEventListener("input", invidiousInstanceChange);
 
-const bibliogramInstanceChange = debounce(() => {
-  if (bibliogramInstance.checkValidity()) {
-    browser.storage.sync.set({
-      bibliogramInstance: parseURL(bibliogramInstance.value),
-    });
-  }
-}, 500);
-bibliogramInstance.addEventListener("input", bibliogramInstanceChange);
+// const bibliogramInstanceChange = debounce(() => {
+//   if (bibliogramInstance.checkValidity()) {
+//     browser.storage.sync.set({
+//       bibliogramInstance: parseURL(bibliogramInstance.value),
+//     });
+//   }
+// }, 500);
+// bibliogramInstance.addEventListener("input", bibliogramInstanceChange);
 
 const osmInstanceChange = debounce(() => {
   if (osmInstance.checkValidity()) {
@@ -357,9 +357,9 @@ disableInvidious.addEventListener("change", (event) => {
   browser.storage.sync.set({ disableInvidious: !event.target.checked });
 });
 
-disableBibliogram.addEventListener("change", (event) => {
-  browser.storage.sync.set({ disableBibliogram: !event.target.checked });
-});
+// disableBibliogram.addEventListener("change", (event) => {
+//   browser.storage.sync.set({ disableBibliogram: !event.target.checked });
+// });
 
 disableOsm.addEventListener("change", (event) => {
   browser.storage.sync.set({ disableOsm: !event.target.checked });
@@ -447,12 +447,12 @@ const invidiousRandomPoolChange = debounce(() => {
 }, 500);
 invidiousRandomPool.addEventListener("input", invidiousRandomPoolChange);
 
-const bibliogramRandomPoolChange = debounce(() => {
-  browser.storage.sync.set({
-    bibliogramRandomPool: bibliogramRandomPool.value,
-  });
-}, 500);
-bibliogramRandomPool.addEventListener("input", bibliogramRandomPoolChange);
+// const bibliogramRandomPoolChange = debounce(() => {
+//   browser.storage.sync.set({
+//     bibliogramRandomPool: bibliogramRandomPool.value,
+//   });
+// }, 500);
+// bibliogramRandomPool.addEventListener("input", bibliogramRandomPoolChange);
 
 theme.addEventListener("change", (event) => {
   const value = event.target.options[theme.selectedIndex].value;
diff --git a/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/popup/popup.html b/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/popup/popup.html
index ada7e75..0f3792b 100644
--- a/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/popup/popup.html
+++ b/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/popup/popup.html
@@ -69,7 +69,7 @@
         </tbody>
       </table>
     </section>
-
+<!--
     <section class="settings-block">
       <table class="option" aria-label="Toggle Bibliogram redirects">
         <tbody>
@@ -91,7 +91,7 @@
           </tr>
         </tbody>
       </table>
-    </section>
+    </section>  -->
 
     <section class="settings-block">
       <table class="option" aria-label="Toggle OpenStreetMap redirects">
diff --git a/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/popup/popup.js b/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/popup/popup.js
index 4309c60..b4699ca 100644
--- a/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/popup/popup.js
+++ b/data/extensions/{b7f9d2cd-d772-4302-8c3f-eb941af36f76}/pages/popup/popup.js
@@ -2,7 +2,7 @@
 
 let disableNitter = document.querySelector("#disable-nitter");
 let disableInvidious = document.querySelector("#disable-invidious");
-let disableBibliogram = document.querySelector("#disable-bibliogram");
+// let disableBibliogram = document.querySelector("#disable-bibliogram");
 let disableOsm = document.querySelector("#disable-osm");
 let disableReddit = document.querySelector("#disable-reddit");
 let disableSearchEngine = document.querySelector("#disable-searchEngine");
@@ -28,7 +28,7 @@ browser.storage.sync.get(
     if (result.theme) document.body.classList.add(result.theme);
     disableNitter.checked = !result.disableNitter;
     disableInvidious.checked = !result.disableInvidious;
-    disableBibliogram.checked = !result.disableBibliogram;
+//    disableBibliogram.checked = !result.disableBibliogram;
     disableOsm.checked = !result.disableOsm;
     disableReddit.checked = !result.disableReddit;
     disableSearchEngine.checked = !result.disableSearchEngine;
@@ -47,9 +47,9 @@ disableInvidious.addEventListener("change", (event) => {
   browser.storage.sync.set({ disableInvidious: !event.target.checked });
 });
 
-disableBibliogram.addEventListener("change", (event) => {
-  browser.storage.sync.set({ disableBibliogram: !event.target.checked });
-});
+// disableBibliogram.addEventListener("change", (event) => {
+//   browser.storage.sync.set({ disableBibliogram: !event.target.checked });
+// });
 
 disableOsm.addEventListener("change", (event) => {
   browser.storage.sync.set({ disableOsm: !event.target.checked });