Fix Noz.de (no amp) & grouping NOZ/MHN Mediengruppe

README.md

@@ -524,13 +524,10 @@ Grouped in options:\
 [Kölnische Rundschau](https://www.rundschau-online.de) -
 [Krautreporter](https://krautreporter.de) -
 [Mitteldeutsche Zeitung](https://www.mz.de) -
-[Neue Osnabrücker Zeitung](https://www.noz.de) -
 [Neue Westfälische](https://www.nw.de) -
 [Nordwest Zeitung](https://www.nwzonline.de) -
 [Piqd.de](https://www.piqd.de) -
 [Rhein-Zeitung](https://www.rhein-zeitung.de) -
-[Schleswig-Holsteinischer Zeitungsverlag](https://www.shz.de) -
-[Schweriner Volkszeitung](https://www.svz.de) -
 [Süddeutsche Zeitung (link to archive.is)](https://www.sueddeutsche.de) -
 [Volksstimme](https://www.volksstimme.de) -
 [Weltkunst](https://www.weltkunst.de) -
@@ -557,6 +554,10 @@ Grouped in options:\
 [Neue Presse (Hannover)](https://www.neuepresse.de) -
 [Ostsee-Zeitung](https://www.ostsee-zeitung.de) -
 [RedaktionsNetzwerk Deutschland](https://www.rnd.de)\
+*NOZ/MHN Mediengruppe* sites like\
+[Neue Osnabrücker Zeitung](https://www.noz.de) -
+[Schleswig-Holsteinischer Zeitungsverlag](https://www.shz.de) -
+[Schweriner Volkszeitung](https://www.svz.de)\
 *Rheinische Post Mediengruppe* sites like
 [Aachener Nachrichten](https://www.aachener-nachrichten.de) -
 [Aachener Zeitung](https://www.aachener-zeitung.de) -

background.js

@@ -409,7 +409,7 @@ ext_api.storage.local.get({
     } else {
       ext_api.management.getSelf(function (result) {
         if ((result.installType === 'development' || (result.installType !== 'development' && !enabledSites.includes('#options_on_update')))) {
-          let new_groups = ['###_au_nine_ent', '###_de_rp_medien', '###_de_westfalen_medien', '###_es_grupo_vocento', '###_es_unidad', '###_fr_gcf', '###_it_gedi', '###_nl_dpg_media', '###_usa_cbj', '###_usa_chronicle', '###_usa_genomeweb'];
+          let new_groups = ['###_au_nine_ent', '###_de_noz_mhn', '###_de_rp_medien', '###_de_westfalen_medien', '###_es_grupo_vocento', '###_es_unidad', '###_fr_gcf', '###_it_gedi', '###_nl_dpg_media', '###_usa_cbj', '###_usa_chronicle', '###_usa_genomeweb'];
           let open_options = new_groups.some(group => !enabledSites.includes(group) && grouped_sites[group].some(domain => enabledSites.includes(domain) && !customSites_domains.includes(domain)))
              || (!enabledSites.includes('uol.com.br') && (enabledSites.includes('crusoe.uol.com.br') || enabledSites.includes('###_br_folha')))
              || (!enabledSites.includes('iltalehti.fi') && enabledSites.includes('###_fi_alma_talent'));

changelog.txt

@@ -4,6 +4,8 @@ Changelog Bypass Paywalls Clean - Firefox
 Post-release
 Fix L'Express.fr
 Fix MIT Sloan Management Review
+Fix Noz.de (no amp)
+Grouping NOZ/MHN Mediengruppe
 Update block general paywall script (TownNews & fix Pigeon)
 Update custom flex sites (identify main domain)
 Update custom/updated sites (onMessage in contentScript)

contentScript.js

@@ -649,15 +649,8 @@ else if (matchDomain(['noz.de', 'shz.de', 'svz.de'])) {
   if (window.location.pathname.endsWith('/amp')) {
     amp_unhide_access_hide('="NOT data.reduced"', '="data.reduced"', 'amp-ad, amp-embed, .ads-wrapper, #flying-carpet-wrapper');
   } else {
-    let paywall = document.querySelector('.paywall');
-    let amphtml = document.querySelector('link[rel="amphtml"]');
-    if (paywall && amphtml) {
-      removeDOMElement(paywall);
-      window.location.href = amphtml.href;
-    } else {
-      let ads = document.querySelectorAll('div.nozmhn_ad');
-      removeDOMElement(...ads);
-    }
+    let ads = document.querySelectorAll('div.nozmhn_ad');
+    removeDOMElement(...ads);
   }
 }
 

manifest.json

@@ -713,5 +713,5 @@
     "*://*.wallkit.net/*",
     "*://webcache.googleusercontent.com/*"
   ],
-  "version": "2.9.7.7"
+  "version": "2.9.7.8"
 }

sites.js

@@ -1001,7 +1001,7 @@ var defaultSites = {
   "L'Express": {
     domain: "lexpress.fr",
     allow_cookies: 1,
-    block_regex: /\.qiota\.com\/data\/.+\/data\.json/
+    block_regex: /\.qiota\.com\/data/
   },
   "L'Humanité": {
     domain: "humanite.fr",
@@ -1315,8 +1315,13 @@ var defaultSites = {
     allow_cookies: 1,
     block_js_inline: /\/nautil\.us\/((\w)+(\-)+){3,}/
   },
-  "Neue Osnabrücker Zeitung": {
-    domain: "noz.de",
+  "NOZ/MHN Mediengruppe": {
+    domain: "###_de_noz_mhn",
+    group: [
+      "noz.de",
+      "shz.de",
+      "svz.de"
+    ],
     allow_cookies: 1,
     block_regex: /cdn\.ampproject\.org\/v\d\/amp-access-.+\.js/,
     useragent: "googlebot"
@@ -1610,16 +1615,6 @@ var defaultSites = {
     domain: "sandiegouniontribune.com",
     block_regex: /(metering\.platform\.sandiegouniontribune\.com\/|cdn\.ampproject\.org\/v\d\/amp-(access|subscriptions)-.+\.js)/
   },
-  "Schleswig-Holsteinischer Zeitungsverlag": {
-    domain: "shz.de",
-    allow_cookies: 1,
-    block_regex: /cdn\.ampproject\.org\/v\d\/amp-access-.+\.js/
-  },
-  "Schweriner Volkszeitung": {
-    domain: "svz.de",
-    allow_cookies: 1,
-    block_regex: /cdn\.ampproject\.org\/v\d\/amp-access-.+\.js/
-  },
   "Science (free articles only)": {
     domain: "science.org",
     allow_cookies: 1
@@ -2248,8 +2243,7 @@ var defaultSites = {
   "Qiota": {
     domain: "qiota.com",
     allow_cookies: 1,
-    block_regex_general: /\.qiota\.com\//,
-    excluded_domains: ["lexpress.fr"]
+    block_regex_general: /\.qiota\.com\/data/
   },
   "TinyPass": {
     domain: "tinypass.com",

sites_updated.json

@@ -2,7 +2,7 @@
   "L'Express": {
     "domain": "lexpress.fr",
     "allow_cookies": 1,
-    "block_regex": "\\.qiota\\.com\\/data\\/.+\\/data\\.json"
+    "block_regex": "\\.qiota\\.com\\/data"
   },
   "Neue Osnabrücker Zeitung": {
     "domain": "noz.de",
@@ -23,7 +23,6 @@
   "Qiota": {
     "domain": "qiota.com",
     "allow_cookies": 1,
-    "block_regex_general": "\\.qiota\\.com\\/",
-    "excluded_domains": ["lexpress.fr"]
+    "block_regex_general": "\\.qiota\\.com\\/data"
   }
 }