diff --git a/README.md b/README.md index d934d5a0..604b6e97 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ If you want to install the latest [master ZIP-file from GitLab](https://gitlab.c Or load a temporary add-on in regular Firefox (go to about:debugging#/runtime/this-firefox & load manifest.json from unpacked folder (of master-zip)). By default BPC has limited host permissions, but you can opt-in to enable custom sites (and also clear cookies/block general paywall-scripts for non-listed sites). You can also just request permissions for the custom sites you added yourself (or click `clear cookies` (BPC-icon) to ask for permission for current site).\ -You can also install the custom add-on version (with host permissions for all sites): [Bypass Paywalls Clean (c)](https://addons.mozilla.org/firefox/addon/bypass-paywalls-clean) +You can also install the custom add-on version (with host permissions for all sites): [Bypass Paywalls Clean (c)](https://addons.mozilla.org/firefox/addon/bypass-paywalls-clean-custom) ### Update Check for updates (in about:addons) and allow permissions for newly supported sites (else no update will be installed).\ @@ -492,9 +492,8 @@ Grouped in options:\ [Golem.de](https://www.golem.de) - [Kölner Stadt-Anzeiger](https://www.ksta.de) - [Kölnische Rundschau](https://www.rundschau-online.de) - -[Krautreporter.de](https://krautreporter.de) - +[Krautreporter](https://krautreporter.de) - [Mitteldeutsche Zeitung](https://www.mz.de) - -[Münstersche Zeitung](https://www.muensterschezeitung.de) - [Neue Osnabrücker Zeitung](https://www.noz.de) - [Nordwest Zeitung](https://www.nwzonline.de) - [Nürnberger Nachrichten](https://www.nn.de) - @@ -503,9 +502,7 @@ Grouped in options:\ [Schleswig-Holsteinischer Zeitungsverlag](https://www.shz.de) - [Schweriner Volkszeitung](https://www.svz.de) - [Volksstimme](https://www.volksstimme.de) - -[Westdeutsche Zeitung](https://www.wz.de) - -[Westfalen-Blatt](https://www.westfalen-blatt.de) - -[Westfälische Nachrichten](https://www.wn.de) +[Westdeutsche Zeitung](https://www.wz.de) Grouped in options:\ *Funke Mediengruppe* sites like (opt-in to custom sites for unlisted)\ @@ -527,7 +524,11 @@ Grouped in options:\ [Märkische Allgemeine](https://www.maz-online.de) - [Neue Presse (Hannover)](https://www.neuepresse.de) - [Ostsee-Zeitung](https://www.ostsee-zeitung.de) - -[RedaktionsNetzwerk Deutschland](https://www.rnd.de) +[RedaktionsNetzwerk Deutschland](https://www.rnd.de)\ +*Westfälische Mediengruppe* sites like\ +[Münstersche Zeitung](https://www.muensterschezeitung.de) - +[Westfalen-Blatt](https://www.westfalen-blatt.de) - +[Westfälische Nachrichten](https://www.wn.de) ##### Italy [Corriere della Sera](https://www.corriere.it) - diff --git a/background.js b/background.js index 806f9b32..7263541f 100644 --- a/background.js +++ b/background.js @@ -5,7 +5,7 @@ var manifestData = ext_api.runtime.getManifest(); var ext_name = manifestData.name; var ext_version = manifestData.version; -const cs_limit_except = ['elespanol.com', 'faz.net', 'nation.africa', 'nationalgeographic.com', 'thetimes.co.uk']; +const cs_limit_except = ['elespanol.com', 'faz.net', 'nation.africa', 'nationalgeographic.com', 'thetimes.co.uk'].concat(de_westfalen_medien_domains); const dompurify_sites = ['asiatimes.com', 'bloomberg.com', 'cicero.de', 'economictimes.com', 'golem.de', 'hs.fi', 'ilmanifesto.it', 'iltalehti.fi', 'iltirreno.it', 'ipolitics.ca', 'italiaoggi.it', 'lanuovasardegna.it', 'lesechos.fr', 'limburger.nl', 'marianne.net', 'newleftreview.org', 'nzherald.co.nz', 'outlookbusiness.com', 'prospectmagazine.co.uk', 'stratfor.com', 'tagesspiegel.de', 'techinasia.com', 'theathletic.com', 'timesofindia.com', 'vn.nl'].concat(be_mediahuis_domains, nl_mediahuis_region_domains, no_nhst_media_domains); var currentTabUrl = ''; var csDone = false; diff --git a/changelog.txt b/changelog.txt index 6dfef873..e077946c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -7,6 +7,7 @@ Add Standaard.be Add SuomenSotilas.fi Add Tagesspiegel.de Fix The Athletic (amp) +Grouping Westfaelische Mediengruppe Redirect Google AMP cache (opt-in to custom sites) Update block general paywall script (limit Evolok WordPress) Update custom sites (load text from Google webcache) diff --git a/contentScript.js b/contentScript.js index 310f675a..0d52b6e2 100644 --- a/contentScript.js +++ b/contentScript.js @@ -7,9 +7,10 @@ var dompurify_loaded = (typeof DOMPurify === 'function'); 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_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_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', '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 = ['diaridegirona.cat', 'diariocordoba.com', 'diariodeibiza.es', 'diariodemallorca.es', 'eldia.es', 'elperiodicodearagon.com', 'elperiodicoextremadura.com', 'elperiodicomediterraneo.com', 'emporda.info', 'epe.es', 'farodevigo.es', 'informacion.es', 'laopinioncoruna.es', 'laopiniondemalaga.es', 'laopiniondemurcia.es', 'laopiniondezamora.es', 'laprovincia.es', 'levante-emv.com', 'lne.es', 'mallorcazeitung.es', 'regio7.cat']; 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']; @@ -38,7 +39,7 @@ var usa_outside_mag_domains = ["backpacker.com", "betamtb.com", "betternutrition var usa_tribune_domains = ['baltimoresun.com', 'chicagotribune.com', 'courant.com', 'dailypress.com', 'mcall.com', 'nydailynews.com', 'orlandosentinel.com', 'pilotonline.com', 'sun-sentinel.com']; // clean local storage of sites (with an exemption for hold-list) -var arr_localstorage_hold = ['abc.es', 'allgaeuer-zeitung.de', 'augsburger-allgemeine.de', 'barrons.com', 'businessoffashion.com', 'challenges.fr', 'charliehebdo.fr', 'cmjornal.pt', 'corriere.it', 'corrieredellosport.it', 'eldiario.es', 'elespanol.com', 'elle.fr', 'elpais.com', 'elperiodico.com', 'enotes.com', 'estadao.com.br', 'forbes.com', 'fortune.com', 'freiepresse.de', 'ilfoglio.it', 'inc42.com', 'lanouvellerepublique.fr', 'lesechos.fr', 'mid-day.com', 'muensterschezeitung.de', 'nytimes.com', 'nzherald.co.nz', 'scmp.com', 'seekingalpha.com', 'telegraph.co.uk', 'thehindu.com', 'thetimes.co.uk', 'westfalen-blatt.de', 'wn.de', 'wsj.com'].concat(de_funke_media_domains, es_epiberica_domains, es_grupo_vocento_domains, es_unidad_domains, fr_groupe_ebra_domains, fr_groupe_la_depeche_domains, fr_groupe_nice_matin_domains, it_quotidiano_domains, ca_gcm_domains, nl_pg_domains, no_nhst_media_domains, usa_hearst_comm_domains); +var arr_localstorage_hold = ['abc.es', 'allgaeuer-zeitung.de', 'augsburger-allgemeine.de', 'barrons.com', 'businessoffashion.com', 'challenges.fr', 'charliehebdo.fr', 'cmjornal.pt', 'corriere.it', 'corrieredellosport.it', 'eldiario.es', 'elespanol.com', 'elle.fr', 'elpais.com', 'elperiodico.com', 'enotes.com', 'estadao.com.br', 'forbes.com', 'fortune.com', 'freiepresse.de', 'ilfoglio.it', 'inc42.com', 'lanouvellerepublique.fr', 'lesechos.fr', 'mid-day.com', 'nytimes.com', 'nzherald.co.nz', 'scmp.com', 'seekingalpha.com', 'telegraph.co.uk', 'thehindu.com', 'thetimes.co.uk', 'wsj.com'].concat(de_funke_medien_domains, de_westfalen_medien_domains, es_epiberica_domains, es_grupo_vocento_domains, es_unidad_domains, fr_groupe_ebra_domains, fr_groupe_la_depeche_domains, fr_groupe_nice_matin_domains, it_quotidiano_domains, ca_gcm_domains, nl_pg_domains, no_nhst_media_domains, usa_hearst_comm_domains); if (!matchDomain(arr_localstorage_hold)) { window.localStorage.clear(); } @@ -518,13 +519,6 @@ else if (matchDomain('cicero.de')) { removeDOMElement(...urban_ad_sign); } -else if (matchDomain(de_funke_media_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('faz.net')) { if (matchDomain('zeitung.faz.net')) { let paywall_z = document.querySelector('.c-red-carpet'); @@ -740,25 +734,28 @@ else if (matchDomain('tagesspiegel.de')) { } } -else if (matchDomain(['westfalen-blatt.de', 'wn.de', 'muensterschezeitung.de'])) { +else if (matchDomain(de_westfalen_medien_domains)) { let url = window.location.href; if (url.includes('/amp/')) { amp_unhide_subscr_section('amp-ad, amp-embed, section[class^="fp-ad"]'); } else { - let paywall = document.querySelector('.fp-article-paywall-dialog, .fp-article-paywall'); + let paywall = document.querySelector('.fp-article-paywall'); + let amphtml = document.querySelector('link[rel="amphtml"]'); if (paywall) { removeDOMElement(paywall); - let gallery_no_amp = false; - if (matchDomain('westfalen-blatt.de')) { - let article_body = document.querySelector('.fp-article__body'); - gallery_no_amp = url.includes('/fotos/') || (!article_body && document.querySelector('.fp-gallery-carousel')); - } - if (!gallery_no_amp) - window.location.href = url.replace('.de/', '.de/amp/'); + if (amphtml) + window.location.href = amphtml.href; } } } +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_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'); diff --git a/sites.js b/sites.js index 636d7f26..df82ddcb 100644 --- a/sites.js +++ b/sites.js @@ -1258,11 +1258,6 @@ var defaultSites = { "Mountain View Voice": { domain: "mv-voice.com" }, - "Münstersche Zeitung": { - allow_cookies: 1, - domain: "muensterschezeitung.de", - block_regex: /cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js/ - }, "National Geographic USA": { domain: "nationalgeographic.com", allow_cookies: 1, @@ -2010,17 +2005,15 @@ var defaultSites = { domain: "wz.de", useragent: "googlebot" }, - "Westfalen-Blatt": { - domain: "westfalen-blatt.de", + "Westfälische Mediengruppe": { + domain: "###_de_westfalen_medien", + group: [ + "muensterschezeitung.de", + "westfalen-blatt.de", + "wn.de" + ], allow_cookies: 1, - block_regex: /cdn\.ampproject\.org\/.+\/v\d\/amp-subscriptions-.+\.js/, - useragent: "googlebot" - }, - "Westfälische Nachrichten": { - domain: "wn.de", - allow_cookies: 1, - block_regex: /cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js/, - useragent: "googlebot" + block_regex: /cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js/ }, "Winnipeg Free Press": { domain: "winnipegfreepress.com", diff --git a/sites_updated.json b/sites_updated.json index 8979cdf6..2c07158f 100644 --- a/sites_updated.json +++ b/sites_updated.json @@ -9,24 +9,6 @@ } ] }, - "Folha de S. Paulo": { - "domain": "###_br_folha", - "group": [ - "folha.uol.com.br", - "blogfolha.uol.com.br" - ], - "allow_cookies": 1, - "block_regex": "(\\.folha\\.uol\\.com\\.br\\/paywall\\/js\\/|paywall\\.folha\\.uol\\.com\\.br\\/|js\\.matheranalytics\\.com\\/|cdn\\.ampproject\\.org\\/v\\d\\/amp-subscriptions-.+\\.js)", - "useragent": "googlebot", - "amp_redirect": { - "paywall": ".revista--interna__assineonly" - }, - "amp_unhide": 1 - }, - "Foreign Affairs": { - "domain": "foreignaffairs.com", - "block_regex": "\\.foreignaffairs\\.com\\/modules\\/custom\\/fa_paywall_js\\/js\\/paywall\\.js" - }, "Irish Independent (setCookie opt-in)": { "domain": "independent.ie", "allow_cookies": 1, @@ -37,41 +19,12 @@ } ] }, - "Krautreporter.de": { - "domain": "krautreporter.de", - "cs_code": [{ - "cond": ".js-article-paywall", - "rm_elem": 1, - "elems": [{ - "cond": ".js-paywall-divider", - "rm_elem": 1 - }, { - "cond": "#steady-checkout", - "rm_elem": 1 - }, { - "cond": ".blurred", - "rm_class": "blurred" - } - ] - } - ] - }, "Law.com (free articles only)": { "domain": "law.com", "allow_cookies": 1, "remove_cookies": 1, "referer": "facebook" }, - "Le Devoir": { - "domain": "ledevoir.com", - "block_regex": "\\.tinypass\\.com\\/", - "remove_cookies_select_drop": ["pw6"] - }, - "Saltwire Network": { - "domain": "saltwire.com", - "allow_cookies": 1, - "block_regex": "\\/loader-cdn\\.azureedge\\.net\\/" - }, "Suomen Sotilas": { "domain": "suomensotilas.fi", "allow_cookies": 1,