Add Nzz.ch Regional (opt-in to custom sites)

README.md

@@ -608,7 +608,7 @@ Grouped in options:\
 [NyTeknik](https://www.nyteknik.se)
 
 ##### Switzerland
-[Neue Zürcher Zeitung](https://www.nzz.ch) -
+[Neue Zürcher Zeitung (+ regional/opt-in to custom sites)](https://www.nzz.ch) -
 [The Market](https://themarket.ch)
 
 #### Africa

background.js

@@ -147,10 +147,11 @@ function set_rules(sites, sites_updated, sites_custom) {
     let custom = false;
     if (!site_domain.match(/^(###$|#options_)/)) {
       let rule = {};
-      if (defaultSites.hasOwnProperty(site)) {
-        rule = defaultSites[site];
-        if (sites_updated.hasOwnProperty(site))
-          rule = sites_updated[site];
+      let site_default = defaultSites.hasOwnProperty(site) ? site : Object.keys(defaultSites).find(default_key => compareKey(default_key, site));
+      if (site_default) {
+        rule = defaultSites[site_default];
+        if (sites_updated.hasOwnProperty(site_default))
+          rule = sites_updated[site_default];
       } else if (sites_updated.hasOwnProperty(site)) { // updated (new) sites
         rule = sites_updated[site];
       } else if (sites_custom.hasOwnProperty(site)) { // custom (new) sites
@@ -767,6 +768,12 @@ ext_api.webRequest.onBeforeSendHeaders.addListener(function(details) {
         !matchUrlDomain(au_thewest_domains, header_referer) && enabledSites.includes('thewest.com.au'));
       if (au_thewest_domain)
         au_thewest_domains = customAddRules(au_thewest_domains, true);
+    } else if (header_referer_hostname.endsWith('.ch')) {
+      // set googlebot-useragent for regional nzz.ch sites (opt-in to custom sites)
+      var ch_media_domains = [];
+      var ch_media_domain = (matchUrlDomain('static-chmedia.ch', details.url) && ['script'].includes(details.type) && !matchUrlDomain(ch_media_domains, header_referer) && enabledSites.includes('nzz.ch'));
+      if (ch_media_domain)
+        ch_media_domains = customAddRules(ch_media_domains, true, blockedRegexes['nzz.ch'], 'googlebot');
     } else if (header_referer_hostname.endsWith('.de')) {
       // set googlebot-useragent for additional Funke sites (opt-in to custom sites)
       var de_funke_medien_domains = grouped_sites['###_de_funke_medien'];

changelog.txt

@@ -3,6 +3,7 @@ Changelog Bypass Paywalls Clean - Firefox
 
 Post-release
 Add Aftonbladet.se
+Add Nzz.ch Regional (opt-in to custom sites)
 
 * v2.6.4.0 (2022-04-10)
 Add El Periodico Extremadura

contentScript.js

@@ -704,11 +704,6 @@ else if (matchDomain(['noz.de', 'nwzonline.de', 'shz.de', 'svz.de'])) {
   }
 }
 
-else if (matchDomain('nzz.ch')) {
-  let regwall = document.querySelector('.dynamic-regwall');
-  removeDOMElement(regwall);
-}
-
 else if (matchDomain('rheinpfalz.de')) {
   let url = window.location.href;
   if (url.includes('reduced=true')) {

custom/sites_custom.json

@@ -1,9 +1,4 @@
 {
-  "Aargauerzeitung.ch": {
-    "allow_cookies": 1,
-    "domain": "aargauerzeitung.ch",
-    "useragent": "googlebot"
-  },
   "Abqjournal.com": {
     "allow_cookies": 1,
     "block_regex": "\\.abqjournal\\.com\\/.+\\/abq-pw-manager\\.js",
@@ -95,11 +90,6 @@
     "domain": "lsa-conso.fr",
     "useragent": "googlebot"
   },
-  "Luzernerzeitung.ch": {
-    "allow_cookies": 1,
-    "domain": "luzernerzeitung.ch",
-    "useragent": "googlebot"
-  },
   "Mailplus.co.uk": {
     "allow_cookies": 1,
     "block_regex": "\\.tinypass\\.com\\/",
@@ -158,11 +148,6 @@
     "allow_cookies": 1,
     "domain": "supchina.com"
   },
-  "Tagblatt.ch": {
-    "allow_cookies": 1,
-    "domain": "tagblatt.ch",
-    "useragent": "googlebot"
-  },
   "The-japan-news.com": {
     "domain": "the-japan-news.com"
   },

manifest.json

@@ -661,9 +661,10 @@
         "*://*.prcdn.co/*",
         "*://*.repstatic.it/*",
         "*://*.sanoma-sndp.fi/*",
+        "*://*.static-chmedia.ch/*",
         "*://*.wallkit.net/*",
         "*://*.wsj.net/*",
         "*://webcache.googleusercontent.com/*"
     ],
-    "version": "2.6.4.1"
+    "version": "2.6.4.2"
 }

sites.js

@@ -296,6 +296,7 @@ var defaultSites = {
   "Dagens Nyheter (free articles only)": {
     domain: "dn.se",
     allow_cookies: 1,
+    block_regex: /auth\.dn\.se\/check-paywall-v2\.js/,
     useragent: "googlebot"
   },
   "Daily Nation": {
@@ -1188,10 +1189,10 @@ var defaultSites = {
     allow_cookies: 1,
     block_regex: /cdn\.ampproject\.org\/v\d\/amp-(access|(sticky-)?ad|fx-flying-carpet)-.+\.js/
   },
-  "Neue Zürcher Zeitung": {
+  "Neue Zürcher Zeitung (+ regional/opt-in to custom sites)": {
     domain: "nzz.ch",
     allow_cookies: 1,
-    block_regex: /cdn\.ampproject\.org\/v\d\/amp-(access|ad)-.+\.js/,
+    block_regex: /((ens\.nzz\.ch|nexus\.ensighten\.com)\/.+\/Bootstrap\.js|cdn\.ampproject\.org\/v\d\/amp-(access|ad)-.+\.js)/,
     useragent: "googlebot"
   },
   "New Left Review": {
@@ -1643,7 +1644,7 @@ var defaultSites = {
   "The Market.ch": {
     domain: "themarket.ch",
     allow_cookies: 1,
-    block_regex: /cdn\.ampproject\.org\/v\d\/amp-(access|ad)-.+\.js/,
+    block_regex: /(\.piano\.io\/|ens\.themarket\.ch\/.+\/Bootstrap\.js|cdn\.ampproject\.org\/v\d\/amp-(access|ad)-.+\.js)/,
     useragent: "googlebot"
   },
   "The Nation": {