From bd5c1096625d915a99d3a959e5afcd815dbeedfe Mon Sep 17 00:00:00 2001
From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com>
Date: Sat, 16 Mar 2024 12:35:07 +0100
Subject: [PATCH] Fix ProMedia.nl Group (premium-backup)

---
 background.js            |  2 +-
 changelog.txt            |  1 +
 contentScript.js         | 37 ++++++++++++++++++++++++++++++++-----
 contentScript_once.js    | 20 +++++++++++---------
 custom/sites_custom.json | 12 ++++++++++++
 sites.js                 |  8 +++++---
 6 files changed, 62 insertions(+), 18 deletions(-)

diff --git a/background.js b/background.js
index a6cb5df..cc09feb 100644
--- a/background.js
+++ b/background.js
@@ -1500,7 +1500,7 @@ ext_api.runtime.onMessage.addListener(function (message, sender) {
     let custom_domain = message.data.domain;
     let group = message.data.group;
     if (group) {
-      let nofix_groups = ['###_beehiiv', '###_fi_alma_talent', '###_fi_kaleva', '###_ghost', '###_it_citynews', '###_nl_vmnmedia', '###_se_gota_media', '###_substack_custom', '###_uk_delinian'];
+      let nofix_groups = ['###_beehiiv', '###_fi_alma_talent', '###_fi_kaleva', '###_ghost', '###_it_citynews', '###_nl_vmnmedia', '###_se_gota_media', '###_substack_custom', '###_uk_delinian', '###_usa_cherryroad'];
       if (!custom_flex_domains.includes(custom_domain)) {
         if (!nofix_groups.includes(group)) {
           if (custom_flex[group])
diff --git a/changelog.txt b/changelog.txt
index 6bf09c7..e1a60a6 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -10,6 +10,7 @@ Add Pour l'Eco
 Fix Autosport (js)
 Fix Fast Company (premium)
 Fix Mid-Day (amp-redirect)
+Fix ProMedia.nl Group (premium-backup)
 Fix Tech in Asia (json)
 Fix Telegraaf.nl (no article/image)
 Update options (search)
diff --git a/contentScript.js b/contentScript.js
index a5d918e..f1876f9 100644
--- a/contentScript.js
+++ b/contentScript.js
@@ -365,7 +365,7 @@ if (ext_api.runtime) {
 
 // Content workarounds/domain
 
-if (matchDomain('medium.com') || matchDomain(medium_custom_domains) || (!matchDomain('webcache.googleusercontent.com') && document.querySelector('script[src*=".medium.com/"]'))) {
+if (matchDomain('medium.com') || matchDomain(medium_custom_domains) || (!matchDomain('webcache.googleusercontent.com') && document.querySelector('head > link[href*=".medium.com/"]'))) {
   let url = window.location.href;
   let paywall = document.querySelector('article.meteredContent');
   if (paywall) {
@@ -481,7 +481,7 @@ else {
       }
     } else {
       // Australian Seven West Media
-      if (matchDomain('thewest.com.au') || document.querySelector('li > a[href*=".sevenwestmedia.com.au"]')) {
+      if (matchDomain('thewest.com.au') || document.querySelector('head > link[href="https://images.thewest.com.au"]')) {
         function thewest_main(node) {
           let scripts = document.querySelectorAll('script:not([src]):not([type])');
           let json_script;
@@ -1259,6 +1259,11 @@ else if (matchDomain('profil.at')) {
   hideDOMElement(overlay);
 }
 
+else if (matchDomain('rhein-zeitung.de')) {
+  let ads = document.querySelectorAll('div[class$="board"]');
+  hideDOMElement(...ads);
+}
+
 else if (matchDomain('schwaebische.de')) {
   let url = window.location.href;
   let paywall_sel = 'div > div.sve-paywall-wrapper_overlay';
@@ -2562,7 +2567,7 @@ else if (matchDomain('tuttosport.com')) {
 else
   csDone = true;
 
-} else if (window.location.hostname.match(/\.(be|nl)$/) || matchDomain(['artsenkrant.com', 'lavenir.net'])) {//belgium/netherlands
+} else if (window.location.hostname.match(/\.(be|nl)$/) || matchDomain(['artsenkrant.com', 'lavenir.net', 'projectcargojournal.com', 'railfreight.cn', 'railfreight.com', 'railtech.com'])) {//belgium/netherlands
 
 if (matchDomain(be_groupe_ipm_domains)) {
   let paywall = document.querySelector('div.is-preview');
@@ -2844,6 +2849,28 @@ else if (matchDomain('vn.nl')) {
   }
 }
 
+else if (document.querySelector('head > link[href="//ppt.promedia.nl"]') || document.querySelector('head > script[src*="/pmgnews/scripts/promedia.js"]')) {
+  let paywall_sel = 'div.pmgsub';
+  let paywall = document.querySelector(paywall_sel);
+  if (paywall) {
+    let article_sel = 'div.post-body, div.text';
+    let article = document.querySelector(article_sel);
+    if (article) {
+      let pars = article.querySelectorAll('p:first-child');
+      if (pars.length > 2)
+        removeDOMElement(paywall);
+      else {
+        func_post = function () {
+          let paywall = document.querySelector(paywall_sel);
+          removeDOMElement(paywall);
+        }
+        let url = window.location.href;
+        getGoogleWebcache(url, paywall_sel, '', article_sel);
+      }
+    }
+  }
+}
+
 else
   csDone = true;
 
@@ -6111,7 +6138,7 @@ else if (matchDomain(usa_gannett_domains) || document.querySelector('head > link
     window.location.href = decodeURIComponent(window.location.href.split('?return=')[1]);
 }
 
-else if (matchDomain(usa_hearst_comm_domains) || document.querySelector('script[src*="/treg.hearstnp.com/"]')) {
+else if (matchDomain(usa_hearst_comm_domains) || document.querySelector('head > script[src*="/treg.hearstnp.com/"]')) {
   let overlay = document.querySelector('div > div#modalOuter');
   if (overlay) {
     hideDOMElement(overlay.parentNode);
@@ -6124,7 +6151,7 @@ else if (matchDomain(usa_hearst_comm_domains) || document.querySelector('script[
     hideDOMElement(elem.parentNode.parentNode);
 }
 
-else if ((domain = matchDomain(usa_lee_ent_domains)) || matchDomain(ca_torstar_domains.concat(['abqjournal.com'])) || document.querySelector('script[src*=".townnews.com/"][src*="/tncms/"]')) {
+else if ((domain = matchDomain(usa_lee_ent_domains)) || matchDomain(ca_torstar_domains.concat(['abqjournal.com'])) || document.querySelector('head > meta[name="tncms-access-version"]')) {
   if (window.location.pathname.endsWith('.amp.html')) {
     amp_unhide_access_hide('="hasAccess"', '="NOT hasAccess"', 'amp-ad, amp-embed, .amp-ads-container');
     let elem_hidden = document.querySelectorAll('html[class], body[class]');
diff --git a/contentScript_once.js b/contentScript_once.js
index 64ae63e..210ad5a 100644
--- a/contentScript_once.js
+++ b/contentScript_once.js
@@ -33,7 +33,7 @@ window.setTimeout(function () {
   let custom_domain = getCookieDomain(hostname);
   let group;
   if (hostname) {
-    if (document.querySelector('script[src*=".medium.com/"]') || matchDomain(['plainenglish.io']))
+    if (document.querySelector('head > link[href*=".medium.com/"]') || matchDomain(['plainenglish.io']))
       group = 'medium.com';
     else if (document.querySelector('head > meta[property="og:image"][content*="beehiiv"]'))
       group = '###_beehiiv';// no fix
@@ -41,9 +41,9 @@ window.setTimeout(function () {
       group = '###_ghost';// no fix
     else if (document.querySelector('head > link[href*="/leaky-paywall"], script[src*="/leaky-paywall"], div[id^="issuem-leaky-paywall-"]'))
       group = '###_wp_leaky_paywall';
-    else if (document.querySelector('script[src*="/substackcdn.com/"], link[rel="stylesheet"][href*="/substackcdn.com/"]'))
+    else if (document.querySelector('head > link[href^="https://substackcdn.com/"]'))
       group = '###_substack_custom';// no fix
-    else if (document.querySelector('script[src*="/wp-content/themes/pmgnews/scripts/promedia.js"], form[action^="https://go.promedia.nl/"]'))
+    else if (document.querySelector('head > link[href="//ppt.promedia.nl"]') || document.querySelector('head > script[src*="/pmgnews/scripts/promedia.js"]'))
       group = '###_nl_promedia';
     else if (hostname.match(/\.com$/) && !matchDomain(['campaignlive.com']) && document.querySelector('span#hmn-logo > a[href="https://www.haymarketmedicalnetwork.com/about"], footer a[href="https://www.haymarketmediaus.com/haymarket-media-inc-privacy-policy/"]'))
       group = '###_uk_haymarket_medical';
@@ -55,7 +55,7 @@ window.setTimeout(function () {
       if (document.querySelector('a[href^="https://austcommunitymedia.my.site.com/"]'))
         group = '###_au_comm_media';
       else if (hostname.endsWith('.com.au')) {
-        if (document.querySelector('li > a[href*=".sevenwestmedia.com.au"]'))
+        if (document.querySelector('head > link[href="https://images.thewest.com.au"]'))
           group = 'thewest.com.au';
         else if (document.querySelector('head > link[rel="dns-prefetch"][href="//static.ew.mmg.navigacloud.com"]'))
           group = '###_au_mmg';
@@ -64,7 +64,7 @@ window.setTimeout(function () {
       if (document.querySelector('head > meta[property="og:image"][content*="/impresa.soy-chile.cl/"]'))
         group = 'elmercurio.com';
     } else if (hostname.match(/\.(de|at|ch)$/) || matchDomain(['horizont.net', 'lebensmittelzeitung.net'])) {
-      if (document.querySelector('script[src*="/dfv.containers.piwik.pro/"]'))
+      if (document.querySelector('head > script[src*="/dfv.containers.piwik.pro/"]'))
         group = '###_de_dfv_medien';
       else if (document.querySelector('div.navigation__personalization > a[href^="https://www.haas-mediengruppe.de/"]'))
         group = '###_de_haas_medien';
@@ -128,15 +128,17 @@ window.setTimeout(function () {
         group = '###_uk_incisive_media';
       else if (document.querySelector('footer li > a[href^="https://www.newsquest.co.uk/"]'))
         group = '###_uk_newsquest';
-      else if (document.querySelector('script[src="https://cdn.blueconic.net/bridgetowermedia.js"], header.site-header > div.btm-header'))
+      else if (document.querySelector('head > script[src="https://cdn.blueconic.net/bridgetowermedia.js"], header.site-header > div.btm-header'))
         group = '###_usa_bridge_tower';
+      else if (document.querySelector('footer#footer li > a[href^="https://cherryroad-media.com"]'))
+        group = '###_usa_cherryroad';// no fix
       else if (document.querySelector('head > link[href*=".gannettdigital.com/"], head > link[href*=".gannett-cdn.com/"]'))
         group = '###_usa_gannett';
-      else if (document.querySelector('script[src*="/treg.hearstnp.com/"]'))
+      else if (document.querySelector('head > script[src*="/treg.hearstnp.com/"]'))
         group = '###_usa_hearst_comm';
-      else if (document.querySelector('script[src*=".townnews.com/"][src*="leetemplates.com/'))
+      else if (document.querySelector('head > script[src*=".townnews.com/leetemplates.com/'))
         group = '###_usa_lee_ent';
-      else if (document.querySelector('script[src*=".townnews.com/"][src*="/tncms/"]'))
+      else if (document.querySelector('head > meta[name="tncms-access-version'))
         group = '###_usa_townnews';
       else if (document.querySelector('head > meta[content^="https://www.mcclatchy-wires.com/"], a[href^="https://classifieds.mcclatchy.com/"], script[src*=".mcclatchyinteractive.com/"]'))
         group = '###_usa_mcc';
diff --git a/custom/sites_custom.json b/custom/sites_custom.json
index 43569c5..3cc497f 100644
--- a/custom/sites_custom.json
+++ b/custom/sites_custom.json
@@ -579,6 +579,11 @@
     "domain": "nnn.de",
     "useragent": "googlebot"
   },
+  "Nordjyske.dk": {
+    "allow_cookies": 1,
+    "domain": "nordjyske.dk",
+    "useragent": "googlebot"
+  },
   "Nordsee-zeitung.de": {
     "allow_cookies": 1,
     "domain": "nordsee-zeitung.de",
@@ -688,6 +693,13 @@
     "cs_code": "[{\"cond\":\"div.bg-paywall\", \"rm_elem\":1, \"elems\": [{\"cond\":\"body\", \"rm_attrib\":\"class|style\"}, {\"cond\":\"div#body\", \"rm_attrib\":\"style\"}]}]",
     "domain": "rockdelux.com"
   },
+  "Rp-online.de": {
+    "add_ext_link": "div.paid-content,span.park-widget|article",
+    "add_ext_link_type": "archive.is",
+    "allow_cookies": 1,
+    "domain": "rp-online.de",
+    "ld_archive_is": "div.paid-content,span.park-widget|div[data-cy='article_content']"
+  },
   "Schwaebische-post.de": {
     "allow_cookies": 1,
     "block_regex": "\\.schwaebische-post\\.de\\/sub\\/js\\/pc-offer-west\\.js",
diff --git a/sites.js b/sites.js
index efb593f..7961c59 100644
--- a/sites.js
+++ b/sites.js
@@ -1449,7 +1449,7 @@ var defaultSites = {
   "Law.com (free articles only)": {
     domain: "law.com",
     allow_cookies: 1,
-    remove_cookies: 1,
+    block_regex: /\/olytics\.omeda\.com\//,
     referer: "facebook"
   },
   "Le Courrier des Stratèges": {
@@ -2026,7 +2026,8 @@ var defaultSites = {
   "ProMedia.nl Group (opt-in to custom sites)": {
     domain: "###_nl_promedia",
     group: [],
-    useragent: "googlebot"
+    useragent: "googlebot",
+    cs_dompurify: 1
   },
   "Prospect Magazine": {
     domain: "prospectmagazine.co.uk",
@@ -3111,6 +3112,7 @@ var de_westfalen_medien_nofix_domains = ['muensterschezeitung.de', 'westfalen-bl
 var fr_be_groupe_rossel_nofix_domains = ['aisnenouvelle.fr', 'courrier-picard.fr', 'lardennais.fr', 'lavoixdunord.fr', 'lesoir.be', 'lest-eclair.fr', 'liberation-champagne.fr', 'lunion.fr', 'nordlittoral.fr', 'paris-normandie.fr', 'sudinfo.be'];
 var fr_groupe_ebra_nofix_domains = ['bienpublic.com', 'dna.fr', 'estrepublicain.fr', 'lalsace.fr', 'ledauphine.com', 'lejsl.com', 'leprogres.fr', 'republicain-lorrain.fr', 'vosgesmatin.fr'];
 var fr_indigo_nofix_domains = ['africaintelligence.com', 'africaintelligence.fr', 'glitz.paris', 'intelligenceonline.com', 'intelligenceonline.fr', 'lalettre.fr'];
+var fr_jamg_nofix_domains = ['africabusinessplus.com', 'jeuneafrique.com', 'theafricareport.com'];
 var it_gedi_nofix_domains = ['gelocal.it', 'limesonline.com'];
 var nl_mediahuis_region_nofix_domains = ['gooieneemlander.nl', 'haarlemsdagblad.nl', 'ijmuidercourant.nl', 'leidschdagblad.nl', 'noordhollandsdagblad.nl'];
-var nofix_sites = ['11freunde.de', 'aamulehti.fi', 'aftenposten.no', 'aftonbladet.se', 'allgaeuer-zeitung.de', 'americanscientist.org', 'arkansasonline.com', 'asahi.com', 'asiatimes.com', 'aviationweek.com', 'badische-zeitung.de', 'bhaskar.com', 'bloomberglaw.com', 'bloombergtax.com', 'bnef.com', 'bnn.de', 'borsen.dk', 'businessinsider.de', 'businessinsider.jp', 'businesslive.co.za', 'businesstimes.com.sg', 'caixin.com', 'caixinglobal.com', 'caravanmagazine.in', 'catalyst-journal.com', 'chegg.com', 'codesports.com.au', 'compactmag.com', 'coursehero.com',  'deutsche-wirtschafts-nachrichten.de', 'die-glocke.de', 'dn.no', 'dn.se', 'elordenmundial.com', 'entrepreneur.com', 'epw.in', 'ewmagazine.nl', 'falter.at', 'finance.si', 'franc-tireur.fr', 'ftchinese.com', 'ftchineselive.com', 'gamestar.de', 'geo.de', 'golem.de', 'gp.se', 'gva.be', 'handelsblatt.com', 'hbrarabic.com', 'hbrchina.org', 'hbrfrance.fr', 'heise.de', 'hs.fi', 'information.dk', 'investors.com', 'iltalehti.fi', 'jacobin.com', 'jeuneafrique.com', 'jungefreiheit.de', 'kleinezeitung.at', 'krone.at', 'laverita.info', 'lavie.fr', 'lavozdegalicia.es', 'law360.co.uk', 'law360.com', 'le1hebdo.fr', 'leconomiste.com', 'lefigaro.fr', 'lefilmfrancais.com', 'lemonde.fr', 'lequipe.fr', 'lesjours.fr', 'letemps.ch', 'liberation.fr', 'libertiesjournal.com', 'lr-online.de', 'main-echo.de', 'mainpost.de', 'manager-magazin.de', 'medianama.com', 'mediapart.fr', 'milanofinanza.it', 'mittelbayerische.de', 'monde-diplomatique.fr', 'mondediplo.com', 'money.it', 'moneycontrol.com', 'moodys.com', 'morningstar.com', 'motorsport.com', 'moz.de', 'nachrichten.at', 'nationaljournal.com', 'nature.com', 'nbr.co.nz', 'newcriterion.com', 'news24.com', 'newslaundry.com', 'nn.de', 'nwzonline.de', 'on3.com', 'ouest-france.fr', 'philonomist.com', 'pnp.de', 'politicopro.com', 'politiken.dk', 'pressreader.com', 'publico.pt', 'puck.news', 'quillette.com', 'rbc.ru', 'republic.ru', 'rheinpfalz.de', 'risk.net', 'rnz.de', 'saechsische.de', 'sciencedirect.com', 'springer.com', 'statnews.com', 'stern.de', 'stimme.de', 'streetinsider.com', 'substack.com', 'svd.se', 'swp.de', 'taxation.co.uk', 'taxjournal.com', 'the-ken.com', 'theinformation.com', 'theinitium.com', 'themorningcontext.com', 'theparisreview.org', 'thestar.com.my', 'thewirechina.com', 'timeslive.co.za', 'usine-digitale.fr', 'weltwoche.ch', 'weltwoche.de', 'wissenschaft.de', 'worldpoliticsreview.com', 'wz.de', 'zaobao.com.sg'].concat(de_funke_medien_nofix_domains, de_rp_aachen_medien_nofix_domains, de_westfalen_medien_nofix_domains, fr_be_groupe_rossel_nofix_domains, fr_groupe_ebra_nofix_domains, fr_indigo_nofix_domains, it_gedi_nofix_domains, nl_mediahuis_region_nofix_domains);
+var nofix_sites = ['11freunde.de', 'aamulehti.fi', 'aftenposten.no', 'aftonbladet.se', 'allgaeuer-zeitung.de', 'americanscientist.org', 'arkansasonline.com', 'asahi.com', 'asiatimes.com', 'aviationweek.com', 'badische-zeitung.de', 'bhaskar.com', 'bloomberglaw.com', 'bloombergtax.com', 'bnef.com', 'bnn.de', 'borsen.dk', 'businessinsider.de', 'businessinsider.jp', 'businesslive.co.za', 'businesstimes.com.sg', 'caixin.com', 'caixinglobal.com', 'caravanmagazine.in', 'catalyst-journal.com', 'chegg.com', 'codesports.com.au', 'compactmag.com', 'coursehero.com',  'deutsche-wirtschafts-nachrichten.de', 'die-glocke.de', 'dn.no', 'dn.se', 'elordenmundial.com', 'entrepreneur.com', 'epw.in', 'ewmagazine.nl', 'falter.at', 'finance.si', 'franc-tireur.fr', 'ftchinese.com', 'ftchineselive.com', 'gamestar.de', 'geo.de', 'golem.de', 'gp.se', 'gva.be', 'handelsblatt.com', 'hbrarabic.com', 'hbrchina.org', 'hbrfrance.fr', 'heise.de', 'hs.fi', 'information.dk', 'investors.com', 'iltalehti.fi', 'jacobin.com', 'jungefreiheit.de', 'kleinezeitung.at', 'krone.at', 'laverita.info', 'lavie.fr', 'lavozdegalicia.es', 'law360.co.uk', 'law360.com', 'le1hebdo.fr', 'leconomiste.com', 'lefigaro.fr', 'lefilmfrancais.com', 'lemonde.fr', 'lequipe.fr', 'lesjours.fr', 'letemps.ch', 'liberation.fr', 'libertiesjournal.com', 'lr-online.de', 'main-echo.de', 'mainpost.de', 'manager-magazin.de', 'medianama.com', 'mediapart.fr', 'milanofinanza.it', 'mittelbayerische.de', 'monde-diplomatique.fr', 'mondediplo.com', 'money.it', 'moneycontrol.com', 'moodys.com', 'morningstar.com', 'motorsport.com', 'moz.de', 'nachrichten.at', 'nationaljournal.com', 'nature.com', 'nbr.co.nz', 'newcriterion.com', 'news24.com', 'newslaundry.com', 'nn.de', 'nwzonline.de', 'on3.com', 'ouest-france.fr', 'philonomist.com', 'pnp.de', 'politicopro.com', 'politiken.dk', 'pressreader.com', 'publico.pt', 'puck.news', 'quillette.com', 'rbc.ru', 'republic.ru', 'rheinpfalz.de', 'risk.net', 'rnz.de', 'saechsische.de', 'sciencedirect.com', 'springer.com', 'statnews.com', 'stern.de', 'stimme.de', 'streetinsider.com', 'substack.com', 'svd.se', 'swp.de', 'taxation.co.uk', 'taxjournal.com', 'the-ken.com', 'theinformation.com', 'theinitium.com', 'themorningcontext.com', 'theparisreview.org', 'thestar.com.my', 'thewirechina.com', 'timeslive.co.za', 'usine-digitale.fr', 'weltwoche.ch', 'weltwoche.de', 'wissenschaft.de', 'worldpoliticsreview.com', 'wz.de', 'zaobao.com.sg'].concat(de_funke_medien_nofix_domains, de_rp_aachen_medien_nofix_domains, de_westfalen_medien_nofix_domains, fr_be_groupe_rossel_nofix_domains, fr_groupe_ebra_nofix_domains, fr_indigo_nofix_domains, fr_jamg_nofix_domains, it_gedi_nofix_domains, nl_mediahuis_region_nofix_domains);