Fix & grouping Australia Nine Entertainment

README.md

@@ -558,7 +558,6 @@ Grouped in options:\
 [Neue Presse (Hannover)](https://www.neuepresse.de) -
 [Ostsee-Zeitung](https://www.ostsee-zeitung.de) -
 [RedaktionsNetzwerk Deutschland](https://www.rnd.de)\
-*Westfälische Mediengruppe* sites like\
 *Rheinische Post Mediengruppe* sites like
 [Aachener Nachrichten](https://www.aachener-nachrichten.de) -
 [Aachener Zeitung](https://www.aachener-zeitung.de) -
@@ -566,6 +565,7 @@ Grouped in options:\
 [Rheinische Post](https://rp-online.de) -
 [Saarbrücker Zeitung](http://www.saarbruecker-zeitung.de) -
 [Trierischer Volksfreund](http://www.volksfreund.de)\
+*Westfälische Mediengruppe* sites like\										
 [Münstersche Zeitung](https://www.muensterschezeitung.de) -
 [Westfalen-Blatt](https://www.westfalen-blatt.de) -
 [Westfälische Nachrichten](https://www.wn.de)
@@ -719,21 +719,16 @@ Grouped in options:\
 
 ##### Australia/New Zealand
 
-[Brisbane Times](https://www.brisbanetimes.com.au) -
 [Eureka Report](https://www.eurekareport.com.au) -
 [Griffith Review](https://www.griffithreview.com) -
 [Intelligent Investor](https://www.intelligentinvestor.com.au) -
 [New Zealand Herald](https://www.nzherald.co.nz) -
-[The Age](https://www.theage.com.au) -
-[The Australian Financial Review](https://www.afr.com) -
 [The Saturday Paper](https://www.thesaturdaypaper.com.au) -
 [The Spectator Australia](https://www.spectator.com.au) -
-[The Sydney Morning Herald](https://www.smh.com.au) -
-[The West Australian (+ regional/opt-in to custom sites)](https://thewest.com.au) -
-[WAtoday](https://www.watoday.com.au)
+[The West Australian (+ regional/opt-in to custom sites)](https://thewest.com.au)
 
 Grouped in options:\
-*News Corp Australia* sites like\
+*Australia News Corp* sites like\
 [Cairns Post](https://www.cairnspost.com.au) -
 [Code Sports](https://www.codesports.com.au) -
 [Geelong Advertiser](https://www.geelongadvertiser.com.au) -
@@ -748,6 +743,12 @@ Grouped in options:\
 [The Mercury Tasmania](https://www.themercury.com.au) -
 [The Weekly Times](https://www.weeklytimesnow.com.au) -
 [Townsville Bulletin](https://www.townsvillebulletin.com.au)\
+*Australia Nine Entertainment* sites like\
+[Brisbane Times](https://www.brisbanetimes.com.au) -
+[The Age](https://www.theage.com.au) -
+[The Australian Financial Review](https://www.afr.com) -
+[The Sydney Morning Herald](https://www.smh.com.au) -
+[WAtoday](https://www.watoday.com.au)
 *Australian Community Media (daily)* sites like (opt-in to custom sites for unlisted)\
 [Bendigo Advertiser](https://www.bendigoadvertiser.com.au) -
 [Central Western Daily](https://www.centralwesterndaily.com.au) -

background.js

@@ -405,7 +405,7 @@ ext_api.storage.local.get({
     } else {
       ext_api.management.getSelf(function (result) {
         if ((result.installType === 'development' || (result.installType !== 'development' && !enabledSites.includes('#options_on_update')))) {
-          let new_groups = ['###_de_rp_medien', '###_de_westfalen_medien', '###_es_grupo_vocento', '###_es_unidad', '###_fr_gcf', '###_it_gedi', '###_nl_dpg_media', '###_usa_cbj', '###_usa_chronicle', '###_usa_genomeweb'];
+          let new_groups = ['###_au_nine_ent', '###_de_rp_medien', '###_de_westfalen_medien', '###_es_grupo_vocento', '###_es_unidad', '###_fr_gcf', '###_it_gedi', '###_nl_dpg_media', '###_usa_cbj', '###_usa_chronicle', '###_usa_genomeweb'];
           let open_options = new_groups.some(group => !enabledSites.includes(group) && grouped_sites[group].some(domain => enabledSites.includes(domain) && !customSites_domains.includes(domain)))
              || (!enabledSites.includes('uol.com.br') && (enabledSites.includes('crusoe.uol.com.br') || enabledSites.includes('###_br_folha')))
              || (!enabledSites.includes('iltalehti.fi') && enabledSites.includes('###_fi_alma_talent'));

changelog.txt

@@ -4,6 +4,7 @@ Changelog Bypass Paywalls Clean - Firefox
 Post-release
 Add Haaretz.co.il & The Marker
 Remove LaVie.fr
+Fix & grouping Australia Nine Entertainment
 
 * v2.9.4.0 (2022-11-20)
 Add CNBC (Pro text)

manifest.json

@@ -731,5 +731,5 @@
     "*://gcm.omerlocdn.com/*",
     "*://webcache.googleusercontent.com/*"
   ],
-  "version": "2.9.4.2"
+  "version": "2.9.4.3"
 }

sites.js

@@ -169,6 +169,18 @@ var defaultSites = {
     allow_cookies: 1,
     block_regex: /(cdn-au\.piano\.io\/api\/tinypass.+\.js|cdn\.cxense\.com\/)/
   },
+  "Australia Nine Entertainment": {
+    domain: "###_au_nine_ent",
+    group: [
+      "afr.com",
+      "brisbanetimes.com.au",
+      "smh.com.au",
+      "theage.com.au",
+      "watoday.com.au"
+    ],
+    allow_cookies: 1,
+    block_regex: "(api\\.{domain}\\/graphql\\?query=.+PaywallRuleQuery|cdn\\.ampproject\\.org\\/v\\d\\/amp-subscriptions-.+\\.js)"
+  },
   "Automobilwoche": {
     domain: "automobilwoche.de",
     allow_cookies: 1,
@@ -230,10 +242,6 @@ var defaultSites = {
     allow_cookies: 1,
     block_regex: /(cdn\.cxense\.com\/|\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js)/
   },
-  "Brisbane Times": {
-    domain: "brisbanetimes.com.au",
-    group_rule: "###_gr_au_nine_domains"
-  },
   "Business Insider": {
     domain: "businessinsider.com",
     block_regex: /(\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-access-.+\.js)/
@@ -1736,10 +1744,6 @@ var defaultSites = {
     allow_cookies: 1,
     block_regex: "(\\.{domain}\\/script\\.js|\\.blueconic\\.net\\/|\\.com\\/shared-content\\/art\\/tncms\\/user\\/user\\.js|js\\.matheranalytics\\.com\\/)"
   },
-  "The Age": {
-    domain: "theage.com.au",
-    group_rule: "###_gr_au_nine_domains"
-  },
   "The American Interest": {
     domain: "the-american-interest.com",
     allow_cookies: 1
@@ -2002,10 +2006,6 @@ var defaultSites = {
     domain: "thestar.com.my",
     block_regex: /(cdn\.cxense\.com\/|\.piano\.io\/)/
   },
-  "The Sydney Morning Herald": {
-    domain: "smh.com.au",
-    group_rule: "###_gr_au_nine_domains"
-  },
   "The Telegraph": {
     domain: "telegraph.co.uk",
     allow_cookies: 1,
@@ -2140,10 +2140,6 @@ var defaultSites = {
     domain: "vn.nl",
     allow_cookies: 1
   },
-  "WAtoday": {
-    domain: "watoday.com.au",
-    group_rule: "###_gr_au_nine_domains"
-  },
   "Weltkunst": {
     domain: "weltkunst.de",
     allow_cookies: 1,
@@ -2169,10 +2165,6 @@ var defaultSites = {
     allow_cookies: 1,
     block_regex: /(account\.winnipegfreepress\.com\/api\/v\d\/auth\/identify|cdn\.cxense\.com\/)/
   },
-  "###_gr_au_nine_domains": {
-    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/
-  },
   "* Block general paywall-scripts (opt-in to custom sites to enable also for unlisted sites)": {
     domain: "###"
   },

sites_updated.json

@@ -89,5 +89,10 @@
     "domain": "washingtonpost.com",
     "allow_cookies": 1,
     "block_regex": "\\.washingtonpost\\.com\\/tetro\\/metering\\/evaluate"
+  },
+  "###_gr_au_nine_domains": {
+    "group_rule_domains": ["brisbanetimes.com.au", "smh.com.au", "theage.com.au", "watoday.com.au"],
+    "allow_cookies": 1,
+    "block_regex": "(api\\.{domain}\\/graphql\\?query=.+PaywallRuleQuery|cdn\\.ampproject\\.org\\/v\\d\\/amp-subscriptions-.+\\.js)"
   }
 }