diff --git a/changelog.txt b/changelog.txt index 880c7e9..86a0fec 100644 --- a/changelog.txt +++ b/changelog.txt @@ -10,6 +10,7 @@ Fix Harper's Magazine (modal) Fix Madsack Mediengruppe (custom flex sites) Fix NK News (pro) Fix Quartz (newsletter) +Fix Quotidiano.net sites * v3.0.6.0 (2023-02-19) Add DHnet.be diff --git a/contentScript.js b/contentScript.js index aa23405..f60fad5 100644 --- a/contentScript.js +++ b/contentScript.js @@ -1307,7 +1307,7 @@ else if (matchDomain(es_grupo_vocento_domains)) { let amphtml = document.querySelector('link[rel="amphtml"]'); if (!amphtml) amphtml = {href: window.location.pathname.replace('.html', '_amp.html')}; - if (paywall && amphtml) { + if (paywall && amphtml && !matchDomain(['diariovasco.com', 'eldiariomontanes.es'])) { removeDOMElement(paywall); window.location.href = amphtml.href; } else { @@ -1962,16 +1962,19 @@ 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-ad, amp-embed, amp-fx-flying-carpet, .watermark-adv'); + if (window.location.pathname.endsWith('/amp') || window.location.search.startsWith('?amp')) { + amp_unhide_access_hide('="c.customGranted"', '="NOT c.customGranted"', 'amp-ad, amp-embed, amp-fx-flying-carpet, .watermark-adv, .amp__watermark'); } else { - let paywall = document.querySelector('div[data-testid="paywall-container"]'); + let paywall = document.querySelector('div[data-testid="paywall-container"], div[class^="Paywall_paywall_"]'); let amphtml = document.querySelector('link[rel="amphtml"]'); if (!amphtml) amphtml = {href: window.location.pathname + '/amp'}; if (paywall && amphtml) { removeDOMElement(paywall); window.location.href = amphtml.href; + } else { + let ads = document.querySelectorAll('div[id^="div-gpt-ad"]'); + removeDOMElement(...ads); } } } diff --git a/custom/manifest.json b/custom/manifest.json index 9ead946..0942201 100644 --- a/custom/manifest.json +++ b/custom/manifest.json @@ -51,5 +51,5 @@ "webRequestBlocking", "*://*/*" ], - "version": "3.0.6.4" + "version": "3.0.6.5" } diff --git a/custom/sites_custom.json b/custom/sites_custom.json index 9f458af..d517b34 100644 --- a/custom/sites_custom.json +++ b/custom/sites_custom.json @@ -86,9 +86,10 @@ "domain": "diariodenavarra.es" }, "Die-glocke.de": { + "add_ext_link": "div.cardPw|div.mainContent", + "add_ext_link_type": "google_search_tool", "allow_cookies": 1, - "domain": "die-glocke.de", - "ld_google_webcache": "div.cardPw|div.mainContent" + "domain": "die-glocke.de" }, "Doorbraak.be": { "allow_cookies": 1, diff --git a/manifest.json b/manifest.json index a536583..697ec3d 100644 --- a/manifest.json +++ b/manifest.json @@ -739,5 +739,5 @@ "*://*.wallkit.net/*", "*://webcache.googleusercontent.com/*" ], - "version": "3.0.6.4" + "version": "3.0.6.5" } diff --git a/sites.js b/sites.js index f079c09..b99283f 100644 --- a/sites.js +++ b/sites.js @@ -1608,7 +1608,7 @@ var defaultSites = { "quotidiano.net" ], allow_cookies: 1, - block_regex: /(cdn\.cxense\.com\/|\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-access-.+\.js)/ + block_regex: /(\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-access-.+\.js)/ }, "Record.pt": { domain: "record.pt", diff --git a/sites_updated.json b/sites_updated.json index 669755a..d1e9e01 100644 --- a/sites_updated.json +++ b/sites_updated.json @@ -89,5 +89,18 @@ "domain": "qz.com", "allow_cookies": 1, "block_regex": "\\.kinja-static\\.com\\/assets\\/.+\\/regwalled-content.+\\.js" + }, + "Quotidiano.net (+ regional)": { + "domain": "###_it_quotidiano", + "group": [ + "ilgiorno.it", + "ilrestodelcarlino.it", + "iltelegrafolivorno.it", + "lanazione.it", + "quotidiano.net" + ], + "allow_cookies": 1, + "block_regex": "(\\.tinypass\\.com\\/|cdn\\.ampproject\\.org\\/v\\d\\/amp-access-.+\\.js)", + "amp_redirect": "div[data-testid='paywall-container'], div[class^='Paywall_paywall_']" } }