From c8cc08bc391ad7502e60b5d9643a59ed91f93879 Mon Sep 17 00:00:00 2001 From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com> Date: Mon, 27 Nov 2023 18:26:40 +0100 Subject: [PATCH] Add ikz-online.de & remove Braunschweiger-zeitung.de Fix Freitag.de (text-break) --- README.md | 4 +-- changelog.txt | 3 ++ contentScript.js | 45 ++++++++++++++++------- contentScript_once.js | 2 -- custom/manifest.json | 2 +- manifest.json | 4 +-- sites.js | 7 ++-- sites_updated.json | 83 +------------------------------------------ 8 files changed, 46 insertions(+), 104 deletions(-) diff --git a/README.md b/README.md index 6192264..c0fd227 100644 --- a/README.md +++ b/README.md @@ -630,10 +630,10 @@ Grouped in options:\ Grouped in options:\ *[Deutscher Fachverlag Mediengruppe](https://www.dfv.de)* (opt-in to custom sites)\ -*Funke Mediengruppe* sites like (opt-in to custom sites for unlisted)\ +*Funke Mediengruppe* sites like\ [Berliner Morgenpost](https://www.morgenpost.de) - -[Braunschweiger Zeitung](https://www.braunschweiger-zeitung.de) - [Hamburger Abendblatt](https://www.abendblatt.de) - +[Iserlohner Kreisanzeiger und Zeitung](https://www.ikz-online.de) - [Neue Ruhr Zeitung](https://www.nrz.de) - [Ostthüringer Zeitung](https://www.otz.de) - [Thüringer Allgemeine](https://www.thueringer-allgemeine.de) - diff --git a/changelog.txt b/changelog.txt index 34570a6..374e425 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,6 +3,9 @@ Changelog Bypass Paywalls Clean - Firefox Updates (install signed xpi-file): https://gitlab.com/magnolia1234/bypass-paywalls-firefox-clean/-/releases Post-release +Add Ikz-online.de (Funke) +Remove Braunschweiger-zeitung.de (Funke; fix obsolete) +Fix Freitag.de (text-break) * v3.4.4.0 (2023-11-26) Add Freitag.de diff --git a/contentScript.js b/contentScript.js index 530f85e..c8e718a 100644 --- a/contentScript.js +++ b/contentScript.js @@ -11,7 +11,7 @@ var be_groupe_ipm_domains = ['dhnet.be', 'lalibre.be', 'lavenir.net']; var be_roularta_domains = ['artsenkrant.com', 'beleggersbelangen.nl', 'femmesdaujourdhui.be', 'flair.be', 'knack.be', 'kw.be', 'levif.be', 'libelle.be']; var ca_gcm_domains = ['lesoleil.com'].concat(['latribune.ca', 'lavoixdelest.ca', 'ledroit.com', 'ledroitfranco.com', 'lenouvelliste.ca', 'lequotidien.com']); 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_funke_medien_domains = ['abendblatt.de', 'ikz-online.de', 'morgenpost.de', 'nrz.de', 'otz.de', 'thueringer-allgemeine.de', 'tlz.de', 'waz.de', 'wp.de', 'wr.de']; var de_lv_domains = ['profi.de', 'topagrar.at', 'topagrar.com', 'wochenblatt.com']; 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_mhs_custom_domains = ['cannstatter-zeitung.de', 'esslinger-zeitung.de', 'frankenpost.de', 'insuedthueringen.de', 'krzbb.de', 'kurier.de', 'np-coburg.de']; @@ -859,6 +859,7 @@ else if (matchDomain('freitag.de')) { related.classList.remove('c-teaser-plus-related--paywall'); let article = document.querySelector('div#x-article-text'); if (article) { + let intro = article.querySelectorAll('p'); let json_script = getArticleJsonScript(); if (json_script) { let json = JSON.parse(json_script.text); @@ -866,7 +867,6 @@ else if (matchDomain('freitag.de')) { let json_text = breakText(json.articleBody); let pars = json_text.split(/\n\n/g); if (json_text) { - let intro = article.querySelectorAll('p'); removeDOMElement(...intro); let article_new = document.createElement('div'); for (let par of pars) { @@ -880,12 +880,23 @@ else if (matchDomain('freitag.de')) { } else { let hidden_article = document.querySelector('div.o-paywall'); if (hidden_article) { - article.appendChild(document.createTextNode('> > >')); + let par_first = true; let pars = breakText(hidden_article.innerText).split(/\n\n/g); for (let par of pars) { let par_new = document.createElement('p'); - par_new.innerText = par; - article.appendChild(par_new); + let overlap = ''; + if (par_first) { + let intro_last = intro[intro.length - 1]; + par = par.trim(); + overlap = findOverlap(intro_last.innerText, par); + if (overlap) + intro_last.innerText = intro_last.innerText.replace(new RegExp(overlap + '$'), '') + par; + par_first = false; + } + if (!overlap) { + par_new.innerText = par; + article.appendChild(par_new); + } } } } @@ -1315,7 +1326,7 @@ else if (matchDomain('welt.de')) { article.firstChild.before(archiveLink(url)); } let ads = document.querySelectorAll('div[data-component="Outbrain"], div[data-component="OEmbedComponent"], div[class*="c-ad"]'); - removeDOMElement(...ads); + hideDOMElement(...ads); } else if (matchDomain('zeit.de')) { @@ -1364,11 +1375,8 @@ else if (matchDomain(de_westfalen_medien_domains)) { } } -else if (matchDomain(de_funke_medien_domains) || document.querySelector('a[href="https://www.funkemedien.de/"]')) { - if (window.location.search.startsWith('?service=amp')) - amp_unhide_access_hide('="NOT p.showRegWall AND NOT p.showPayWall"', '', 'amp-ad, amp-embed, amp-fx-flying-carpet'); - else - sessionStorage.setItem('deobfuscate', 'true'); +else if (matchDomain(de_funke_medien_domains)) { + sessionStorage.setItem('deobfuscate', 'true'); } else if (matchDomain(de_madsack_domains) || document.querySelector('head > link[href*=".rndtech.de/"]')) { @@ -4440,7 +4448,7 @@ else if (matchDomain('newscientist.com')) { } let ads = document.querySelectorAll('div[class*="Advert"]'); hideDOMElement(...ads); - }, 1000); + }, 1500); } else if (matchDomain('newsday.com')) { @@ -4455,6 +4463,11 @@ else if (matchDomain('newsday.com')) { } } +else if (matchDomain('newsweek.com')) { + let ads = document.querySelectorAll('div#topad, div[id^="dfp-ad-"]'); + hideDOMElement(...ads); +} + else if (matchDomain(['nola.com', 'theadvocate.com'])) { if (window.location.pathname.endsWith('.amp.html')) { let body_hidden = document.querySelector('.site-container'); @@ -6192,6 +6205,14 @@ function pageContains(selector, text) { }); } +function findOverlap(a, b) { + if (b.length === 0) + return ""; + if (a.endsWith(b)) + return b; + return findOverlap(a, b.substring(0, b.length - 1)); +} + function breakText(str) { str = str.replace(/(?:^|[A-Za-z\"\“\)])(\.|\?|!)(?=[A-ZÖÜ\„\d][A-Za-zÀ-ÿ\„\d]{1,})/gm, "$&\n\n"); str = str.replace(/(([a-z]{2,}|[\"\“]))(?=[A-Z](?=[A-Za-zÀ-ÿ]+))/gm, "$&\n\n"); diff --git a/contentScript_once.js b/contentScript_once.js index 2c04454..840ee8c 100644 --- a/contentScript_once.js +++ b/contentScript_once.js @@ -60,8 +60,6 @@ window.setTimeout(function () { } else if (hostname.match(/\.(de|at|ch)$/) || matchDomain(['horizont.net', 'lebensmittelzeitung.net'])) { if (document.querySelector('script[src*="/dfv.containers.piwik.pro/"]')) group = '###_de_dfv_medien'; - else if (document.querySelector('script[data-cmp-src*=".funkedigital.de/"], div#fmg-markenanker > a[href="https://www.funkemedien.de/"]')) - group = '###_de_funke_medien'; else if (document.querySelector('div.navigation__personalization > a[href^="https://www.haas-mediengruppe.de/"]')) group = '###_de_haas_medien'; else if (document.querySelector('head > link[href*=".rndtech.de/"]')) diff --git a/custom/manifest.json b/custom/manifest.json index eb31c0e..56e2b47 100644 --- a/custom/manifest.json +++ b/custom/manifest.json @@ -51,5 +51,5 @@ "webRequestBlocking", "*://*/*" ], - "version": "3.4.4.0" + "version": "3.4.4.1" } diff --git a/manifest.json b/manifest.json index 1dcf645..bc77955 100644 --- a/manifest.json +++ b/manifest.json @@ -122,7 +122,6 @@ "*://*.bordermail.com.au/*", "*://*.bostonglobe.com/*", "*://*.bqprime.com/*", - "*://*.braunschweiger-zeitung.de/*", "*://*.brisbanetimes.com.au/*", "*://*.britannica.com/*", "*://*.buffalonews.com/*", @@ -312,6 +311,7 @@ "*://*.humanite.fr/*", "*://*.humo.be/*", "*://*.ideal.es/*", + "*://*.ikz-online.de/*", "*://*.ilfattoquotidiano.it/*", "*://*.ilfoglio.it/*", "*://*.ilgazzettino.it/*", @@ -821,5 +821,5 @@ "*://*.wyleex.com/*", "*://webcache.googleusercontent.com/*" ], - "version": "3.4.4.0" + "version": "3.4.4.1" } diff --git a/sites.js b/sites.js index a45ffb1..ebd1234 100644 --- a/sites.js +++ b/sites.js @@ -724,7 +724,7 @@ var defaultSites = { domain: "###_de_funke_medien", group: [ "abendblatt.de", - "braunschweiger-zeitung.de", + "ikz-online.de", "morgenpost.de", "nrz.de", "otz.de", @@ -736,7 +736,7 @@ var defaultSites = { ], allow_cookies: 1, useragent: "googlebot", - block_regex: /(\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-access-.+\.js)/ + block_regex: /\.tinypass\.com\// }, "Gannett Group (local USA Today)": { domain: "###_usa_gannett", @@ -2903,8 +2903,9 @@ init_custom_flex_domains(); // sites with no fix (background) var be_mediahuis_nofix_domains = ['gva.be', 'hbvl.be', 'nieuwsblad.be', 'standaard.be']; +var de_funke_medien_nofix_domains = ['braunschweiger-zeitung.de', 'harzkurier.de']; var de_rp_aachen_medien_nofix_domains = ['aachener-nachrichten.de', 'aachener-zeitung.de', 'ga.de', 'rp-online.de', 'saarbruecker-zeitung.de', 'volksfreund.de']; var fr_indigo_nofix_domains = ['africaintelligence.com', 'africaintelligence.fr', 'glitz.paris', 'intelligenceonline.com', 'intelligenceonline.fr', 'lalettre.fr']; var it_gedi_nofix_domains = ['gelocal.it', 'huffingtonpost.it', 'limesonline.com']; var nl_mediahuis_region_nofix_domains = ['gooieneemlander.nl', 'haarlemsdagblad.nl', 'ijmuidercourant.nl', 'leidschdagblad.nl', 'noordhollandsdagblad.nl']; -var nofix_sites = ['aamulehti.fi', 'aftenposten.no', 'aftonbladet.se', 'allgaeuer-zeitung.de', 'asahi.com', 'asiatimes.com', 'autosport.com', 'aviationweek.com', 'badische-zeitung.de', 'bild.de', 'bloomberglaw.com', 'bloombergtax.com', 'borsen.dk', 'businessgreen.com', 'businessinsider.de', 'businesslive.co.za', 'businesstimes.com.sg', 'caixin.com', 'caixinglobal.com', 'caravanmagazine.in', 'catalyst-journal.com', 'codesports.com.au', 'compactmag.com', 'courrierinternational.com', 'deutsche-wirtschafts-nachrichten.de', 'die-glocke.de', 'diepresse.com', 'dn.no', 'dn.se', 'elordenmundial.com', 'entrepreneur.com', 'epw.in', 'expresso.pt', 'falter.at', 'finance.si', 'ftchinese.com', 'gamestar.de', 'geo.de', 'golem.de', 'handelsblatt.com', 'hbrchina.org', 'heise.de', 'hln.be', 'hs.fi', 'ilsole24ore.com', 'information.dk', 'investors.com', 'iltalehti.fi', 'jacobin.com', 'jeuneafrique.com', 'kleinezeitung.at', 'lavie.fr', 'lavozdegalicia.es', 'law360.com', 'le1hebdo.fr', 'leconomiste.com', 'lefilmfrancais.com', 'lequipe.fr', 'lesjours.fr', 'liberation.fr', 'limburger.nl', 'mainpost.de', 'manager-magazin.de', 'medianama.com', 'mediapart.fr', 'milanofinanza.it', 'mittelbayerische.de', 'monde-diplomatique.fr', 'mondediplo.com', 'moneycontrol.com', 'moodys.com', 'morningstar.com', 'moz.de', 'nachrichten.at', 'nationaljournal.com', 'nature.com', 'nbr.co.nz', 'newslaundry.com', 'nn.de', 'observador.pt', 'ouest-france.fr', 'philonomist.com', 'pnp.de', 'politicopro.com', 'politiken.dk', 'pressreader.com', 'publico.pt', 'quillette.com', 'republic.ru', 'rheinpfalz.de', 'risk.net', 'rnz.de', 'saechsische.de', 'schwarzwaelder-bote.de', 'sciencedirect.com', 'springer.com', 'statnews.com', 'stern.de', 'stimme.de', 'straitstimes.com', 'stratfor.com', 'substack.com', 'suedkurier.de', 'swp.de', 'techcrunch.com', 'the-ken.com', 'theinformation.com', 'theinitium.com', 'themorningcontext.com', 'theparisreview.org', 'thewirechina.com', 'vosgesmatin.fr', 'weltwoche.ch', 'weltwoche.de', 'weser-kurier.de', 'wiwo.de', 'worldpoliticsreview.com', 'ynet.co.il'].concat(be_mediahuis_nofix_domains, de_rp_aachen_medien_nofix_domains, fr_indigo_nofix_domains, it_gedi_nofix_domains, nl_mediahuis_region_nofix_domains); +var nofix_sites = ['aamulehti.fi', 'aftenposten.no', 'aftonbladet.se', 'allgaeuer-zeitung.de', 'asahi.com', 'asiatimes.com', 'autosport.com', 'aviationweek.com', 'badische-zeitung.de', 'bild.de', 'bloomberglaw.com', 'bloombergtax.com', 'borsen.dk', 'businessgreen.com', 'businessinsider.de', 'businesslive.co.za', 'businesstimes.com.sg', 'caixin.com', 'caixinglobal.com', 'caravanmagazine.in', 'catalyst-journal.com', 'codesports.com.au', 'compactmag.com', 'courrierinternational.com', 'deutsche-wirtschafts-nachrichten.de', 'die-glocke.de', 'diepresse.com', 'dn.no', 'dn.se', 'elordenmundial.com', 'entrepreneur.com', 'epw.in', 'expresso.pt', 'falter.at', 'finance.si', 'ftchinese.com', 'gamestar.de', 'geo.de', 'golem.de', 'handelsblatt.com', 'hbrchina.org', 'heise.de', 'hln.be', 'hs.fi', 'ilsole24ore.com', 'information.dk', 'investors.com', 'iltalehti.fi', 'jacobin.com', 'jeuneafrique.com', 'kleinezeitung.at', 'lavie.fr', 'lavozdegalicia.es', 'law360.com', 'le1hebdo.fr', 'leconomiste.com', 'lefilmfrancais.com', 'lequipe.fr', 'lesjours.fr', 'liberation.fr', 'limburger.nl', 'mainpost.de', 'manager-magazin.de', 'medianama.com', 'mediapart.fr', 'milanofinanza.it', 'mittelbayerische.de', 'monde-diplomatique.fr', 'mondediplo.com', 'moneycontrol.com', 'moodys.com', 'morningstar.com', 'moz.de', 'nachrichten.at', 'nationaljournal.com', 'nature.com', 'nbr.co.nz', 'newslaundry.com', 'nn.de', 'observador.pt', 'ouest-france.fr', 'philonomist.com', 'pnp.de', 'politicopro.com', 'politiken.dk', 'pressreader.com', 'publico.pt', 'quillette.com', 'republic.ru', 'rheinpfalz.de', 'risk.net', 'rnz.de', 'saechsische.de', 'schwarzwaelder-bote.de', 'sciencedirect.com', 'springer.com', 'statnews.com', 'stern.de', 'stimme.de', 'straitstimes.com', 'stratfor.com', 'substack.com', 'suedkurier.de', 'swp.de', 'techcrunch.com', 'the-ken.com', 'theinformation.com', 'theinitium.com', 'themorningcontext.com', 'theparisreview.org', 'thewirechina.com', 'vosgesmatin.fr', 'weltwoche.ch', 'weltwoche.de', 'weser-kurier.de', 'wiwo.de', 'worldpoliticsreview.com', 'ynet.co.il'].concat(be_mediahuis_nofix_domains, de_funke_medien_nofix_domains, de_rp_aachen_medien_nofix_domains, fr_indigo_nofix_domains, it_gedi_nofix_domains, nl_mediahuis_region_nofix_domains); diff --git a/sites_updated.json b/sites_updated.json index 823216c..cb972d0 100644 --- a/sites_updated.json +++ b/sites_updated.json @@ -1,11 +1,4 @@ { - "Albuquerque Journal": { - "domain": "abqjournal.com", - "allow_cookies": 1, - "block_regex": "\\.abqjournal\\.com\\/.+\\/tncms\\/api\\/access\\..+\\.js", - "cs_dompurify": 1, - "upd_version": "3.4.1.6" - }, "Bloomberg": { "domain": "bloomberg.com", "allow_cookies": 1, @@ -39,13 +32,6 @@ "ld_google_webcache": "div.article-teaser|article", "upd_version": "3.4.2.3" }, - "GaúchaZH": { - "domain": "gauchazh.clicrbs.com.br", - "allow_cookies": 1, - "block_regex": "(\\.piano\\.io\\/api\\/tinypass\\.min\\.js|\\.clicrbs\\.com\\.br\\/paywall-api\\/count\\/)", - "cs_block": 1, - "upd_version": "3.4.1.7" - }, "Groupe Nice-Matin": { "domain": "###_fr_groupe_nice_matin", "group": [ @@ -58,27 +44,6 @@ "cs_code": "[{\"cond\":\"div#poool-widget-content\", \"rm_elem\":1}]", "upd_version": "3.4.3.4" }, - "Groupe Rossel": { - "domain": "###_fr_be_groupe_rossel", - "group": [ - "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" - ], - "allow_cookies": 1, - "block_regex": "\\.qiota\\.com\\/", - "add_ext_link": "div.qiota_reserve, r-panel.r-paywall--header, r-panel.r-panel--paywall|article", - "add_ext_link_type": "archive.is", - "upd_version": "3.4.1.8" - }, "Investsmart.com.au": { "domain": "investsmart.com.au", "allow_cookies": 1, @@ -91,24 +56,6 @@ "ld_json_url": "div.emoxie-pay-wall|div.restricted-content", "upd_version": "3.4.3.6" }, - "Lee Enterprises Group": { - "domain": "###_usa_lee_ent", - "group": [ - "buffalonews.com", - "journalnow.com", - "journalstar.com", - "madison.com", - "nwitimes.com", - "omaha.com", - "richmond.com", - "stltoday.com", - "tucson.com", - "tulsaworld.com" - ], - "allow_cookies": 1, - "block_regex": "\\.com\\/.+\\/tncms\\/api\\/access\\..+\\.js", - "upd_version": "3.4.1.6" - }, "Profil.at": { "domain": "profil.at", "allow_cookies": 1, @@ -123,25 +70,13 @@ "cs_code": "[{\"cond\":\"div.paywalled-content\", \"rm_attrib\":\"class\"}]", "upd_version": "3.4.2.5" }, - "The Diplomat (refresh magazine)": { - "domain": "thediplomat.com", - "useragent": "facebookbot", - "upd_version": "3.4.1.2" - }, "The Economist": { "domain": "economist.com", "allow_cookies": 1, - "block_regex": "\\.tinypass\\.com", + "block_regex": "\\.tinypass\\.com\\/", "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 Globe and Mail": { - "domain": "theglobeandmail.com", - "block_js_inline": "\\.theglobeandmail\\.com\\/.+\\/article-.+\\?rel=premium", - "block_regex": "smartwall\\.theglobeandmail\\.com\\/", - "cs_code": "[{\"cond\":\"html.no-js\", \"rm_class\":\"no-js\"}]", - "upd_version": "3.4.1.7" - }, "The New York Times": { "domain": "nytimes.com", "allow_cookies": 1, @@ -149,22 +84,6 @@ "useragent": "googlebot", "upd_version": "3.1.4.0" }, - "The Toronto Star (+ local TorStar sites)": { - "domain": "###_ca_torstar", - "group": [ - "niagarafallsreview.ca", - "stcatharinesstandard.ca", - "thepeterboroughexaminer.com", - "therecord.com", - "thespec.com", - "thestar.com", - "wellandtribune.ca" - ], - "allow_cookies": 1, - "block_regex": "(\\.{domain}\\/(script|.+\\/tncms\\/api\\/access\\..+)\\.js|cdn\\.ampproject\\.org\\/v\\d\\/amp-access-.+\\.js)", - "cs_dompurify": 1, - "upd_version": "3.4.1.6" - }, "Tiroler Tageszeitung": { "domain": "tt.com", "allow_cookies": 1,