Grouping GEDI.it sites

README.md

@@ -535,23 +535,24 @@ Grouped in options:\
 [Corriere dello Sport](https://www.corrieredellosport.it) -
 [Domani](https://editorialedomani.it) -
 [Eastwest](https://eastwest.eu) -
-[GElocal.it](https://quotidiani.gelocal.it) -
-[Huffingtonpost.it](https://www.huffingtonpost.it) -
 [Il Fatto Quotidiano](https://www.ilfattoquotidiano.it) -
 [Il Foglio](https://www.ilfoglio.it) -
 [Il Manifesto](https://ilmanifesto.it) -
-[Il Secolo XIX](https://www.ilsecoloxix.it) -
 [Il Tirreno](https://www.iltirreno.it) -
 [Internazionale](https://www.internazionale.it) -
 [Italia Oggi](https://www.italiaoggi.it) -
+[La Nuova Sardegna](https://www.lanuovasardegna.it)
+
+Grouped in options:\
+*Gruppo GEDI.it* sites like\
+[GElocal.it](https://quotidiani.gelocal.it) -
+[Huffingtonpost.it](https://www.huffingtonpost.it) -
+[Il Secolo XIX](https://www.ilsecoloxix.it) -
 [Italian.tech](https://www.italian.tech) -
-[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)\
-
-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) -
@@ -679,7 +680,7 @@ Grouped in options:\
 [WAtoday](https://www.watoday.com.au)
 
 Grouped in options:\
-*News Corp Australia* site like\
+*News Corp Australia* sites like\
 [Cairns Post](https://www.cairnspost.com.au) -
 [Code Sports](https://www.codesports.com.au) -
 [Geelong Advertiser](https://www.geelongadvertiser.com.au) -

background.js

@@ -976,7 +976,7 @@ ext_api.webRequest.onBeforeSendHeaders.addListener(function(details) {
       (matchUrlDomain('nationalgeographic.com', header_referer) && matchUrlDomain('natgeofe.com', details.url)) ||
       (matchUrlDomain('usatoday.com', header_referer) && matchUrlDomain('gannett-cdn.com', details.url)) ||
       (matchUrlDomain(ca_gcm_domains, header_referer) && matchUrlDomain('gcm.omerlocdn.com', details.url)) ||
-      (matchUrlDomain(it_repubblica_domains, header_referer) && matchUrlDomain(['repstatic.it'], details.url));
+      (matchUrlDomain(it_gedi_domains, header_referer) && matchUrlDomain(['repstatic.it'], details.url));
   }
 
   if (!isSiteEnabled(details) && !allow_ext_source) {
@@ -1018,7 +1018,7 @@ if (matchUrlDomain(change_headers, details.url) && !['font', 'image', 'styleshee
       setReferer = true;
     }
     if (requestHeader.name === 'User-Agent') {
-      useUserAgentMobile = requestHeader.value.toLowerCase().includes("mobile") && !matchUrlDomain(['telerama.fr'].concat(it_repubblica_domains), details.url);
+      useUserAgentMobile = requestHeader.value.toLowerCase().includes("mobile") && !matchUrlDomain(['telerama.fr'].concat(it_gedi_domains), details.url);
     }
     return requestHeader;
   });

changelog.txt

@@ -9,6 +9,7 @@ Fix Australian Community Media (css)
 Add Tagesspiegel.de
 Fix The Athletic (css & amp)
 Grouping DPG Media (not ADR)
+Grouping GEDI.it sites
 Grouping Unidad Editorial
 Grouping Westfaelische Mediengruppe
 Redirect Google AMP cache (opt-in to custom sites)

contentScript.js

@@ -19,7 +19,7 @@ var fr_groupe_ebra_domains = ['bienpublic.com', 'dna.fr', 'estrepublicain.fr', '
 var fr_groupe_la_depeche_domains = ['centrepresseaveyron.fr', 'ladepeche.fr', 'lindependant.fr', 'midi-olympique.fr', 'midilibre.fr', 'nrpyrenees.fr', 'petitbleu.fr'];
 var fr_groupe_nice_matin_domains = ['monacomatin.mc', 'nicematin.com', 'varmatin.com'];
 var it_ilmessaggero_domains = ['corriereadriatico.it', 'ilgazzettino.it', 'ilmattino.it', 'ilmessaggero.it', 'quotidianodipuglia.it'];
-var it_repubblica_domains = ['gelocal.it', 'ilsecoloxix.it', 'italian.tech', 'lastampa.it', 'repubblica.it'];
+var it_gedi_domains = ['gelocal.it', 'huffingtonpost.it', 'ilsecoloxix.it', 'italian.tech', 'lastampa.it', 'lescienze.it', 'limesonline.com', 'repubblica.it'];
 var it_quotidiano_domains = ['ilgiorno.it', 'ilrestodelcarlino.it', 'iltelegrafolivorno.it', 'lanazione.it', 'quotidiano.net'];
 var medium_custom_domains = ['betterprogramming.pub', 'towardsdatascience.com'];
 var nl_mediahuis_region_domains = ['gooieneemlander.nl', 'haarlemsdagblad.nl', 'ijmuidercourant.nl', 'leidschdagblad.nl', 'noordhollandsdagblad.nl'];
@@ -1833,28 +1833,6 @@ else if (matchDomain('italiaoggi.it')) {
   }
 }
 
-else if (matchDomain('lescienze.it')) {
-  window.setTimeout(function () {
-    let paywall = document.querySelector('.paywall-adagio');
-    let body_paywall = document.getElementById('detail-body-paywall');
-    let shade = document.querySelector('.shade');
-    removeDOMElement(paywall, body_paywall, shade);
-    let hidden_bodies = document.querySelectorAll('.detail_body');
-    for (let hidden_body of hidden_bodies) {
-      hidden_body.removeAttribute('hidden');
-      hidden_body.setAttribute('style', 'display:block; max-height:auto; overflow:visible');
-    }
-  }, 1000);
-}
-
-else if (matchDomain('limesonline.com')) {
-  window.setTimeout(function () {
-    let url = window.location.href;
-    if (url.includes('prv=true'))
-      window.location.href = new URL(url).pathname;
-  }, 500);
-}
-
 else if (matchDomain('rep.repubblica.it')) {
   window.setTimeout(function () {
     if (window.location.href.includes('/pwa/')) {
@@ -1870,37 +1848,60 @@ else if (matchDomain('rep.repubblica.it')) {
   }
 }
 
-else if (matchDomain(it_repubblica_domains)) {
+else if (matchDomain(it_gedi_domains)) {
-  let url = window.location.href.split('?')[0];
+  if (matchDomain('huffingtonpost.it')) {
-  if (!url.match(/\amp(\/)?$/)) {
+    csDoneOnce = true;
-    let premium = document.querySelector('#paywall, iframe#__limio_frame');
+  } else if (matchDomain('lescienze.it')) {
-    if (premium) {
+    let paywall = document.querySelector('.paywall-adagio');
-      removeDOMElement(premium);
+    if (paywall) {
-      if (!url.includes('/podcast/')) {
+      let body_paywall = document.querySelector('#detail-body-paywall');
+      let shade = document.querySelector('.shade');
+      removeDOMElement(paywall, body_paywall, shade);
+      let detail_body_hidden = document.querySelectorAll('.detail_body[hidden]');
+      for (let elem of detail_body_hidden) {
+        elem.removeAttribute('hidden');
+        elem.removeAttribute('style');
+      }
+      csDoneOnce = true;
+    }
+  } else if (matchDomain('limesonline.com')) {
+    let url = window.location.href;
+    if (url.includes('prv=true')) {
+      window.setTimeout(function () {
+        window.location.href = url.split('?')[0];
+      }, 500);
+    } else
+      csDoneOnce = true;
+  } else {
+    let url = window.location.href.split('?')[0];
+    if (!url.match(/\amp(\/)?$/)) {
+      let premium = document.querySelector('#paywall, iframe#__limio_frame');
+      if (premium) {
+        removeDOMElement(premium);
         let amphtml = document.querySelector('link[rel="amphtml"]');
         if (amphtml)
           window.location.href = amphtml.href;
+      } else if (matchDomain('gelocal.it')) {
+        premium = document.querySelector('.paywall-adagio');
+        if (premium) {
+          removeDOMElement(premium);
+          window.setTimeout(function () {
+            let article_body = document.querySelector('div#article-body[style]');
+            if (article_body)
+              article_body.removeAttribute('style');
+          }, 1000);
+        }
       }
-    } else if (matchDomain('gelocal.it')) {
+      let ads = document.querySelectorAll('div[id^="adv"]');
-      premium = document.querySelector('.paywall-adagio');
+      removeDOMElement(...ads);
-      if (premium) {
-        removeDOMElement(premium);
-        window.setTimeout(function () {
-          let article_body = document.querySelector('div#article-body[style]');
-          if (article_body)
-            article_body.removeAttribute('style');
-        }, 1000);
-      }
-    }
-    let ads = document.querySelectorAll('div[id^="adv"]');
-    removeDOMElement(...ads);
-  } else {
-    if (matchDomain(['lastampa.it', 'www.repubblica.it'])) {
-      let paywall = document.querySelector('div[id^="paywall-banner"]');
-      removeDOMElement(paywall);
-      amp_unhide_subscr_section('amp-ad, amp-embed');
     } else {
-      amp_unhide_access_hide('="showContent"', '', 'amp-ad, amp-embed')
+      if (matchDomain(['lastampa.it', 'www.repubblica.it'])) {
+        let paywall = document.querySelector('div[id^="paywall-banner"]');
+        removeDOMElement(paywall);
+        amp_unhide_subscr_section('amp-ad, amp-embed');
+      } else {
+        amp_unhide_access_hide('="showContent"', '', 'amp-ad, amp-embed')
+      }
     }
   }
 }

custom/sites_custom.json

@@ -129,6 +129,7 @@
   },
   "Supchina.com": {
     "allow_cookies": 1,
+    "block_regex": "\\.tinypass\\.com\\/",
     "domain": "supchina.com"
   },
   "Swarajyamag.com": {

manifest.json

@@ -700,5 +700,5 @@
     "*://gcm.omerlocdn.com/*",
     "*://webcache.googleusercontent.com/*"
   ],
-  "version": "2.7.8.5"
+  "version": "2.7.8.6"
 }

sites.js

@@ -382,7 +382,7 @@ var defaultSites = {
       "trouw.nl",
       "volkskrant.nl"
     ],
-    allow_cookies: 1,
+    remove_cookies_select_drop: ["TID_ID"],
     block_regex: "(\\.{domain}\\/temptation\\/resolve|temptation\\.{domain}\\/rest\\/.+\\/_resolve_from_website)"
   },
   "Eastwest.eu": {
@@ -582,10 +582,6 @@ var defaultSites = {
     block_regex: /cdn\.ampproject\.org\/v\d\/amp-access-.+\.js/,
     useragent: "googlebot"
   },
-  "GElocal.it": {
-    domain: "gelocal.it",
-    group_rule: "###_gr_it_repubblica_domains"
-  },
   "GenomeWeb": {
     domain: "###_usa_genomeweb",
     group: [
@@ -751,6 +747,21 @@ var defaultSites = {
     allow_cookies: 1,
     block_regex: /cdn\.ampproject\.org\/v\d\/amp-(access|subscriptions)-.+\.js/
   },
+  "Gruppo GEDI.it": {
+    domain: "###_it_gedi",
+    group: [
+      "gelocal.it",
+      "huffingtonpost.it",
+      "ilsecoloxix.it",
+      "italian.tech",
+      "lastampa.it",
+      "lescienze.it",
+      "limesonline.com",
+      "repubblica.it"],
+    allow_cookies: 1,
+    block_regex: /(scripts\.repubblica\.it\/pw\/pw\.js|cdn\.ampproject\.org\/v\d\/amp-(access|user-notification)-.+\.js)/,
+    useragent: "googlebot"
+  },
   "Haaretz English": {
     domain: "haaretz.com",
     allow_cookies: 1,
@@ -819,10 +830,6 @@ var defaultSites = {
     domain: "staradvertiser.com",
     allow_cookies: 1
   },
-  "Huffingtonpost.it": {
-    domain: "huffingtonpost.it",
-    group_rule: "###_gr_it_repubblica_domains"
-  },
   "Il Fatto Quotidiano": {
     domain: "ilfattoquotidiano.it",
     allow_cookies: 1,
@@ -848,10 +855,6 @@ var defaultSites = {
     ],
     block_regex: /(utils\.cedsdigital\.it\/js\/PaywallMeter\.js|cdn\.ampproject\.org\/v\d\/amp-(access|consent|subscriptions)-.+\.mjs)/
   },
-  "Il Secolo XIX": {
-    domain: "ilsecoloxix.it",
-    group_rule: "###_gr_it_repubblica_domains"
-  },
   "Il Tirreno": {
     domain: "iltirreno.it"
   },
@@ -905,10 +908,6 @@ var defaultSites = {
     domain: "italiaoggi.it",
     allow_cookies: 1
   },
-  "Italian.tech": {
-    domain: "italian.tech",
-    group_rule: "###_gr_it_repubblica_domains"
-  },
   "Knack.be": {
     domain: "knack.be",
     allow_cookies: 1,
@@ -993,18 +992,10 @@ var defaultSites = {
   "La Nuova Sardegna": {
     domain: "lanuovasardegna.it"
   },
-  "La Repubblica": {
-    domain: "repubblica.it",
-    group_rule: "###_gr_it_repubblica_domains"
-  },
   "La Segunda": {
     domain: "lasegunda.com",
     block_regex: /\.(lasegunda\.com|emol\.cl)\/(.+\/)?js\/(.+\/)?(modal|merPramV\d|PramModal\.min)\.js/
   },
-  "La Stampa": {
-    domain: "lastampa.it",
-    group_rule: "###_gr_it_repubblica_domains"
-  },
   "La Tercera": {
     domain: "latercera.com",
     allow_cookies: 1,
@@ -1060,10 +1051,6 @@ var defaultSites = {
     block_regex: /\.tinypass\.com\//,
     useragent: "googlebot"
   },
-  "Le Scienze": {
-    domain: "lescienze.it",
-    group_rule: "###_gr_it_repubblica_domains"
-  },
   "Le Télégramme": {
     domain: "letelegramme.fr",
     allow_cookies: 1,
@@ -1096,10 +1083,6 @@ var defaultSites = {
     allow_cookies: 1,
     block_regex: /\.qiota\.com\//
   },
-  "LimesOnline": {
-    domain: "limesonline.com",
-    group_rule: "###_gr_it_repubblica_domains"
-  },
   "Live Law": {
     domain: "livelaw.in",
     allow_cookies: 1
@@ -2018,12 +2001,6 @@ var defaultSites = {
     group_rule_domains: ["brisbanetimes.com.au", "smh.com.au", "theage.com.au", "watoday.com.au"],
     block_regex: /cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js/
   },
-  "###_gr_it_repubblica_domains": {
-    group_rule_domains: ["gelocal.it", "huffingtonpost.it", "ilsecoloxix.it", "italian.tech", "lastampa.it", "lescienze.it", "limesonline.com", "repubblica.it"],
-    allow_cookies: 1,
-    block_regex: /(scripts\.repubblica\.it\/pw\/pw\.js|cdn\.ampproject\.org\/v\d\/amp-(access|user-notification)-.+\.js)/,
-    useragent: "googlebot"
-  },
   "* Block Paywall-scripts (opt-in to custom sites to enable also for non-listed sites)": {
     domain: "###"
   },
@@ -2176,11 +2153,11 @@ var be_mediahuis_domains = grouped_sites['###_be_mediahuis'];
 var ca_gcm_domains = grouped_sites['###_ca_gcm'];
 var de_westfalen_medien_domains = grouped_sites['###_de_westfalen_medien'];
 var fr_groupe_sud_ouest_domains = grouped_sites['###_fr_groupe_sud_ouest'];
-var it_repubblica_domains = defaultSites['###_gr_it_repubblica_domains']['group_rule_domains'];
+var it_gedi_domains = grouped_sites['###_it_gedi'];
 var medium_custom_domains = grouped_sites['###_medium_custom'];
 var nl_mediahuis_region_domains = grouped_sites['###_nl_mediahuis_region'];
 var no_nhst_media_domains = grouped_sites['###_no_nhst_media'];
 
 // sites with no fix (background)
-var nl_ad_region_domains = ['ad.nl', 'bd.nl', 'ed.nl', 'tubantia.nl', 'bndestem.nl', 'pzc.nl', 'destentor.nl', 'gelderlander.nl'];
+var nl_dpg_media_nofix_domains = ['ad.nl', 'bd.nl', 'bndestem.nl', 'destentor.nl', 'ed.nl', 'gelderlander.nl', 'hln.be', 'pzc.nl', 'tubantia.nl'];
-var nofix_sites = ['africaintelligence.com', 'africaintelligence.fr', 'aftenposten.no', 'bild.de', 'borsen.dk', 'businesstimes.com.sg', 'caixin.com', 'caixinglobal.com', 'caravanmagazine.in', 'cnbc.com', 'courrierinternational.com', 'dn.se', 'elordenmundial.com', 'epw.in', 'expresso.pt', 'ftchinese.com', 'gazzetta.it', 'handelsblatt.com', 'hln.be', 'ilmanifesto.it', 'ilsole24ore.com', 'jacobinmag.com', 'jeunesafrique.com', 'kurier.at', 'lavozdegalicia.es', 'leconomiste.com', 'lefigaro.fr', 'lemonde.fr', 'lepoint.fr', 'liberation.fr', 'mediapart.fr', 'milanofinanza.it', 'mondediplo.com', 'moneycontrol.com', 'nieuwsblad.be', 'nknews.org', 'ouest-france.fr', 'politiken.dk', 'publico.pt', 'republic.ru', 'rp-online.de', 'statnews.com', 'stern.de', 'straitstimes.com', 'sueddeutsche.de', 'tagesanzeiger.ch', 'the-ken.com', 'theinformation.com', ' themorningcontext.com', 'theparisreview.org', 'thewirechina.com', 'welt.de', 'wiwo.de', 'ynet.co.il'].concat(nl_ad_region_domains);
+var nofix_sites = ['africaintelligence.com', 'africaintelligence.fr', 'aftenposten.no', 'bild.de', 'borsen.dk', 'businesstimes.com.sg', 'caixin.com', 'caixinglobal.com', 'caravanmagazine.in', 'cnbc.com', 'courrierinternational.com', 'dn.se', 'elordenmundial.com', 'epw.in', 'expresso.pt', 'ftchinese.com', 'gazzetta.it', 'handelsblatt.com', 'hln.be', 'ilmanifesto.it', 'ilsole24ore.com', 'jacobinmag.com', 'jeunesafrique.com', 'kurier.at', 'lavozdegalicia.es', 'leconomiste.com', 'lefigaro.fr', 'lemonde.fr', 'lepoint.fr', 'liberation.fr', 'mediapart.fr', 'milanofinanza.it', 'mondediplo.com', 'moneycontrol.com', 'nieuwsblad.be', 'nknews.org', 'ouest-france.fr', 'politiken.dk', 'publico.pt', 'republic.ru', 'rp-online.de', 'statnews.com', 'stern.de', 'straitstimes.com', 'sueddeutsche.de', 'tagesanzeiger.ch', 'the-ken.com', 'theinformation.com', ' themorningcontext.com', 'theparisreview.org', 'thewirechina.com', 'welt.de', 'wiwo.de', 'ynet.co.il'].concat(nl_dpg_media_nofix_domains);