From 354d9926659d8d6de8e339257d4df9e70f78d6c4 Mon Sep 17 00:00:00 2001
From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com>
Date: Tue, 19 Oct 2021 19:38:33 +0200
Subject: [PATCH] Update custom sites (block regex for default sites)

---
 background.js        | 36 ++++++++++++++----------------------
 changelog.txt        |  1 +
 custom/manifest.json |  2 +-
 manifest.json        |  2 +-
 4 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/background.js b/background.js
index 69c3251..f789ea0 100755
--- a/background.js
+++ b/background.js
@@ -426,6 +426,7 @@ var blockedRegexes = {
   'wn.de': /cdn\.ampproject\.org\/v\d\/amp-(ad|subscriptions)-.+\.js/,
   'wsj.com': /(cdn\.ampproject\.org\/v\d\/amp-(access|ad|consent|subscriptions)-.+\.js|cdn\.cxense\.com\/)/
 };
+var blockedRegexesCustom = {};
 
 var amp_unhide = [];
 
@@ -724,12 +725,10 @@ ext_api.storage.local.get({
       block_js_custom.push(domainVar);
     if (sites_custom[key]['block_javascript_ext'] > 0)
       block_js_custom_ext.push(domainVar);
-    if (!(defaultSites_domains.includes(domainVar) && blockedRegexes[domainVar])) {
-      if (sites_custom[key]['block_regex']) {
-        if (sites_custom[key]['block_regex'].match(/^\/.+\/$/))
-          sites_custom[key]['block_regex'] = sites_custom[key]['block_regex'].replace(/(^\/|\/$)/g, '');
-        blockedRegexes[domainVar] = new RegExp(sites_custom[key]['block_regex']);
-      }
+    if (sites_custom[key]['block_regex']) {
+      if (sites_custom[key]['block_regex'].match(/^\/.+\/$/))
+        sites_custom[key]['block_regex'] = sites_custom[key]['block_regex'].replace(/(^\/|\/$)/g, '');
+      blockedRegexesCustom[domainVar] = new RegExp(sites_custom[key]['block_regex']);
     }
     if (sites_custom[key]['amp_unhide'] > 0)
       amp_unhide.push(domainVar);
@@ -812,6 +811,7 @@ ext_api.storage.onChanged.addListener(function (changes, namespace) {
       use_twitter_referer = use_twitter_referer_default.slice();
       block_js_custom = [];
       block_js_custom_ext = [];
+      blockedRegexesCustom = {};
       amp_unhide = [];
       for (let key in sites_custom) {
         var domainVar = sites_custom[key]['domain'].toLowerCase();
@@ -844,20 +844,13 @@ ext_api.storage.onChanged.addListener(function (changes, namespace) {
         if (sites_custom[key]['block_javascript_ext'] > 0) {
           block_js_custom_ext.push(domainVar);
         }
-        if (!(defaultSites_domains.includes(domainVar) && blockedRegexes[domainVar])) {
-          if (sites_custom[key]['block_regex']) {
-            if (sites_custom[key]['block_regex'].match(/^\/.+\/$/))
-              sites_custom[key]['block_regex'] = sites_custom[key]['block_regex'].replace(/(^\/|\/$)/g, '');
-            blockedRegexes[domainVar] = new RegExp(sites_custom[key]['block_regex']);
-          } else {
-            if (blockedRegexes[domainVar])
-              delete blockedRegexes[domainVar];
-          }
+        if (sites_custom[key]['block_regex']) {
+          if (sites_custom[key]['block_regex'].match(/^\/.+\/$/))
+            sites_custom[key]['block_regex'] = sites_custom[key]['block_regex'].replace(/(^\/|\/$)/g, '');
+          blockedRegexesCustom[domainVar] = new RegExp(sites_custom[key]['block_regex']);
         }
         if (sites_custom[key]['amp_unhide'] > 0) {
           amp_unhide.push(domainVar);
-        } else {
-          amp_unhide.splice(amp_unhide.indexOf(domainVar), 1);
         }
         switch (sites_custom[key]['referer']) {
         case 'facebook':
@@ -1245,11 +1238,10 @@ ext_api.webRequest.onBeforeSendHeaders.addListener(function(details) {
   // check for blocked regular expression: domain enabled, match regex, block on an internal or external regex
   var blockedDomains = Object.keys(blockedRegexes);
   var domain = matchUrlDomain(blockedDomains, header_referer);
-  var block_regex = true;
-  if (domain && details.url.match(blockedRegexes[domain]) && isSiteEnabled({url: header_referer})) {
-    if (block_regex)
-      return { cancel: true };
-  }
+  var blockedDomainsCustom = Object.keys(blockedRegexesCustom);
+  var domainCustom = matchUrlDomain(blockedDomainsCustom, header_referer);
+  if (((domain && details.url.match(blockedRegexes[domain])) || (domainCustom && details.url.match(blockedRegexesCustom[domainCustom]))) && isSiteEnabled({url: header_referer}))
+    return { cancel: true };
 
   // load toggleIcon.js (icon for dark or incognito mode in Chrome))
   if (typeof browser !== 'object' && ['main_frame', 'xmlhttprequest'].includes(details.type)) {
diff --git a/changelog.txt b/changelog.txt
index ab8fc11..8dfb08d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -7,6 +7,7 @@ Fix Business Standard
 Fix Il Tirreno (GElocal.it)
 Fix Financial Times (amp)
 Fix Trouw.nl (timing)
+Update custom sites (block regex for default sites)
 
 * v2.4.0.0 (2021-10-17)
 Add Westfaelische Nachrichten (Germany)
diff --git a/custom/manifest.json b/custom/manifest.json
index 21b6455..8869460 100644
--- a/custom/manifest.json
+++ b/custom/manifest.json
@@ -39,5 +39,5 @@
         "webRequestBlocking",
         "<all_urls>"
     ],
-    "version": "2.4.0.1"
+    "version": "2.4.0.2"
 }
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 80f038a..4bb46d4 100755
--- a/manifest.json
+++ b/manifest.json
@@ -544,5 +544,5 @@
         "*://*.wallkit.net/*",
         "*://*.wsj.net/*"
     ],
-    "version": "2.4.0.1"
+    "version": "2.4.0.2"
 }
\ No newline at end of file