From 64d0f66c972642c45cee7c8b593ed6b895f0c204 Mon Sep 17 00:00:00 2001 From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com> Date: Sat, 14 Nov 2020 18:37:07 +0100 Subject: [PATCH] Fix-update ilMessaggero.it (+ regional sites) --- README.md | 8 ++++++-- background.js | 20 ++++++++++++++------ changelog.txt | 1 + manifest.json | 7 +++++-- sites.js | 2 +- 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 8f607e90..ca61ca21 100644 --- a/README.md +++ b/README.md @@ -178,8 +178,12 @@ So don't update to Firefox 79 or use Firefox Nightly (and load BPC from a custom [Domani](https://editorialedomani.it) - [GElocal.it](https://quotidiani.gelocal.it) - [Il Fatto Quotidiano](https://www.ilfattoquotidiano.it) - -[Il Manifesto](https://ilmanifesto.it) - -[Il Messaggero](https://www.ilmessaggero.it) - +[Il Manifesto](https://ilmanifesto.it) +[Il Messaggero](https://www.ilmessaggero.it) and regional sites (grouped in options) like +[Corriere Adriatico](https://www.corriereadriatico.it) - +[Il Gazzettino](https://www.ilgazzettino.it) - +[Il Mattino](https://www.ilmattino.it) - +[Quotidiano di Puglia](https://www.quotidianodipuglia.it) [Il Resto del Carlino](https://www.ilrestodelcarlino.it) - [La Repubblica](https://www.repubblica.it) - [La Stampa](https://www.lastampa.it) - diff --git a/background.js b/background.js index 16e6acbf..1c473ff8 100644 --- a/background.js +++ b/background.js @@ -209,7 +209,7 @@ var blockedRegexes = { 'haaretz.co.il': /haaretz\.co\.il\/htz\/js\/inter\.js/, 'haaretz.com': /haaretz\.com\/hdc\/web\/js\/minified\/header-scripts-int.js.+/, 'historyextra.com': /.+\.evolok\.net\/.+\/authorize\/.+/, - 'ilmessaggero.it': /(utils\.cedsdigital\.it\/js\/PaywallMeter\.js|static\.viralize\.tv\/viralize_player)/, + 'ilmessaggero.it': /utils\.cedsdigital\.it\/js\/PaywallMeter\.js/, 'ilrestodelcarlino.it': /.+\.tinypass\.com\/.+/, 'independent.ie': /cdn\.flip-pay\.com\/clients\/inm\/flip-pay\.js/, 'inquirer.com': /.+\.tinypass\.com\/.+/, @@ -273,6 +273,7 @@ const au_comm_media_domains = ['bendigoadvertiser.com.au', 'bordermail.com.au', const au_news_corp_domains = ['adelaidenow.com.au', 'cairnspost.com.au', 'couriermail.com.au', 'dailytelegraph.com.au', 'geelongadvertiser.com.au', 'goldcoastbulletin.com.au', 'heraldsun.com.au', 'ntnews.com.au', 'theaustralian.com.au', 'themercury.com.au', 'townsvillebulletin.com.au', 'weeklytimesnow.com.au']; const au_prov_news_domains = ['news-mail.com.au', 'frasercoastchronicle.com.au', 'gladstoneobserver.com.au', 'dailyexaminer.com.au', 'dailymercury.com.au', 'themorningbulletin.com.au', 'sunshinecoastdaily.com.au', 'gympietimes.com.au', 'northernstar.com.au', 'qt.com.au', 'thechronicle.com.au', 'warwickdailynews.com.au']; const nymag_domains = ['grubstreet.com', 'thecut.com', 'vulture.com']; +const ilmessaggero_domains = ['corriereadriatico.it', 'ilgazzettino.it', 'ilmattino.it', 'quotidianodipuglia.it']; const userAgentDesktopG = "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)" const userAgentMobileG = "Chrome/80.0.3987.92 Mobile Safari/537.36 (compatible ; Googlebot/2.1 ; +http://www.google.com/bot.html)" @@ -283,7 +284,7 @@ const userAgentMobileB = "Chrome/80.0.3987.92 Mobile Safari/537.36 (compatible; var enabledSites = []; var disabledSites = []; var defaultSites_grouped_domains = Object.values(defaultSites); -var defaultSites_domains = defaultSites_grouped_domains.concat(ad_region_domains, au_comm_media_domains, au_news_corp_domains, au_prov_news_domains, nymag_domains); +var defaultSites_domains = defaultSites_grouped_domains.concat(ad_region_domains, au_comm_media_domains, au_news_corp_domains, au_prov_news_domains, nymag_domains, ilmessaggero_domains); var customSites = {}; var customSites_domains = []; @@ -357,12 +358,15 @@ ext_api.storage.local.get({ disabledSites = disabledSites.concat(ad_region_domains); if (enabledSites.includes('nymag.com')) { enabledSites = enabledSites.concat(nymag_domains); - for (let domain of nymag_domains) { - allow_cookies.push(domain); - remove_cookies.push(domain); - } } else disabledSites = disabledSites.concat(nymag_domains); + if (enabledSites.includes('ilmessaggero.it')) { + enabledSites = enabledSites.concat(ilmessaggero_domains); + for (let domain of ilmessaggero_domains) { + blockedRegexes[domain] = /utils\.cedsdigital\.it\/js\/PaywallMeter\.js/; + } + } else + disabledSites = disabledSites.concat(ilmessaggero_domains); if (enabledSites.includes('###_au_comm_media')) { enabledSites = enabledSites.concat(au_comm_media_domains); for (let domain of au_comm_media_domains) { @@ -420,6 +424,10 @@ ext_api.storage.onChanged.addListener(function (changes, namespace) { enabledSites = enabledSites.concat(nymag_domains); else disabledSites = disabledSites.concat(nymag_domains); + if (enabledSites.includes('ilmessaggero.it')) + enabledSites = enabledSites.concat(ilmessaggero_domains); + else + disabledSites = disabledSites.concat(nymag_domains); if (enabledSites.includes('###_au_comm_media')) enabledSites = enabledSites.concat(au_comm_media_domains); else diff --git a/changelog.txt b/changelog.txt index a38ecbc3..100ea740 100644 --- a/changelog.txt +++ b/changelog.txt @@ -5,6 +5,7 @@ Post-release Add La Estrella de Valparaiso (Chile) Fix-update Folha de S. Paulo (MatherAnalytics) Fix-update Gazet van Antwerpen (video/maps) +Fix-update ilMessaggero.it (+ regional sites) Fix-update WSJ (mobile layout) Update custom sites: allow_cookies diff --git a/manifest.json b/manifest.json index 3565ba55..52a25471 100644 --- a/manifest.json +++ b/manifest.json @@ -77,6 +77,7 @@ "*://*.clarin.com/*", "*://*.commentarymagazine.com/*", "*://*.corriere.it/*", + "*://*.corriereadriatico.it/*", "*://*.courant.com/*", "*://*.couriermail.com.au/*", "*://*.csmonitor.com/*", @@ -144,8 +145,10 @@ "*://*.historyextra.com/*", "*://*.humo.be/*", "*://*.ilfattoquotidiano.it/*", + "*://*.ilgazzettino.it/*", "*://*.illawarramercury.com.au/*", "*://*.ilmanifesto.it/*", + "*://*.ilmattino.it/*", "*://*.ilmessaggero.it/*", "*://*.ilrestodelcarlino.it/*", "*://*.inc.com/*", @@ -226,6 +229,7 @@ "*://*.qt.com.au/*", "*://*.quora.com/*", "*://*.quotidiano.net/*", + "*://*.quotidianodipuglia.it/*", "*://*.qz.com/*", "*://*.repubblica.it/*", "*://*.republic.ru/*", @@ -336,11 +340,10 @@ "*://*.rcsobjects.it/*", "*://*.repstatic.it/*", "*://*.userzoom.com/*", - "*://*.viralize.tv/*", "storage", "tabs", "webRequest", "webRequestBlocking" ], - "version": "1.9.4.5" + "version": "1.9.4.6" } \ No newline at end of file diff --git a/sites.js b/sites.js index 0f55a6f7..f2c9e781 100644 --- a/sites.js +++ b/sites.js @@ -77,7 +77,7 @@ var defaultSites = "Humo.be": "humo.be", "Il Fatto Quotidiano": "ilfattoquotidiano.it", "Il Manifesto": "ilmanifesto.it", - "Il Messaggero": "ilmessaggero.it", + "Il Messaggero (+ regional)": "ilmessaggero.it", "Il Resto del Carlino": "ilrestodelcarlino.it", "Inc.com": "inc.com", "Inkl": "inkl.com",