Grouping Quotidiano.net sites (Italy)

README.md

@@ -359,23 +359,24 @@ Madsack Mediengruppe sites like (opt-in to custom sites for unlisted)
 [Domani](https://editorialedomani.it) -
 [GElocal.it](https://quotidiani.gelocal.it) -
 [Il Fatto Quotidiano](https://www.ilfattoquotidiano.it) -
-[Il Giorno](https://www.ilgiorno.it) -
 [Il Manifesto](https://ilmanifesto.it) -
-[Il Resto del Carlino](https://www.ilrestodelcarlino.it) -
+[[Il Secolo XIX](https://www.ilsecoloxix.it) -
-[Il Secolo XIX](https://www.ilsecoloxix.it) -
-[La Nazione](https://www.lanazione.it) -
 [La Nuova Sardegna](https://www.lanuovasardegna.it) -
 [La Repubblica](https://www.repubblica.it) -
 [La Stampa](https://www.lastampa.it) -
 [Le Scienze](https://www.lescienze.it) -
-[LimesOnline (it/en)](https://www.limesonline.com) -
+[LimesOnline (it/en)](https://www.limesonline.com)\
-[Quotidiano.net](https://www.quotidiano.net)\
 Grouped in options:\
 [Il Messaggero](https://www.ilmessaggero.it) and regional sites 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)
+[Quotidiano di Puglia](https://www.quotidianodipuglia.it)\
+[Quotidiano Nazionale](https://www.quotidiano.net) and regional sites like
+[Il Giorno](https://www.ilgiorno.it) -
+[Il Resto del Carlino](https://www.ilrestodelcarlino.it) -
+[Il Telegrafo Livorno](https://www.iltelegrafolivorno.it) -
+[La Nazione](https://www.lanazione.it)
 
 ##### Netherlands/Flanders
 [Dagblad van het Noorden](https://www.dvhn.nl) -
@@ -392,8 +393,7 @@ Grouped in options:\
 [Parool](https://www.parool.nl) -
 [Telegraaf](https://www.telegraaf.nl) -
 [Trouw](https://www.trouw.nl) -
-[Volkskrant](https://www.volkskrant.nl)
+[Volkskrant](https://www.volkskrant.nl)\
-
 Grouped in options:\
 [Algemeen Dagblad](https://www.ad.nl) and regional ADR sites like
 [BN DeStem](https://www.bndestem.nl) -

background.js

@@ -85,8 +85,6 @@ var allow_cookies_default = [
   'hindustantimes.com',
   'hs.fi',
   'ilfattoquotidiano.it',
-  'ilgiorno.it',
-  'ilrestodelcarlino.it',
   'independent.ie',
   'infzm.com',
   'intelligentinvestor.com.au',
@@ -94,7 +92,6 @@ var allow_cookies_default = [
   'knack.be',
   'kurier.at',
   'la-croix.com',
-  'lanazione.it',
   'lanouvellerepublique.fr',
   'latribune.fr',
   'lavanguardia.com',
@@ -129,7 +126,6 @@ var allow_cookies_default = [
   'politicaexterior.com',
   'prospectmagazine.co.uk',
   'quora.com',
-  'quotidiano.net',
   'reuters.com',
   'rhein-zeitung.de',
   'rheinpfalz.de',
@@ -268,14 +264,14 @@ var change_headers = use_google_bot.concat(use_bing_bot, use_facebook_referer, u
 var blockedRegexes = {
   'abril.com.br': /\.abril\.com\.br\/.+\/abril-paywall\/js\/abril-paywall\.js/,
   'adweek.com': /\.lightboxcdn\.com\//,
-  'apollo-magazine.com': /\.tinypass\.com\//,
-  'augsburger-allgemeine.de':/(\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-(ad|subscriptions)-.+\.js)/,
   'afr.com': /api\.afr\.com\/graphql\?query=.+PaywallRuleQuery/,
   'ajc.com': /loader-cdn\.azureedge\.net\//,
   'alternatives-economiques.fr': /\.poool\.fr\//,
   'americanbanker.com': /\.tinypass\.com\//,
+  'apollo-magazine.com': /\.tinypass\.com\//,
   'asiatimes.com': /cdn\.ampproject\.org\/v\d\/amp-(access|ad|analytics)-.+\.(m)?js/,
   'atlantico.fr': /\.poool\.fr\//,
+  'augsburger-allgemeine.de':/(\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-(ad|subscriptions)-.+\.js)/,
   'barrons.com': /(cdn\.cxense\.com\/.+|cdn\.ampproject\.org\/v\d\/amp-(access|ad|consent)-.+\.js)/,
   'belfasttelegraph.co.uk': /(cdn\.flip-pay\.com\/clients\/inm\/flip-pay\.js|cdn\.ampproject\.org\/v\d\/amp-(access|ad|consent)-.+\.js)/,
   'billboard.com': /(cdn\.cxense\.com\/|\.tinypass\.com\/)/,
@@ -321,8 +317,6 @@ var blockedRegexes = {
   'hilltimes.com': /\.hilltimes\.com\/.+\/js\/loadingoverlay\/loadingoverlay\.min\.js/,
   'historyextra.com': /\.evolok\.net\/.+\/authorize\//,
   'houstonchronicle.com': /\.blueconic\.net\//,
-  'ilgiorno.it': /\.tinypass\.com\//,
-  'ilrestodelcarlino.it': /\.tinypass\.com\//,
   'independent.ie': /(cdn\.flip-pay\.com\/clients\/inm\/flip-pay\.js|cdn\.ampproject\.org\/v\d\/amp-(access|ad|consent)-.+\.js)/,
   'inquirer.com': /\.tinypass\.com\//,
   'irishtimes.com': /cdn\.ampproject\.org\/v\d\/amp-(access|ad)-.+\.js/,
@@ -332,7 +326,6 @@ var blockedRegexes = {
   'kurier.at': /\.tinypass\.com\//,
   'la-croix.com': /cdn\.ampproject\.org\/v\d\/amp-(access|ad)-.+\.js/,
   'lasegunda.com': /\.(lasegunda\.com|emol\.cl)\/(.+\/)?js\/(.+\/)?(modal|merPramV\d|PramModal\.min)\.js/,
-  'lanazione.it': /\.tinypass\.com\//,
   'latercera.com': /(\.latercera\.com\/arc\/subs\/p\.js|cdn\.cxense\.com\/)/,
   'latimes.com': /(js\.matheranalytics\.com\/|metering\.platform\.latimes\.com\/v\d\/meter)/,
   'latribune.fr': /\.poool\.fr\//,
@@ -366,13 +359,11 @@ var blockedRegexes = {
   'nytimes.com': /(meter-svc\.nytimes\.com\/meter\.js|mwcm\.nyt\.com\/.+\.js)/,
   'observador.pt': /\.tinypass\.com\//,
   'parismatch.com': /\.poool\.fr\//,
-  'quotidiano.net': /\.tinypass\.com\//,
   'qz.com': /\.tinypass\.com\//,
   'reuters.com': /\.reuters\.com\/(arc\/subs\/p\.min|pf\/resources\/dist\/reuters\/js\/index)\.js/,
   'rollingstone.com': /cdn\.cxense\.com\//,
   'ruhrnachrichten.de': /\.tinypass\.com\//,
   'saechsische.de': /\.tinypass\.com\//,
-  'thesaturdaypaper.com.au': /\.thesaturdaypaper\.com\.au\/sites\/all\/modules\/custom\/node_meter\/pw\.js/,
   'science-et-vie.com': /\.qiota\.com\//,
   'sciencesetavenir.fr': /\.poool\.fr\//,
   'scmp.com': /(\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-(access|ad|analytics|consent|fx-flying-carpet)-.+\.js)/,
@@ -395,6 +386,7 @@ var blockedRegexes = {
   'thehindubusinessline.com': /(cdn\.cxense\.com\/|\.tinypass\.com\/)/,
   'thenation.com': /\.tinypass\.com\//,
   'thenewatlantis.com': /\.thenewatlantis\.com\/.+\/thenewatlantis\/js\/(gate|donate)\.js/,
+  'thesaturdaypaper.com.au': /\.thesaturdaypaper\.com\.au\/sites\/all\/modules\/custom\/node_meter\/pw\.js/,
   'thewrap.com': /\.wallkit\.net\/js\//,
   'time.com': /\/time\.com\/dist\/meter-wall-client-js\..+\.js/,
   'timeshighereducation.com': /\.timeshighereducation\.com\/sites\/default\/files\/js\/js_bbCGL.+\.js/,
@@ -452,6 +444,7 @@ var grouped_sites = {
 '###_fr_groupe_ebra': fr_groupe_ebra_domains,
 '###_fr_groupe_la_depeche': fr_groupe_la_depeche_domains,
 '###_it_ilmessaggero': it_ilmessaggero_domains,
+'###_it_quotidiano': it_quotidiano_domains,
 '###_nl_ad_region': nl_ad_region_domains,
 '###_nl_mediahuis_region': nl_mediahuis_region_domains,
 '###_no_nhst_media': no_nhst_media_domains,
@@ -546,6 +539,10 @@ function add_grouped_sites(init_rules) {
       remove_cookies.push(domain);
       remove_cookies_select_drop[domain] = ['temptationTrackingId'];
     }
+    for (let domain of it_quotidiano_domains) {
+      allow_cookies.push(domain);
+      blockedRegexes[domain] = /(cdn\.cxense\.com\/|\.tinypass\.com\/)/;
+    }
     for (let domain of nl_mediahuis_region_domains)
       allow_cookies.push(domain);
     for (let domain of no_nhst_media_domains) {
@@ -565,7 +562,7 @@ function add_grouped_sites(init_rules) {
       blockedRegexes[domain] = /(\.tinypass\.com\/|\.(crains.+|.+business)\.com\/.+\/js\/js_.+\.js)/;
     }
     for (let domain of usa_mcc_domains)
-      blockedRegexes[domain] = /cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js/;
+      blockedRegexes[domain] = /(js\.matheranalytics\.com\/|cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js)/;
     for (let domain of usa_tribune_domains) {
       allow_cookies.push(domain);
       blockedRegexes[domain] = /\.tribdss\.com\//;
@@ -1058,7 +1055,7 @@ ext_api.webRequest.onBeforeSendHeaders.addListener(function(details) {
   if (usa_mcc_domain) {
     let mcc_domain = urlHost(header_referer).replace('account.', '');
     if (!usa_mcc_domains.includes(mcc_domain)) {
-      blockedRegexes[mcc_domain] = /cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js/;
+      blockedRegexes[domain] = /(js\.matheranalytics\.com\/|cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js)/;
       usa_mcc_domains.push(mcc_domain);
       if (!enabledSites.includes(mcc_domain))
         enabledSites.push(mcc_domain);

changelog.txt

@@ -2,6 +2,7 @@
 Changelog Bypass Paywalls Clean - Firefox
 
 Post-release
+Grouping Quotidiano.net sites (Italy)
 Remove Le Un (obsolete)
 Fix Commentary Magazine (new domain)
 Fix Gestion & El Comercio (Peru)
@@ -53,7 +54,7 @@ Remove The Northern Star (obsolete)
 Fix Atlantico.fr
 Fix Boston Globe (no opt-in)
 Fix Foreign Policy
-Fix Group Tribune Publishing Company (overlay)
+Fix group Tribune Publishing Company (overlay)
 Fix The Globe and Mail
 Fix The Spectator UK (amp)
 

contentScript.js

@@ -13,6 +13,7 @@ var fi_alma_talent_domains = ['arvopaperi.fi', 'kauppalehti.fi', 'marmai.fi', 'm
 var fr_groupe_ebra_domains = ['bienpublic.com', 'dna.fr', 'estrepublicain.fr', 'lalsace.fr', 'ledauphine.com', 'lejsl.com', 'leprogres.fr', 'republicain-lorrain.fr', 'vosgesmatin.fr'];
 var fr_groupe_la_depeche_domains = ['centrepresseaveyron.fr', 'ladepeche.fr', 'lindependant.fr', 'midi-olympique.fr', 'midilibre.fr', 'nrpyrenees.fr', 'petitbleu.fr'];
 var it_repubblica_domains = ['gelocal.it', 'ilsecoloxix.it', 'lanuovasardegna.it', 'lastampa.it', 'limesonline.com', 'repubblica.it'];
+var it_quotidiano_domains = ['ilgiorno.it', 'ilrestodelcarlino.it', 'iltelegrafolivorno.it', 'lanazione.it', 'quotidiano.net'];
 var nl_mediahuis_region_domains = ['gooieneemlander.nl', 'haarlemsdagblad.nl', 'ijmuidercourant.nl', 'leidschdagblad.nl', 'noordhollandsdagblad.nl'];
 var no_nhst_media_domains = ['intrafish.com', 'rechargenews.com', 'tradewindsnews.com', 'upstreamonline.com'];
 var usa_crainsbiz_domains = ['chicagobusiness.com', 'crainscleveland', 'crainsdetroit', 'crainsnewyork.com'];
@@ -1023,7 +1024,7 @@ else if (matchDomain('ilfattoquotidiano.it')) {
   }, 500); // Delay (in milliseconds)
 }
 
-else if (matchDomain(['ilgiorno.it', 'ilrestodelcarlino.it', 'lanazione.it', 'quotidiano.net'])) {
+else if (matchDomain(it_quotidiano_domains)) {
   let detail_text_truncated = document.querySelector('div.detail-text--truncated');
   let detail_page_paywall = document.querySelector('body.detail-page--paywall');
   if (detail_page_paywall) {

manifest.json

@@ -229,6 +229,7 @@
         "*://*.ilmessaggero.it/*",
         "*://*.ilrestodelcarlino.it/*",
         "*://*.ilsecoloxix.it/*",
+        "*://*.iltelegrafolivorno.it/*",
         "*://*.inc.com/*",
         "*://*.independent.ie/*",
         "*://*.infzm.com/*",
@@ -537,5 +538,5 @@
         "*://*.wallkit.net/*",
         "*://*.wsj.net/*"
     ],
-    "version": "2.3.0.5"
+    "version": "2.3.0.6"
 }

sites.js

@@ -112,10 +112,8 @@ var defaultSites =
   "Houston Chronicle": "houstonchronicle.com",
   "Humo.be": "humo.be",
   "Il Fatto Quotidiano": "ilfattoquotidiano.it",
-  "Il Giorno": "ilgiorno.it",
   "Il Manifesto": "ilmanifesto.it",
   "Il Messaggero (+ regional)": "###_it_ilmessaggero",
-  "Il Resto del Carlino": "ilrestodelcarlino.it",
   "Il Secolo XIX": "ilsecoloxix.it",
   "Inc.com": "inc.com",
   "Inkl": "inkl.com",
@@ -133,7 +131,6 @@ var defaultSites =
   "La Croix": "la-croix.com",
   "La Estrella de Valparaíso": "estrellavalpo.cl",
   "La Nación": "lanacion.com.ar",
-  "La Nazione": "lanazione.it",
   "La Nouvelle République du Centre-Ouest": "lanouvellerepublique.fr",
   "La Nueva España": "lne.es",
   "La Nuova Sardegna": "lanuovasardegna.it",
@@ -205,7 +202,7 @@ var defaultSites =
   "Prospect Magazine": "prospectmagazine.co.uk",
   "Quartz (free articles only)": "qz.com",
   "Quora": "quora.com",
-  "Quotidiano.net": "quotidiano.net",
+  "Quotidiano.net (+ regional)": "###_it_quotidiano",
   "Republic.ru": "republic.ru",
   "Reuters": "reuters.com",
   "Rhein-Zeitung": "rhein-zeitung.de",
@@ -337,6 +334,7 @@ const fr_be_groupe_rossel_domains = ['aisnenouvelle.fr', 'courrier-picard.fr', '
 const fr_groupe_ebra_domains = ['bienpublic.com', 'dna.fr', 'estrepublicain.fr', 'lalsace.fr', 'ledauphine.com', 'lejsl.com', 'leprogres.fr', 'republicain-lorrain.fr', 'vosgesmatin.fr'];
 const fr_groupe_la_depeche_domains = ['centrepresseaveyron.fr', 'ladepeche.fr', 'lindependant.fr', 'midi-olympique.fr', 'midilibre.fr', 'nrpyrenees.fr', 'petitbleu.fr'];
 const it_ilmessaggero_domains = ['corriereadriatico.it', 'ilgazzettino.it', 'ilmattino.it', 'ilmessaggero.it', 'quotidianodipuglia.it'];
+const it_quotidiano_domains = ['ilgiorno.it', 'ilrestodelcarlino.it', 'iltelegrafolivorno.it', 'lanazione.it', 'quotidiano.net'];
 const nl_ad_region_domains = ['ad.nl', 'bd.nl', 'ed.nl', 'tubantia.nl', 'bndestem.nl', 'pzc.nl', 'destentor.nl', 'gelderlander.nl'];
 const nl_mediahuis_region_domains = ['gooieneemlander.nl', 'haarlemsdagblad.nl', 'ijmuidercourant.nl', 'leidschdagblad.nl', 'noordhollandsdagblad.nl'];
 const no_nhst_media_domains = ['intrafish.com', 'rechargenews.com', 'tradewindsnews.com', 'upstreamonline.com'];
@@ -348,4 +346,4 @@ const usa_tribune_domains = ['baltimoresun.com', 'chicagotribune.com', 'courant.
 const usa_theathletic_domains = ['theathletic.com', 'theathletic.co.uk'];
 
 var defaultSites_grouped_domains = Object.values(defaultSites);
-var defaultSites_domains = defaultSites_grouped_domains.concat(au_comm_media_domains, au_news_corp_domains, au_prov_news_domains, br_folha_domains, ca_torstar_domains, de_funke_media_domains, de_madsack_domains, economictimes_domains, es_grupo_vocento_domains, fi_alma_talent_domains, fr_be_groupe_rossel_domains, fr_groupe_ebra_domains, fr_groupe_la_depeche_domains, it_ilmessaggero_domains, nl_ad_region_domains, nl_mediahuis_region_domains, no_nhst_media_domains, timesofindia_domains, usa_crainsbiz_domains, usa_mcc_domains, usa_nymag_domains, usa_tribune_domains, usa_theathletic_domains);
+var defaultSites_domains = defaultSites_grouped_domains.concat(au_comm_media_domains, au_news_corp_domains, au_prov_news_domains, br_folha_domains, ca_torstar_domains, de_funke_media_domains, de_madsack_domains, economictimes_domains, es_grupo_vocento_domains, fi_alma_talent_domains, fr_be_groupe_rossel_domains, fr_groupe_ebra_domains, fr_groupe_la_depeche_domains, it_ilmessaggero_domains, it_quotidiano_domains, nl_ad_region_domains, nl_mediahuis_region_domains, no_nhst_media_domains, timesofindia_domains, usa_crainsbiz_domains, usa_mcc_domains, usa_nymag_domains, usa_tribune_domains, usa_theathletic_domains);