Fix The Globe and Mail (revert to old fix)

background.js

@@ -111,7 +111,7 @@ var excludedSites = [];
 function setDefaultOptions() {
   ext_api.storage.local.set({
     sites: filterObject(defaultSites, function (val, key) {
-      return val.domain && !val.domain.match(/^(###$|#options_disable_)/)
+      return val.domain && !val.domain.match(/^(###$|#options_(disable|optin)_)/)
     },
       function (val, key) {
       return [key, val.domain]
@@ -277,8 +277,8 @@ function set_rules(sites, sites_updated, sites_custom) {
       }
     }
   }
-  if (enabledSites.includes('#options_optin_tgam_media'))
-    blockedRegexes['theglobeandmail.com'] = /(\.theglobeandmail\.com\/pf\/dist\/engine\/react\.js|smartwall\.theglobeandmail\.com\/)/;
+  if (enabledSites.includes('#options_optin_tgam_premium'))
+    blockedRegexes['theglobeandmail.com'] = /smartwall\.theglobeandmail\.com\//;
   use_random_ip = Object.keys(random_ip);
   change_headers = use_google_bot.concat(use_bing_bot, use_facebook_referer, use_google_referer, use_twitter_referer, use_random_ip);
   disableJavascriptOnListedSites();
@@ -622,7 +622,7 @@ if (block_js_inline.length)
 ext_api.webRequest.onHeadersReceived.addListener(function (details) {
   let url_path = details.url.split('?')[0];
   let excluded = (matchUrlDomain('elpais.com', details.url) && (url_path.includes('/elpais.com') || !url_path.includes('.html')))
-  || (matchUrlDomain('theglobeandmail.com', details.url) && (enabledSites.includes('#options_optin_tgam_media') || !details.url.includes('?rel=premium')));
+  || (matchUrlDomain('theglobeandmail.com', details.url) && (!enabledSites.includes('#options_optin_tgam_premium') || !details.url.includes('?rel=premium')));
   if (!isSiteEnabled(details) || excluded)
     return;
   var headers = details.responseHeaders;

changelog.txt

@@ -2,6 +2,7 @@
 Changelog Bypass Paywalls Clean - Firefox
 
 Post-release
+Fix The Globe and Mail (revert to old fix)
 
 * v2.6.9.0 (2022-05-15)
 Add The Star Malaysia

contentScript.js

@@ -3463,7 +3463,7 @@ else if (matchDomain('theglobeandmail.com')) {
     if (article_body_subscribed)
       article_body_subscribed.removeAttribute('class');
   }
-  let banners = document.querySelectorAll('div.c-ad, div#subscription-pencil-area');
+  let banners = document.querySelectorAll('div.c-ad, div#subscription-pencil-area, div.marketing-container-wrapper');
   removeDOMElement(...banners);
 }
 

manifest.json

@@ -673,5 +673,5 @@
         "*://*.wsj.net/*",
         "*://webcache.googleusercontent.com/*"
     ],
-    "version": "2.6.9.0"
+    "version": "2.6.9.1"
 }

sites.js

@@ -1635,7 +1635,7 @@ var defaultSites = {
   },
   "The Globe and Mail": {
     domain: "theglobeandmail.com",
-    block_regex: /smartwall\.theglobeandmail\.com\//
+    block_regex: /(\.theglobeandmail\.com\/pf\/dist\/engine\/react\.js|smartwall\.theglobeandmail\.com\/)/
   },
   "The Hill Times": {
     domain: "hilltimes.com",
@@ -2033,8 +2033,8 @@ var defaultSites = {
   "The Wall Street Journal - no Googlebot (http error 500)": {
     domain: "#options_disable_gb_wsj"
   },
-  "The Globe and Mail premium-media (empty sections)": {
-    domain: "#options_optin_tgam_media"
+  "The Globe and Mail premium-only (or when empty sections)": {
+    domain: "#options_optin_tgam_premium"
   },
 }
 

sites_updated.json

@@ -28,6 +28,10 @@
     "block_regex": "(\\.blueconic\\.net\\/|js\\.matheranalytics\\.com\\/|cdn\\.ampproject\\.org\\/v\\d\\/amp-subscriptions-.+\\.js)",
     "useragent": "googlebot"
   },
+  "The Globe and Mail": {
+    "domain": "theglobeandmail.com",
+    "block_regex": "(\\.theglobeandmail\\.com\\/pf\\/dist\\/engine\\/react\\.js|smartwall\\.theglobeandmail\\.com\\/)"
+  },
   "The Star Malaysia": {
     "domain": "thestar.com.my",
     "block_regex": "(cdn\\.cxense\\.com\\/|\\.piano\\.io\\/)"