Fix Sacramento Bee (amp)

Plus Fix The Atlanta Journal-Constitution (js)

README.md

@@ -41,7 +41,7 @@ Add-on was removed by Mozilla from add-on store.\
 Current installations (by custom collection in Firefox Beta/Nightly or Firefox-clone) will stay active, but with no more updates.
 
 There is still an elaborate workaround for regular Firefox though:
-* install an old version of Firefox (like [v68.11.0](https://www.apkmirror.com/apk/mozilla/firefox/firefox-68-11-0-release/)); you have to remove your current Firefox app (or use an old Firefox Beta version)
+* install an old version of Firefox (like v68.11.0 from [archive.mozilla.org](https://archive.mozilla.org/pub/mobile/releases/68.11.0/) or [apkmirror.com](https://www.apkmirror.com/apk/mozilla/firefox/firefox-68-11-0-release/) or Firefox-clone; you have to remove your current Firefox app (or use an old Firefox Beta version)
 * download add-on's xpi-file (custom version if you want to use custom sites) from [releases](https://gitlab.com/magnolia1234/bypass-paywalls-firefox-clean/-/releases) and install/open in Firefox
 * now you can update Firefox to the latest version
 * add-on will stay active & automatically updates to the latest version

changelog.txt

@@ -11,6 +11,8 @@ Fix Madsack Mediengruppe (custom flex sites)
 Fix NK News (pro)
 Fix Quartz (newsletter)
 Fix Quotidiano.net sites
+Fix Sacramento Bee (amp)
+Fix The Atlanta Journal-Constitution (js)
 
 * v3.0.6.0 (2023-02-19)
 Add DHnet.be

contentScript.js

@@ -43,7 +43,7 @@ var usa_outside_mag_domains = ["backpacker.com", "betamtb.com", "betternutrition
 var usa_tribune_domains = ['baltimoresun.com', 'chicagotribune.com', 'courant.com', 'dailypress.com', 'mcall.com', 'nydailynews.com', 'orlandosentinel.com', 'pilotonline.com', 'sun-sentinel.com'];
 
 // clean local storage of sites (with an exemption for hold-list)
-var arr_localstorage_hold = ['aachener-nachrichten.de', 'aachener-zeitung.de', 'allgaeuer-zeitung.de', 'augsburger-allgemeine.de', 'barrons.com', 'businessoffashion.com', 'businesspost.ie', 'challenges.fr', 'charliehebdo.fr', 'cmjornal.pt', 'corriere.it', 'corrieredellosport.it', 'cyclingtips.com', 'dvhn.nl', 'economictimes.com', 'eldiario.es', 'elespanol.com', 'elle.fr', 'elpais.com', 'elperiodico.com', 'enotes.com', 'estadao.com.br', 'forbes.com', 'fortune.com', 'freiepresse.de', 'ilfoglio.it', 'inc42.com', 'indianexpress.com', 'ksta.de', 'kurier.at', 'lanouvellerepublique.fr', 'latimes.com', 'lc.nl', 'lesechos.fr', 'livemint.com', 'mid-day.com', 'nationalreview.com', 'nknews.org', 'nw.de', 'nytimes.com', 'nzherald.co.nz', 'rundschau-online.de', 'sandiegouniontribune.com', 'scmp.com', 'seekingalpha.com', 'telegraph.co.uk', 'tes.com', 'theatlantic.com', 'thebulletin.org', 'thecritic.co.uk', 'thetimes.co.uk', 'uol.com.br', 'wsj.com'].concat(ca_gcm_domains, de_funke_medien_domains, de_westfalen_medien_domains, es_epiberica_domains, es_epiberica_custom_domains, es_grupo_vocento_domains, es_unidad_domains, fr_groupe_ebra_domains, fr_groupe_la_depeche_domains, fr_groupe_nice_matin_domains, it_gedi_domains, it_quotidiano_domains, ca_gcm_domains, nl_dpg_media_domains, no_nhst_media_domains, timesofindia_domains, usa_hearst_comm_domains, usa_mcc_domains);
+var arr_localstorage_hold = ['aachener-nachrichten.de', 'aachener-zeitung.de', 'allgaeuer-zeitung.de', 'augsburger-allgemeine.de', 'barrons.com', 'businessoffashion.com', 'businesspost.ie', 'challenges.fr', 'charliehebdo.fr', 'cmjornal.pt', 'corriere.it', 'corrieredellosport.it', 'cyclingtips.com', 'dvhn.nl', 'economictimes.com', 'eldiario.es', 'elespanol.com', 'elle.fr', 'elpais.com', 'elperiodico.com', 'enotes.com', 'estadao.com.br', 'forbes.com', 'fortune.com', 'freiepresse.de', 'ilfoglio.it', 'inc42.com', 'indianexpress.com', 'ksta.de', 'kurier.at', 'lanouvellerepublique.fr', 'latimes.com', 'lc.nl', 'lesechos.fr', 'livemint.com', 'mid-day.com', 'nationalreview.com', 'nknews.org', 'nw.de', 'nytimes.com', 'nzherald.co.nz', 'record.pt', 'rundschau-online.de', 'sandiegouniontribune.com', 'scmp.com', 'seekingalpha.com', 'telegraph.co.uk', 'tes.com', 'theatlantic.com', 'thebulletin.org', 'thecritic.co.uk', 'thetimes.co.uk', 'uol.com.br', 'wsj.com'].concat(ca_gcm_domains, de_funke_medien_domains, de_westfalen_medien_domains, es_epiberica_domains, es_epiberica_custom_domains, es_grupo_vocento_domains, es_unidad_domains, fr_groupe_ebra_domains, fr_groupe_la_depeche_domains, fr_groupe_nice_matin_domains, it_gedi_domains, it_quotidiano_domains, ca_gcm_domains, nl_dpg_media_domains, no_nhst_media_domains, timesofindia_domains, usa_hearst_comm_domains, usa_mcc_domains);
 if (!matchDomain(arr_localstorage_hold)) {
   window.localStorage.clear();
 }
@@ -1197,7 +1197,6 @@ if (matchDomain(['ara.cat', 'arabalears.cat'])) {
 
 else if (matchDomain(['cmjornal.pt', 'record.pt'])) {
   let paywall = document.querySelector('.bloqueio_exclusivos, .container_assinatura');
-  console.log(paywall);
   let amphtml = document.querySelector('link[rel="amphtml"]');
   let url = window.location.href;
   if (!url.includes('/amp/')) {
@@ -1206,7 +1205,7 @@ else if (matchDomain(['cmjornal.pt', 'record.pt'])) {
       window.location.href = amphtml.href;
     }
   } else {
-    amp_unhide_subscr_section('amp-ad, amp-embed, amp-consent');
+    amp_unhide_subscr_section('amp-ad, amp-embed, amp-consent, .detalheAds, .exclusivos_bar');
     let amp_links = document.querySelectorAll('a[href^="https://www-cmjornal-pt.cdn.ampproject.org/c/s/"]');
     for (let amp_link of amp_links)
       amp_link.href = amp_link.href.replace('www-cmjornal-pt.cdn.ampproject.org/c/s/', '');
@@ -1857,7 +1856,7 @@ else if (matchDomain('gazzetta.it')) {
 else if (matchDomain('ilfattoquotidiano.it')) {
   let url = window.location.href;
   if (url.includes('/amp/')) {
-    amp_unhide_subscr_section('amp-ad, div#_4sVideoContainer');
+    amp_unhide_subscr_section('amp-ad, amp-embed, div#_4sVideoContainer');
     let comments = document.querySelector('div.content.comments');
     removeDOMElement(comments);
   } else if (url.split('?')[0].match(/\/\d{4}\/\d{2}\/\d{2}\//)) {
@@ -4586,6 +4585,9 @@ else if ((domain = matchDomain(usa_mcc_domains)) ||
     }, 500);
   } else if (url.includes('amp.' + domain + '/')) {
     amp_unhide_subscr_section('amp-ad, amp-embed', false);
+    let subscriptions_action = document.querySelector('div[subscriptions-action][subscriptions-display="NOT data.hasError"]');
+    if (subscriptions_action)
+      subscriptions_action.removeAttribute('subscriptions-action');
     let subscr_tag = document.querySelector('div#subscriber-exclusive-tag');
     let amp_players = document.querySelectorAll('amp-connatix-player');
     removeDOMElement(subscr_tag, ...amp_players);
@@ -4781,8 +4783,8 @@ function amp_iframes_replace(weblink = false, source = '') {
 }
 
 function amp_unhide_subscr_section(amp_ads_sel = 'amp-ad, .ad', replace_iframes = true, amp_iframe_link = false, source = '') {
-  let preview = document.querySelector('[subscriptions-section="content-not-granted"]');
-  removeDOMElement(preview);
+  let preview = document.querySelectorAll('[subscriptions-section="content-not-granted"]');
+  removeDOMElement(...preview);
   let subscr_section = document.querySelectorAll('[subscriptions-section="content"]');
   for (let elem of subscr_section)
     elem.removeAttribute('subscriptions-section');

custom/manifest.json

@@ -51,5 +51,5 @@
     "webRequestBlocking",
     "*://*/*"
   ],
-  "version": "3.0.6.5"
+  "version": "3.0.6.6"
 }

manifest.json

@@ -739,5 +739,5 @@
     "*://*.wallkit.net/*",
     "*://webcache.googleusercontent.com/*"
   ],
-  "version": "3.0.6.5"
+  "version": "3.0.6.6"
 }

sites.js

@@ -334,8 +334,7 @@ var defaultSites = {
   },
   "Correio da Manhã": {
     domain: "cmjornal.pt",
-    allow_cookies: 1,
-    block_regex: /cdn\.ampproject\.org\/v\d\/amp-(subscriptions|consent)-.+\.js/
+    allow_cookies: 1
   },
   "Corriere della Sera": {
     domain: "corriere.it",
@@ -550,7 +549,6 @@ var defaultSites = {
   },
   "Financial Times (not Chinese)": {
     domain: "ft.com",
-    block_regex: /cdn\.ampproject\.org\/v\d\/amp-(access|subscriptions)-.+\.js/,
     useragent: "googlebot"
   },
   "Financieele Dagblad (fd.nl)": {
@@ -1238,7 +1236,7 @@ var defaultSites = {
       "thestate.com",
       "tri-cityherald.com"
     ],
-    block_regex: "(\\.{domain}\\/script\\.js|\\.blueconic\\.net\\/|js\\.matheranalytics\\.com|cdn\\.ampproject\\.org\\/v\\d\\/amp-access-.+\\.js)"
+    block_regex: "(\\.{domain}\\/script\\.js|\\.blueconic\\.net\\/|js\\.matheranalytics\\.com|cdn\\.ampproject\\.org\\/v\\d\\/amp-(access|subscriptions)-.+\\.js)"
   },
   "Mediahuis Nederland Regional": {
     domain: "###_nl_mediahuis_region",
@@ -1613,7 +1611,7 @@ var defaultSites = {
   "Record.pt": {
     domain: "record.pt",
     allow_cookies: 1,
-    block_regex: /cdn\.ampproject\.org\/v\d\/amp-(subscriptions|consent)-.+\.js/
+    block_regex: /cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js/
   },
   "Reuters": {
     domain: "reuters.com",
@@ -1815,7 +1813,7 @@ var defaultSites = {
   "The Atlanta Journal-Constitution": {
     domain: "ajc.com",
     allow_cookies: 1,
-    block_regex: /(loader-cdn\.azureedge\.net\/|cdn\.ampproject\.org\/v\d\/amp-access-.+\.js)/
+    block_regex: /(\.ajc\.com\/prod\/ajc\/loader\.min\.js|cdn\.ampproject\.org\/v\d\/amp-access-.+\.js)/
   },
   "The Atlantic": {
     domain: "theatlantic.com",
@@ -2239,7 +2237,7 @@ var defaultSites = {
     domain: "cdn.ampproject.org",
     allow_cookies: 1,
     block_regex_general: /cdn\.ampproject\.org\/.+\/amp-(access|(.+-)?ad|analytics|fx-flying-carpet|subscriptions)-.+\.(m)?js/,
-    excluded_domains: ["cambridge.org"]
+    excluded_domains: ["cambridge.org", "cmjornal.pt"]
   },
   "Axate.io": {
     domain: "###_uk_axate.io",

sites_updated.json

@@ -102,5 +102,10 @@
     "allow_cookies": 1,
     "block_regex": "(\\.tinypass\\.com\\/|cdn\\.ampproject\\.org\\/v\\d\\/amp-access-.+\\.js)",
     "amp_redirect": "div[data-testid='paywall-container'], div[class^='Paywall_paywall_']"
+  },
+  "The Atlanta Journal-Constitution": {
+    "domain": "ajc.com",
+    "allow_cookies": 1,
+    "block_regex": "(\\.ajc\\.com\\/prod\\/ajc\\/loader\\.min\\.js|cdn\\.ampproject\\.org\\/v\\d\\/amp-access-.+\\.js)"
   }
 }