diff --git a/README.md b/README.md index ee536ef..312c747 100644 --- a/README.md +++ b/README.md @@ -707,7 +707,8 @@ Grouped in options:\ ##### Portugal [Correio da Manhã](https://www.cmjornal.pt) - [Observador](https://observador.pt) - -[Record](https://www.record.pt) +[Record](https://www.record.pt) - +[Sábado](https://www.sabado.pt) ##### Russia [Wonderzine](https://www.wonderzine.com) diff --git a/changelog.txt b/changelog.txt index c9b9a3a..9db47f1 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,7 +3,9 @@ Changelog Bypass Paywalls Clean - Firefox Updates (install signed xpi-file): https://gitlab.com/magnolia1234/bypass-paywalls-firefox-clean/-/releases Post-release +Add Sabado.pt Fix Australia News Corp (amp-fix) +Fix Cmjornal.pt & Record.pt (amp) * v3.2.4.0 (2023-07-09) Add Delish, Elle Decor, Harper's Bazaar & Oprah Daily (Hearst) diff --git a/contentScript.js b/contentScript.js index 7ed9842..f8af6a0 100644 --- a/contentScript.js +++ b/contentScript.js @@ -1214,8 +1214,8 @@ if (matchDomain(['ara.cat', 'arabalears.cat'])) { } } -else if (matchDomain(['cmjornal.pt', 'record.pt'])) { - let paywall = document.querySelector('.bloqueio_exclusivos, .container_assinatura'); +else if (matchDomain(['cmjornal.pt', 'record.pt', 'sabado.pt'])) { + let paywall = document.querySelector('.bloqueio_exclusivos, .container_assinatura, .bloco_bloqueio'); let amphtml = document.querySelector('link[rel="amphtml"]'); let url = window.location.href; if (!url.includes('/amp/')) { @@ -1224,7 +1224,7 @@ else if (matchDomain(['cmjornal.pt', 'record.pt'])) { window.location.href = amphtml.href; } } else { - amp_unhide_subscr_section('amp-ad, amp-embed, amp-consent, .detalheAds, .exclusivos_bar'); + amp_unhide_access_hide('="subscriber"', '="NOT subscriber"', 'amp-ad, amp-embed, amp-consent, .detalheAds, .exclusivos_bar'); let amp_links = document.querySelectorAll('a[href^="https://www-cmjornal-pt.cdn.ampproject.org/c/s/"]'); for (let amp_link of amp_links) amp_link.href = amp_link.href.replace('www-cmjornal-pt.cdn.ampproject.org/c/s/', ''); @@ -1629,11 +1629,10 @@ else if (matchDomain('legrandcontinent.eu')) { } else if (matchDomain(['lejdd.fr', 'parismatch.com', 'public.fr'])) { - let poool_banner = document.querySelector('#poool-container'); - let poool_widget = document.querySelector('#poool-widget-content'); + let poool_banners = document.querySelectorAll('#poool-container, #poool-widget-content, #poool-widget'); let forbidden = document.querySelector('.forbidden'); let ads = document.querySelectorAll('div[class^="lmn-"]'); - removeDOMElement(poool_banner, poool_widget, forbidden, ...ads); + removeDOMElement(...poool_banners, forbidden, ...ads); let bottom_hide = document.querySelector('.cnt[data-poool-mode="hide"]'); if (bottom_hide) { bottom_hide.removeAttribute('data-poool-mode'); diff --git a/custom/manifest.json b/custom/manifest.json index 004f06b..1874ea3 100644 --- a/custom/manifest.json +++ b/custom/manifest.json @@ -51,5 +51,5 @@ "webRequestBlocking", "*://*/*" ], - "version": "3.2.4.1" + "version": "3.2.4.2" } diff --git a/manifest.json b/manifest.json index 48640e9..0bab993 100644 --- a/manifest.json +++ b/manifest.json @@ -549,6 +549,7 @@ "*://*.rugbyrama.fr/*", "*://*.rundschau-online.de/*", "*://*.runnersworld.com/*", + "*://*.sabado.pt/*", "*://*.sacbee.com/*", "*://*.saltwire.com/*", "*://*.sandiegouniontribune.com/*", @@ -758,5 +759,5 @@ "*://*.wyleex.com/*", "*://webcache.googleusercontent.com/*" ], - "version": "3.2.4.1" + "version": "3.2.4.2" } diff --git a/sites.js b/sites.js index 999c5d3..0084453 100644 --- a/sites.js +++ b/sites.js @@ -1721,7 +1721,7 @@ var defaultSites = { "Record.pt": { domain: "record.pt", allow_cookies: 1, - block_regex: /cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js/ + block_regex: /cdn\.ampproject\.org\/v\d\/amp-access-.+\.js/ }, "Reuters": { domain: "reuters.com", @@ -1764,6 +1764,11 @@ var defaultSites = { allow_cookies: 1, block_regex: /\.blueconic\.net\// }, + "Sábado (not video)": { + domain: "sabado.pt", + allow_cookies: 1, + block_regex: /cdn\.ampproject\.org\/v\d\/amp-access-.+\.js/ + }, "Saltwire Network": { domain: "saltwire.com", allow_cookies: 1, diff --git a/sites_updated.json b/sites_updated.json index d3882df..666d0e5 100644 --- a/sites_updated.json +++ b/sites_updated.json @@ -5,6 +5,12 @@ "useragent": "bingbot", "upd_version": "3.1.3.3" }, + "Correio da Manhã": { + "domain": "cmjornal.pt", + "allow_cookies": 1, + "amp_unhide": 1, + "upd_version": "3.2.4.2" + }, "Delish": { "domain": "delish.com", "allow_cookies": 1, @@ -122,12 +128,27 @@ "useragent": "googlebot", "upd_version": "3.1.9.6" }, + "Record.pt": { + "domain": "record.pt", + "allow_cookies": 1, + "block_regex": "cdn\\.ampproject\\.org\\/v\\d\\/amp-access-.+\\.js", + "amp_unhide": 1, + "upd_version": "3.2.4.2" + }, "Rugbyrama.fr": { "domain": "rugbyrama.fr", "allow_cookies": 1, "ld_json": "div.paywall|div.article-full__body-content", "upd_version": "3.2.3.3" }, + "Sábado (not video)": { + "domain": "sabado.pt", + "allow_cookies": 1, + "block_regex": "cdn\\.ampproject\\.org\\/v\\d\\/amp-access-.+\\.js", + "amp_redirect": ".bloco_bloqueio", + "amp_unhide": 1, + "new_site": 1 + }, "Stuttgarter Zeitung": { "domain": "stuttgarter-zeitung.de", "allow_cookies": 1,