diff --git a/README.md b/README.md index 31d59d9..9450a02 100755 --- a/README.md +++ b/README.md @@ -410,7 +410,7 @@ Grouped in options:\ [GElocal.it](https://quotidiani.gelocal.it) - [Il Fatto Quotidiano](https://www.ilfattoquotidiano.it) - [Il Manifesto](https://ilmanifesto.it) - -[[Il Secolo XIX](https://www.ilsecoloxix.it) - +[Il Secolo XIX](https://www.ilsecoloxix.it) - [La Nuova Sardegna](https://www.lanuovasardegna.it) - [La Repubblica](https://www.repubblica.it) - [La Stampa](https://www.lastampa.it) - @@ -437,8 +437,8 @@ Grouped in options:\ [Follow the Money](https://www.ftm.nl) - [Gazet van Antwerpen](https://www.gva.be) - [Groene Amsterdammer](https://www.groene.nl) - -[Humo.be](https://www.humo.be) - -[Knack.be](https://www.knack.be) - +[Humo](https://www.humo.be) - +[Knack](https://www.knack.be) - [Leeuwarder Courant](https://www.lc.nl) - [NRC Handelsblad](https://www.nrc.nl) - [Parool](https://www.parool.nl) - diff --git a/background.js b/background.js index 578ab79..64ba97e 100755 --- a/background.js +++ b/background.js @@ -321,6 +321,7 @@ var blockedRegexes = { 'hilltimes.com': /\.hilltimes\.com\/.+\/js\/loadingoverlay\/loadingoverlay\.min\.js/, 'historyextra.com': /\.evolok\.net\/.+\/authorize\//, 'houstonchronicle.com': /\.blueconic\.net\//, + 'ilfattoquotidiano.it': /cdn\.ampproject\.org\/v\d\/amp-(ad|subscriptions)-.+\.js/, 'inc.com': /\.tinypass\.com\//, 'inc42.com': /(\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-(access|ad|analytics)-.+\.(m)?js)/, 'independent.ie': /(cdn\.flip-pay\.com\/clients\/inm\/flip-pay\.js|cdn\.ampproject\.org\/v\d\/amp-(access|ad|consent)-.+\.js)/, @@ -1180,7 +1181,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_law360_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', 'elpais.com', 'elperiodico.com', 'freiepresse.de', 'handelsblatt.com', 'inc42.com', '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_mng_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', 'handelsblatt.com', 'ilfattoquotidiano.it', 'inc42.com', '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_mng_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 85d95bf..4792c7b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -5,6 +5,7 @@ Post-release Remove WirtschaftsWoche (obsolete) Fix Estadao.com.br Fix Handelsblatt (only non-premium articles) +Fix ilFattoQuotidiano.it Fix NzHerald * v2.3.5.0 (2021-08-29) diff --git a/contentScript.js b/contentScript.js index 255254e..42ab17d 100755 --- a/contentScript.js +++ b/contentScript.js @@ -1024,25 +1024,23 @@ if (matchDomain('corriere.it')) { } else if (matchDomain('ilfattoquotidiano.it')) { - window.setTimeout(function () { - let paywall = document.querySelector('.read-more'); - let subscribe = document.querySelector('.article-ifq-bottom-pro-sostenitore'); - removeDOMElement(paywall, subscribe); - if (paywall) { - if (window.location.href.includes('?')) - window.location.href = window.location.href.replace('?', 'amp/?'); - else - window.location.href = window.location.href + 'amp'; + let url = window.location.href; + if (url.includes('/amp/')) { + let section_not_granted = document.querySelector('section[subscriptions-section="content-not-granted"]'); + let comments = document.querySelector('div.content.comments'); + removeDOMElement(section_not_granted, comments); + let hidden_content = document.querySelector('section[subscriptions-section="content"]'); + if (hidden_content) + hidden_content.setAttribute('style', 'display:block !important;'); + let amp_ads = document.querySelectorAll('amp-ad, div#_4sVideoContainer'); + removeDOMElement(...amp_ads); + } else { + let paywall = pageContains('section.article-body > p', '[...]'); + if (paywall.length > 0) { + removeDOMElement(...paywall); + window.location.href = url.split('?')[0] + 'amp'; } - if (window.location.href.includes('/amp/')) { - let section_not_granted = document.querySelector('section[subscriptions-section="content-not-granted"]'); - let comments = document.querySelector('div.content.comments'); - removeDOMElement(section_not_granted, comments); - let hidden_content = document.querySelector('section[subscriptions-section="content"]'); - if (hidden_content) - hidden_content.setAttribute('style', 'display:block !important;'); - } - }, 500); // Delay (in milliseconds) + } } else if (matchDomain(it_quotidiano_domains)) { diff --git a/custom/manifest.json b/custom/manifest.json index 622fa38..7742c69 100644 --- a/custom/manifest.json +++ b/custom/manifest.json @@ -38,5 +38,5 @@ "webRequestBlocking", "" ], - "version": "2.3.5.2" + "version": "2.3.5.3" } \ No newline at end of file diff --git a/manifest.json b/manifest.json index e67d7b1..b590a83 100755 --- a/manifest.json +++ b/manifest.json @@ -541,5 +541,5 @@ "*://*.wallkit.net/*", "*://*.wsj.net/*" ], - "version": "2.3.5.2" + "version": "2.3.5.3" } \ No newline at end of file