From cb034d66ad1282091d27f6d158b88cd3476a8b9f Mon Sep 17 00:00:00 2001 From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com> Date: Fri, 30 Jul 2021 19:20:35 +0200 Subject: [PATCH] Add Marca (Spain) --- README.md | 1 + background.js | 11 ++++++----- changelog.txt | 1 + contentScript.js | 9 +++++---- manifest.json | 3 ++- sites.js | 1 + 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 23f3901..d686274 100644 --- a/README.md +++ b/README.md @@ -433,6 +433,7 @@ Mediahuis Nederland Regional sites like [La Provincia](https://www.laprovincia.es) - [La Vanguardia](https://www.lavanguardia.com) - [Levante-EMV](https://www.levante-emv.com) - +[Marca](https://www.marca.com) - [Política Exterior](https://www.politicaexterior.com)\ Grouped in options:\ Grupo Vocento (ABC) regional sites like diff --git a/background.js b/background.js index fdbe000..70bb12c 100644 --- a/background.js +++ b/background.js @@ -63,14 +63,12 @@ var allow_cookies_default = [ 'elconfidencial.com', 'elespanol.com', 'elmercurio.com', - 'elmundo.es', 'elpais.com', 'elperiodico.com', 'entrepreneur.com', 'esprit.presse.fr', 'euobserver.com', 'eurekareport.com.au', - 'expansion.com', 'faz.net', 'financialpost.com', 'fortune.com', @@ -294,13 +292,11 @@ var blockedRegexes = { 'elconfidencial.com': /\.tinypass\.com\//, 'elespanol.com': /\.eestatic\.com\/assets_js\/web\/v\d\/historia.*\.min\.js/, 'elmercurio.com': /\.(elmercurio\.com|emol\.cl)\/(.+\/)?js\/(.+\/)?(modal|merPramV\d|PramModal\.min)\.js/, - 'elmundo.es': /cdn\.ampproject\.org\/v\d\/amp-(access|ad|consent)-.+\.js/, 'elpais.com': /(\.epimg\.net\/js\/.+\/(noticia|user)\.min\.js|\/elpais\.com\/arc\/subs\/p\.min\.js|cdn\.ampproject\.org\/v\d\/amp-(access|(sticky-)?ad|consent)-.+\.js)/, 'elperiodico.com': /cdn\.ampproject\.org\/v\d\/amp-(access|ad|consent)-.+\.js/, 'estadao.com.br': /acesso\.estadao\.com\.br\/paywall\/.+\/pw\.js/, 'estrellavalpo.cl': /(\.mercuriovalpo\.cl\/impresa\/.+\/assets\/(vendor|\d)\.js|pram\.pasedigital\.cl\/API\/User\/Status\?)/, 'exame.com': /\/exame\.com\/.+\/js\/pywll-dyn\.js/, - 'expansion.com': /cdn\.ampproject\.org\/v\d\/amp-(access|ad|consent)-.+\.js/, 'financialpost.com': /\.tinypass\.com\//, 'foreignaffairs.com': /\.foreignaffairs\.com\/sites\/default\/files\/js\/js_[^y].+\.js/, 'foreignpolicy.com': /(cdn\.cxense\.com\/|\.tinypass\.com\/)/, @@ -403,6 +399,7 @@ var blockedRegexes = { // grouped domains (rules only) const au_nine_domains = ['brisbanetimes.com.au', 'smh.com.au', 'theage.com.au', 'watoday.com.au']; const es_epiberica_domains = ['diariodeibiza.es', 'diariodemallorca.es', 'farodevigo.es', 'laprovincia.es', 'levante-emv.com', 'lne.es']; +const es_unidad_domains = ['elmundo.es', 'expansion.com', 'marca.com']; const it_repubblica_domains = ['gelocal.it', 'ilsecoloxix.it', 'lanuovasardegna.it', 'lastampa.it', 'limesonline.com', 'repubblica.it'].concat(['lescienze.it']); const nl_pg_domains = ['parool.nl', 'trouw.nl', 'volkskrant.nl', 'humo.be', 'demorgen.be']; const usa_genomeweb_domains = ['genomeweb.com', '360dx.com', 'precisiononcologynews.com']; @@ -575,6 +572,10 @@ function add_grouped_sites(init_rules) { // rules only for (let domain of au_nine_domains) blockedRegexes[domain] = /cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js/; + for (let domain of es_unidad_domains) { + allow_cookies.push(domain); + blockedRegexes[domain] = /cdn\.ampproject\.org\/v\d\/amp-(access|(sticky-)?ad|consent)-.+\.js/; + } for (let domain of es_epiberica_domains) { allow_cookies.push(domain); blockedRegexes[domain] = /cdn\.ampproject\.org\/v\d\/amp-(access|analytics|consent)-.+\.js/; @@ -1124,7 +1125,7 @@ ext_api.webRequest.onBeforeSendHeaders.addListener(function(details) { let usa_today_site = (matchUrlDomain('gannett-cdn.com', details.url) && matchUrlDomain(['usatoday.com'], header_referer)); allow_ext_source = allow_ext_source || inkl_site || cl_elmerc_site || es_elesp_site || it_repubblica_site || usa_mw_site || usa_natgeo_site || usa_today_site; - bpc_amp_site = (matchUrlDomain('cdn.ampproject.org', details.url) && matchUrlDomain(['asiatimes.com', 'augsburger-allgemeine.de', 'barrons.com', 'belfasttelegraph.co.uk', 'cicero.de', 'cmjornal.pt', 'elmundo.es', 'elpais.com', 'elperiodico.com', 'expansion.com', 'freiepresse.de', 'independent.ie', 'irishtimes.com', 'la-croix.com', 'marketwatch.com', 'nationalreview.com', 'noz.de', 'nwzonline.de', 'scmp.com', 'seekingalpha.com', 'shz.de', 'staradvertiser.com', 'sueddeutsche.de', 'svz.de', 'telegraph.co.uk', 'washingtonpost.com'].concat(au_news_corp_domains, au_nine_domains, de_madsack_domains, es_epiberica_domains, es_grupo_vocento_domains, fr_groupe_ebra_domains, fr_groupe_la_depeche_domains, it_repubblica_domains, usa_mcc_domains, usa_theathletic_domains), header_referer)); + bpc_amp_site = (matchUrlDomain('cdn.ampproject.org', details.url) && matchUrlDomain(['asiatimes.com', 'augsburger-allgemeine.de', 'barrons.com', 'belfasttelegraph.co.uk', 'cicero.de', 'cmjornal.pt', 'elpais.com', 'elperiodico.com', 'freiepresse.de', 'independent.ie', 'irishtimes.com', 'la-croix.com', 'marketwatch.com', 'nationalreview.com', 'noz.de', 'nwzonline.de', 'scmp.com', 'seekingalpha.com', 'shz.de', 'staradvertiser.com', 'sueddeutsche.de', 'svz.de', 'telegraph.co.uk', 'washingtonpost.com'].concat(au_news_corp_domains, au_nine_domains, de_madsack_domains, es_epiberica_domains, es_grupo_vocento_domains, es_unidad_domains, fr_groupe_ebra_domains, fr_groupe_la_depeche_domains, it_repubblica_domains, usa_mcc_domains, usa_theathletic_domains), header_referer)); } if (!isSiteEnabled(details) && !allow_ext_source && !bpc_amp_site && !au_apn_site && !au_swm_site) { diff --git a/changelog.txt b/changelog.txt index 44515b5..a74ca26 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,7 @@ Changelog Bypass Paywalls Clean - Firefox Post-release +Add Marca (Spain) Grouping Quotidiano.net sites (Italy) Remove Le Un (obsolete) Fix Commentary Magazine (new domain) diff --git a/contentScript.js b/contentScript.js index e3e73e7..5556cff 100644 --- a/contentScript.js +++ b/contentScript.js @@ -9,6 +9,7 @@ var de_funke_media_domains = ['abendblatt.de', 'braunschweiger-zeitung.de', 'mor var de_madsack_domains = ['haz.de', 'kn-online.de', 'ln-online.de', 'lvz.de', 'maz-online.de', 'neuepresse.de', 'ostsee-zeitung.de']; var es_epiberica_domains = ['diariodeibiza.es', 'diariodemallorca.es', 'farodevigo.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']; var fi_alma_talent_domains = ['arvopaperi.fi', 'kauppalehti.fi', 'marmai.fi', 'mediuutiset.fi', 'mikrobitti.fi', 'talouselama.fi', 'tekniikkatalous.fi', 'tivi.fi', 'uusisuomi.fi']; var fr_groupe_ebra_domains = ['bienpublic.com', 'dna.fr', 'estrepublicain.fr', 'lalsace.fr', 'ledauphine.com', 'lejsl.com', 'leprogres.fr', 'republicain-lorrain.fr', 'vosgesmatin.fr']; var fr_groupe_la_depeche_domains = ['centrepresseaveyron.fr', 'ladepeche.fr', 'lindependant.fr', 'midi-olympique.fr', 'midilibre.fr', 'nrpyrenees.fr', 'petitbleu.fr']; @@ -22,7 +23,7 @@ var usa_mcc_domains = ['bnd.com', 'charlotteobserver.com', 'fresnobee.com', 'kan 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 = ['augsburger-allgemeine.de', 'charliehebdo.fr', 'cmjornal.pt', 'elmundo.es', 'expansion.com', 'houstonchronicle.com', 'irishtimes.com', 'kurier.at', 'nknews.org', 'seekingalpha.com', 'sfchronicle.com', 'thehindu.com', 'thetimes.co.uk'].concat(no_nhst_media_domains); +var arr_localstorage_hold = ['augsburger-allgemeine.de', 'charliehebdo.fr', 'cmjornal.pt', 'houstonchronicle.com', 'irishtimes.com', 'kurier.at', 'nknews.org', 'seekingalpha.com', 'sfchronicle.com', 'thehindu.com', 'thetimes.co.uk'].concat(es_unidad_domains, no_nhst_media_domains); arr_localstorage_hold = arr_localstorage_hold.concat(de_funke_media_domains, es_grupo_vocento_domains); if (!matchDomain(arr_localstorage_hold)) { window.localStorage.clear(); @@ -576,7 +577,7 @@ else if ((domain = matchDomain(de_madsack_domains)) || document.querySelector('l else csDone = true; -} else if (window.location.hostname.match(/\.(es|pt)$/) || matchDomain(['diariovasco.com', 'elconfidencial.com', 'elcorreo.com', 'elespanol.com', 'elpais.com', 'elperiodico.com', 'expansion.com', 'larioja.com', 'lavanguardia.com', 'levante-emv.com', 'politicaexterior.com'])) {//spain/portugal +} else if (window.location.hostname.match(/\.(es|pt)$/) || matchDomain(['diariovasco.com', 'elconfidencial.com', 'elcorreo.com', 'elespanol.com', 'elpais.com', 'elperiodico.com', 'expansion.com', 'larioja.com', 'lavanguardia.com', 'levante-emv.com', 'marca.com', 'politicaexterior.com'])) {//spain/portugal if (matchDomain('cmjornal.pt')) { let paywall = document.querySelector('.bloqueio_exclusivos'); @@ -612,7 +613,7 @@ else if (matchDomain('elespanol.com')) { removeDOMElement(...adverts); } -else if (domain = matchDomain(['elmundo.es', 'expansion.com'])) { +else if (domain = matchDomain(es_unidad_domains)) { let premium = document.querySelector('.ue-c-article__premium'); let url = window.location.href; if (!url.includes('/amp.' + domain + '/')) { @@ -629,7 +630,7 @@ else if (domain = matchDomain(['elmundo.es', 'expansion.com'])) { div_hidden.removeAttribute('amp-access-hide'); } } - let adverts = document.querySelectorAll('.advertising, amp-embed'); + let adverts = document.querySelectorAll('.advertising, amp-embed, amp-ad'); removeDOMElement(...adverts); } } diff --git a/manifest.json b/manifest.json index 12ef454..0887c9e 100644 --- a/manifest.json +++ b/manifest.json @@ -303,6 +303,7 @@ "*://*.lrb.co.uk/*", "*://*.lunion.fr/*", "*://*.lvz.de/*", + "*://*.marca.com/*", "*://*.marketwatch.com/*", "*://*.marmai.fi/*", "*://*.maz-online.de/*", @@ -538,5 +539,5 @@ "*://*.wallkit.net/*", "*://*.wsj.net/*" ], - "version": "2.3.0.6" + "version": "2.3.0.7" } \ No newline at end of file diff --git a/sites.js b/sites.js index cc27226..c505152 100644 --- a/sites.js +++ b/sites.js @@ -159,6 +159,7 @@ var defaultSites = "Los Angeles Business Journal": "labusinessjournal.com", "Los Angeles Times": "latimes.com", "Madsack Mediengruppe (Germany)": "###_de_madsack", + "Marca": "marca.com", "MarketWatch": "marketwatch.com", "McClatchy Group": "###_usa_mcc", "Mediahuis Nederland Regional": "###_nl_mediahuis_region",