about summary refs log tree commit diff stats
path: root/src/pages
diff options
context:
space:
mode:
Diffstat (limited to 'src/pages')
-rw-r--r--src/pages/background/background.js7
-rw-r--r--src/pages/options/widgets/general.js7
2 files changed, 8 insertions, 6 deletions
diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index a0179945..b8787f34 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -26,9 +26,10 @@ browser.runtime.onInstalled.addListener(
     // if (details.reason == 'install') {
     if (details.reason == 'install' || details.reason == "update") {
       if (details.reason == "update") browser.tabs.create({ url: browser.runtime.getURL("/pages/background/reset_warning.html") });
-      fetch('/instances/blocklist.json').then(response => response.text()).then(async data => {
+      fetch('/instances/blacklist.json').then(response => response.text()).then(async data => {
         await browser.storage.local.clear();
-        await browser.storage.local.set({ cloudflareList: JSON.parse(data) })
+        await browser.storage.local.set({ cloudflareBlackList: JSON.parse(data).cloudflare })
+        await browser.storage.local.set({ authenticateBlackList: JSON.parse(data).authenticate })
         generalHelper.initDefaults();
         youtubeHelper.initDefaults();
         youtubeMusicHelper.initDefaults();
@@ -65,7 +66,7 @@ let BYPASSTABs = [];
 browser.webRequest.onBeforeRequest.addListener(
   details => {
     const url = new URL(details.url);
-    if (new RegExp(/^chrome-extension:\/{2}.*\/instances\/(blocklist|data).json$/).test(url.href) && details.type == 'xmlhttprequest') return;
+    if (new RegExp(/^chrome-extension:\/{2}.*\/instances\/.*.json$/).test(url.href) && details.type == 'xmlhttprequest') return;
     let initiator;
     try {
       if (details.originUrl) initiator = new URL(details.originUrl);
diff --git a/src/pages/options/widgets/general.js b/src/pages/options/widgets/general.js
index e635ac29..f2ed341a 100644
--- a/src/pages/options/widgets/general.js
+++ b/src/pages/options/widgets/general.js
@@ -63,7 +63,7 @@ importSettingsElement.addEventListener("change",
       if (
         "theme" in data &&
         "disableImgur" in data &&
-        "cloudflareList" in data &&
+        "cloudflareBlackList" in data &&
         "imgurRedirects" in data
       ) {
         await browser.storage.local.clear();
@@ -104,8 +104,9 @@ resetSettings.addEventListener("click",
   async () => {
     resetSettings.innerHTML = '...'
     await browser.storage.local.clear();
-    fetch('/instances/blocklist.json').then(response => response.text()).then(async data => {
-      await browser.storage.local.set({ cloudflareList: JSON.parse(data) })
+    fetch('/instances/blacklist.json').then(response => response.text()).then(async data => {
+      await browser.storage.local.set({ cloudflareBlackList: JSON.parse(data).cloudflare })
+      await browser.storage.local.set({ authenticateBlackList: JSON.parse(data).authenticate })
       await generalHelper.initDefaults();
       await youtubeHelper.initDefaults();
       await youtubeMusicHelper.initDefaults();