From 88620150c9365f24a0486e3a27bfabc2ba17fb07 Mon Sep 17 00:00:00 2001
From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com>
Date: Sun, 30 Apr 2023 07:38:33 +0200
Subject: [PATCH] Fix Gannett Group (redirect restricted)

---
 changelog.txt         | 1 +
 contentScript.js      | 8 +++++++-
 contentScript_once.js | 2 +-
 custom/manifest.json  | 2 +-
 manifest.json         | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 0e4827d..d158cd1 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -4,6 +4,7 @@ Updates (install signed xpi-file): https://gitlab.com/magnolia1234/bypass-paywal
 
 Post-release
 Fix Bloomberg (Live TV limit)
+Fix Gannett Group (redirect restricted)
 Fix La Vanguardia (xhr)
 Fix Mediahuis Noord (refresh)
 Fix Roularta Media Group (js) 
diff --git a/contentScript.js b/contentScript.js
index 040abee..cc222e2 100644
--- a/contentScript.js
+++ b/contentScript.js
@@ -36,6 +36,7 @@ var uk_nat_world_domains = ['scotsman.com', 'yorkshirepost.co.uk'];
 var usa_adv_local_domains = ['al.com', 'cleveland.com', 'lehighvalleylive.com', 'masslive.com', 'mlive.com', 'nj.com', 'oregonlive.com', 'pennlive.com', 'silive.com', 'syracuse.com'];
 var usa_conde_nast_domains = ['architecturaldigest.com', 'bonappetit.com', 'epicurious.com', 'gq.com' , 'newyorker.com', 'vanityfair.com', 'vogue.com', 'wired.com'];
 var usa_craincomm_domains = ['adage.com', 'autonews.com', 'chicagobusiness.com', 'crainscleveland.com', 'crainsdetroit.com', 'crainsnewyork.com', 'modernhealthcare.com'];
+var usa_gannett_domains = ['azcentral.com', 'cincinnati.com', 'commercialappeal.com', 'courier-journal.com', 'democratandchronicle.com', 'detroitnews.com', 'freep.com', 'indystar.com', 'jsonline.com', 'knoxnews.com', 'news-press.com', 'northjersey.com', 'oklahoman.com', 'statesman.com', 'tennessean.com'];
 var usa_genomeweb_domains = ['360dx.com', 'genomeweb.com', 'precisiononcologynews.com'];
 var usa_hearst_comm_domains = ['expressnews.com', 'houstonchronicle.com', 'sfchronicle.com'];
 var usa_lee_ent_domains = ['buffalonews.com', 'journalnow.com', 'omaha.com', 'richmond.com', 'tucson.com', 'tulsaworld.com'];
@@ -500,7 +501,7 @@ else if (matchDomain('aerztezeitung.de')) {
 }
 
 else if (matchDomain('allgaeuer-zeitung.de')) {
-  if (!window.location.search.includes('?type=amp')) {
+  if (!window.location.search.startsWith('?type=amp')) {
     let paywall = document.querySelector('p.nfy-text-blur');
     if (paywall) {
       removeDOMElement(paywall);
@@ -4783,6 +4784,11 @@ else if (matchDomain('zerohedge.com')) {
   }, 1000);
 }
 
+else if (matchDomain(usa_gannett_domains) || document.querySelector('img[srcset^="https://www.gannett-cdn.com/"], link[href*=".gannett-cdn.com/"]')) {
+  if (window.location.pathname.endsWith('/restricted/') && window.location.search.startsWith('?return='))
+    window.location.href = decodeURIComponent(window.location.href.split('?return=')[1]);
+}
+
 else if ((domain = matchDomain(usa_lee_ent_domains)) || document.querySelector('script[src*=".townnews.com/"][src*="/tncms/"]')) {
   if (window.location.pathname.endsWith('.amp.html')) {
     amp_unhide_access_hide('="hasAccess"', '="NOT hasAccess"', 'amp-ad, amp-embed, .amp-ads-container');
diff --git a/contentScript_once.js b/contentScript_once.js
index 34b7ae1..d10182d 100644
--- a/contentScript_once.js
+++ b/contentScript_once.js
@@ -93,7 +93,7 @@ window.setTimeout(function () {
         group = '###_ca_postmedia';
       else if (document.querySelector('script[src*=".axate.io/"], script[src*=".agate.io/"]'))
         group = '###_uk_axate.io';
-      else if (document.querySelector('img[srcset^="https://www.gannett-cdn.com/"]'))
+      else if (document.querySelector('img[srcset^="https://www.gannett-cdn.com/"], link[href*=".gannett-cdn.com/"]'))
         group = '###_usa_gannett';
       else if (document.querySelector('script[src*="/treg.hearstnp.com/"]'))
         group = '###_usa_hearst_comm';
diff --git a/custom/manifest.json b/custom/manifest.json
index 9007690..91fd5d0 100644
--- a/custom/manifest.json
+++ b/custom/manifest.json
@@ -51,5 +51,5 @@
     "webRequestBlocking",
     "*://*/*"
   ],
-  "version": "3.1.5.4"
+  "version": "3.1.5.5"
 }
diff --git a/manifest.json b/manifest.json
index f8602fe..960d081 100644
--- a/manifest.json
+++ b/manifest.json
@@ -753,5 +753,5 @@
     "*://html.onlineviewer.net/*",
     "*://webcache.googleusercontent.com/*"
   ],
-  "version": "3.1.5.4"
+  "version": "3.1.5.5"
 }