Fix Ksta.de & Rundschau-online.de (json)

10 months ago · d872509eb1
parent cb9528964e
commit d872509eb1
8 changed files with 58 additions and 116 deletions
--- a/background.js
+++ b/background.js
@ -423,7 +423,7 @@ ext_api.storage.local.get({
  optIn: false,
  optInUpdate: true
 }, function (items) {
-  var sites = items.sites;
+  var sites = ext_name.includes('Clean') ? items.sites : {};
  optionSites = sites;
  var sites_default = items.sites_default;
  customSites = items.sites_custom;
@ -467,7 +467,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 = ['###_de_mhs', '###_nl_eu_ftm', '###_uk_delinian'];
+          let new_groups = ['###_de_mhs', '###_uk_delinian'];
          let open_options = new_groups.some(group => !enabledSites.includes(group) && grouped_sites[group].some(domain => enabledSites.includes(domain) && !customSites_domains.includes(domain)));
          if (open_options)
            ext_api.runtime.openOptionsPage();
--- a/changelog.txt
+++ b/changelog.txt
@ -5,6 +5,7 @@ Updates (install signed xpi-file): https://gitlab.com/magnolia1234/bypass-paywal
 Post-release
 Add Delinian Group
 Remove Initium Media (fix obsolete)
+Fix Ksta.de & Rundschau-online.de (json)
 Fix The Press-Enterprise (new domain)

 * v3.2.9.0 (2023-08-13)
@ -315,7 +316,7 @@ Update custom sites (add_ext_link)
 * v3.0.5.0 (2023-02-12)
 Add L'Informe (fr)
 Add LePoint.fr
-Fix Koelner Stadt-Anzeiger
+Fix Ksta.de
 Fix Leaky Paywall (identify site)
 Fix LesEchos.fr (json)
 Fix McClatchy Group (amp-redirect)
@ -483,7 +484,7 @@ Remove GElocal.it & Huffintonpost.it (fix obsolete)
 Remove Il Secolo XIX, La Stampa & Limes Online (fix obsolete)
 Fix Cmjornal.pt
 Fix Grupo Vocento
-Fix Koelner Stadt-Anzeiger & Koelnische Rundschau
+Fix Ksta.de & Rundschau-online.de
 Fix La Croix
 Fix NHST Media Group
 Fix Tagesspiegel.de (link to archive.is)
@ -686,7 +687,7 @@ Update custom sites (import from GitLab)
 * v2.7.6.0 (2022-07-17)
 Add The Japan Times
 Fix ilTirreno.it & LaNuovaSardegna.it
-Fix Koelner Stadt-Anzeiger & Koelnische Rundschau
+Fix Ksta.de & Rundschau-online.de
 Fix Nrc.nl
 Fix NYTimes (Cooking)
 Update popup (archive-links)
@ -729,7 +730,7 @@ Remove Valor Economico (fix obsolete)
 Fix Business-standard.com
 Fix El Mercurio
 Fix Helsingin Sanomat (dynamic-json)
-Fix Koelner Stadt-Anzeiger & Koelnische Rundschau
+Fix Ksta.de & Rundschau-online.de
 Fix LesEchos.fr
 Fix Nautilus
 Fix Repubblica.it & LaStampa.it (videos-gtm)
@ -1019,7 +1020,7 @@ Fix National Geographic USA (magazine)
 Remove tabs-permission (amo - Firefox 86+)

 * v2.4.7.0 (2021-12-12)
-Add Koelner Stadt-Anzeiger & Koelnische Rundschau
+Add Ksta.de & Rundschau-online.de
 Add The (New Orleans) Advocate
 Remove Caixin Global (fix obsolete)
 Fix Bloomberg (subscriber-only)
--- a/contentScript.js
+++ b/contentScript.js
@ -946,21 +946,36 @@ else if (matchDomain('krautreporter.de')) {
 }

 else if (matchDomain(['ksta.de', 'rundschau-online.de'])) {
-  let paywall = document.querySelector('div[data-tm-placeholder]');
-  if (paywall) {
-    removeDOMElement(paywall);
-    let span_hidden = document.querySelector('div.dm-paint');
-    if (span_hidden)
-      span_hidden.removeAttribute('class');
-  } else {
-    let paywall_new = document.querySelector('div.paywalled-content');
-    if (paywall_new)
-      paywall_new.removeAttribute('class');
-    let wrapper = document.querySelector('div.dm-paywall-wrapper');
-    removeDOMElement(wrapper);
-  }
+  window.setTimeout(function () {
+    let paywall = document.querySelector('div.dm-paywall-wrapper');
+    if (paywall) {
+      let json_script = getArticleJsonScript();
+      if (json_script) {
+        removeDOMElement(paywall);
+        try {
+          let json = JSON.parse(json_script.text);
+          if (json && json['@graph']) {
+            let json_data = json['@graph'].filter(x => x.articleBody)[0];
+            let url_json = json_data['@id'];
+            if (url_json && !url_json.includes(window.location.pathname))
+              refreshCurrentTab();
+            let json_text = json_data.articleBody;
+            let article = document.querySelector('article');
+            if (json_text && article) {
+              let article_new = document.createElement('p');
+              article_new.setAttribute('class', 'dm-paragraph my-8 dm-article-content-width');
+              article_new.innerText = json_text;
+              article.appendChild(article_new);
+            }
+          }
+        } catch (err) {
+          console.log(err);
+        }
+      }
+    }
+  }, 1000);
  let banners = document.querySelectorAll('div.dm-slot, div[id^="taboola-feed"]');
-  removeDOMElement(...banners);
+  hideDOMElement(...banners);
 }

 else if (matchDomain('kurier.at')) {
--- a/custom/manifest.json
+++ b/custom/manifest.json
@ -51,5 +51,5 @@
    "webRequestBlocking",
    "*://*/*"
  ],
-  "version": "3.2.9.2"
+  "version": "3.2.9.3"
 }
--- a/custom/sites_custom.json
+++ b/custom/sites_custom.json
@ -456,6 +456,12 @@
    "cs_code": "[{\"cond\":\"div.c-memberships-message\", \"rm_elem\":1, \"elems\":[{\"cond\":\"body.access-restricted\",\"rm_class\":\"access-restricted\"}]}]",
    "domain": "stateaffairs.com"
  },
