From 89424f54f244a6c1ceb16791b1fcd4b9d76920e7 Mon Sep 17 00:00:00 2001 From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com> Date: Sat, 14 Jan 2023 17:35:16 +0100 Subject: [PATCH] Fix Madsack Mediengruppe (identify site in cs) --- changelog.txt | 3 +- contentScript.js | 71 +++++++++++++++------------------------- custom/sites_custom.json | 9 +++-- manifest.json | 2 +- sites.js | 4 +-- 5 files changed, 38 insertions(+), 51 deletions(-) diff --git a/changelog.txt b/changelog.txt index 3371f66a..be10cfd1 100644 --- a/changelog.txt +++ b/changelog.txt @@ -4,11 +4,12 @@ Changelog Bypass Paywalls Clean - Firefox Post-release Fix Inc42 Fix LesEchos.fr (investir) +Fix Madsack Mediengruppe (identify site in cs) Fix National Review (no amp) Fix The Athletic (error) Fix Vogue Business Remove Repubblica.it (fix obsolete) -Remove republic.ru (fix obsolete) +Remove Republic.ru (fix obsolete) Update custom sites (default block cookies) * v3.0.0.0 (2023-01-08) diff --git a/contentScript.js b/contentScript.js index 728420c2..749186a7 100644 --- a/contentScript.js +++ b/contentScript.js @@ -9,7 +9,6 @@ var ca_gcm_domains = ['lesoleil.com'].concat(['latribune.ca', 'lavoixdelest.ca', var ca_torstar_domains = ['niagarafallsreview.ca', 'stcatharinesstandard.ca', 'thepeterboroughexaminer.com', 'therecord.com', 'thespec.com', 'thestar.com', 'wellandtribune.ca']; var de_funke_medien_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', 'rnd.de']; -var de_madsack_custom_domains = ['aller-zeitung.de', 'dnn.de', 'gnz.de', 'goettinger-tageblatt.de', 'op-marburg.de', 'paz-online.de', 'sn-online.de', 'waz-online.de']; var de_westfalen_medien_domains = ['muensterschezeitung.de', 'westfalen-blatt.de', 'wn.de']; var es_epiberica_domains = ['diariodemallorca.es', 'eldia.es', 'epe.es', 'farodevigo.es', 'informacion.es', 'laprovincia.es', 'levante-emv.com', 'lne.es', 'mallorcazeitung.es']; var es_epiberica_custom_domains = ['diaridegirona.cat', 'diariocordoba.com', 'diariodeibiza.es', 'elperiodicodearagon.com', 'elperiodicoextremadura.com', 'elperiodicomediterraneo.com', 'emporda.info', 'laopinioncoruna.es', 'laopiniondemalaga.es', 'laopiniondemurcia.es', 'laopiniondezamora.es', 'regio7.cat']; @@ -792,58 +791,40 @@ else if (matchDomain(de_funke_medien_domains) || document.querySelector('a[href= sessionStorage.setItem('deobfuscate', 'true'); } -else if (matchDomain(de_madsack_domains) || matchDomain(de_madsack_custom_domains)) { - 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) { - paidcontent_intro.classList.remove('pdb-article-body-paidcontentintro'); +else if (matchDomain(de_madsack_domains) || document.querySelector('link[href*=".rndtech.de/"]')) { + if (!window.location.search.startsWith('?outputType=valid_amp')) { + let paywall = document.querySelector('div.paywalledContent'); + if (paywall) { + paywall.removeAttribute('class'); + let gradient = document.querySelector('div[class^="ArticleContentLoaderstyled__Gradient"]'); + let loading = document.querySelector('#article > svg'); + removeDOMElement(gradient, loading); + let article = paywall.querySelector('div:not([class])'); let json_script = getArticleJsonScript(); if (json_script) { - let json_text = JSON.parse(json_script.text).articleBody; - if (json_text) { - let pdb_richtext_field = document.querySelectorAll('div.pdb-richtext-field'); - if (pdb_richtext_field[1]) - pdb_richtext_field[1].innerText = json_text; - } - } - let paidcontent_reg = document.querySelector('div.pdb-article-paidcontent-registration'); - removeDOMElement(paidcontent_reg); - } else { - let paywall = document.querySelector('div.paywalledContent'); - if (paywall) { - paywall.removeAttribute('class'); - let gradient = document.querySelector('div[class^="ArticleContentLoaderstyled__Gradient"]'); - let loading = document.querySelector('#article > svg'); - removeDOMElement(gradient, loading); - let article = paywall.querySelector('div:not([class])'); - let json_script = getArticleJsonScript(); - if (json_script) { - let json = JSON.parse(json_script.text); - if (article && json) { - let json_text = json.articleBody; - let article_new = document.createElement('span'); - let par = article.querySelector('p'); - let par_class = par ? par.getAttribute('class') : ''; - article_new.setAttribute('class', par_class); - article_new.innerText = json_text; - article.innerText = ''; - if (json.articleSection) { - let json_section = json.articleSection; - let article_section = document.querySelector('span'); - article_section.setAttribute('class', par_class); - article_section.setAttribute('style', 'font-weight: bold;'); - article_section.innerText = json_section + '. '; - article.appendChild(article_section); - } - article.appendChild(article_new); + let json = JSON.parse(json_script.text); + if (article && json) { + let json_text = json.articleBody; + let article_new = document.createElement('span'); + let par = article.querySelector('p'); + let par_class = par ? par.getAttribute('class') : ''; + article_new.setAttribute('class', par_class); + article_new.innerText = json_text; + article.innerText = ''; + if (json.articleSection) { + let json_section = json.articleSection; + let article_section = document.querySelector('span'); + article_section.setAttribute('class', par_class); + article_section.setAttribute('style', 'font-weight: bold;'); + article_section.innerText = json_section + '. '; + article.appendChild(article_section); } + article.appendChild(article_new); } } } let ads = document.querySelectorAll('div[class^="Adstyled__AdWrapper"]'); removeDOMElement(...ads); - } else if (window.location.pathname.startsWith('/amp/')) { - amp_unhide_subscr_section('.pdb-ad-container, amp-embed'); } else { ampToHtml(); } diff --git a/custom/sites_custom.json b/custom/sites_custom.json index 4a4a5653..9e65006d 100644 --- a/custom/sites_custom.json +++ b/custom/sites_custom.json @@ -65,9 +65,9 @@ }, "Cz.de": { "allow_cookies": 1, - "domain": "cz.de", "block_regex": "\\.cz\\.de\\/sites\\/default\\/files\\/js\\/js_.*\\.js", - "cs_code": "[{\"cond\":\"#erasmo\", \"rm_elem\":1, \"elems\":[{\"cond\":\"article\",\"rm_class\":\"news-read-not-allowed\"},{\"cond\":\".newsletter-signup-wrapper\",\"rm_elem\":1}]}]" + "cs_code": "[{\"cond\":\"#erasmo\", \"rm_elem\":1, \"elems\":[{\"cond\":\"article\",\"rm_class\":\"news-read-not-allowed\"},{\"cond\":\".newsletter-signup-wrapper\",\"rm_elem\":1}]}]", + "domain": "cz.de" }, "Dailyherald.com": { "allow_cookies": 1, @@ -206,6 +206,11 @@ "domain": "kapital.no", "useragent": "googlebot" }, + "Lagazettedescommunes.com": { + "allow_cookies": 1, + "domain": "lagazettedescommunes.com", + "useragent": "googlebot" + }, "Lindipendente.online": { "allow_cookies": 1, "domain": "lindipendente.online", diff --git a/manifest.json b/manifest.json index 1f438f20..4d688685 100644 --- a/manifest.json +++ b/manifest.json @@ -719,5 +719,5 @@ "*://*.wallkit.net/*", "*://webcache.googleusercontent.com/*" ], - "version": "3.0.0.6" + "version": "3.0.0.7" } diff --git a/sites.js b/sites.js index 761affe2..c7163ac0 100644 --- a/sites.js +++ b/sites.js @@ -1192,7 +1192,7 @@ var defaultSites = { "rnd.de" ], allow_cookies: 1, - block_regex: /(\.tinypass\.com\/|\.piano\.io\/|cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js)/ + block_regex: /\.tinypass\.com\// }, "Mainichi Shimbun": { domain: "mainichi.jp", @@ -2404,4 +2404,4 @@ init_custom_flex_domains(); var au_news_corp_nofix_domains = ['cairnspost.com.au', 'geelongadvertiser.com.au', 'goldcoastbulletin.com.au', 'thechronicle.com.au', 'townsvillebulletin.com.au', 'weeklytimesnow.com.au']; var be_mediahuis_nofix_domains = ['gva.be', 'hbvl.be', 'nieuwsblad.be', 'standaard.be']; var it_gedi_nofix_domains = ['gelocal.it', 'huffingtonpost.it', 'ilsecoloxix.it', 'lastampa.it', 'limesonline.com', 'repubblica.it']; -var nofix_sites = ['africaintelligence.com', 'africaintelligence.fr', 'aftenposten.no', 'badische-zeitung.de', 'bild.de', 'borsen.dk', 'businesstimes.com.sg', 'caixin.com', 'caixinglobal.com', 'catalyst-journal.com', 'courrierinternational.com', 'dn.se', 'dvhn.nl', 'elordenmundial.com', 'epw.in', 'expresso.pt', 'ftchinese.com', 'golem.de', 'heise.de', 'hs.fi', 'ilsole24ore.com', 'jacobinmag.com', 'jeuneafrique.com', 'kurier.at', 'lavie.fr', 'lavozdegalicia.es', 'law360.com', 'leconomiste.com', 'lefigaro.fr', 'lemonde.fr', 'lepoint.fr', 'letemps.ch', 'liberation.fr', 'medianama.com', 'mediapart.fr', 'milanofinanza.it', 'mondediplo.com', 'moneycontrol.com', 'nationaljournal.com', 'nature.com', 'nbr.co.nz', 'nn.de', 'ouest-france.fr', 'philonomist.com', 'politicopro.com', 'politiken.dk', 'pressreader.com', 'publico.pt', 'republic.ru', 'saarbruecker-zeitung.de', 'saechsische.de', 'schwarzwaelder-bote.de', 'statnews.com', 'stern.de', 'straitstimes.com', 'stuttgarter-nachrichten.de', 'stuttgarter-zeitung.de', 'substack.com', 'suedkurier.de', 'swp.de', 'techcrunch.com', 'the-ken.com', 'theinformation.com', 'themorningcontext.com', 'theparisreview.org', 'thewirechina.com', 'weser-kurier.de', 'worldpoliticsreview.com', 'ynet.co.il'].concat(au_news_corp_nofix_domains, be_mediahuis_nofix_domains, it_gedi_nofix_domains); +var nofix_sites = ['africaintelligence.com', 'africaintelligence.fr', 'aftenposten.no', 'badische-zeitung.de', 'bild.de', 'borsen.dk', 'businesstimes.com.sg', 'caixin.com', 'caixinglobal.com', 'catalyst-journal.com', 'courrierinternational.com', 'dn.se', 'dvhn.nl', 'elordenmundial.com', 'epw.in', 'expresso.pt', 'ftchinese.com', 'golem.de', 'heise.de', 'hs.fi', 'ilsole24ore.com', 'jacobinmag.com', 'jeuneafrique.com', 'kurier.at', 'lavie.fr', 'lavozdegalicia.es', 'law360.com', 'le1hebdo.fr', 'leconomiste.com', 'lefigaro.fr', 'lemonde.fr', 'lepoint.fr', 'letemps.ch', 'liberation.fr', 'medianama.com', 'mediapart.fr', 'milanofinanza.it', 'mondediplo.com', 'moneycontrol.com', 'nationaljournal.com', 'nature.com', 'nbr.co.nz', 'nn.de', 'ouest-france.fr', 'philonomist.com', 'politicopro.com', 'politiken.dk', 'pressreader.com', 'publico.pt', 'republic.ru', 'ruhrnachrichten.de', 'saarbruecker-zeitung.de', 'saechsische.de', 'schwarzwaelder-bote.de', 'statnews.com', 'stern.de', 'straitstimes.com', 'stuttgarter-nachrichten.de', 'stuttgarter-zeitung.de', 'substack.com', 'suedkurier.de', 'swp.de', 'techcrunch.com', 'the-ken.com', 'theinformation.com', 'themorningcontext.com', 'theparisreview.org', 'thewirechina.com', 'weser-kurier.de', 'worldpoliticsreview.com', 'ynet.co.il'].concat(au_news_corp_nofix_domains, be_mediahuis_nofix_domains, it_gedi_nofix_domains);