Update grouped sites (init rules)

4 years ago · 698cbe19cc
parent ea554b2a66
commit 698cbe19cc
3 changed files with 48 additions and 48 deletions
--- a/README.md
+++ b/README.md
@ -12,10 +12,14 @@
 ### Installation
 You can install the add-on from Mozilla add-ons (AMO): [Bypass Paywalls Clean](https://addons.mozilla.org/en-US/firefox/addon/bypass-paywalls-clean)  
 Or download and install the latest xpi-version from [GitLab](https://gitlab.com/magnolia1234/bypass-paywalls-firefox-clean/-/releases)  
-By default BPC has limited permissions, but you can opt-in to enable custom sites (and also clear cookies/block general paywall-scripts for non-listed sites).  
-Install add-on by downloading xpi-file.  
-On Android this add-on only works with Firefox 68 (Fennec); Firefox 79 (Fenix) only supports 9 add-ons (for now).  
-So don't update to Firefox 79 or use Firefox Nightly (and load BPC from a custom add-on collection).
+By default BPC has limited permissions, but you can opt-in to enable custom sites (and also clear cookies/block general paywall-scripts for non-listed sites). 
+
+#### Android
+On Android this add-on only works with Firefox 68 (Fennec); Firefox 79+ (Fenix) only supports 9 'recommended' add-ons (for now).  
+BPC add-on works fine in Firefox Nightly though (when you load BPC from a [custom add-on collection](https://blog.mozilla.org/addons/2020/09/29/expanded-extension-support-in-firefox-for-android-nightly)).
+
+#### Chrome/Chromium
+Visit the [Chrome repository](https://gitlab.com/magnolia1234/bypass-paywalls-chrome-clean) of Bypass Paywall Clean.

 ### List of supported websites

--- a/background.js
+++ b/background.js
@ -111,15 +111,12 @@ var remove_cookies = [
 const remove_cookies_select_hold = {
  'barrons.com': ['wsjregion'],
  'newstatesman.com': ['STYXKEY_nsversion'],
+  'seattletimes.com': ['st_newsletter_splash_seen'],
  'telegraph.co.uk': ['consentUUID'],
  'qz.com': ['gdpr'],
  'wsj.com': ['wsjregion', 'ResponsiveConditional_initialBreakpoint']
 }

-// list of regional ad.nl sites
-const ad_region_domains = ['bd.nl', 'ed.nl', 'tubantia.nl', 'bndestem.nl', 'pzc.nl', 'destentor.nl', 'gelderlander.nl'];
-const pg_domains = ["parool.nl", "trouw.nl", "volkskrant.nl", "humo.be", "demorgen.be"];
-
 // select only specific cookie(s) to drop from remove_cookies domains
 var remove_cookies_select_drop = {
  'ad.nl': ['temptationTrackingId'],
@ -129,11 +126,6 @@ var remove_cookies_select_drop = {
  'nrc.nl': ['counter'],
  'theatlantic.com': ['articleViews']
 }
-for (let domain of ad_region_domains)
-  remove_cookies_select_drop[domain] = ['temptationTrackingId'];
-
-for (let domain of pg_domains)
-  remove_cookies_select_drop[domain] = ['TID_ID'];

 // Override User-Agent with Googlebot
 var use_google_bot_default = [
@ -281,11 +273,13 @@ var blockedRegexes = {
  'wsj.com': /(cdn\.ampproject\.org\/v\d\/amp-access-.+\.js|cdn\.cxense\.com\/.+)/
 };

+const ad_region_domains = ['bd.nl', 'ed.nl', 'tubantia.nl', 'bndestem.nl', 'pzc.nl', 'destentor.nl', 'gelderlander.nl'];
 const au_comm_media_domains = ['bendigoadvertiser.com.au', 'bordermail.com.au', 'canberratimes.com.au', 'centralwesterndaily.com.au', 'dailyadvertiser.com.au', 'dailyliberal.com.au', 'examiner.com.au', 'illawarramercury.com.au', 'newcastleherald.com.au', 'northerndailyleader.com.au', 'portnews.com.au', 'standard.net.au', 'theadvocate.com.au', 'thecourier.com.au', 'westernadvocate.com.au'];
 const au_news_corp_domains = ['adelaidenow.com.au', 'cairnspost.com.au', 'couriermail.com.au', 'dailytelegraph.com.au', 'geelongadvertiser.com.au', 'goldcoastbulletin.com.au', 'heraldsun.com.au', 'ntnews.com.au', 'theaustralian.com.au', 'themercury.com.au', 'townsvillebulletin.com.au', 'weeklytimesnow.com.au'];
 const au_prov_news_domains = ['news-mail.com.au', 'frasercoastchronicle.com.au', 'gladstoneobserver.com.au', 'dailyexaminer.com.au', 'dailymercury.com.au', 'themorningbulletin.com.au', 'sunshinecoastdaily.com.au', 'gympietimes.com.au', 'northernstar.com.au', 'qt.com.au', 'thechronicle.com.au', 'warwickdailynews.com.au'];
-const nymag_domains = ['grubstreet.com', 'thecut.com', 'vulture.com'];
 const ilmessaggero_domains = ['corriereadriatico.it', 'ilgazzettino.it', 'ilmattino.it', 'quotidianodipuglia.it'];
+const nymag_domains = ['grubstreet.com', 'thecut.com', 'vulture.com'];
+const pg_domains = ['parool.nl', 'trouw.nl', 'volkskrant.nl', 'humo.be', 'demorgen.be'];

 const userAgentDesktopG = "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
 const userAgentMobileG = "Chrome/80.0.3987.92 Mobile Safari/537.36 (compatible ; Googlebot/2.1 ; +http://www.google.com/bot.html)"
@ -310,50 +304,51 @@ function setDefaultOptions() {

 // add grouped sites to en/disabledSites & init rules (optional)
 function add_grouped_sites(init_rules) {
+  if (init_rules) {
+    for (let domain of ad_region_domains)
+      remove_cookies_select_drop[domain] = ['temptationTrackingId'];
+    for (let domain of au_comm_media_domains) {
+      allow_cookies.push(domain);
+      blockedRegexes[domain] = /.+cdn-au\.piano\.io\/api\/tinypass.+\.js/;
+    }
+    for (let domain of au_news_corp_domains) {
+      allow_cookies.push(domain);
+      use_google_bot.push(domain);
+      blockedRegexes[domain] = /cdn\.ampproject\.org\/v\d\/amp-access-.+\.js/;
+    }
+    for (let domain of au_prov_news_domains) {
+      allow_cookies.push(domain);
+      use_google_bot.push(domain);
+    }
+    for (let domain of ilmessaggero_domains)
+      blockedRegexes[domain] = /utils\.cedsdigital\.it\/js\/PaywallMeter\.js/;
+    for (let domain of pg_domains)
+      remove_cookies_select_drop[domain] = ['TID_ID'];
+  }
  if (enabledSites.includes('ad.nl'))
    enabledSites = enabledSites.concat(ad_region_domains);
  else
    disabledSites = disabledSites.concat(ad_region_domains);
-  if (enabledSites.includes('nymag.com'))
-    enabledSites = enabledSites.concat(nymag_domains);
-  else
-    disabledSites = disabledSites.concat(nymag_domains);
-  if (enabledSites.includes('ilmessaggero.it')) {
-    enabledSites = enabledSites.concat(ilmessaggero_domains);
-    if (init_rules)
-      for (let domain of ilmessaggero_domains) {
-        blockedRegexes[domain] = /utils\.cedsdigital\.it\/js\/PaywallMeter\.js/;
-      }
-  } else
-    disabledSites = disabledSites.concat(ilmessaggero_domains);
-  if (enabledSites.includes('###_au_comm_media')) {
+  if (enabledSites.includes('###_au_comm_media'))
    enabledSites = enabledSites.concat(au_comm_media_domains);
-    if (init_rules)
-      for (let domain of au_comm_media_domains) {
-        allow_cookies.push(domain);
-        blockedRegexes[domain] = /.+cdn-au\.piano\.io\/api\/tinypass.+\.js/;
-      }
-  } else
+  else
    disabledSites = disabledSites.concat(au_comm_media_domains);
-  if (enabledSites.includes('###_au_news_corp')) {
+  if (enabledSites.includes('###_au_news_corp'))
    enabledSites = enabledSites.concat(au_news_corp_domains);
-    if (init_rules)
-      for (let domain of au_news_corp_domains) {
-        allow_cookies.push(domain);
-        use_google_bot.push(domain);
-        blockedRegexes[domain] = /cdn\.ampproject\.org\/v\d\/amp-access-.+\.js/;
-      }
-  } else
+  else
    disabledSites = disabledSites.concat(au_news_corp_domains);
-  if (enabledSites.includes('###_au_prov_news')) {
+  if (enabledSites.includes('###_au_prov_news'))
    enabledSites = enabledSites.concat(au_prov_news_domains);
-    if (init_rules)
-      for (let domain of au_prov_news_domains) {
-        allow_cookies.push(domain);
-        use_google_bot.push(domain);
-      }
-  } else
+  else
    disabledSites = disabledSites.concat(au_prov_news_domains);
+  if (enabledSites.includes('ilmessaggero.it'))
+    enabledSites = enabledSites.concat(ilmessaggero_domains);
+  else
+    disabledSites = disabledSites.concat(ilmessaggero_domains);
+  if (enabledSites.includes('nymag.com'))
+    enabledSites = enabledSites.concat(nymag_domains);
+  else
+    disabledSites = disabledSites.concat(nymag_domains);
 }

 // Get the enabled sites (from local storage) & add to allow/remove_cookies (if not already in one of these arrays)
--- a/changelog.txt
+++ b/changelog.txt
@ -2,6 +2,7 @@
 Changelog Bypass Paywalls Clean - Firefox

 Post-release
+Update grouped sites (init rules)

 * v1.9.6.0 (2020-11-20)
 Add Helsingin Sanomat (hs.fi, not paivanlehti)