From 1b37be288fa09606114d72867ef9117d1e2da5d7 Mon Sep 17 00:00:00 2001 From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com> Date: Wed, 28 Apr 2021 21:45:57 +0200 Subject: [PATCH] Add Levante-EMV (Spain) --- README.md | 1 + background.js | 8 +++++--- changelog.txt | 1 + contentScript.js | 30 ++++++++++++++++++------------ manifest.json | 3 ++- sites.js | 1 + 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index e45f3ca9..50543dec 100644 --- a/README.md +++ b/README.md @@ -409,6 +409,7 @@ Grouped in options:\ [La Nueva España](https://www.lne.es) - [La Provincia](https://www.laprovincia.es) - [La Vanguardia](https://www.lavanguardia.com) - +[Levante-EMV](https://www.levante-emv.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 b72ade07..cd67a555 100644 --- a/background.js +++ b/background.js @@ -396,7 +396,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']; +const es_epiberica_domains = ['diariodeibiza.es', 'diariodemallorca.es', 'farodevigo.es', 'laprovincia.es', 'levante-emv.com']; const it_repubblica_domains = ['gelocal.it', 'ilsecoloxix.it', 'lanuovasardegna.it', 'lastampa.it', 'limesonline.com', 'repubblica.it']; const nl_pg_domains = ['parool.nl', 'trouw.nl', 'volkskrant.nl', 'humo.be', 'demorgen.be']; @@ -526,8 +526,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_epiberica_domains) + for (let domain of es_epiberica_domains) { allow_cookies.push(domain); + blockedRegexes[domain] = /cdn\.ampproject\.org\/v\d\/amp-access-.+\.js/; + } for (let domain of it_repubblica_domains) { allow_cookies.push(domain); blockedRegexes[domain] = /(scripts\.repubblica\.it\/pw\/pw\.js|cdn\.ampproject\.org\/v\d\/amp-(access|ad|user-notification)-.+\.js)/; @@ -1014,7 +1016,7 @@ ext_api.webRequest.onBeforeSendHeaders.addListener(function(details) { let usa_mw_site = (matchUrlDomain('wsj.net', details.url) && matchUrlDomain('marketwatch.com', header_referer)); allow_ext_source = allow_ext_source || inkl_site || cl_elmerc_site || es_elesp_site || it_repubblica_site || uk_nlr_site || usa_discmag_site || usa_mw_site; - bpc_amp_site = (matchUrlDomain('cdn.ampproject.org', details.url) && matchUrlDomain(['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', 'lne.es', 'marketwatch.com', 'nationalreview.com', 'noz.de', 'nwzonline.de', 'seekingalpha.com', 'shz.de', 'sueddeutsche.de', 'svz.de', 'telegraph.co.uk'].concat(au_news_corp_domains, au_nine_domains, de_madsack_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(['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', 'lne.es', 'marketwatch.com', 'nationalreview.com', 'noz.de', 'nwzonline.de', 'seekingalpha.com', 'shz.de', 'sueddeutsche.de', 'svz.de', 'telegraph.co.uk'].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)); } if (!isSiteEnabled(details) && !allow_ext_source && !bpc_amp_site && !au_apn_site && !au_swm_site) { diff --git a/changelog.txt b/changelog.txt index 26748eba..e91d9746 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,7 @@ Changelog Bypass Paywalls Clean - Firefox Post-release +Add Levante-EMV (Spain) Add The New Atlantis * v2.1.8.0 (2021-04-25) diff --git a/contentScript.js b/contentScript.js index ba4bbf49..bb0883e5 100644 --- a/contentScript.js +++ b/contentScript.js @@ -6,7 +6,7 @@ var csDone = false; 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 es_epiberica_domains = ['diariodeibiza.es', 'diariodemallorca.es', 'farodevigo.es', 'laprovincia.es']; +var es_epiberica_domains = ['diariodeibiza.es', 'diariodemallorca.es', 'farodevigo.es', 'laprovincia.es', 'levante-emv.com']; var es_grupo_vocento_domains = ['diariosur.es', 'diariovasco.com', 'elcomercio.es', 'elcorreo.com', 'eldiariomontanes.es', 'elnortedecastilla.es', 'hoy.es', 'ideal.es', 'larioja.com', 'laverdad.es', 'lavozdigital.es']; 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']; @@ -551,7 +551,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', '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', 'politicaexterior.com'])) {//spain/portugal if (matchDomain('cmjornal.pt')) { let paywall = document.querySelector('.bloqueio_exclusivos'); @@ -688,16 +688,22 @@ else if (matchDomain(es_grupo_vocento_domains)) { } else if (matchDomain(es_epiberica_domains)) { - let truncated = document.querySelector('div.article-body--truncated'); - if (truncated) - truncated.classList.remove('article-body--truncated'); - let div_hidden = document.querySelector('div.baldomero'); - if (div_hidden) - div_hidden.classList.remove('baldomero'); - window.setTimeout(function () { - let paywall = document.querySelector('div.paywall'); - removeDOMElement(paywall); - }, 500); // Delay (in milliseconds) + if (window.location.href.includes('.amp.html')) { + let div_hidden = document.querySelectorAll('div[amp-access="access"]'); + for (let elem of div_hidden) + elem.removeAttribute('amp-access-hide'); + } else { + let truncated = document.querySelector('div.article-body--truncated'); + if (truncated) + truncated.classList.remove('article-body--truncated'); + let div_hidden = document.querySelector('div.baldomero'); + if (div_hidden) + div_hidden.classList.remove('baldomero'); + window.setTimeout(function () { + let paywall = document.querySelector('div.paywall'); + removeDOMElement(paywall); + }, 500); // Delay (in milliseconds) + } } else if (matchDomain('lavanguardia.com')) { diff --git a/manifest.json b/manifest.json index 3f1c9f40..cd7c8310 100644 --- a/manifest.json +++ b/manifest.json @@ -261,6 +261,7 @@ "*://*.lesoir.be/*", "*://*.lest-eclair.fr/*", "*://*.letelegramme.fr/*", + "*://*.levante-emv.com/*", "*://*.lexpress.fr/*", "*://*.liberation-champagne.fr/*", "*://*.liberation.fr/*", @@ -503,5 +504,5 @@ "*://*.wallkit.net/*", "*://*.wsj.net/*" ], - "version": "2.1.8.1" + "version": "2.1.8.2" } \ No newline at end of file diff --git a/sites.js b/sites.js index 4e6af3c7..30d43032 100644 --- a/sites.js +++ b/sites.js @@ -148,6 +148,7 @@ var defaultSites = "Le Un": "le1hebdo.fr", "Leeuwarder Courant": "lc.nl", "Les Échos": "lesechos.fr", + "Levante-EMV": "levante-emv.com", "Libération (free articles only)": "liberation.fr", "LimesOnline": "limesonline.com", "LiveMint": "livemint.com",