diff --git a/README.md b/README.md index 8fd907e..ee536ef 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Weekly updates are released for fixes and new sites. ### Installation You can install the add-on from [GitLab releases](https://gitlab.com/magnolia1234/bypass-paywalls-firefox-clean/-/releases)\ -Download the xpi-file (from latest release), go to downloads and install the add-on (or drag it from your file-manager anywhere on a page/tab in Firefox).\ +Download the [xpi-file](https://gitlab.com/magnolia1234/bpc-uploads/-/raw/master/bypass_paywalls_clean-latest.xpi) (from latest release), go to downloads and install the add-on (or drag it from your file-manager anywhere on a page/tab in Firefox).\ Or go to Tools > Add-ons (about:addons) > Extensions > Settings/Cogwheel - Install Add-on from File\ You can add/pin the add-on icon to the toolbar with the toolbar extensions menu (jigsaw puzzle shaped icon).\ Custom xpi-file has host permissions for all sites.\ diff --git a/background.js b/background.js index 9e8ac2c..0c8b5c2 100644 --- a/background.js +++ b/background.js @@ -780,7 +780,7 @@ if (typeof browser !== 'object') { if (matchUrlDomain(dompurify_sites, url)) lib_file = 'lib/purify.min.js'; var bg2csData = {}; - if (optin_setcookie && matchUrlDomain(['crusoe.uol.com.br'], url)) + if (optin_setcookie && matchUrlDomain(['###'], url)) bg2csData.optin_setcookie = 1; if (matchUrlDomain(amp_unhide, url)) bg2csData.amp_unhide = 1; diff --git a/changelog.txt b/changelog.txt index 9871913..6fb3931 100644 --- a/changelog.txt +++ b/changelog.txt @@ -14,6 +14,7 @@ Remove Limburger.nl (fix obsolete) Remove Quillette (fix obsolete) Remove Tagesspiegel.de (fix obsolete) Fix BusinessPost.ie (json) +Fix Crusoe.uol.com.br (js) Fix Hearst Communications magazines (js) Fix Mediahuis Noord (regional) Fix Midi-Olympique.fr (new domain Rugbyrama.fr) @@ -21,7 +22,7 @@ Fix Midi-Olympique.fr (new domain Rugbyrama.fr) * v3.2.3.0 (2023-07-02) Add Groupe ESH Medias (ch) Add Hln.be (link to archive.is) -Add MacroBusiness.com.au (ld_nuxt) +Add MacroBusiness.com.au (ld_json_nuxt) Add Puck.news Add Zeit.de (link to archive.is) Remove AerzteBlatt.de (fix obsolete) @@ -576,7 +577,7 @@ Update block general paywall script (limit Evolok WordPress) Update custom sites (load text from Google webcache) * v2.7.8.0 (2022-07-31) -Add Crusoe (Brazil) +Add Crusoe.uol.com.br Add Golem.de Add Groupe Capitales Medias (+ regional/opt-in to custom sites) Grouping GenomeWeb sites diff --git a/contentScript.js b/contentScript.js index 445d192..7ed9842 100644 --- a/contentScript.js +++ b/contentScript.js @@ -184,10 +184,7 @@ if (bg2csData.add_ext_link) { // check for opt-in confirmation (from background.js) if (bg2csData.optin_setcookie) { - if (matchDomain(['crusoe.uol.com.br'])) { - if (!cookieExists('crs_subscriber')) - setCookie('crs_subscriber', 1, 'crusoe.uol.com.br', '/', 14); - } + false; } // custom/updated sites: try to unhide text on amp-page @@ -2904,9 +2901,8 @@ else if (matchDomain(ar_grupo_clarin_domains)) { } else if (matchDomain('crusoe.uol.com.br')) { - let paywall = document.querySelector('#wallcontent'); let ads = document.querySelectorAll('#gpt-leaderboard, .ads_desktop, .catchment-box'); - removeDOMElement(paywall, ...ads); + removeDOMElement(...ads); } else if (matchDomain(pe_grupo_elcomercio_domains)) { diff --git a/custom/manifest.json b/custom/manifest.json index 8a767c4..ef9b726 100644 --- a/custom/manifest.json +++ b/custom/manifest.json @@ -51,5 +51,5 @@ "webRequestBlocking", "*://*/*" ], - "version": "3.2.3.5" + "version": "3.2.3.6" } diff --git a/custom/sites_custom.json b/custom/sites_custom.json index 09a10c6..ddcb31e 100644 --- a/custom/sites_custom.json +++ b/custom/sites_custom.json @@ -70,6 +70,12 @@ "domain": "christianitytoday.com", "useragent": "googlebot" }, + "Clareecho.ie": { + "allow_cookies": 1, + "block_regex": "\\.clareecho\\.ie\\/.+\\/flip-pay\\.js", + "cs_code": "[{\"cond\":\"div.td-post-content\", \"rm_class\": \"td-post-content\"}]", + "domain": "clareecho.ie" + }, "Columbian.com": { "allow_cookies": 1, "block_regex": "loader-cdn\\.azureedge\\.net", @@ -252,6 +258,12 @@ "block_regex": "\\.libraryjournal.com\\.com\\/.+\\/js\\/metering\\.js", "domain": "libraryjournal.com" }, + "Limerickpost.ie": { + "allow_cookies": 1, + "block_regex": "\\.limerickpost\\.ie\\/.+\\/flip-pay\\.js", + "cs_code": "[{\"cond\":\"div.td-post-content\", \"rm_class\": \"td-post-content\"}]", + "domain": "limerickpost.ie" + }, "Lindipendente.online": { "allow_cookies": 1, "domain": "lindipendente.online", diff --git a/manifest.json b/manifest.json index 05f1de2..6d7e434 100644 --- a/manifest.json +++ b/manifest.json @@ -744,6 +744,7 @@ "*://*.cedscdn.it/*", "*://*.cedsdigital.it/*", "*://*.corriereobjects.it/*", + "*://*.crusoe.com.br/*", "*://*.emol.cl/*", "*://*.flip-pay.com/*", "*://*.gitlab.com/magnolia1234/*", @@ -757,5 +758,5 @@ "*://*.wyleex.com/*", "*://webcache.googleusercontent.com/*" ], - "version": "3.2.3.5" + "version": "3.2.3.6" } diff --git a/options/optin/opt-in.html b/options/optin/opt-in.html index fc857bf..47c3ece 100644 --- a/options/optin/opt-in.html +++ b/options/optin/opt-in.html @@ -18,7 +18,7 @@

