Merge pull request #2 from SimonBrazell/master

force update

1 files changed, 323 insertions, 101 deletions

diff --git a/pages/options/options.js b/pages/options/options.js
index 5e25a495..8149be7b 100644
--- a/pages/options/options.js
+++ b/pages/options/options.js
@@ -1,130 +1,213 @@
-'use strict';
-
-let nitterInstance = document.getElementById('nitter-instance');
-let invidiousInstance = document.getElementById('invidious-instance');
-let bibliogramInstance = document.getElementById('bibliogram-instance');
-let osmInstance = document.getElementById('osm-instance');
-let disableNitter = document.getElementById('disable-nitter');
-let disableInvidious = document.getElementById('disable-invidious');
-let disableBibliogram = document.getElementById('disable-bibliogram');
-let disableOsm = document.getElementById('disable-osm');
-let alwaysProxy = document.getElementById('always-proxy');
-let onlyEmbeddedVideo = document.getElementById('only-embed');
-let videoQuality = document.getElementById('video-quality');
-let removeTwitterSW = document.getElementById('remove-twitter-sw');
-let invidiousDarkMode = document.getElementById('invidious-dark-mode');
-let persistInvidiousPrefs = document.getElementById('persist-invidious-prefs');
-let whitelist;
+"use strict";
+
+const nitterInstances = [
+  "https://nitter.net",
+  "https://nitter.snopyta.org",
+  "https://nitter.42l.fr",
+  "https://nitter.nixnet.services",
+  "https://nitter.13ad.de",
+  "https://nitter.pussthecat.org",
+  "https://nitter.mastodont.cat",
+  "https://nitter.dark.fail",
+  "https://nitter.tedomum.net",
+  "https://t.maisputain.ovh",
+  "http://3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion",
+  "http://nitter.l4qlywnpwqsluw65ts7md3khrivpirse744un3x7mlskqauz5pyuzgqd.onion",
+];
+const invidiousInstances = [
+  "https://invidious.snopyta.org",
+  "https://yewtu.be",
+  "https://invidious.ggc-project.de",
+  "https://invidious.13ad.de",
+  "https://invidious.xyz",
+  "https://invidious.toot.koeln",
+  "https://invidious.site",
+  "https://invidiou.site",
+  "https://invidious.fdn.fr",
+  "https://watch.nettohikari.com",
+  "https://yt.iswleuven.be",
+  "https://yt.maisputain.ovh",
+  "http://kgg2m7yk5aybusll.onion",
+  "http://axqzx4s6s54s32yentfqojs3x5i7faxza6xo3ehd4bzzsg2ii4fv2iid.onion",
+  "http://fz253lmuao3strwbfbmx46yu7acac2jz27iwtorgmbqlkurlclmancad.onion",
+  "http://qklhadlycap4cnod.onion",
+  "http://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion",
+  "http://mfqczy4mysscub2s.onion",
+  "http://4l2dgddgsrkf2ous66i6seeyi6etzfgrue332grh2n7madpwopotugyd.onion",
+];
+const bibliogramInstances = [
+  "https://bibliogram.art",
+  "https://bibliogram.snopyta.org",
+  "https://bibliogram.pussthecat.org",
+  "https://bibliogram.nixnet.services",
+  "https://bibliogram.hamster.dance",
+  "https://insta.maisputain.ovh",
+  "https://bibliogram.ggc-project.de",
+];
+const osmInstances = ["https://openstreetmap.org"];
+const autocompletes = [
+  { id: "nitter-instance", instances: nitterInstances },
+  { id: "invidious-instance", instances: invidiousInstances },
+  { id: "bibliogram-instance", instances: bibliogramInstances },
+  { id: "osm-instance", instances: osmInstances },
+];
+
+let nitterInstance = document.getElementById("nitter-instance");
+let invidiousInstance = document.getElementById("invidious-instance");
+let bibliogramInstance = document.getElementById("bibliogram-instance");
+let osmInstance = document.getElementById("osm-instance");
+let disableNitter = document.getElementById("disable-nitter");
+let disableInvidious = document.getElementById("disable-invidious");
+let disableBibliogram = document.getElementById("disable-bibliogram");
+let disableOsm = document.getElementById("disable-osm");
+let alwaysProxy = document.getElementById("always-proxy");
+let onlyEmbeddedVideo = document.getElementById("only-embed");
+let videoQuality = document.getElementById("video-quality");
+let removeTwitterSW = document.getElementById("remove-twitter-sw");
+let invidiousDarkMode = document.getElementById("invidious-dark-mode");
+let persistInvidiousPrefs = document.getElementById("persist-invidious-prefs");
+let invidiousVolume = document.getElementById("invidious-volume");
+let invidiousPlayerStyle = document.getElementById("invidious-player-style");
+let invidiousSubtitles = document.getElementById("invidious-subtitles");
+let invidiousAutoplay = document.getElementById("invidious-autoplay");
+let theme = document.getElementById("theme");
+let exceptions;
 
 window.browser = window.browser || window.chrome;
 
