Fix USA Today & Gannett Group (amp)

background.js

@@ -686,6 +686,9 @@ ext_api.webRequest.onBeforeSendHeaders.addListener(function(details) {
       use_google_bot.push(gn_domain);
       change_headers.push(gn_domain);
     }
+    blockedRegexes[gn_domain] = blockedRegexes['azcentral.com'];
+    if (!amp_unhide.includes(gn_domain))
+      amp_unhide.push(gn_domain);
     usa_gannett_domains.push(gn_domain);
     if (!enabledSites.includes(gn_domain))
       enabledSites.push(gn_domain);

changelog.txt

@@ -6,6 +6,7 @@ Add Koelner Stadt-Anzeiger & Koelnische Rundschau
 Add The (New Orleans) Advocate
 Fix Lecho.be (separate from Groupe Rossel)
 Fix Repubblica sites (no amp)
+Fix USA Today & Gannett Group (amp)
 
 * v2.4.6.0 (2021-12-05)
 Add Artnet

contentScript.js

@@ -2740,16 +2740,20 @@ else if (matchDomain(usa_tribune_domains)) {
 }
 
 else if (matchDomain('usatoday.com')) {
-  let roadblock = document.querySelector('.roadblock-container');
-  if (roadblock) {
-    removeDOMElement(roadblock);
-    article_next = document.querySelector('article.next-in-depth-story > div.article-inner');
-    if (article_next) {
-      let url = article_next.getAttribute('data-url');
-      let weblink = document.createElement('a');
-      weblink.href = url;
-      weblink.innerText = 'open next in-depth story';
-      article_next.appendChild(weblink);
+  if (window.location.hostname.startsWith('amp.')) {
+    amp_unhide_access_hide('="gup.hasAssetAccess"', '', 'div[class*="ad-"]');
+  } else {
+    let roadblock = document.querySelector('.roadblock-container');
+    if (roadblock) {
+      removeDOMElement(roadblock);
+      article_next = document.querySelector('article.next-in-depth-story > div.article-inner');
+      if (article_next) {
+        let url = article_next.getAttribute('data-url');
+        let weblink = document.createElement('a');
+        weblink.href = url;
+        weblink.innerText = 'open next in-depth story';
+        article_next.appendChild(weblink);
+      }
     }
   }
 }

manifest.json

@@ -587,5 +587,5 @@
         "*://*.wallkit.net/*",
         "*://*.wsj.net/*"
     ],
-    "version": "2.4.6.3"
+    "version": "2.4.6.4"
 }

sites.js

@@ -511,6 +511,8 @@ var defaultSites = {
       "tennessean.com"
     ],
     allow_cookies: 1,
+    amp_unhide: 1,
+    block_regex: /cdn\.ampproject\.org\/v\d\/amp-(access|ad)-.+\.js/,
     useragent: "googlebot"
   },
   "GElocal.it": {
@@ -1612,6 +1614,7 @@ var defaultSites = {
   "USA Today": {
     domain: "usatoday.com",
     allow_cookies: 1,
+    block_regex: /cdn\.ampproject\.org\/v\d\/amp-(access|ad)-.+\.js/,
     useragent: "googlebot"
   },
   "Valeurs Actuelles": {

sites_updated.json

@@ -9,19 +9,25 @@
       }
     ]
   },
-  "Code Sports": {
-    "domain": "codesports.com.au",
+  "Gannett Group (local USA Today)": {
+    "domain": "###_usa_gannett",
+    "group": [
+      "azcentral.com",
+      "cincinnati.com",
+      "courier-journal.com",
+      "detroitnews.com",
+      "freep.com",
+      "indystar.com",
+      "jsonline.com",
+      "northjersey.com",
+      "statesman.com",
+      "tennessean.com"
+    ],
     "allow_cookies": 1,
+    "amp_unhide": 1,
+    "block_regex": "cdn\\.ampproject\\.org\\/v\\d\\/amp-(access|ad)-.+\\.js",
     "useragent": "googlebot"
   },
-  "DealStreetAsia": {
-    "domain": "dealstreetasia.com",
-    "useragent": "bingbot"
-  },
-  "Italian.tech": {
-    "domain": "italian.tech",
-    "group_rule": "###_gr_it_repubblica_domains"
-  },
   "Internazionale.it": {
     "domain": "internazionale.it",
     "allow_cookies": 1,
@@ -55,8 +61,11 @@
       }
     ]
   },
-  "The Spectator World": {
-    "domain": "spectatorworld.com",
-    "block_regex": "(cdn\\.cxense\\.com\\/|\\.tinypass\\.com\\/)"
+  "USA Today": {
+    "domain": "usatoday.com",
+    "allow_cookies": 1,
+    "amp_unhide": 1,
+    "block_regex": "cdn\\.ampproject\\.org\\/v\\d\\/amp-(access|ad)-.+\\.js",
+    "useragent": "googlebot"
   }
 }