From 698dab3809f741be0dd1927700398e957107eb86 Mon Sep 17 00:00:00 2001 From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com> Date: Thu, 31 Mar 2022 18:10:47 +0200 Subject: [PATCH] Add RedaktionsNetzwerk Deutschland --- README.md | 4 +++- background.js | 2 +- changelog.txt | 1 + contentScript.js | 4 ++-- manifest.json | 3 ++- sites.js | 3 ++- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f32e5005..b49c6bcc 100644 --- a/README.md +++ b/README.md @@ -492,7 +492,9 @@ Grouped in options:\ [Lübecker Nachrichten](https://www.ln-online.de) - [Märkische Allgemeine](https://www.maz-online.de) - [Neue Presse (Hannover)](https://www.neuepresse.de) - -[Ostsee-Zeitung](https://www.ostsee-zeitung.de) +[Ostsee-Zeitung](https://www.ostsee-zeitung.de) - +[RedaktionsNetzwerk Deutschland](https://www.rnd.de) + ##### Italy [Corriere della Sera](https://www.corriere.it) - diff --git a/background.js b/background.js index 03a9cfb8..fb6539bf 100644 --- a/background.js +++ b/background.js @@ -775,7 +775,7 @@ ext_api.webRequest.onBeforeSendHeaders.addListener(function(details) { else { // block script for additional Madsack/RND sites (opt-in to custom sites) var de_madsack_domains = grouped_sites['###_de_madsack']; - var de_rnd_domain = (matchUrlDomain('rndtech.de', details.url) && ['script'].includes(details.type) && !matchUrlDomain(de_madsack_domains.concat(['madsack.de', 'madsack-medien-campus.de', 'rnd.de']), header_referer) && enabledSites.includes('###_de_madsack')); + var de_rnd_domain = (((matchUrlDomain('rndtech.de', details.url) && ['script'].includes(details.type)) || (details.url.includes('.images.arcpublishing.com/madsack/') && ['image'].includes(details.type))) && !matchUrlDomain(de_madsack_domains.concat(['madsack.de', 'madsack-medien-campus.de']), header_referer) && enabledSites.includes('###_de_madsack')); if (de_rnd_domain) de_madsack_domains = customAddRules(de_madsack_domains, true, blockedRegexes['haz.de']); } diff --git a/changelog.txt b/changelog.txt index 433f3df4..55450342 100644 --- a/changelog.txt +++ b/changelog.txt @@ -5,6 +5,7 @@ Post-release Add Diario Cordoba Add La Opinion A Coruna Add La Opinion de Zamora +Add RedaktionsNetzwerk Deutschland Fix Alma Talent sites (js-ads) Fix Australia News Corp (amp) Fix Madsack Mediengruppe diff --git a/contentScript.js b/contentScript.js index f0ed87af..83451590 100644 --- a/contentScript.js +++ b/contentScript.js @@ -7,7 +7,7 @@ var dompurify_loaded = (typeof DOMPurify === 'function'); var ca_torstar_domains = ['niagarafallsreview.ca', 'stcatharinesstandard.ca', 'thepeterboroughexaminer.com', 'therecord.com', 'thespec.com', 'thestar.com', 'wellandtribune.ca']; var de_funke_media_domains = ['abendblatt.de', 'braunschweiger-zeitung.de', 'morgenpost.de', 'nrz.de', 'otz.de', 'thueringer-allgemeine.de', 'tlz.de', 'waz.de', 'wp.de', 'wr.de']; -var de_madsack_domains = ['haz.de', 'kn-online.de', 'ln-online.de', 'lvz.de', 'maz-online.de', 'neuepresse.de', 'ostsee-zeitung.de']; +var de_madsack_domains = ['haz.de', 'kn-online.de', 'ln-online.de', 'lvz.de', 'maz-online.de', 'neuepresse.de', 'ostsee-zeitung.de', 'rnd.de']; var es_epiberica_domains = ['diariocordoba.com', 'diariodeibiza.es', 'diariodemallorca.es', 'eldia.es', 'elperiodicomediterraneo.com', 'farodevigo.es', 'informacion.es', 'laopinioncoruna.es', 'laopiniondemalaga.es', 'laopiniondemurcia.es', 'laopiniondezamora.es', 'laprovincia.es', 'levante-emv.com', 'lne.es']; var es_grupo_vocento_domains = ['diariosur.es', 'diariovasco.com', 'elcomercio.es', 'elcorreo.com', 'eldiariomontanes.es', 'elnortedecastilla.es', 'hoy.es', 'ideal.es', 'larioja.com', 'lasprovincias.es', 'laverdad.es', 'lavozdigital.es']; var es_unidad_domains = ['elmundo.es', 'expansion.com', 'marca.com']; @@ -720,7 +720,7 @@ else if (matchDomain(['westfalen-blatt.de', 'wn.de', 'muensterschezeitung.de'])) } } -else if (matchDomain(de_madsack_domains) || document.querySelector('link[rel="preload"][href="https://static.rndtech.de/cmp/1.x.x.js"]') || document.querySelector('a.pdb-footer-meta-items-item-link[href="http://www.madsack.de/"]')) { +else if (matchDomain(de_madsack_domains) || document.querySelector('link[rel="preload"][href="https://static.rndtech.de/cmp/1.x.x.js"]') || document.querySelector('li > a[href*="//www.madsack.de/"]')) { if (!(window.location.pathname.startsWith('/amp/') || window.location.search.startsWith('?outputType=valid_amp'))) { let paidcontent_intro = document.querySelector('div.pdb-article-body-paidcontentintro'); if (paidcontent_intro) { diff --git a/manifest.json b/manifest.json index f6be1564..98a4da88 100644 --- a/manifest.json +++ b/manifest.json @@ -475,6 +475,7 @@ "*://*.rhein-zeitung.de/*", "*://*.rheinpfalz.de/*", "*://*.richmond.com/*", + "*://*.rnd.de/*", "*://*.roadandtrack.com/*", "*://*.rollingstone.com/*", "*://*.rugbypass.com/*", @@ -666,5 +667,5 @@ "*://*.wallkit.net/*", "*://*.wsj.net/*" ], - "version": "2.6.2.3" + "version": "2.6.2.4" } diff --git a/sites.js b/sites.js index c1c3cab8..92baaced 100644 --- a/sites.js +++ b/sites.js @@ -1059,7 +1059,8 @@ var defaultSites = { "lvz.de", "maz-online.de", "neuepresse.de", - "ostsee-zeitung.de" + "ostsee-zeitung.de", + "rnd.de" ], allow_cookies: 1, block_regex: /(\.tinypass\.com\/|\.piano\.io\/|cdn\.ampproject\.org\/v\d\/amp-(ad|subscriptions)-.+\.js)/