-function prependWhitelistItem(item, index) {
-  const li = document.createElement('li');
+function prependExceptionsItem(item, index) {
+  const li = document.createElement("li");
   li.appendChild(document.createTextNode(item.toString()));
-  const button = document.createElement('button');
-  button.appendChild(document.createTextNode('X'));
-  button.addEventListener('click', () => {
-    li.remove();
-    whitelist.splice(index, 1);
+  const button = document.createElement("button");
+  li.appendChild(button);
+  document.getElementById("exceptions-items").prepend(li);
+  const svg = `<svg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 512 512'>
+      <line x1='368' y1='368' x2='144' y2='144'
+        style='fill:none;stroke:#FFF;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px' />
+      <line x1='368' y1='144' x2='144' y2='368'
+        style='fill:none;stroke:#FFF;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px' />
+    </svg>`;
+  button.innerHTML = svg;
+  button.addEventListener("click", () => {
+    exceptions.splice(index, 1);
     browser.storage.sync.set({
-      whitelist: whitelist
+      exceptions: exceptions,
     });
+    li.remove();
   });
-  li.appendChild(button);
-  document.getElementById('whitelist-items').prepend(li);
 }
 
 browser.storage.sync.get(
   [
-    'nitterInstance',
-    'invidiousInstance',
-    'bibliogramInstance',
-    'osmInstance',
-    'disableNitter',
-    'disableInvidious',
-    'disableBibliogram',
-    'disableOsm',
-    'alwaysProxy',
-    'onlyEmbeddedVideo',
-    'videoQuality',
-    'removeTwitterSW',
-    'whitelist',
-    'invidiousDarkMode',
-    'persistInvidiousPrefs'
+    "nitterInstance",
+    "invidiousInstance",
+    "bibliogramInstance",
+    "osmInstance",
+    "disableNitter",
+    "disableInvidious",
+    "disableBibliogram",
+    "disableOsm",
+    "alwaysProxy",
+    "onlyEmbeddedVideo",
+    "videoQuality",
+    "removeTwitterSW",
+    "invidiousDarkMode",
+    "persistInvidiousPrefs",
+    "invidiousVolume",
+    "invidiousPlayerStyle",
+    "invidiousSubtitles",
+    "invidiousAutoplay",
+    "exceptions",
+    "theme",
   ],
-  result => {
-    nitterInstance.value = result.nitterInstance || '';
-    invidiousInstance.value = result.invidiousInstance || '';
-    bibliogramInstance.value = result.bibliogramInstance || '';
-    osmInstance.value = result.osmInstance || '';
+  (result) => {
+    theme.value = result.theme || "";
+    if (result.theme) document.body.classList.add(result.theme);
+    nitterInstance.value = result.nitterInstance || "";
+    invidiousInstance.value = result.invidiousInstance || "";
+    bibliogramInstance.value = result.bibliogramInstance || "";
+    osmInstance.value = result.osmInstance || "";
     disableNitter.checked = !result.disableNitter;
     disableInvidious.checked = !result.disableInvidious;
     disableBibliogram.checked = !result.disableBibliogram;
     disableOsm.checked = !result.disableOsm;
     alwaysProxy.checked = result.alwaysProxy;
     onlyEmbeddedVideo.checked = result.onlyEmbeddedVideo;
-    videoQuality.value = result.videoQuality || '';
+    videoQuality.value = result.videoQuality || "";
     removeTwitterSW.checked = !result.removeTwitterSW;
     invidiousDarkMode.checked = result.invidiousDarkMode;
     persistInvidiousPrefs.checked = result.persistInvidiousPrefs;
-    whitelist = result.whitelist || [];
-    whitelist.forEach(prependWhitelistItem);
+    exceptions = result.exceptions || [];
+    exceptions.forEach(prependExceptionsItem);
+    invidiousVolume.value = result.invidiousVolume;
+    document.querySelector("#volume-value").textContent = result.invidiousVolume
+      ? `${result.invidiousVolume}%`
+      : " - ";
+    invidiousPlayerStyle.value = result.invidiousPlayerStyle || "";
+    invidiousSubtitles.value = result.invidiousSubtitles || "";
+    invidiousAutoplay.checked = result.invidiousAutoplay;
   }
 );
 
 function openTab(tab, event) {
   let i, tabcontent, tablinks;
-  tabcontent = document.getElementsByClassName('tabcontent');
+  tabcontent = document.getElementsByClassName("tabcontent");
   for (i = 0; i < tabcontent.length; i++) {
-    tabcontent[i].style.display = 'none';
+    tabcontent[i].style.display = "none";
   }
-  tablinks = document.getElementsByClassName('tablinks');
+  tablinks = document.getElementsByClassName("tablinks");
   for (i = 0; i < tablinks.length; i++) {
-    tablinks[i].className = tablinks[i].className.replace(' active', '');
+    tablinks[i].className = tablinks[i].className.replace(" active", "");
   }
-  document.getElementById(tab).style.display = 'block';
-  event.currentTarget.className += ' active';
+  document.getElementById(tab).style.display = "block";
+  event.currentTarget.className += " active";
 }
 
-document.getElementById('general-tab').addEventListener(
-  'click', openTab.bind(null, 'general')
-);
-document.getElementById('advanced-tab').addEventListener(
-  'click', openTab.bind(null, 'advanced')
-);
-document.getElementById('whitelist-tab').addEventListener(
-  'click', openTab.bind(null, 'whitelist')
-);
+document
+  .getElementById("general-tab")
+  .addEventListener("click", openTab.bind(null, "general"));
+document
+  .getElementById("advanced-tab")
+  .addEventListener("click", openTab.bind(null, "advanced"));
+document
+  .getElementById("exceptions-tab")
+  .addEventListener("click", openTab.bind(null, "exceptions"));
 
-document.getElementById('general-tab').click();
+document.getElementById("general-tab").click();
 
-function addToWhitelist() {
-  const input = document.getElementById('new-whitelist-item');
+function addToExceptions() {
+  const input = document.getElementById("new-exceptions-item");
+  const type = document.querySelector('input[name="type"]:checked').value;
   if (input.value) {
     try {
+      let value = input.value;
       new RegExp(input.value);
-      const index = whitelist.push(input.value);
-      prependWhitelistItem(input.value, index);
+      if (type === "URL") {
+        value = value.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&");
+      }
+      exceptions.push(value);
       browser.storage.sync.set({
-        whitelist: whitelist
+        exceptions: exceptions,
       });
-      input.value = '';
+      prependExceptionsItem(value, exceptions.indexOf(value));
+      input.value = "";
     } catch (error) {
-      input.setCustomValidity('Invalid RegExp');
+      input.setCustomValidity("Invalid RegExp");
     }
   } else {
-    input.setCustomValidity('Invalid RegExp');
+    input.setCustomValidity("Invalid RegExp");
   }
 }
 
-document.getElementById('add-to-whitelist').addEventListener(
-  'click', addToWhitelist
-);
+document
+  .getElementById("add-to-exceptions")
+  .addEventListener("click", addToExceptions);
 
 function debounce(func, wait, immediate) {
   let timeout;
   return () => {
-    let context = this, args = arguments;
+    let context = this,
+      args = arguments;
     let later = () => {
       timeout = null;
       if (!immediate) func.apply(context, args);
@@ -134,100 +217,239 @@ function debounce(func, wait, immediate) {
     timeout = setTimeout(later, wait);
     if (callNow) func.apply(context, args);
   };
-};
+}
 
 function parseURL(urlString) {
   if (urlString) {
     try {
       const url = new URL(urlString);
       if (url.username && url.password) {
-        return `${url.protocol}//${url.username}:${url.password}@${url.host}`
+        return `${url.protocol}//${url.username}:${url.password}@${url.host}`;
       } else {
         return url.origin;
       }
     } catch (error) {
       console.log(error);
-      return '';
+      return "";
     }
   } else {
-    return '';
+    return "";
   }
 }
 
 let nitterInstanceChange = debounce(() => {
   if (nitterInstance.checkValidity()) {
     browser.storage.sync.set({
-      nitterInstance: parseURL(nitterInstance.value)
+      nitterInstance: parseURL(nitterInstance.value),
     });
   }
 }, 500);
-nitterInstance.addEventListener('input', nitterInstanceChange);
+nitterInstance.addEventListener("input", nitterInstanceChange);
 
 let invidiousInstanceChange = debounce(() => {
   if (invidiousInstance.checkValidity()) {
     browser.storage.sync.set({
-      invidiousInstance: parseURL(invidiousInstance.value)
+      invidiousInstance: parseURL(invidiousInstance.value),
     });
   }
 }, 500);
-invidiousInstance.addEventListener('input', invidiousInstanceChange);
+invidiousInstance.addEventListener("input", invidiousInstanceChange);
 
 let bibliogramInstanceChange = debounce(() => {
   if (bibliogramInstance.checkValidity()) {
     browser.storage.sync.set({
-      bibliogramInstance: parseURL(bibliogramInstance.value)
+      bibliogramInstance: parseURL(bibliogramInstance.value),
     });
   }
 }, 500);
-bibliogramInstance.addEventListener('input', bibliogramInstanceChange);
+bibliogramInstance.addEventListener("input", bibliogramInstanceChange);
 
 let osmInstanceChange = debounce(() => {
   if (osmInstance.checkValidity()) {
     browser.storage.sync.set({
-      osmInstance: parseURL(osmInstance.value)
+      osmInstance: parseURL(osmInstance.value),
     });
   }
 }, 500);
-osmInstance.addEventListener('input', osmInstanceChange);
+osmInstance.addEventListener("input", osmInstanceChange);
 
-disableNitter.addEventListener('change', event => {
+disableNitter.addEventListener("change", (event) => {
   browser.storage.sync.set({ disableNitter: !event.target.checked });
 });
 
-disableInvidious.addEventListener('change', event => {
+disableInvidious.addEventListener("change", (event) => {
   browser.storage.sync.set({ disableInvidious: !event.target.checked });
 });
 
-disableBibliogram.addEventListener('change', event => {
+disableBibliogram.addEventListener("change", (event) => {
   browser.storage.sync.set({ disableBibliogram: !event.target.checked });
 });
 
-disableOsm.addEventListener('change', event => {
+disableOsm.addEventListener("change", (event) => {
   browser.storage.sync.set({ disableOsm: !event.target.checked });
 });
 
-alwaysProxy.addEventListener('change', event => {
+alwaysProxy.addEventListener("change", (event) => {
   browser.storage.sync.set({ alwaysProxy: event.target.checked });
 });
 
-onlyEmbeddedVideo.addEventListener('change', event => {
+onlyEmbeddedVideo.addEventListener("change", (event) => {
   browser.storage.sync.set({ onlyEmbeddedVideo: event.target.checked });
 });
 
-videoQuality.addEventListener('change', event => {
+videoQuality.addEventListener("change", (event) => {
   browser.storage.sync.set({
-    videoQuality: event.target.options[videoQuality.selectedIndex].value
+    videoQuality: event.target.options[videoQuality.selectedIndex].value,
   });
 });
 
-removeTwitterSW.addEventListener('change', event => {
+removeTwitterSW.addEventListener("change", (event) => {
   browser.storage.sync.set({ removeTwitterSW: !event.target.checked });
 });
 
-invidiousDarkMode.addEventListener('change', event => {
+invidiousDarkMode.addEventListener("change", (event) => {
   browser.storage.sync.set({ invidiousDarkMode: event.target.checked });
 });
 
-persistInvidiousPrefs.addEventListener('change', event => {
+persistInvidiousPrefs.addEventListener("change", (event) => {
   browser.storage.sync.set({ persistInvidiousPrefs: event.target.checked });
 });
+
+let invidiousVolumeChange = debounce(() => {
+  document.querySelector(
+    "#volume-value"
+  ).textContent = `${invidiousVolume.value}%`;
+  browser.storage.sync.set({
+    invidiousVolume: invidiousVolume.value,
+  });
+}, 500);
+invidiousVolume.addEventListener("input", invidiousVolumeChange);
+
+invidiousPlayerStyle.addEventListener("change", (event) => {
+  browser.storage.sync.set({
+    invidiousPlayerStyle:
+      event.target.options[invidiousPlayerStyle.selectedIndex].value,
+  });
+});
+
+let invidiousSubtitlesChange = debounce(() => {
+  if (invidiousInstance.checkValidity()) {
+    browser.storage.sync.set({
+      invidiousSubtitles: invidiousSubtitles.value,
+    });
+  }
+}, 500);
+invidiousSubtitles.addEventListener("input", invidiousSubtitlesChange);
+
+invidiousAutoplay.addEventListener("change", (event) => {
+  browser.storage.sync.set({ invidiousAutoplay: event.target.checked });
+});
+
+theme.addEventListener("change", (event) => {
+  const value = event.target.options[theme.selectedIndex].value;
+  switch (value) {
+    case "dark-theme":
+      document.body.classList.add("dark-theme");
+      document.body.classList.remove("light-theme");
+      break;
+    case "light-theme":
+      document.body.classList.add("light-theme");
+      document.body.classList.remove("dark-theme");
+      break;
+    default:
+      document.body.classList.remove("light-theme");
+      document.body.classList.remove("dark-theme");
+  }
+  browser.storage.sync.set({
+    theme: value,
+  });
+});
+
+function autocomplete(input, list) {
+  let currentFocus;
+  input.addEventListener("focus", (e) => {
+    showOptions(e, true);
+  });
+  input.addEventListener("input", (e) => {
+    const val = e.target.value;
+    if (!val) {
+      return false;
+    }
+    currentFocus = -1;
+    showOptions(e);
+  });
+  input.addEventListener("keydown", function (e) {
+    let x = document.getElementById(this.id + "autocomplete-list");
+    if (x) x = x.getElementsByTagName("div");
+    if (e.keyCode == 40) {
+      currentFocus++;
+      addActive(x);
+    } else if (e.keyCode == 38) {
+      currentFocus--;
+      addActive(x);
+    } else if (e.keyCode == 13) {
+      e.preventDefault();
+      if (currentFocus > -1) {
+        if (x) x[currentFocus].click();
+      }
+    }
+  });
+  function showOptions(event, showAll = false) {
+    let div,
+      i,
+      val = event.target.value;
+    closeAllLists();
+    div = document.createElement("div");
+    div.setAttribute("id", event.target.id + "autocomplete-list");
+    div.setAttribute("class", "autocomplete-items");
+    event.target.parentNode.appendChild(div);
+    for (i = 0; i < list.length; i++) {
+      if (list[i].toLowerCase().indexOf(val.toLowerCase()) > -1) {
+        div.appendChild(getItem(list[i], val));
+      } else if (showAll) {
+        div.appendChild(getItem(list[i], val));
+      }
+    }
+  }
+  function getItem(item, val) {
+    let div = document.createElement("div");
+    div.innerHTML = "<strong>" + item.substr(0, val.length) + "</strong>";
+    div.innerHTML += item.substr(val.length);
+    div.innerHTML += "<input type='hidden' value='" + item + "'>";
+    div.addEventListener("click", function (e) {
+      input.value = e.target.getElementsByTagName("input")[0].value;
+      input.dispatchEvent(new Event("input"));
+      closeAllLists();
+    });
+    return div;
+  }
+  function addActive(x) {
+    if (!x) return false;
+    removeActive(x);
+    if (currentFocus >= x.length) currentFocus = 0;
+    if (currentFocus < 0) currentFocus = x.length - 1;
+    x[currentFocus].classList.add("autocomplete-active");
+  }
+  function removeActive(x) {
+    for (let i = 0; i < x.length; i++) {
+      x[i].classList.remove("autocomplete-active");
+    }
+  }
+  function closeAllLists(elmnt) {
+    let x = document.getElementsByClassName("autocomplete-items");
+    for (let i = 0; i < x.length; i++) {
+      if (elmnt != x[i] && elmnt != input) {
+        x[i].parentNode.removeChild(x[i]);
+      }
+    }
+  }
+  document.addEventListener("click", (e) => {
+    if (!autocompletes.find((element) => element.id === e.target.id)) {
+      closeAllLists(e.target);
+    }
+  });
+}
+
+autocompletes.forEach((value) => {
+  autocomplete(document.getElementById(value.id), value.instances);
+});