setCookie opt-in

For some sites a necessary cookie has to be set (this cookie doesn't contain any personal information about the user or device):

- Crusoé

+ None

setCookie opt-in enabled:

diff --git a/sites.js b/sites.js index d7a0519..999c5d3 100644 --- a/sites.js +++ b/sites.js @@ -2258,9 +2258,8 @@ var defaultSites = { }, "UOL.com.br": { domain: "uol.com.br", - allow_cookies: 1, - block_js_inline: /crusoe\.uol\.com\.br\/(diario|edicoes)\/.+/, - block_regex: /(paywall\.folha\.uol\.com\.br\/|\.(tinypass|matheranalytics)\.com\/|cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js)/, + block_regex: /(paywall\.folha\.uol\.com\.br\/|\.crusoe\.com\.br\/assets\/js\/swg-wallcontent-crusoe\.js|\.(tinypass|matheranalytics)\.com\/|cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js)/, + remove_cookies_select_drop: ["crs_subscriber"], useragent: "googlebot" }, "USA Today": { diff --git a/sites_updated.json b/sites_updated.json index 0d21bf3..d3882df 100644 --- a/sites_updated.json +++ b/sites_updated.json @@ -174,5 +174,12 @@ "block_regex": "(\\.nytimes\\.com\\/meter\\.js|mwcm\\.nyt\\.com\\/.+\\.js|cooking\\.nytimes\\.com\\/api\\/.+\\/access)", "useragent": "googlebot", "upd_version": "3.1.4.0" + }, + "UOL.com.br": { + "domain": "uol.com.br", + "block_regex": "(paywall\\.folha\\.uol\\.com\\.br\\/|\\.crusoe\\.com\\.br\\/assets\\/js\\/swg-wallcontent-crusoe\\.js|\\.(tinypass|matheranalytics)\\.com\\/|cdn\\.ampproject\\.org\\/v\\d\\/amp-subscriptions-.+\\.js)", + "remove_cookies_select_drop": ["crs_subscriber"], + "useragent": "googlebot", + "upd_version": "3.2.3.6" } }