From a1e49fe9017dc0569e47ad03766488ffabb14afc Mon Sep 17 00:00:00 2001 From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com> Date: Sun, 12 Dec 2021 18:32:28 +0100 Subject: [PATCH] Fix elDiario.es, El Espanol, Estadao.com.br, Grupo Abril & Folha de S. Paulo (amp) --- changelog.txt | 3 ++- contentScript.js | 44 ++++++++++++++++++++++++++++++++++++-------- sites.js | 15 ++++++++------- 3 files changed, 46 insertions(+), 16 deletions(-) diff --git a/changelog.txt b/changelog.txt index 3cc0af1..d98e4dd 100644 --- a/changelog.txt +++ b/changelog.txt @@ -9,12 +9,13 @@ Fix Bloomberg Quint (bq blue) Fix Inkl (images) Fix Lecho.be (separate from Groupe Rossel) Fix Repubblica sites (no amp) -Fix amp: ABC.es +Fix amp: ABC.es, elDiario.es & El Espanol Fix amp: Artnet, Billboard, Digiday, Fortune, Lee Enterprises Group, Newsday, The Boston Globe, The Dallas Morning News & Vanity Fair Fix amp: Los Angeles Times & San Diego Union-Tribune Fix amp: USA Today & Gannett Group Fix amp: Challenges.fr, Elle.fr, L'Opinion.fr & Science et Vie Fix amp: Corriere della Sera, Il Messaggero & Quotidiano.net +Fix amp: Estadao.com.br, Grupo Abril & Folha de S. Paulo Fix amp: ET Prime & LiveMint Fix amp: Funke Mediengruppe diff --git a/contentScript.js b/contentScript.js index 4d96ece..3469af7 100644 --- a/contentScript.js +++ b/contentScript.js @@ -681,9 +681,19 @@ else if (matchDomain('elconfidencial.com')) { premium.classList.remove('newsType__content--closed'); } +else if (matchDomain('eldiario.es')) { + if (window.location.pathname.endsWith('.amp.html')) { + amp_unhide_access_hide('^="access"'); + } +} + else if (matchDomain('elespanol.com')) { - let adverts = document.querySelectorAll('[id*="superior"], [class*="adv"]'); - removeDOMElement(...adverts); + if (window.location.pathname.endsWith('.amp.html')) { + amp_unhide_subscr_section('amp-ad, amp-embed'); + } else { + let adverts = document.querySelectorAll('[id*="superior"], [class*="adv"]'); + removeDOMElement(...adverts); + } } else if (domain = matchDomain(es_unidad_domains)) { @@ -797,6 +807,8 @@ else if (matchDomain('observador.pt')) { let paywall = document.querySelector('.premium-article'); if (paywall) paywall.classList.remove('premium-article'); + let amp_ads = document.querySelectorAll('amp-ad'); + removeDOMElement(... amp_ads) } else if (matchDomain('politicaexterior.com')) { @@ -1119,7 +1131,7 @@ else if (matchDomain(it_ilmessaggero_domains)) { else if (matchDomain(it_quotidiano_domains)) { if (window.location.pathname.endsWith('/amp')) { - amp_unhide_access_hide('="c.customGranted"', '="NOT c.customGranted"'); + amp_unhide_access_hide('="c.customGranted"', '="NOT c.customGranted"', 'amp-ad, amp-fx-flying-carpet'); } else { let detail_text_truncated = document.querySelector('div.detail-text--truncated'); let detail_page_paywall = document.querySelector('body.detail-page--paywall'); @@ -1516,7 +1528,15 @@ else if (!matchDomain(['belfasttelegraph.co.uk', 'independent.ie'])) } else if (window.location.hostname.match(/\.(br|cl|pe)$/) || matchDomain(['elmercurio.com', 'latercera.com', 'lasegunda.com', 'valor.globo.com'])) {//south america -if (matchDomain(['elcomercio.pe', 'gestion.pe'])) { +if (matchDomain('abril.com.br')) { + if (window.location.pathname.endsWith('/amp/')) { + let paywall = document.querySelector('.piano-modal'); + let amp_ads = document.querySelectorAll('amp-ad, amp-embed'); + removeDOMElement(paywall, ...amp_ads); + } +} + +else if (matchDomain(['elcomercio.pe', 'gestion.pe'])) { let paywall = document.querySelector('.story-content__nota-premium'); if (paywall) { paywall.classList.remove('story-content__nota-premium'); @@ -1541,13 +1561,21 @@ else if (matchDomain('elmercurio.com')) { } else if (matchDomain('estadao.com.br')) { - let paywall = document.getElementById('paywall-wrapper-iframe-estadao'); - removeDOMElement(paywall); + if (window.location.pathname.endsWith('.amp')) { + amp_unhide_access_hide('="granted"', '="NOT granted"'); + } else { + let paywall = document.getElementById('paywall-wrapper-iframe-estadao'); + removeDOMElement(paywall); + } } else if (matchDomain('folha.uol.com.br')) { - let signup = document.querySelector('.c-top-signup'); - removeDOMElement(signup); + if (window.location.pathname.startsWith('/amp/')) { + amp_unhide_subscr_section('amp-ad, amp-sticky-ad, amp-embed'); + } else { + let signup = document.querySelector('.c-top-signup'); + removeDOMElement(signup); + } } else if (matchDomain('latercera.com')) { diff --git a/sites.js b/sites.js index 6d1f085..5429bcd 100644 --- a/sites.js +++ b/sites.js @@ -348,12 +348,13 @@ var defaultSites = { block_regex: /\.tinypass\.com\// }, "El Diario.es": { - domain: "eldiario.es" + domain: "eldiario.es", + block_regex: /cdn\.ampproject\.org\/v\d\/amp-(access|(sticky-)?ad|consent)-.+\.js/ }, "El Español": { domain: "elespanol.com", allow_cookies: 1, - block_regex: /\.eestatic\.com\/assets_js\/web\/v\d\/historia.*\.min\.js/ + block_regex: /(\.eestatic\.com\/assets_js\/web\/v\d\/historia.*\.min\.js|cdn\.ampproject\.org\/v\d\/amp-(access|(sticky-)?ad|consent|subscriptions)-.+\.js)/ }, "El Mercurio": { domain: "elmercurio.com", @@ -443,7 +444,7 @@ var defaultSites = { "blogfolha.uol.com.br" ], allow_cookies: 1, - block_regex: /(\.folha\.uol\.com\.br\/paywall\/js\/.+\/publicidade\.ads\.js|paywall\.folha\.uol\.com\.br\/|js\.matheranalytics\.com\/)/ + block_regex: /(\.folha\.uol\.com\.br\/paywall\/js\/.+\/publicidade\.ads\.js|paywall\.folha\.uol\.com\.br\/|js\.matheranalytics\.com\/|cdn\.ampproject\.org\/v\d\/amp-((sticky-)?ad|subscriptions)-.+\.js)/ }, "Follow the Money (ftm.nl)": { domain: "ftm.nl", @@ -595,7 +596,7 @@ var defaultSites = { "Grupo Abril": { domain: "abril.com.br", allow_cookies: 1, - block_regex: /\.abril\.com\.br\/.+\/abril-paywall\/js\/abril-paywall\.js/ + block_regex: /(\.abril\.com\.br\/.+\/abril-paywall\/js\/abril-paywall\.js|cdn\.ampproject\.org\/v\d\/amp-((sticky-)?ad|subscriptions)-.+\.js)/ }, "Grupo Prensa Ibérica": { domain: "###_es_epiberica", @@ -1115,7 +1116,7 @@ var defaultSites = { }, "O Estado de S. Paulo": { domain: "estadao.com.br", - block_regex: /acesso\.estadao\.com\.br\/paywall\/.+\/.+\.js/ + block_regex: /(acesso\.estadao\.com\.br\/paywall\/.+\/.+\.js|cdn\.ampproject\.org\/v\d\/amp-(access|ad|consent|fx-flying-carpet)-.+\.js)/ }, "O Globo (& Valor Econômico)": { domain: "globo.com", @@ -1124,7 +1125,7 @@ var defaultSites = { "Observador.pt": { domain: "observador.pt", allow_cookies: 1, - block_regex: /\.tinypass\.com\// + block_regex: /(\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-((sticky-)?ad|subscriptions)-.+\.js)/ }, "Palo Alto Online": { domain: "paloaltoonline.com" @@ -1182,7 +1183,7 @@ var defaultSites = { "quotidiano.net" ], allow_cookies: 1, - block_regex: /(cdn\.cxense\.com\/|\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-(access|(sticky-)?ad|consent)-.+\.js)/ + block_regex: /(cdn\.cxense\.com\/|\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-(access|(sticky-)?ad|consent|fx-flying-carpet)-.+\.js)/ }, "Reuters": { domain: "reuters.com",