From 1c2c69568f2ef37b40c8a61241533ba156010319 Mon Sep 17 00:00:00 2001
From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com>
Date: Thu, 5 Jan 2023 08:39:31 +0100
Subject: [PATCH] Fix Nordwest Zeitung

---
 changelog.txt      |  3 ++-
 contentScript.js   |  7 +++----
 manifest.json      |  2 +-
 sites_updated.json | 11 ++++++-----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index c9b5971..cfd6b2e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -11,6 +11,7 @@ Remove Entrepreneur (fix obsolete)
 Remove The-Village.ru (fix obsolete)
 Fix Aftonbladet.se (link to archive.is)
 Fix Boston Globe (css)
+Fix Nordwest Zeitung
 Fix Substack (split content)
 Fix Telegraaf.nl
 Fix TheSaturdayPaper.com.au
@@ -984,7 +985,7 @@ Update options: restore opt-in for custom sites (on reload; Chrome-only)
 Add Aachener-Zeitung.de (RP-medien)
 Add Apollo Magazine
 Add NK News (not pro)
-Add Nordwest Zeitung (Germany)
+Add Nordwest Zeitung
 Fix McClatchy Group (opt-in to custom sites for unlisted)
 Fix Wired (Googlebot)
 Fix WSJ (option to disable Googlebot; http error 500)
diff --git a/contentScript.js b/contentScript.js
index fe831af..a208fa9 100644
--- a/contentScript.js
+++ b/contentScript.js
@@ -676,11 +676,10 @@ else if (matchDomain('nwzonline.de')) {
   if (window.location.pathname.match(/-amp\.html$/)) {
     amp_unhide_access_hide('="NOT data.reduced"', '="data.reduced"', 'amp-ad, amp-embed');
   } else {
-    let paywall = document.querySelector('.story--premium__container');
-    let amphtml = document.querySelector('link[rel="amphtml"]');
-    if (paywall && amphtml) {
+    let paywall = document.querySelector('.story--premium__container, .paywall-overlay');
+    if (paywall) {
       removeDOMElement(paywall);
-      window.location.href = amphtml.href;
+      window.location.href = window.location.pathname.replace('.html', '-amp.html');
     }
   }
 }
diff --git a/manifest.json b/manifest.json
index 0bd9bb7..b49c6e4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -721,5 +721,5 @@
     "*://*.wallkit.net/*",
     "*://webcache.googleusercontent.com/*"
   ],
-  "version": "2.9.8.2"
+  "version": "2.9.9.7"
 }
diff --git a/sites_updated.json b/sites_updated.json
index de47d25..f6292e9 100644
--- a/sites_updated.json
+++ b/sites_updated.json
@@ -15,17 +15,18 @@
     "allow_cookies": 1,
     "block_regex": "(\\.evolok\\.net\\/|\\.lavanguardia\\.com\\/js\\/godo-basex-)"
   },
+  "Nordwest Zeitung": {
+    "domain": "nwzonline.de",
+    "allow_cookies": 1,
+    "block_regex": "cdn\\.ampproject\\.org\\/v\\d\\/amp-access-.+\\.js",
+    "amp_redirect": ".paywall-overlay"
+  },
   "Republic.ru": {
     "domain": "republic.ru",
     "allow_cookies": 1,
     "useragent": "googlebot",
     "new_site": 1
   },
-  "The Village.ru": {
-    "domain": "the-village.ru",
-    "allow_cookies": 1,
-    "block_regex": "\\.the-village\\.ru\\/assets\\/app\\/\\d.+\\.js"
-  },
   "WirtschaftsWoche": {
     "domain": "wiwo.de",
     "allow_cookies": 1,