+  "Suedkurier.de": {
+    "add_ext_link": "aside.article-paywall|section.article-content",
+    "add_ext_link_type": "archive.is",
+    "allow_cookies": 1,
+    "domain": "suedkurier.de"
+  },
  "Supchina.com": {
    "allow_cookies": 1,
    "block_regex": "\\.tinypass\\.com",
--- a/manifest.json
+++ b/manifest.json
@ -789,5 +789,5 @@
    "*://*.wyleex.com/*",
    "*://webcache.googleusercontent.com/*"
  ],
-  "version": "3.2.9.2"
+  "version": "3.2.9.3"
 }
--- a/sites.js
+++ b/sites.js
@ -1140,11 +1140,13 @@ var defaultSites = {
  },
  "Kölner Stadt-Anzeiger": {
    domain: "ksta.de",
-    allow_cookies: 1
+    allow_cookies: 1,
+    block_regex: /\.zephr\.com\/zephr\/decide/
  },
  "Kölnische Rundschau": {
    domain: "rundschau-online.de",
-    allow_cookies: 1
+    allow_cookies: 1,
+    block_regex: /\.zephr\.com\/zephr\/decide/
  },
  "Krautreporter.de": {
    domain: "krautreporter.de"
--- a/sites_updated.json
+++ b/sites_updated.json
@ -2,19 +2,14 @@
  "America's Test Kitchen": {
    "domain": "americastestkitchen.com",
    "allow_cookies": 1,
-    "block_regex": "\\.tinypass\\.com"
+    "block_regex": "\\.tinypass\\.com",
+    "upd_version": "3.2.7.9"
  },
  "Autocar.co.uk": {
    "domain": "autocar.co.uk",
    "allow_cookies": 1,
    "ld_google_webcache": "div.ms-block,div.register-block|div.content-wrapper",
-    "new_site": 1
-  },
-  "Automobilwoche": {
-    "domain": "automobilwoche.de",
-    "allow_cookies": 1,
-    "block_regex": "\\.automobilwoche\\.de\\/sites\\/camw\\/files\\/js\\/js_9G4.+\\.js",
-    "upd_version": "3.2.6.6"
+    "upd_version": "3.2.7.5"
  },
  "Bar and Bench": {
    "domain": "barandbench.com",
@ -28,25 +23,12 @@
    "block_regex": "(\\.cm\\.bloomberg\\.com\\/|assets\\.bwbx\\.io\\/s\\d\\/javelin\\/.+\\/transporter\\/)",
    "upd_version": "3.2.7.1"
  },
-  "Cxense": {
-    "domain": "cxense.com",
-    "allow_cookies": 1,
-    "block_regex_general": "cdn\\.cxense\\.com",
-    "excluded_domains": ["bizjournals.com"],
-    "upd_version": "3.2.6.6"
-  },
  "EUobserver": {
    "domain": "euobserver.com",
    "allow_cookies": 1,
    "cs_code": "[{\"cond\":\"div.membership-upsell.show\", \"rm_class\":\"show\"}]",
    "upd_version": "3.2.7.4"
  },
-  "Haaretz English": {
-    "domain": "haaretz.com",
-    "allow_cookies": 1,
-    "useragent": "facebookbot",
-    "upd_version": "3.0.8.3"
-  },
  "Harvard Business Review": {
    "domain": "hbr.org",
    "block_regex": "cdn\\.cxense\\.com",
@ -57,24 +39,6 @@
    "block_js_inline": "\\.lastampa\\.it",
    "remove_cookies_select_drop": ["blaize_session"]
  },
-  "Mannheimer Morgen": {
-    "domain": "mannheimer-morgen.de",
-    "allow_cookies": 1,
-    "useragent": "googlebot"
-  },
-  "New Scientist": {
-    "domain": "newscientist.com",
-    "allow_cookies": 1,
-    "block_regex": "\\.piano\\.io",
-    "cs_dompurify": 1,
-    "upd_version": "3.2.6.2"
-  },
-  "Nordwest Zeitung": {
-    "domain": "nwzonline.de",
-    "allow_cookies": 1,
-    "ld_json": "div.offerlist-wrapper|div.article-body|1",
-    "upd_version": "3.2.6.0"
-  },
  "Piano.io (+ TinyPass)": {
    "domain": "piano.io",
    "allow_cookies": 1,
@ -82,18 +46,12 @@
    "excluded_domains": ["piano.io", "asia.nikkei.com", "hbr.org", "japantimes.co.jp", "kurier.at", "onet.pl"],
    "upd_version": "3.2.8.2"
  },
-  "Star Tribune": {
-    "domain": "startribune.com",
-    "remove_cookies_select_drop": ["client_id"],
-    "cs_code": "[{\"cond\":\"div.ReactModalPortal\", \"rm_elem\": 1}, {\"cond\":\"body.ReactModal__Body--open\", \"rm_class\": \"ReactModal__Body--open\"}]",
-    "upd_version": "3.2.6.3"
-  },
  "Swarajyamag": {
    "domain": "swarajyamag.com",
    "allow_cookies": 1,
    "remove_cookies": 1,
    "cs_code": "[{\"cond\":\"div#story-notification\", \"rm_elem\": 1, \"elems\":[{\"cond\":\"div#non-subscriber-text\", \"rm_attrib\": \"id\"}, {\"cond\":\"div.subscriber-text\", \"rm_attrib\": \"class\"}]}]",
-    "new_site": 1
+    "upd_version": "3.2.7.8"
  },
  "The Athletic": {
    "domain": "###_usa_theathletic",
@ -104,17 +62,6 @@
    "block_regex": "(\\/theathletic\\.com\\/_next\\/static\\/chunks\\/pages\\/article\\/.+\\.js|cdn\\.ampproject\\.org\\/v\\d\\/amp-(access|subscriptions)-.+\\.js)",
    "upd_version": "3.2.1.1"
  },
-  "The Atlantic": {
-    "domain": "theatlantic.com",
-    "block_regex": "cdn\\.theatlantic\\.com\\/_next\\/static\\/chunks\\/pages\\/.+\\/archive",
-    "remove_cookies_select_drop": ["articleViews"],
-    "upd_version": "3.0.3.8"
-  },
-  "The Business Journals (free articles only": {
-    "domain": "bizjournals.com",
-    "block_regex": "cdn\\.cxense\\.com\\/cx\\.js",
-    "upd_version": "3.2.6.6"
-  },
  "The Economic Times (ET Prime)": {
    "domain": "###_economictimes",
    "group": [
@ -134,13 +81,6 @@
    "cs_code": "[{\"cond\":\"div.paywall\", \"rm_elem\": 1, \"elems\":[{\"cond\":\"svelte-scroller-outer\", \"rm_elem\": 1}, {\"cond\":\"body > style\", \"rm_elem\": 1}]}]",
    "upd_version": "3.2.7.6"
  },
-  "The Japan Times (recent/last 2 months articles only; do not block Piano.io-script externally)": {
-    "domain": "japantimes.co.jp",
-    "block_regex": "cdn\\.cxense\\.com",
-    "remove_cookies_select_drop": ["xbc"],
-    "ld_json": "div.blocker > div.tp-container-inner|div.article-body|1",
-    "upd_version": "3.2.6.4"
-  },
  "The New York Times": {
    "domain": "nytimes.com",
    "allow_cookies": 1,
@ -164,21 +104,17 @@
    "cs_dompurify": 1,
    "upd_version": "3.2.8.3"
  },
-  "The Verge (newsletter)": {
-    "domain": "theverge.com",
-    "allow_cookies": 1,
-    "ld_json": "div.bg-paywall-fade|div.duet--article--article-body-component-container",
-    "new_site": 1
-  },
  "The Week - UK": {
    "domain": "theweek.co.uk",
    "allow_cookies": 1,
-    "useragent": "googlebot"
+    "useragent": "googlebot",
+    "upd_version": "3.2.8.5"
  },
  "The Week - USA": {
    "domain": "theweek.com",
    "allow_cookies": 1,
-    "useragent": "googlebot"
+    "useragent": "googlebot",
+    "upd_version": "3.2.8.5"
  },
  "Times of India": {
    "domain": "###_timesofindia",
@ -201,28 +137,10 @@
    "block_regex_general": "\\/shared-content\\/art\\/tncms\\/api\\/access\\.js",
    "upd_version": "3.2.8.3"
  },
-  "Verlagsgruppe Rhein Main": {
-    "allow_cookies": 1,
-    "domain": "###_de_vrm",
-    "group": [
-      "allgemeine-zeitung.de",
-      "echo-online.de",
-      "wiesbadener-kurier.de"
-    ],
-    "block_regex": "cdn\\.cxense\\.com",
-    "useragent": "googlebot",
-    "upd_version": "3.2.6.7"
-  },
  "Washington Examiner": {
    "domain": "washingtonexaminer.com",
    "allow_cookies": 1,
    "block_regex": "\\.zephr\\.com\\/zephr-browser",
-    "new_site": 1
-  },
-  "Weltkunst": {
-    "domain": "weltkunst.de",
-    "allow_cookies": 1,
-    "useragent": "googlebot",
-    "upd_version": "3.2.6.9"
+    "upd_version": "3.2.7.8"
  }
 }