From a2b2537b80611f28147bb65a7eeaf65b84b17ed2 Mon Sep 17 00:00:00 2001 From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com> Date: Mon, 5 Feb 2024 13:41:26 +0100 Subject: [PATCH] Fix Grupo Prensa Iberica (css) --- README.md | 3 +- changelog.txt | 2 + contentScript.js | 15 ++++--- custom/manifest.json | 2 +- manifest.json | 2 +- sites.js | 4 +- sites_updated.json | 98 +++++++++----------------------------------- updates.json | 4 +- 8 files changed, 40 insertions(+), 90 deletions(-) diff --git a/README.md b/README.md index c7e5580..ddf32e3 100644 --- a/README.md +++ b/README.md @@ -815,7 +815,8 @@ Grouped in options:\ [La Nueva España](https://www.lne.es) - [La Provincia](https://www.laprovincia.es) - [Levante-EMV](https://www.levante-emv.com) - -[Mallorca Zeitung](https://www.mallorcazeitung.es)\ +[Mallorca Zeitung](https://www.mallorcazeitung.es) - +[Superdeporte](https://www.superdeporte.es)\ *Grupo Unidad Editorial* sites like\ [El Mundo](https://www.elmundo.es) - [Expansión](https://www.expansion.com) - diff --git a/changelog.txt b/changelog.txt index d86d6a0..e1a0151 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,6 +3,8 @@ Changelog Bypass Paywalls Clean - Firefox Updates (install signed xpi-file): https://gitlab.com/magnolia1234/bypass-paywalls-firefox-clean/-/releases Post-release +Add Superdeporte.es (Grupo Prensa Iberica) +Fix Grupo Prensa Iberica (css) * v3.5.4.0 (2024-02-04) Add BusinessTimes.com.sg & StraitsTimes.com (SPH Media) diff --git a/contentScript.js b/contentScript.js index 0b09728..18714d2 100644 --- a/contentScript.js +++ b/contentScript.js @@ -20,8 +20,8 @@ var de_madsack_domains = ['haz.de', 'kn-online.de', 'ln-online.de', 'lvz.de', 'm var de_mhs_custom_domains = ['cannstatter-zeitung.de', 'esslinger-zeitung.de', 'frankenpost.de', 'insuedthueringen.de', 'krzbb.de', 'kurier.de', 'np-coburg.de']; var de_vrm_domains = ['allgemeine-zeitung.de', 'echo-online.de', 'wiesbadener-kurier.de']; var de_vrm_custom_domains = ['buerstaedter-zeitung.de', 'hochheimer-zeitung.de', 'lampertheimer-zeitung.de', 'lauterbacher-anzeiger.de', 'main-spitze.de', 'mittelhessen.de', 'oberhessische-zeitung.de', 'wormser-zeitung.de']; -var es_epiberica_domains = ['diariodemallorca.es', 'eldia.es', 'elperiodico.com', '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']; +var es_epiberica_domains = ['diariodemallorca.es', 'eldia.es', 'elperiodico.com', 'epe.es', 'farodevigo.es', 'informacion.es', 'laprovincia.es', 'levante-emv.com', 'lne.es', 'mallorcazeitung.es', 'superdeporte.es']; +var es_epiberica_custom_domains = ['diaridegirona.cat', 'diariocordoba.com', 'diariodeibiza.es', 'elcorreogallego.es', 'elperiodicodearagon.com', 'elperiodicoextremadura.com', 'elperiodicomediterraneo.com', 'emporda.info', 'laopinioncoruna.es', 'laopiniondemalaga.es', 'laopiniondemurcia.es', 'laopiniondezamora.es', 'regio7.cat']; var es_grupo_vocento_domains = ['abc.es', '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 fr_be_groupe_rossel = ['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']; @@ -1602,7 +1602,7 @@ else if (matchDomain(es_epiberica_domains) || matchDomain(es_epiberica_custom_do let truncated = document.querySelector('div.article-body--truncated'); if (truncated) truncated.classList.remove('article-body--truncated'); - amp_unhide_access_hide('="NOT access"], [amp-access="FALSE"', '="access"'); + amp_unhide_access_hide('="NOT access"], [amp-access="FALSE"', '="access"', 'amp-ad, amp-embed, span.ad-signature'); } else if (['amp.elperiodico.com', 'amp.epe.es'].includes(window.location.hostname)) { amp_unhide_access_hide('="loggedIn"', '="NOT loggedIn"', 'amp-ad, amp-embed, amp-next-page'); let amp_images = document.querySelectorAll('div > amp-img[src]'); @@ -1613,7 +1613,10 @@ else if (matchDomain(es_epiberica_domains) || matchDomain(es_epiberica_custom_do amp_image.parentNode.replaceChild(elem, amp_image); } } else { - let ads = document.querySelectorAll('div.commercial-up-full__wrapper, div.sidebar--sticky__space, div[data-bbnx-id*="cxense"], div.container-ad'); + let paywall = document.querySelector('div.ft-helper-closenews'); + if (paywall) + paywall.removeAttribute('class'); + let ads = document.querySelectorAll('div.commercial-up-full__wrapper, aside.ft-ad, div[class^="_mo_recs"]'); hideDOMElement(...ads); } } @@ -1647,7 +1650,7 @@ else if (matchDomain('expresso.pt')) { for (let par of pars) { let par_new; if (par.html) { - let doc = parser.parseFromString('
' + DOMPurify.sanitize(par.html) + '
', 'text/html'); + let doc = parser.parseFromString('
' + DOMPurify.sanitize(par.html, dompurify_options) + '
', 'text/html'); par_new = doc.querySelector('div'); } else if (par.type === 'PICTURE') { if (par.urlOriginal) { @@ -1668,7 +1671,7 @@ else if (matchDomain('expresso.pt')) { for (let elem of par.contents) { let elem_new; if (elem.html) { - let doc = parser.parseFromString('
' + DOMPurify.sanitize(elem.html) + '
', 'text/html'); + let doc = parser.parseFromString('
' + DOMPurify.sanitize(elem.html, dompurify_options) + '
', 'text/html'); elem_new = doc.querySelector('div'); } else if (elem.urlOriginal) { elem_new = document.createElement('figure'); diff --git a/custom/manifest.json b/custom/manifest.json index 516a7f3..b30caf6 100644 --- a/custom/manifest.json +++ b/custom/manifest.json @@ -51,5 +51,5 @@ "webRequestBlocking", "*://*/*" ], - "version": "3.5.4.0" + "version": "3.5.4.1" } diff --git a/manifest.json b/manifest.json index 57c4af0..452e775 100644 --- a/manifest.json +++ b/manifest.json @@ -846,5 +846,5 @@ "*://archive.vn/*", "*://webcache.googleusercontent.com/*" ], - "version": "3.5.4.0" + "version": "3.5.4.1" } diff --git a/sites.js b/sites.js index 4bf0923..e370e16 100644 --- a/sites.js +++ b/sites.js @@ -988,7 +988,8 @@ var defaultSites = { "laprovincia.es", "levante-emv.com", "lne.es", - "mallorcazeitung.es" + "mallorcazeitung.es", + "superdeporte.es" ], allow_cookies: 1, block_regex: /(\.piano\.io\/|cdn\.ampproject\.org\/v\d\/amp-access-.+\.js)/ @@ -3000,6 +3001,7 @@ var custom_flex_not = { "###_ca_postmedia": ["canada.com", "canoe.com", "driving.ca"], "###_de_dfv_medien": ["dfv.de"], "###_de_madsack": ["madsack.de", "madsack-medien-campus.de"], + "###_es_epiberica": ["sport.es", "stilo.es"], "###_wp_leaky_paywall": ["epsilontheory.com", "heisenbergreport.com", "investmentnews.com", "thewirechina.com"], "###_uk_axate.io": ["thecricketer.com", "thinkofx.net"], "###_uk_haymarket": ["gpbusiness.co.uk", "scmagazineuk.com", "thecorporatetreasurer.com"], diff --git a/sites_updated.json b/sites_updated.json index fb4cfdb..a1238be 100644 --- a/sites_updated.json +++ b/sites_updated.json @@ -26,13 +26,6 @@ "ld_archive_is": "div.esi-paywall|div.article__premium-content|article>div[style='display:block;']", "upd_version": "3.5.3.7" }, - "Die Zeit": { - "domain": "zeit.de", - "allow_cookies": 1, - "add_ext_link": "aside#paywall|article", - "add_ext_link_type": "archive.is", - "upd_version": "3.5.1.2" - }, "Funke Mediengruppe": { "domain": "###_de_funke_medien", "group": [ @@ -53,6 +46,26 @@ "block_regex": "\\.abril\\.com\\.br\\/.+\\/abril-paywall\\/", "upd_version": "3.5.2.1" }, + "Grupo Prensa Ibérica": { + "domain": "###_es_epiberica", + "group": [ + "diariodemallorca.es", + "eldia.es", + "elperiodico.com", + "epe.es", + "farodevigo.es", + "informacion.es", + "laprovincia.es", + "levante-emv.com", + "lne.es", + "mallorcazeitung.es", + "superdeporte.es" + ], + "allow_cookies": 1, + "block_regex": "(\\.piano\\.io\\/|cdn\\.ampproject\\.org\\/v\\d\\/amp-access-.+\\.js)", + "cs_code": "[{\"cond\":\"div.ft-helper-closenews\", \"rm_attrib\":\"class\"}]", + "upd_version": "3.5.4.1" + }, "Haaretz Group": { "domain": "###_il_haaretz_group", "group": [ @@ -66,40 +79,6 @@ "cs_dompurify": 1, "upd_version": "3.5.2.3" }, - "Hearst Communications magazines": { - "domain": "###_usa_hearst_comm_mag", - "group": [ - "bicycling.com", - "cosmopolitan.com", - "countryliving.com", - "delish.com", - "elle.com", - "elledecor.com", - "esquire.com", - "goodhousekeeping.com", - "harpersbazaar.com", - "housebeautiful.com", - "menshealth.com", - "oprahdaily.com", - "popularmechanics.com", - "prevention.com", - "roadandtrack.com", - "runnersworld.com", - "townandcountrymag.com", - "womenshealthmag.com" - ], - "allow_cookies": 1, - "block_regex": "(\\.com\\/_assets\\/jam\\/|\\.ensighten\\.com\\/.+\\/Bootstrap\\.js)", - "upd_version": "3.5.1.5" - }, - "Het Laatste Nieuws": { - "domain": "hln.be", - "allow_cookies": 1, - "add_ext_link": "div#remaining-paid-content|div.article__body", - "add_ext_link_type": "archive.is", - "block_regex": "temptation\\.hln\\.be\\/temptation\\.js", - "upd_version": "3.5.1.5" - }, "Landwirtschaftsverlag": { "domain": "###_de_lv", "group": [ @@ -116,20 +95,6 @@ ], "upd_version": "3.5.2.4" }, - "Mediahuis Nederland Regional": { - "domain": "###_nl_mediahuis_region", - "group": [ - "gooieneemlander.nl", - "haarlemsdagblad.nl", - "ijmuidercourant.nl", - "leidschdagblad.nl", - "noordhollandsdagblad.nl" - ], - "allow_cookies": 1, - "add_ext_link": "div[data-auth-root='paywall']|article", - "add_ext_link_type": "archive.is", - "upd_version": "3.5.1.4" - }, "Newsweek.pl": { "domain": "newsweek.pl", "allow_cookies": 1, @@ -149,22 +114,6 @@ "ld_archive_is": "div[class*=eas-paywall],div#nocx_paywall_area|main#content", "upd_version": "3.5.3.4" }, - "Stratfor": { - "domain": "stratfor.com", - "allow_cookies": 1, - "useragent": "googlebot", - "upd_version": "3.5.1.8" - }, - "The (New Orleans) Advocate": { - "domain": "###_usa_theadvocate", - "group": [ - "nola.com", - "theadvocate.com" - ], - "allow_cookies": 1, - "block_regex": "(\\.{domain}\\/(script||.+\\/tncms\\/api\\/access\\..+)\\.js|js\\.matheranalytics\\.com\\/)", - "upd_version": "3.5.1.7" - }, "The Lamp Magazine": { "domain": "thelampmagazine.com", "allow_cookies": 1, @@ -195,12 +144,5 @@ "allow_cookies": 1, "block_regex": "(\\.{domain}\\/(script|.+\\/loader-wp\\/static\\/loader\\.min)\\.js)", "upd_version": "3.5.3.2" - }, - "WirtschaftsWoche": { - "domain": "wiwo.de", - "allow_cookies": 1, - "add_ext_link": "div.o-paywall|article", - "add_ext_link_type": "archive.is", - "upd_version": "3.5.1.3" } } diff --git a/updates.json b/updates.json index 6f487f0..9c9f83a 100644 --- a/updates.json +++ b/updates.json @@ -2,8 +2,8 @@ "addons": { "magnolia@12.34": { "updates": [ - { "version": "3.5.3.2", - "update_link": "https://gitlab.com/magnolia1234/bpc-uploads/-/raw/master/bypass_paywalls_clean-3.5.3.2.xpi" } + { "version": "3.5.4.0", + "update_link": "https://gitlab.com/magnolia1234/bpc-uploads/-/raw/master/bypass_paywalls_clean-3.5.4.0.xpi" } ] } }