Fix bloomberg.com

* update UA for haaretz, themarker

* remove paywall for fortune.com

* [PATCH] fix themarker/haaretz user agent

.github/workflows/ci.yml

@@ -0,0 +1,17 @@
+name: ci
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Build
+        run: cd build && ./build.sh

README.md

@@ -7,10 +7,10 @@
 *Bypass Paywalls is a web browser extension to help bypass paywalls for selected sites.*
 
 ### Installation Instructions
-**Google Chrome** (Custom sites supported)
+**Google Chrome / Microsoft Edge** (Custom sites supported)
 1. Download this repo as a [ZIP file from GitHub](https://github.com/iamadamdev/bypass-paywalls-chrome/archive/master.zip).
 1. Unzip the file and you should have a folder named `bypass-paywalls-chrome-master`.
-1. In Chrome go to the extensions page (`chrome://extensions`).
+1. In Chrome/Edge go to the extensions page (`chrome://extensions` or `edge://extensions`).
 1. Enable Developer Mode.
 1. Drag the `bypass-paywalls-chrome-master` folder anywhere on the page to import it (do not delete the folder afterwards).
 
@@ -21,17 +21,18 @@
 * Every time you open Chrome it may warn you about running extensions in developer mode, just click ✕ to keep the extension enabled.
 * You will be logged out for any site you have checked.
 * This extension works best alongside the adblocker uBlock Origin.
-* On the Firefox version automatic updates are enabled.
+* The Firefox version supports automatic updates.
 
 ### Bypass the following sites' paywalls with this extension:
 
 [Adweek](https://www.adweek.com)\
-[Algemeen Dagblad](https://www.ad.nl)\
 [American Banker](https://www.americanbanker.com)\
+[Ámbito](https://www.ambito.com)\
 [Baltimore Sun](https://www.baltimoresun.com)\
 [Barron's](https://www.barrons.com)\
 [Bloomberg Quint](https://www.bloombergquint.com)\
 [Bloomberg](https://www.bloomberg.com)\
+[Boston Globe](https://www.bostonglobe.com)\
 [Brisbane Times](https://www.brisbanetimes.com.au)\
 [Business Insider](https://www.businessinsider.com)\
 [Caixin](https://www.caixinglobal.com)\
@@ -42,21 +43,22 @@
 [Crain's Chicago Business](https://www.chicagobusiness.com)\
 [Daily Press](https://www.dailypress.com)\
 [De Groene Amsterdammer](https://www.groene.nl)\
+[De Speld](https://speld.nl)\
 [De Tijd](https://www.tijd.be)\
 [De Volkskrant](https://www.volkskrant.nl)\
-[DELFI](https://www.delfi.ee)\
 [DeMorgen](https://www.demorgen.be)\
 [Denver Post](https://www.denverpost.com)\
 [Diario Financiero](https://www.df.cl)\
-[Domani](https://www.editorialedomani.it/)\
+[Domani](https://www.editorialedomani.it)\
 [Dynamed Plus](https://www.dynamed.com)\
-[Eindhovens Dagblad](https://www.ed.nl)\
 [El Mercurio](https://www.elmercurio.com)\
-[El Pais](https://www.elpais.com/)\
+[El Pais](https://www.elpais.com)\
+[El Periodico](https://www.elperiodico.com)\
 [Elu24](https://www.elu24.ee)\
 [Encyclopedia Britannica](https://www.britannica.com)\
 [Estadão](https://www.estadao.com.br)\
 [Examiner](https://www.examiner.com.au)\
+[Expansión](https://www.expansion.com)\
 [Financial News](https://www.fnlondon.com)\
 [Financial Post](https://www.financialpost.com)\
 [Financial Times](https://www.ft.com)\
@@ -69,15 +71,16 @@
 [Grubstreet](https://www.grubstreet.com)\
 [Haaretz.co.il](https://www.haaretz.co.il)\
 [Haaretz.com](https://www.haaretz.com)\
-[Handelsblatt](https://www.handelsblatt.com)\
 [Harper's Magazine](https://harpers.org)\
 [Hartford Courant](https://www.courant.com)\
 [Harvard Business Review](https://www.hbr.org)\
+[Harvard Business Review China](https://www.hbrchina.org)\
 [Herald Sun](https://www.heraldsun.com.au)\
 [Het Financieel Dagblad](https://fd.nl)\
 [History Extra](https://www.historyextra.com)\
 [Humo](https://www.humo.be)\
 [Il Manifesto](https://www.ilmanifesto.it)\
+[Il Messaggero](https://www.ilmessaggero.it)\
 [Inc.com](https://www.inc.com)\
 [Interest.co.nz](https://www.interest.co.nz)\
 [Investors Chronicle](https://www.investorschronicle.co.uk)
@@ -87,8 +90,9 @@
 [La Repubblica](https://www.repubblica.it)\
 [La Stampa](https://www.lastampa.it)\
 [La Tercera](https://www.latercera.com)\
+[La Voix du Nord](https://www.lavoixdunord.fr)\
 [Le Devoir](https://www.ledevoir.com)\
-[Le Parisien](http://www.leparisien.fr)\
+[Le Parisien](https://www.leparisien.fr)\
 [Les Échos](https://www.lesechos.fr)\
 [Loeb Classical Library](https://www.loebclassics.com)\
 [London Review of Books](https://www.lrb.co.uk)\
@@ -99,14 +103,14 @@
 [Medscape](https://www.medscape.com)\
 [Mexicon News Daily](https://mexiconewsdaily.com)\
 [Mountain View Voice](https://www.mv-voice.com)\
-[New York Daily News](https://www.nydailynews.com/)\
+[National Geographic](https://www.nationalgeographic.com)\
+[New York Daily News](https://www.nydailynews.com)\
 [NRC Handelsblad](https://www.nrc.nl)\
 [NT News](https://www.ntnews.com.au)\
 [National Post](https://www.nationalpost.com)\
 [Neue Zürcher Zeitung](https://www.nzz.ch)\
 [New York Magazine](https://www.nymag.com)\
 [New Zealand Herald](https://www.nzherald.co.nz)\
-[Nikkei Asian Review](https://asia.nikkei.com)\
 [Orange County Register](https://www.ocregister.com)\
 [Orlando Sentinel](https://www.orlandosentinel.com)\
 [Palo Alto Online](https://www.paloaltoonline.com)\
@@ -114,7 +118,9 @@
 [Postimees](https://www.postimees.ee)\
 [Quartz](https://qz.com)\
 [Quora](https://www.quora.com)\
+[Quotidiani Gelocal](https://quotidiani.gelocal.it)\
 [Republic.ru](https://republic.ru)\
+[Reuters](https://www.reuters.com)\
 [San Diego Union Tribune](https://www.sandiegouniontribune.com)\
 [San Francisco Chronicle](https://www.sfchronicle.com)\
 [Scientific American](https://www.scientificamerican.com)\
@@ -131,6 +137,8 @@
 [The Advocate](https://www.theadvocate.com.au)\
 [The Age](https://www.theage.com.au)\
 [The American Interest](https://www.the-american-interest.com)\
+[The Athletic](https://www.theathletic.com)\
+[The Athletic (UK)](https://www.theathletic.co.uk)\
 [The Atlantic](https://www.theatlantic.com)\
 [The Australian Financial Review](https://www.afr.com)\
 [The Australian](https://www.theaustralian.com.au)\
@@ -157,6 +165,7 @@
 [The New York Times](https://www.nytimes.com)\
 [The New Yorker](https://www.newyorker.com)\
 [The News-Gazette](https://www.news-gazette.com)\
+[The Olive Press](https://www.theolivepress.es)\
 [The Philadelphia Inquirer](https://www.inquirer.com)\
 [The Saturday Paper](https://www.thesaturdaypaper.com.au)\
 [The Seattle Times](https://www.seattletimes.com)\
@@ -164,7 +173,6 @@
 [The Spectator](https://www.spectator.co.uk)\
 [The Sydney Morning Herald](https://www.smh.com.au)\
 [The Telegraph](https://www.telegraph.co.uk)\
-[The Times](https://www.thetimes.co.uk)\
 [The Toronto Star](https://www.thestar.com)\
 [The Wall Street Journal](https://www.wsj.com)\
 [The Washington Post](https://www.washingtonpost.com)\
@@ -175,17 +183,16 @@
 [Trouw](https://www.trouw.nl)\
 [Vanity Fair](https://www.vanityfair.com)\
 [Vrij Nederland](https://www.vn.nl)\
-[Vulture](https://www.vulture.com/)\
+[Vulture](https://www.vulture.com)\
 [Winston-Salem Journal](https://journalnow.com)\
 [Wired](https://www.wired.com)\
-[World Politics Review](https://www.worldpoliticsreview.com)
+[Zeit Online](https://www.zeit.de)
 
 ### Sites with limited number of free articles
 The free article limit can normally be bypassed by removing cookies for the site.*
 
 Install the Cookie Remover extension [for Google Chrome](https://chrome.google.com/webstore/detail/cookie-remover/kcgpggonjhmeaejebeoeomdlohicfhce) or [for Mozilla Firefox](https://addons.mozilla.org/en-US/firefox/addon/cookie-remover/). Please rate it 5 stars if you find it useful.
 
-
 When coming across a paywall click the cookie icon to remove the cookies then refresh the page.
 
 _*May not always succeed_
@@ -204,7 +211,7 @@ Only large or major sites will be considered. Usually premium articles cannot be
 ### Troubleshooting
 * This extension works best alongside uBlock Origin [for Google Chrome](https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm) or [for Mozilla Firefox](https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/).
 * If a site doesn't work, try turning off uBlock and refreshing.
-* Make sure the site is checked under Options (on macOS sometimes the sites get unselected).
+* Try clearing [cookies](https://chrome.google.com/webstore/detail/cookie-remover/kcgpggonjhmeaejebeoeomdlohicfhce).
 * Make sure you're running the latest version of Bypass Paywalls.
 * If a site is having problems try unchecking "\*General Paywall Bypass\*" in Options.
 * If none of these work, you can submit an issue [here](https://github.com/iamadamdev/bypass-paywalls-chrome/issues/new/choose).
@@ -218,4 +225,14 @@ PRs are welcome.
 
 ### Show your support
 * Follow me on Twitter [@iamadamdev](https://twitter.com/iamadamdev) for updates.
-* I am not asking for donations or anything like that, all I ask is that you star this repo.
+* I do not ask for donations, all I ask is that you star this repo.
+
+### Disclaimer
+* This software is provided for educational purposes only and
+is provided "AS IS", without warranty of any kind, express or
+implied, including but not limited to the warranties of merchantability,
+fitness for a particular purpose and noninfringement. in no event shall the
+authors or copyright holders be liable for any claim, damages or other
+liability, whether in an action of contract, tort or otherwise, arising from,
+out of or in connection with the software or the use or other dealings in the
+software.

manifest-ff.json

@@ -9,32 +9,34 @@
   "content_scripts": [
     {
     "matches": [
-    "*://*.ad.nl/*",
     "*://*.afr.com/*",
     "*://*.americanbanker.com/*",
+    "*://*.ambito.com/*",
     "*://*.bizjournals.com/*",
     "*://*.bloomberg.com/*",
     "*://*.bloombergquint.com/*",
     "*://*.businessinsider.com/*",
     "*://*.caixinglobal.com/*",
     "*://*.canberratimes.com.au/*",
-    "*://*.delfi.ee/*",
     "*://*.economist.com/*",
-    "*://*.ed.nl/*",
     "*://*.editorialedomani.it/*",
     "*://*.elmercurio.com/*",
     "*://*.elpais.com/*",
+    "*://*.elperiodico.com/*",
     "*://*.elu24.ee/*",
     "*://*.estadao.com.br/*",
     "*://*.examiner.com.au/*",
     "*://*.firstthings.com/*",
     "*://*.ft.com/*",
+    "*://*.gelocal.it/*",
     "*://*.grubstreet.com/*",
     "*://*.haaretz.co.il/*",
     "*://*.humo.be/*",
+    "*://*.ilmessaggero.it/*",
     "*://*.interest.co.nz/*",
     "*://*.ledevoir.com/*",
     "*://*.leparisien.fr/*",
+    "*://*.lavoixdunord.fr/*",
     "*://*.medium.com/*",
     "*://*.medscape.com/*",
     "*://*.mexiconewsdaily.com/*",
@@ -56,6 +58,7 @@
     "*://*.theglobeandmail.com/*",
     "*://*.thehindu.com/*",
     "*://*.thenational.scot/*",
+    "*://*.theolivepress.es/*",
     "*://*.thestar.com/*",
     "*://*.thewrap.com/*",
     "*://*.trouw.nl/*",
@@ -64,14 +67,24 @@
     "*://*.washingtonpost.com/*",
     "*://*.wsj.com/*",
     "*://*.hbr.org/*",
-    "*://*.financialpost.com/*"
+    "*://*.financialpost.com/*",
+    "*://*.sueddeutsche.de/*",
+    "*://*.elmundo.es/*",
+    "*://*.time.com/*",
+    "*://*.expansion.com/*",
+    "*://*.foreignpolicy.com/*",
+    "*://*.bostonglobe.com/*",
+    "*://*.theathletic.com/*",
+    "*://*.theathletic.co.uk/*",
+    "*://*.hbrchina.org/*",
+    "*://*.scmp.com/*"
     ],
       "js": ["src/js/contentScript.js"]
     }
   ],
   "applications": {
     "gecko": {
-      "id": "bypasspaywalls@bypasspaywalls.weebly.com",
+      "id": "bypasspaywalls@bypasspaywalls",
       "update_url": "https://raw.githubusercontent.com/iamadamdev/bypass-paywalls-chrome/master/src/updates/updates.json"
     }
   },
@@ -110,11 +123,9 @@
     "*://*.poool.fr/*",
     "*://*.qiota.com/*",
     "*://*.tinypass.com/*",
-    "*://*.ad.nl/*",
     "*://*.adelaidenow.com.au/*",
     "*://*.adweek.com/*",
     "*://*.afr.com/*",
-    "*://*.asia.nikkei.com/*",
     "*://*.baltimoresun.com/*",
     "*://*.barrons.com/*",
     "*://*.bizjournals.com/*",
@@ -139,7 +150,6 @@
     "*://*.denverpost.com/*",
     "*://*.dynamed.com/*",
     "*://*.economist.com/*",
-    "*://*.ed.nl/*",
     "*://*.elmercurio.com/*",
     "*://*.elu24.ee/*",
     "*://*.examiner.com.au/*",
@@ -149,12 +159,12 @@
     "*://*.fortune.com/*",
     "*://*.ft.com/*",
     "*://*.genomeweb.com/*",
+    "*://*.gelocal.it/*",
     "*://*.glassdoor.com/*",
     "*://*.globes.co.il/*",
     "*://*.groene.nl/*",
     "*://*.haaretz.co.il/*",
     "*://*.haaretz.com/*",
-    "*://*.handelsblatt.com/*",
     "*://*.harpers.org/*",
     "*://*.hbr.org/*",
     "*://*.heraldsun.com.au/*",
@@ -172,6 +182,7 @@
     "*://*.lastampa.it/*",
     "*://*.latercera.com/*",
     "*://*.latimes.com/*",
+    "*://*.lavoixdunord.fr/*",
     "*://*.lecho.be/*",
     "*://*.leparisien.fr/*",
     "*://*.lesechos.fr/*",
@@ -182,6 +193,7 @@
     "*://*.medscape.com/*",
     "*://*.mercurynews.com/*",
     "*://*.mv-voice.com/*",
+    "*://*.nationalgeographic.com",
     "*://*.nationalpost.com/*",
     "*://*.news-gazette.com/*",
     "*://*.newstatesman.com/*",
@@ -209,6 +221,7 @@
     "*://*.sofrep.com/*",
     "*://*.spectator.co.uk/*",
     "*://*.spectator.com.au/*",
+    "*://*.speld.nl/",
     "*://*.statista.com/*",
     "*://*.stuff.co.nz/*",
     "*://*.sun-sentinel.com/*",
@@ -229,9 +242,9 @@
     "*://*.themercury.com.au/*",
     "*://*.thenation.com/*",
     "*://*.thenational.scot/*",
+    "*://*.theolivepress.es/*",
     "*://*.thesaturdaypaper.com.au/*",
     "*://*.thestar.com/*",
-    "*://*.thetimes.co.uk/*",
     "*://*.thewrap.com/*",
     "*://*.tijd.be/*",
     "*://*.towardsdatascience.com/*",
@@ -241,7 +254,6 @@
     "*://*.volkskrant.nl/*",
     "*://*.washingtonpost.com/*",
     "*://*.wired.com/*",
-    "*://*.worldpoliticsreview.com/*",
     "*://*.wsj.com/*",
     "*://*.nzz.ch/*",
     "*://*.republic.ru/*",
@@ -249,7 +261,21 @@
     "*://*.netdna-ssl.com/*",
     "*://*.startribune.com/*",
     "*://*.df.cl/*",
-    "*://*.financialpost.com/*"
+    "*://*.financialpost.com/*",
+    "*://*.ambito/*",
+    "*://*.sueddeutsche.de/*",
+    "*://*.spectator.us/*",
+    "*://*.humo.be/*",
+    "*://*.elmundo.es/*",
+    "*://*.time.com/*",
+    "*://*.zeit.de/*",
+    "*://*.ampproject.org/*",
+    "*://*.reuters.com/*",
+    "*://*.expansion.com/*",
+    "*://*.theathletic.com/*",
+    "*://*.theathletic.co.uk/*",
+    "*://*.hbrchina.org/*",
+    "*://*.scmp.com/*"
   ],
-  "version": "1.7.7"
+  "version": "1.8.1"
 }

manifest.json

@@ -34,5 +34,5 @@
     "webRequestBlocking",
     "<all_urls>"
   ],
-  "version": "1.7.7"
+  "version": "1.8.1"
 }

src/js/background.js

@@ -1,24 +1,26 @@
 'use strict';
 
 const restrictions = {
-  'barrons.com': /.+barrons\.com\/(amp\/)?article(s)?\/.+/,
+  'adweek.com': /^((?!\.adweek\.com\/(.+\/)?(amp|agencyspy|tvnewser|tvspy)\/).)*$/,
+  'barrons.com': /.+\.barrons\.com\/(amp\/)?article(s)?\/.+/,
   'economist.com': /.+economist\.com\/.+\/\d{1,4}\/\d{1,2}\/\d{2}\/.+/,
-  'seekingalpha.com': /.+seekingalpha\.com\/article\/.+/
+  'seekingalpha.com': /.+seekingalpha\.com\/article\/.+/,
+  'techinasia.com': /\.techinasia\.com\/.+/,
+  'ft.com': /.+\.ft.com\/content\//,
+  'nytimes.com': /^((?!\/timesmachine\.nytimes\.com\/).)*$/,
+  'theatlantic.com': /^((?!\/newsletters\.theatlantic\.com\/).)*$/,
+  'bloomberg.com': /^((?!\.bloomberg\.com\/news\/terminal\/).)*$/
 };
 
 // Don't remove cookies before page load
 const allowCookies = [
-  'ad.nl',
-  'asia.nikkei.com',
   'brisbanetimes.com.au',
   'canberratimes.com.au',
   'cen.acs.org',
-  'chicagobusiness.com',
   'demorgen.be',
   'denverpost.com',
-  'ed.nl',
   'examiner.com.au',
-  'ft.com',
+  'gelocal.it',
   'grubstreet.com',
   'harpers.org',
   'hbr.org',
@@ -27,7 +29,6 @@ const allowCookies = [
   'lrb.co.uk',
   'medium.com',
   'mercurynews.com',
-  'mexiconewsdaily.com',
   'newstatesman.com',
   'nrc.nl',
   'nymag.com',
@@ -39,6 +40,7 @@ const allowCookies = [
   'seekingalpha.com',
   'sofrep.com',
   'spectator.co.uk',
+  'speld.nl',
   'techinasia.com',
   'telegraaf.nl',
   'the-american-interest.com',
@@ -49,43 +51,45 @@ const allowCookies = [
   'thecut.com',
   'thediplomat.com',
   'themercury.com.au',
-  'thestar.com',
   'towardsdatascience.com',
   'trouw.nl',
   'vn.nl',
   'volkskrant.nl',
   'vulture.com',
-  'washingtonpost.com',
-  'wired.com',
   'nzz.ch',
-  'handelsblatt.com',
   'thehindu.com',
-  'financialpost.com'
+  'financialpost.com',
+  'haaretz.co.il',
+  'haaretz.com',
+  'themarker.com',
+  'sueddeutsche.de',
+  'gelocal.it',
+  'elmundo.es',
+  'time.com',
+  'zeit.de',
+  'expansion.com',
+  'dailytelegraph.com.au',
+  'washingtonpost.com',
+  'nytimes.com'
 ];
 
 // Removes cookies after page load
 const removeCookies = [
-  'ad.nl',
+  'bloomberg.com',
-  'asia.nikkei.com',
   'bloombergquint.com',
   'brisbanetimes.com.au',
   'canberratimes.com.au',
   'cen.acs.org',
-  'chicagobusiness.com',
   'demorgen.be',
   'denverpost.com',
-  'ed.nl',
   'examiner.com.au',
-  'ft.com',
   'globes.co.il',
   'grubstreet.com',
   'harpers.org',
   'hbr.org',
   'humo.be',
   'lesechos.fr',
-  'medium.com',
   'mercurynews.com',
-  'mexiconewsdaily.com',
   'newstatesman.com',
   'nrc.nl',
   'nymag.com',
@@ -95,18 +99,20 @@ const removeCookies = [
   'seattletimes.com',
   'sofrep.com',
   'spectator.co.uk',
+  'speld.nl',
   'telegraaf.nl',
   'theadvocate.com.au',
   'theage.com.au',
   'theatlantic.com',
   'thecut.com',
   'thediplomat.com',
-  'thestar.com',
   'towardsdatascience.com',
-  'vulture.com',
   'vn.nl',
-  'wired.com',
+  'vulture.com',
-  'wsj.com'
+  'wsj.com',
+  'medium.com',
+  'washingtonpost.com',
+  'japantimes.co.jp'
 ];
 
 // Contains remove cookie sites above plus any custom sites
@@ -115,17 +121,18 @@ let _removeCookies = removeCookies;
 // select specific cookie(s) to hold from removeCookies domains
 const removeCookiesSelectHold = {
   'qz.com': ['gdpr'],
-  'wsj.com': ['wsjregion']
+  'wsj.com': ['wsjregion'],
+  'seattletimes.com': ['st_newsletter_splash_seen']
 };
 
 // select only specific cookie(s) to drop from removeCookies domains
 const removeCookiesSelectDrop = {
-  'ad.nl': ['temptationTrackingId'],
+  'ambito.com': ['TDNotesRead'],
-  'ed.nl': ['temptationTrackingId'],
   'demorgen.be': ['TID_ID'],
-  'humo.be': ['TID_ID'],
   'fd.nl': ['socialread'],
-  'nrc.nl': ['counter']
+  'humo.be': ['TID_ID'],
+  'nrc.nl': ['counter'],
+  'speld.nl': ['speld-paywall']
 };
 
 // Override User-Agent with Googlebot
@@ -133,29 +140,35 @@ const useGoogleBotSites = [
   'adelaidenow.com.au',
   'barrons.com',
   'couriermail.com.au',
-  'dailytelegraph.com.au',
   'fd.nl',
   'genomeweb.com',
-  'haaretz.co.il',
-  'haaretz.com',
   'heraldsun.com.au',
-  'mexiconewsdaily.com',
+  'lavoixdunord.fr',
   'ntnews.com.au',
   'quora.com',
   'seekingalpha.com',
   'telegraph.co.uk',
   'theaustralian.com.au',
-  'themarker.com',
   'themercury.com.au',
   'thenational.scot',
-  'thetimes.co.uk',
   'wsj.com',
   'kansascity.com',
   'republic.ru',
   'nzz.ch',
-  'handelsblatt.com',
+  'df.cl',
-  'washingtonpost.com',
+  'ft.com',
-  'df.cl'
+  'wired.com',
+  'zeit.de',
+  'nytimes.com'
+];
+
+// Override User-Agent with Bingbot
+const useBingBot = [];
+
+const useMsnBot = [
+  'haaretz.co.il',
+  'haaretz.com',
+  'themarker.com'
 ];
 
 // Contains google bot sites above plus any custom sites
@@ -177,14 +190,13 @@ const blockedRegexes = {
   'chicagotribune.com': /.+:\/\/.+\.tribdss\.com\//,
   'economist.com': /(.+\.tinypass\.com\/.+|economist\.com\/engassets\/_next\/static\/chunks\/framework.+\.js)/,
   'editorialedomani.it': /(js\.pelcro\.com\/.+|editorialedomani.it\/pelcro\.js)/,
-  'foreignpolicy.com': /.+\.tinypass\.com\/.+/,
+  'foreignpolicy.com': /(cdn\.cxense\.com\/|\.tinypass\.com\/)/,
   'fortune.com': /.+\.tinypass\.com\/.+/,
   'haaretz.co.il': /haaretz\.co\.il\/htz\/js\/inter\.js/,
   'haaretz.com': /haaretz\.com\/hdc\/web\/js\/minified\/header-scripts-int.js.+/,
   'inquirer.com': /.+\.tinypass\.com\/.+/,
   'lastampa.it': /.+\.repstatic\.it\/minify\/sites\/lastampa\/.+\/config\.cache\.php\?name=social_js/,
   'lrb.co.uk': /.+\.tinypass\.com\/.+/,
-  'nzherald.co.nz': /(.+nzherald\.co\.nz\/.+\/subs\/p\.js|.+nzherald\.co\.nz\/.+\/react\.js|.+nzherald\.co\.nz\/.+\/appear\.js|.+nzherald\.co\.nz\/.+\/tracking\/.+|.+nzherald\.co\.nz\/.+\/default\.js|.+\/newsbarscript\.js)/,
   'medscape.com': /.+\.medscapestatic\.com\/.*medscape-library\.js/,
   'interest.co.nz': /(.+\.presspatron\.com.+|.+interest\.co\.nz.+pp-ablock-banner\.js)/,
   'repubblica.it': /scripts\.repubblica\.it\/pw\/pw\.js.+/,
@@ -203,13 +215,34 @@ const blockedRegexes = {
   'sloanreview.mit.edu': /(.+\.tinypass\.com\/.+|.+\.netdna-ssl\.com\/wp-content\/themes\/smr\/assets\/js\/libs\/welcome-ad\.js)/,
   'latercera.com': /.+\.cxense\.com\/+/,
   'lesechos.fr': /.+\.tinypass\.com\/.+/,
-  'washingtonpost.com': /.+\.washingtonpost\.com\/.+\/pwapi-proxy\.min\.js/,
   'thehindu.com': /ajax\.cloudflare\.com\/cdn-cgi\/scripts\/.+\/cloudflare-static\/rocket-loader\.min\.js/,
-  'technologyreview.com': /.+\.blueconic\.net\/.+/
+  'technologyreview.com': /.+\.blueconic\.net\/.+/,
+  'spectator.us': /(cdn\.cxense\.com\/.+|\.tinypass\.com\/.+)/,
+  'gelocal.it': /(\.repstatic\.it\/minify\/sites\/gelocal\/.+\/config\.cache(_\d)?\.php|cdn\.ampproject\.org\/v\d\/amp-(access|ad)-.+\.js)/,
+  'elmundo.es': /cdn\.ampproject\.org\/v\d\/amp-(access|ad|consent)-.+\.js/,
+  'time.com': /\/time\.com\/dist\/meter-wall-client-js\..+\.js/,
+  'thestar.com': /\.com\/api\/overlaydata/,
+  'elpais.com': /(\.epimg\.net\/js\/.+\/(noticia|user)\.min\.js|\/elpais\.com\/arc\/subs\/p\.min\.js|cdn\.ampproject\.org\/v\d\/amp-(access|(sticky-)?ad|consent)-.+\.js)/,
+  'expansion.com': /cdn\.ampproject\.org\/v\d\/amp-(access|ad|consent)-.+\.js/,
+  'chicagobusiness.com': /(\.tinypass\.com\/|\.chicagobusiness\.com\/.+\/js\/js_.+\.js)/,
+  'dailytelegraph.com.au': /cdn\.ampproject\.org\/v\d\/amp-(access|ad|consent)-.+\.js/,
+  'theglobeandmail.com': /(\.theglobeandmail\.com\/pf\/dist\/engine\/react\.js|smartwall\.theglobeandmail\.com\/)/,
+  'nytimes.com': /(\.nytimes\.com\/meter\.js|mwcm\.nyt\.com\/.+\.js|cooking\.nytimes\.com\/api\/.+\/access)/,
+  'latimes.com': /\.californiatimes\.com\/meteringjs/,
+  'theathletic.com': /cdn\.ampproject\.org\/v\d\/amp-(access|subscriptions)-.+\.js/,
+  'japantimes.co.jp': /cdn\.cxense\.com\//,
+  'scmp.com': /(\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-access-.+\.js)/,
+  'ilmessaggero.it': /(utils\.cedsdigital\.it\/js\/PaywallMeter\.js)/,
+  'washingtonpost.com': /\.washingtonpost\.com\/tetro\/metering\/evaluate/,
+  'theatlantic.com': /cdn\.theatlantic\.com\/_next\/static\/chunks\/pages\/.+\/archive\//,
+  'bloomberg.com': /(\.cm\.bloomberg\.com\/|assets\.bwbx\.io\/s\d\/javelin\/.+\/transporter\/)/
 };
 
 const userAgentDesktop = 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)';
 const userAgentMobile = 'Chrome/41.0.2272.96 Mobile Safari/537.36 (compatible ; Googlebot/2.1 ; +http://www.google.com/bot.html)';
+const userAgentDesktopBingBot = 'Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)';
+const userAgentMobileBingBot = 'Chrome/80.0.3987.92 Mobile Safari/537.36 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)';
+const userAgentMsnBot = 'msnbot/2.0b (+http://search.msn.com/msnbot.htm)';
 
 let enabledSites = [];
 
@@ -256,7 +289,7 @@ extensionApi.tabs.onActivated.addListener(function (activeInfo) {
 });
 
 function updateBadge (activeTab) {
-  if (!activeTab) { return; }
+  if (extensionApi.runtime.lastError || !activeTab) { return; }
   const badgeText = getBadgeText(activeTab.url);
   extensionApi.browserAction.setBadgeBackgroundColor({ color: 'blue' });
   extensionApi.browserAction.setBadgeText({ text: badgeText });
@@ -266,9 +299,40 @@ function getBadgeText (currentUrl) {
   return currentUrl && isSiteEnabled({ url: currentUrl }) ? 'ON' : '';
 }
 
+// AMP redirect for dailytelegraph.com.au
+extensionApi.webRequest.onBeforeRequest.addListener(function (details) {
+  if (!isSiteEnabled(details)) {
+    return;
+  }
+  const updatedUrl = decodeURIComponent(details.url.split('&dest=')[1].split('&')[0]).replace('www.', 'amp.');
+  return { redirectUrl: updatedUrl };
+},
+{ urls: ['*://www.dailytelegraph.com.au/subscribe/*'], types: ['main_frame'] },
+['blocking']
+);
+
+// nytimes.com
+extensionApi.webRequest.onHeadersReceived.addListener(function (details) {
+  if (!isSiteEnabled(details)) {
+    return;
+  }
+  let headers = details.responseHeaders;
+  headers = headers.map(function (header) {
+    if (header.name === 'x-frame-options') { header.value = 'SAMEORIGIN'; }
+    return header;
+  });
+  return {
+    responseHeaders: headers
+  };
+}, {
+  urls: ['*://*.nytimes.com/*']
+},
+['blocking', 'responseHeaders']);
+
 // Disable javascript for these sites
 extensionApi.webRequest.onBeforeRequest.addListener(function (details) {
-  if (!isSiteEnabled(details) && !enabledSites.includes('generalpaywallbypass')) {
+  const headerReferer = details.originUrl ? details.originUrl : details.initiator;
+  if (!isSiteEnabled(details) && (!enabledSites.includes('generalpaywallbypass') || matchUrlDomain('japantimes.co.jp', headerReferer))) {
     return;
   }
   return { cancel: true };
@@ -310,7 +374,7 @@ extensionApi.webRequest.onBeforeSendHeaders.addListener(function (details) {
     return { cancel: true };
   }
 
-  if (!isSiteEnabled(details)) {
+  if (!isSiteEnabled(details) && !matchUrlDomain('cdn.ampproject.org', details.url)) {
     return;
   }
 
@@ -327,6 +391,8 @@ extensionApi.webRequest.onBeforeSendHeaders.addListener(function (details) {
         requestHeader.value = 'https://cooking.nytimes.com';
       } else if (matchUrlDomain('fd.nl', details.url)) {
         requestHeader.value = 'https://www.facebook.com/';
+      } else if (matchUrlDomain('medium.com', details.url)) {
+        requestHeader.value = 'https://t.co/x?amp=1';
       } else {
         requestHeader.value = 'https://www.google.com/';
       }
@@ -346,6 +412,11 @@ extensionApi.webRequest.onBeforeSendHeaders.addListener(function (details) {
         name: 'Referer',
         value: 'https://www.facebook.com/'
       });
+    } else if (matchUrlDomain('medium.com', details.url)) {
+      requestHeaders.push({
+        name: 'Referer',
+        value: 'https://t.co/x?amp=1'
+      });
     } else {
       requestHeaders.push({
         name: 'Referer',
@@ -370,6 +441,22 @@ extensionApi.webRequest.onBeforeSendHeaders.addListener(function (details) {
     });
   }
 
+  // override User-Agent to use Bingbot
+  if (matchUrlDomain(useBingBot, details.url)) {
+    requestHeaders.push({
+      name: 'User-Agent',
+      value: useUserAgentMobile ? userAgentMobileBingBot : userAgentDesktopBingBot
+    });
+  }
+
+  // override User-Agent to use Google AdsBot Mobile Web
+  if (matchUrlDomain(useMsnBot, details.url)) {
+    requestHeaders.push({
+      name: 'User-Agent',
+      value: userAgentMsnBot
+    });
+  }
+
   // remove cookies before page load
   const enabledCookies = allowCookies.some(function (site) {
     return matchUrlDomain(site, details.url);
@@ -444,6 +531,24 @@ extensionApi.webRequest.onCompleted.addListener(function (details) {
   urls: ['<all_urls>']
 });
 
+// nytimes.com fix
+extensionApi.webRequest.onHeadersReceived.addListener(function (details) {
+  if (!isSiteEnabled(details)) {
+    return;
+  }
+  let headers = details.responseHeaders;
+  headers = headers.map(function (header) {
+    if (header.name === 'x-frame-options') { header.value = 'SAMEORIGIN'; }
+    return header;
+  });
+  return {
+    responseHeaders: headers
+  };
+}, {
+  urls: ['*://*.nytimes.com/*']
+},
+['blocking', 'responseHeaders']);
+
 // Google Analytics to anonymously track DAU (Chrome only)
 function initGA () {
   (function (i, s, o, g, r, a, m) {

src/js/contentScript.js

@@ -1,4 +1,4 @@
-if (!matchDomain(['seekingalpha.com', 'sfchronicle.com', 'cen.acs.org', 'thetimes.co.uk'])) {
+if (!matchDomain(['seekingalpha.com', 'sfchronicle.com', 'cen.acs.org', 'elmundo.es', 'scmp.com', 'nytimes.com'])) {
   window.localStorage.clear();
 }
 
@@ -20,24 +20,24 @@ if (matchDomain('elmercurio.com')) {
     body.removeAttribute('style');
   }, 300); // Delay (in milliseconds)
 } else if (matchDomain('rep.repubblica.it')) {
+  window.setTimeout(function () {
     if (window.location.href.includes('/pwa/')) {
-    setTimeout(function () {
       window.location.href = window.location.href.replace('/pwa/', '/ws/detail/');
-    }, 400);
     }
+  }, 500);
   if (window.location.href.includes('/ws/detail/')) {
-    const paywall = document.querySelector('.paywall[subscriptions-section="content"]');
+    const paywall = document.querySelector('.paywall');
     if (paywall) {
-      paywall.removeAttribute('subscriptions-section');
+      ampUnhideSubscriptionsSection();
-      const preview = document.querySelector('div[subscriptions-section="content-not-granted"]');
-      if (preview) {
-        preview.remove();
-      }
     }
   }
 } else if (matchDomain('americanbanker.com')) {
-  const paywall = document.getElementsByClassName('embargo-content')[0];
+  const inlineGate = document.querySelector('.inline-gate');
-  if (paywall) { paywall.classList.remove('embargo-content'); }
+  if (inlineGate) {
+    inlineGate.classList.remove('inline-gate');
+    const inlineGated = document.querySelectorAll('.inline-gated');
+    for (const elem of inlineGated) { elem.classList.remove('inline-gated'); }
+  }
 } else if (matchDomain('telegraaf.nl')) {
   if (window.location.href.startsWith('https://www.telegraaf.nl/error?ref=/')) {
     window.location.href = window.location.href.split('&')[0].replace('error?ref=/', '');
@@ -73,13 +73,11 @@ if (matchDomain('elmercurio.com')) {
       }
     }
   }
-} else if (matchDomain(['ad.nl', 'ed.nl'])) {
-  const paywall = document.querySelector('.article__component.article__component--paywall-module-notification');
-  removeDOMElement(paywall);
 } else if (matchDomain('washingtonpost.com')) {
   const leaderboard = document.querySelector('#leaderboard-wrapper');
   const adverts = document.querySelectorAll('div[data-qa="article-body-ad"]');
-  removeDOMElement(leaderboard, ...adverts);
+  const softwall = document.querySelector('[id^="softwall"]');
+  removeDOMElement(leaderboard, softwall, ...adverts);
   if (window.location.href.includes('/gdpr-consent/')) {
     const freeButton = document.querySelector('.gdpr-consent-container .continue-btn.button.free');
     if (freeButton) { freeButton.click(); }
@@ -91,6 +89,18 @@ if (matchDomain('elmercurio.com')) {
         document.querySelector('.gdpr-consent-container .consent-page:not(.hide) .continue-btn.button.accept-consent').click();
       }
     }, 300); // Delay (in milliseconds)
+  } else {
+    const url = window.location.href;
+    function main (element) {
+      removeDOMElement(element);
+      window.location.href = url.split('?')[0] + '?outputType=amp';
+    }
+    if (!url.includes('outputType=amp')) {
+      waitDOMElement('div[id^="paywall-"]', 'DIV', main, false);
+    } else {
+      const subscriptionsSections = document.querySelectorAll('[subscriptions-section="content"]');
+      for (const subscriptionsSection of subscriptionsSections) { subscriptionsSection.removeAttribute('subscriptions-section'); }
+    }
   }
 } else if (matchDomain('wsj.com') && !matchDomain('cn.wsj.com')) {
   if (window.location.href.includes('/articles/')) {
@@ -115,19 +125,39 @@ if (matchDomain('elmercurio.com')) {
     readMore.click();
   }
 } else if (matchDomain('mexiconewsdaily.com')) {
-  document.addEventListener('DOMContentLoaded', () => {
+  window.setTimeout(function () {
-    const sideNotification = document.querySelector('.pigeon-widget-prompt');
+    const popup = document.querySelector('div.pigeon-widget-prompt');
-    const subMessage = document.querySelector('.sub_message_container');
+    const cproOverlay = document.querySelector('.cpro-overlay');
-    const popup = document.querySelector('.popupally-pro-outer-full-width-7-fluid_qemskqa');
+    removeDOMElement(popup, cproOverlay);
-    const bgFocusRemoverId = document.getElementById('popup-box-pro-gfcr-7');
+  }, 500); // Delay (in milliseconds)
-
-    removeDOMElement(sideNotification, subMessage, popup, bgFocusRemoverId);
-  });
 } else if (matchDomain('the-american-interest.com')) {
   const counter = document.getElementById('article-counter');
   removeDOMElement(counter);
 } else if (matchDomain('nzherald.co.nz')) {
-  NZHerald();
+  const articleContent = document.querySelector('.article__content');
+  if (articleContent) {
+    const articleOffer = document.querySelector('.article-offer');
+    if (articleOffer) {
+      const cssSelector = articleContent.querySelectorAll('p')[5].getAttribute('class');
+      const hiddenNotPars = articleContent.querySelectorAll('.' + cssSelector + ':not(p)');
+      for (const hiddenNotPar of hiddenNotPars) {
+        hiddenNotPar.classList.remove(cssSelector);
+        hiddenNotPar.removeAttribute('style');
+      }
+      const hiddenPars = articleContent.querySelectorAll('p.' + cssSelector);
+      const parser = new DOMParser();
+      for (const hiddenPar of hiddenPars) {
+        const parHtml = parser.parseFromString('<div style="margin: 10px 0px; font-size: 17px">' + hiddenPar.innerHTML + '</div>', 'text/html');
+        const parDom = parHtml.querySelector('div');
+        articleContent.insertBefore(parDom, hiddenPar);
+      }
+      const firstSpan = document.querySelector('p > span');
+      if (firstSpan) { firstSpan.removeAttribute('class'); }
+      removeDOMElement(articleOffer);
+    }
+  }
+  const premiumToaster = document.querySelector('#premium-toaster');
+  removeDOMElement(premiumToaster);
 } else if (matchDomain('interest.co.nz')) {
   const wrapper = document.getElementById('pp-ablock-banner-wrapper');
   const overlay = document.querySelector('.black-overlay');
@@ -174,58 +204,35 @@ if (matchDomain('elmercurio.com')) {
   const paywall = document.getElementsByClassName('paywall')[0];
   removeDOMElement(paywall);
 } else if (matchDomain('bloomberg.com')) {
-  document.addEventListener('DOMContentLoaded', () => {
+  const paywall = document.querySelectorAll('div[id^="fortress-"]');
-    const fence = document.querySelector('.fence-body');
+  const leaderboard = document.querySelector('div[id^="leaderboard"], div[class^="leaderboard"], div.canopy-container');
-    if (fence) {
+  const ads = document.querySelectorAll('div[data-ad-status], div.dvz-v0-ad, div[class^="FullWidthAd_"]');
-      fence.classList.remove('fence-body');
+  hideDOMElement(...paywall, leaderboard, ...ads);
+  if (window.location.pathname.startsWith('/live/')) {
+    setInterval(function () {
+      window.localStorage.clear();
+    }, 15 * 60 * 1000);
   }
-    const paywall = document.getElementById('paywall-banner');
-    removeDOMElement(paywall);
-  });
 } else if (matchDomain('bloombergquint.com')) {
   const articlesLeftModal = document.getElementsByClassName('paywall-meter-module__story-paywall-container__1UgCE')[0];
   const paywall = document.getElementById('paywallDmp');
   removeDOMElement(articlesLeftModal, paywall);
-} else if (matchDomain('medium.com')) {
+} else if (matchDomain('medium.com') || document.querySelector('script[src^="https://cdn-client.medium.com/"]')) {
-  const bottomMessageText = 'Get one more story in your member preview when you sign up. It’s free.';
+  const paywall = document.querySelector('div#paywall-background-color');
-  const DOMElementsToTextDiv = pageContains('div', bottomMessageText);
+  removeDOMElement(paywall);
-  if (DOMElementsToTextDiv[2]) removeDOMElement(DOMElementsToTextDiv[2]);
+  if (paywall) {
-} else if (matchDomain('theglobeandmail.com')) {
+    extensionApi.runtime.sendMessage({ request: 'refreshCurrentTab' });
-  document.addEventListener('DOMContentLoaded', () => {
-    const realArticle = document.querySelector('.js-c-article-body');
-    let decoyArticle = document.querySelector('.decoy-article');
-    if (realArticle && !decoyArticle) {
-      decoyArticle = document.createElement('div');
-      decoyArticle.classList.add('js-c-article-body');
-      decoyArticle.classList.add('decoy-article');
-      decoyArticle.hidden = true;
-      realArticle.parentElement.insertBefore(decoyArticle, realArticle);
-      for (var child = realArticle.firstChild; child !== null; child = child.nextSibling) {
-        if (child.style) {
-          child.style.display = 'block';
   }
-      }
-    }
-    const regWall = document.querySelector('#regwall');
-    const lightBox = document.querySelector('.c-lightbox');
-    if (regWall && lightBox) {
-      regWall.hidden = true;
-      lightBox.hidden = true;
-    }
-    const subscribed = document.querySelector('html.story-subscribed');
-    if (subscribed && !window.location.href.includes('?ref=premium')) {
   window.setTimeout(function () {
-        window.location.href = new URL(window.location.href).pathname + '?ref=premium';
+    const meter = document.querySelector('[id*="highlight-meter-"]');
-      }, 100);
+    if (meter) {
-    }
+      meter.hidden = true;
-  });
-  const cCards = document.querySelectorAll('div.c-card');
-  for (const cCard of cCards) {
-    const aLink = cCard.querySelector('a');
-    const key = cCard.querySelector('span.c-indicator-icon--key');
-    if (key && aLink && !aLink.href.includes('?ref=premium')) {
-      aLink.href = aLink.href + '?ref=premium';
     }
+  }, 500); // Delay (in milliseconds)
+} else if (matchDomain('theglobeandmail.com')) {
+  const articleBodySubscribed = document.querySelector('.c-article-body--subscribed');
+  if (articleBodySubscribed) {
+    articleBodySubscribed.removeAttribute('class');
   }
 } else if (matchDomain(['examiner.com.au', 'thecourier.com.au', 'theadvocate.com.au'])) {
   const subscribeTruncate = document.querySelector('.subscribe-truncate');
@@ -243,15 +250,14 @@ if (matchDomain('elmercurio.com')) {
   for (const el of content) {
     el.classList.remove('subscriber-hider');
   }
-} else if (matchDomain('asia.nikkei.com')) {
-  const cookieBanner = document.querySelector('.pw-widget');
-  removeDOMElement(cookieBanner);
 } else if (matchDomain('ledevoir.com')) {
   const counter = document.querySelector('.full.hidden-print.popup-msg');
   removeDOMElement(counter);
 } else if (matchDomain('ft.com')) {
-  const cookieBanner = document.querySelector('.cookie-banner');
+  const cookieBanner = document.querySelector('.o-banner__outer');
-  removeDOMElement(cookieBanner);
+  const ribbon = document.querySelector('.js-article-ribbon');
+  const ads = document.querySelector('.o-ads');
+  removeDOMElement(cookieBanner, ads, ribbon);
 } else if (matchDomain('thehindu.com')) {
   document.addEventListener('DOMContentLoaded', () => {
     const counter = document.querySelector('#test');
@@ -260,38 +266,8 @@ if (matchDomain('elmercurio.com')) {
     removeDOMElement(counter, coBanner, support);
   });
 } else if (matchDomain('nytimes.com')) {
-  const previewButton = document.querySelector('.css-3s1ce0');
+  const banners = document.querySelectorAll('div[data-testid="inline-message"], div[id^="ad-"], div.expanded-dock, div.pz-ad-box');
-  if (previewButton) { previewButton.click(); }
+  removeDOMElement(...banners);
-  // Prevent bottom dock from appearing
-  new window.MutationObserver(function (mutations) {
-    for (const mutation of mutations) {
-      for (const node of mutation.addedNodes) {
-        if (node instanceof window.HTMLElement) {
-          if (node.matches('.css-3fbowa')) {
-            removeDOMElement(node);
-            this.disconnect();
-          }
-        }
-      }
-    }
-  }).observe(document, { subtree: true, childList: true });
-  // Reload iframes after window is loaded to fix iframes not loading
-  document.addEventListener('readystatechange', event => {
-    if (event.target.readyState === 'complete') {
-      const iframes = document.querySelectorAll('iframe');
-      iframes.forEach(iframe =>
-        window.fetch(iframe.src).then(function (response) {
-          // The API call was successful!
-          return response.text();
-        }).then(function (html) {
-          // This is the HTML from our response as a text string
-          iframe.outerHTML = html;
-        }).catch(function (err) {
-          // There was an error
-          console.warn('Something went wrong.', err);
-        }));
-    }
-  });
 } else if (matchDomain('technologyreview.com')) {
   window.setTimeout(function () {
     const bodyObscured = document.querySelector('body[class*="body__obscureContent"]');
@@ -341,14 +317,17 @@ if (matchDomain('elmercurio.com')) {
 } else if (matchDomain('cen.acs.org')) {
   const paywall = document.querySelector('.meteredBar');
   removeDOMElement(paywall);
-} else if (matchDomain('elpais.com')) {
+} else if (matchDomain('elperiodico.com')) {
   setTimeout(function () {
-    const paywall = document.querySelector('.fc-ab-root');
+    const unavailableArea = document.querySelector('.closed');
-    const body = document.querySelector('.salida_articulo');
+    const infoBox = document.querySelector('.ep-masPeriodico-info');
-
+    if (unavailableArea) {
-    removeDOMElement(paywall);
+      unavailableArea.classList.remove('closed');
-    body.removeAttribute('style');
+    }
-  }, 500); // Delay (in milliseconds)
+    if (infoBox) {
+      infoBox.parentNode.removeChild(infoBox);
+    }
+  }, 1000);
 } else if (matchDomain('techinasia.com')) {
   const paywall = document.querySelector('.paywall-content');
   if (paywall) {
@@ -369,33 +348,33 @@ if (matchDomain('elmercurio.com')) {
   const banner = document.querySelector('.persistent-banner');
   removeDOMElement(banner);
 } else if (matchDomain('spectator.co.uk')) {
-  const container = document.querySelector('.HardPayWallContainer-module__overlay');
+  const banner = document.querySelector('#subscribe-ribbon');
-  window.setTimeout(function () {
+  removeDOMElement(banner);
-    if (container && window.location.href.includes('/www.spectator.co.uk/')) {
-      window.location.href = window.location.href + '/amp';
-    }
-  }, 500);
 } else if (matchDomain('barrons.com')) {
-  document.addEventListener('DOMContentLoaded', () => {
+  const url = window.location.href;
+  if (!url.includes('barrons.com/amp/')) {
     const bodyContinuous = document.querySelector('body.is-continuous');
     const snippet = document.querySelector('meta[content="snippet"]');
     if (bodyContinuous && snippet) {
-      window.location.href = window.location.href.replace('barrons.com', 'barrons.com/amp');
+      removeDOMElement(snippet);
+      window.location.href = url.replace('barrons.com', 'barrons.com/amp');
     }
-  });
+    const signinLinks = document.querySelectorAll('a.primary-button--link[href*="target="]');
-  if (!window.location.href.includes('barrons.com/amp/')) {
-    let href = '';
-    const signinLinks = document.querySelectorAll('a.primary-button--link');
     for (const signinLink of signinLinks) {
-      href = signinLink.href;
+      signinLink.href = decodeURIComponent(signinLink.href.split('target=')[1]).split('?')[0];
-      if (href.includes('target=')) {
-        href = href.split('target')[1].split('%3F')[0];
-        href = href.replace('=', '').replace('%3A', ':').replace(/%2F/g, '/');
-        signinLink.href = href;
       signinLink.text = 'Click';
     }
+    const barronsAds = document.querySelectorAll('.barrons-body-ad-placement');
+    removeDOMElement(...barronsAds);
+  } else {
+    const preview = document.querySelector('section[subscriptions-section="content-not-granted"]');
+    removeDOMElement(preview);
+    const subscrSection = document.querySelector('section[subscriptions-section="content"]');
+    if (subscrSection) {
+      subscrSection.removeAttribute('subscriptions-section');
     }
   }
+  removeDOMElement(document.querySelector('.login-section-container'));
 } else if (matchDomain('nzz.ch')) {
   const paywall = document.querySelector('.dynamic-regwall');
   removeDOMElement(paywall);
@@ -410,22 +389,28 @@ if (matchDomain('elmercurio.com')) {
   removeDOMElement(paywall);
 } else if (matchDomain('lesechos.fr') && window.location.href.match(/-\d{6,}/)) {
   window.setTimeout(function () {
+    const aboBanner = document.querySelector('[class^="pgxf3b"]');
+    const adBlocks = document.querySelectorAll('[class*="jzxvkd"');
+    for (const adBlock of adBlocks) { adBlock.setAttribute('style', 'display:none'); }
+    if (aboBanner) {
+      removeDOMElement(aboBanner);
       const url = window.location.href;
       const html = document.documentElement.outerHTML;
-    const split1 = html.split('window.__PRELOADED_STATE__')[1];
+      let state;
+      const split1 = html.split('window.__PRELOADED_STATE__=')[1];
       const split2 = split1.split('</script>')[0].trim();
-    const state = split2.substr(1, split2.length - 2);
+      if (split2.includes('; window.__DATA__=')) { state = split2.split('; window.__DATA__=')[0].trim(); } else { state = split2.substr(0, split2.length - 1); }
       try {
         const data = JSON.parse(state);
         const article = data.article.data.stripes[0].mainContent[0].data.description;
         const urlLoaded = data.article.data.path;
-      if (!url.includes(urlLoaded)) { document.location.reload(true); }
+        if (!url.includes(urlLoaded)) { window.location.reload(true); }
         const paywallNode = document.querySelector('.post-paywall');
         if (paywallNode) {
           const contentNode = document.createElement('div');
           const parser = new DOMParser();
-        const articleHtml = parser.parseFromString('<div id="bypass">' + article + '</div>', 'text/html');
+          const articleHtml = parser.parseFromString('<div>' + article + '</div>', 'text/html');
-        const articlePar = articleHtml.querySelector('div#bypass');
+          const articlePar = articleHtml.querySelector('div');
           if (articlePar) {
             contentNode.appendChild(articlePar);
             contentNode.className = paywallNode.className;
@@ -437,15 +422,12 @@ if (matchDomain('elmercurio.com')) {
             }
           }
         }
+        const styleElem = document.head.appendChild(document.createElement('style'));
+        styleElem.innerHTML = '.post-paywall::after {height: auto !important;}';
       } catch (err) {
-      console.warn(err);
+        window.location.reload(true);
       }
-    const adBlocks = document.querySelectorAll('.jzxvkd-1');
-    for (const adBlock of adBlocks) {
-      adBlock.setAttribute('style', 'display:none');
     }
-    const aboBanner = document.querySelector('[class^="pgxf3b"]');
-    removeDOMElement(aboBanner);
   }, 500); // Delay (in milliseconds)
 } else if (matchDomain('startribune.com')) {
   // remove active class from all elements
@@ -470,38 +452,270 @@ if (matchDomain('elmercurio.com')) {
       .forEach(function (el) {
         el.removeAttribute('class');
       });
-  }, 2000); // Delay (in milliseconds)
+  }, 1000); // Delay (in milliseconds)
 } else if (matchDomain('theatlantic.com')) {
-  // Remove all nudge elements
+  const images = document.querySelectorAll('img[class*="Image_lazy__"]');
-  document.querySelectorAll('div[class*="c-nudge"]').forEach(function (el) {
+  for (const elem of images) { removeClassesByPrefix(elem, 'Image_lazy__'); }
-    removeDOMElement(el);
+  const banners = document.querySelectorAll('.c-nudge__container, .c-non-metered-nudge, div[class^="ArticleInjector_"]');
-  });
+  hideDOMElement(...banners);
-  // Remove all FancyBox ads
+} else if (matchDomain('theathletic.com')) {
-  document.querySelectorAll('div[class*="fancybox"]').forEach(function (el) {
+  if (!window.location.search.match(/(\?|&)amp/)) {
-    removeDOMElement(el);
+    const paywall = document.querySelector('div#slideup-paywall');
-  });
+    if (paywall) {
+      const overlays = document.querySelectorAll('div[id*="overlay"], div:empty:not([data-rjs])');
+      removeDOMElement(paywall, ...overlays);
+      const body = document.querySelector('body');
+      if (body) {
+        body.style.overflow = 'visible';
+        body.style.position = 'relative';
+      }
+    } else {
+      const headlinePaywall = document.querySelectorAll('a.headline-paywall');
+      const amphtml = document.querySelector('link[rel="amphtml"]');
+      if (headlinePaywall.length && amphtml) {
+        removeDOMElement(...headlinePaywall);
+        window.setTimeout(function () {
+          window.location.href = amphtml.href;
+        }, 1000);
+      }
+    }
+  } else {
+    ampUnhideSubscriptionsSection();
+  }
+  const apron = document.querySelector('div#free-apron-cta, div.slideup-free-apron-container');
+  removeDOMElement(apron);
 } else if (matchDomain('newyorker.com')) {
-  const paywall = document.querySelector('.paywall-bar');
+  blockElement('.paywall-bar', true);
-  removeDOMElement(paywall);
+  blockElement('.paywall-modal');
 } else if (matchDomain('vanityfair.com')) {
   const paywall = document.querySelector('.paywall-bar');
   removeDOMElement(paywall);
-} else if (matchDomain('delfi.ee')) {
-  // Remove 'adblocker-detected' notification overlay
-  document.body.classList.remove('adb-curtain');
-  const el = document.getElementById('ab--notification-header');
-  removeDOMElement(el);
 } else if (matchDomain(['postimees.ee', 'elu24.ee'])) {
   setTimeout(function () {
     // Remove 'adblocker-detected' footer notification
-    const adblockNotif = document.querySelector('.adblock-notif');
+    const adblockNotif = document.querySelector('.ad-block-notification-overlay');
     removeDOMElement(adblockNotif);
+    document.body.removeAttribute('style');
   }, 800); // Delay (in milliseconds)
-} else if (matchDomain('thetimes.co.uk')) {
+} else if (matchDomain('theolivepress.es')) {
-  const block = document.querySelector('.subscription-block');
+  const modalBackdrop = document.querySelector('.modal-backdrop');
-  const adBlock = document.getElementById('ad-article-inline');
+  const paywall = document.querySelector('.ev-open-modal-paywall-REQUIRE_LOGIN_WITH_ENTITLEMENT');
-  const adHeader = document.getElementById('sticky-ad-header');
+  removeDOMElement(modalBackdrop, paywall);
-  removeDOMElement(block, adBlock, adHeader);
+
+  for (const clazz of ['ev-modals', 'modal-open']) {
+    document.body.classList.remove(clazz);
+  }
+} else if (matchDomain('themarker.com')) {
+  setTimeout(function () {
+    const paywall = document.querySelector('[data-test="bottomStrip"]');
+    const notifications = document.querySelector('#pwSubscribePopup');
+    const banner = document.querySelector('#themarker\\.com\\.billboard\\.desktop');
+    const newsBanner = document.querySelector('#themarker\\.com\\.news\\.banner');
+    const midBanner = document.querySelector('#themarker\\.com.headline\\.banner\\.desktop');
+    const financeBanner = document.querySelector('#themarker\\.com\\.finance\\.banner');
+    const topStrip = document.querySelector('[data-test="topStrip"]');
+    const otherBanners = Array.from(document.querySelectorAll('[data-audtarget]'));
+    removeDOMElement(paywall, notifications, banner, topStrip, midBanner, newsBanner, financeBanner, ...otherBanners);
+  }, 500);
+} else if (matchDomain('haaretz.co.il')) {
+  setTimeout(function () {
+    const notifications = document.querySelector('#pwSubscribePopup');
+    const paywall = document.querySelector('[data-test="bottomStrip"]');
+    const banner = document.querySelector('#haaretz\\.co\\.il\\.billboard\\.desktop');
+    const editorsBanner = document.querySelector('#haaretz\\.co\\.il\\.editors\\.banner');
+    const headlinesBanner = document.querySelector('#haaretz\\.co\\.il\\.headline\\.box\\.desktop');
+    const topStrip = document.querySelector('[data-test="topStrip"]');
+    const otherBanners = Array.from(document.querySelectorAll('[data-audtarget]'));
+    removeDOMElement(paywall, notifications, banner, editorsBanner, topStrip, headlinesBanner, ...otherBanners);
+  }, 500);
+} else if (matchDomain('sueddeutsche.de')) {
+  const url = window.location.href;
+  document.addEventListener('DOMContentLoaded', () => {
+    const offerPage = document.querySelector('div.offer-page');
+    if (url.startsWith('https://www.sueddeutsche.de') && (url.includes('reduced=true') || offerPage)) { window.location.href = url.split('?')[0].replace('www.', 'amphtml.'); } else if (url.startsWith('https://sz-magazin.sueddeutsche.de')) {
+      if (url.includes('reduced=true') || offerPage) { window.location.href = new URL(url).pathname + '!amp'; }
+    }
+  });
+  window.setTimeout(function () {
+    if (url.includes('!amp')) {
+      const paragraphReduced = document.querySelector('.paragraph--reduced');
+      if (paragraphReduced) { paragraphReduced.classList.remove('paragraph--reduced'); }
+      const paragraphHidden = document.querySelectorAll('.paragraph--hidden');
+      for (const parHidden of paragraphHidden) { parHidden.classList.remove('paragraph--hidden'); }
+      const paragraphDynamic = document.querySelector('.paragraph--dynamic');
+      if (paragraphDynamic) { paragraphDynamic.classList.remove('paragraph--dynamic'); }
+      const ampOfferpage = document.querySelector('.amp-offerpage');
+      removeDOMElement(ampOfferpage);
+    }
+  }, 500); // Delay (in milliseconds)
+} else if (matchDomain('adweek.com')) {
+  const bodySingle = document.querySelector('body.single');
+  const ampHtml = document.querySelector('link[rel="amphtml"]');
+  if (bodySingle && ampHtml) {
+    bodySingle.classList.remove('single');
+    window.location.href = ampHtml.href;
+  }
+} else if (matchDomain('gelocal.it')) {
+  if (!window.location.href.includes('/amp/')) {
+    const paywallAdagio = document.querySelector('.paywall-adagio');
+    removeDOMElement(paywallAdagio);
+  } else {
+    const paywall = document.querySelector('div[amp-access="showContent"]');
+    if (paywall) { paywall.removeAttribute('amp-access-hide'); }
+    const ampAds = document.querySelectorAll('amp-ad');
+    removeDOMElement(...ampAds);
+  }
+} else if (matchDomain('elmundo.es')) {
+  const premium = document.querySelector('.ue-c-article__premium');
+  const url = window.location.href;
+  if (!url.includes('/amp.' + 'elmundo.es' + '/')) {
+    if (premium) {
+      removeDOMElement(premium);
+      window.location.href = window.location.href.replace('/www.', '/amp.');
+    }
+  } else {
+    const paywall = document.querySelector('div[amp-access="authorized!=true"]');
+    if (paywall) {
+      removeDOMElement(paywall);
+      const divHidden = document.querySelector('div[amp-access="authorized=true"]');
+      if (divHidden) {
+        divHidden.removeAttribute('amp-access-hide');
+      }
+    }
+    const advertising = document.querySelectorAll('.advertising, amp-embed');
+    removeDOMElement(...advertising);
+  }
+} else if (matchDomain('speld.nl')) {
+  const paywallPopup = document.querySelector('.c-paywall-notice');
+  removeDOMElement(paywallPopup);
+} else if (matchDomain('lastampa.it')) {
+  const url = window.location.href;
+  if (!url.includes('/amp/')) {
+    const premium = document.querySelector('.paywall-adagio');
+    removeDOMElement(premium);
+    window.setTimeout(function () {
+      if (premium) {
+        window.location.href = url.split('?')[0] + '/amp/';
+      }
+      const articleBody = document.querySelector('div#article-body[style]');
+      if (articleBody) {
+        articleBody.removeAttribute('style');
+      }
+    }, 500);
+  } else {
+    const paywall = document.querySelector('div[id^="paywall-banner"]');
+    removeDOMElement(paywall);
+    const subscriptionSection = document.querySelector('[subscriptions-section="content"]');
+    if (subscriptionSection) {
+      subscriptionSection.removeAttribute('subscriptions-section');
+      const preview = document.querySelector('div[subscriptions-section="content-not-granted"]');
+      removeDOMElement(preview);
+    }
+    const ampAds = document.querySelectorAll('amp-ad, amp-embed');
+    removeDOMElement(...ampAds);
+  }
+} else if (matchDomain('time.com')) {
+  const body = document.querySelector('body');
+  if (body) {
+    body.setAttribute('style', 'position:relative !important;');
+  }
+} else if (matchDomain('expansion.com')) {
+  const premium = document.querySelector('.ue-c-article__premium');
+  const url = window.location.href;
+  if (!url.includes('/amp.' + 'expansion.com' + '/')) {
+    if (premium) {
+      removeDOMElement(premium);
+      window.location.href = window.location.href.replace('/www.', '/amp.');
+    }
+  } else {
+    const paywall = document.querySelector('div[amp-access="authorized!=true"]');
+    if (paywall) {
+      removeDOMElement(paywall);
+      const divHidden = document.querySelector('div[amp-access="authorized=true"]');
+      if (divHidden) {
+        divHidden.removeAttribute('amp-access-hide');
+      }
+    }
+    const advertising = document.querySelectorAll('.advertising, amp-embed');
+    removeDOMElement(...advertising);
+  }
+} else if (matchDomain('chicagobusiness.com')) {
+  const body = document.querySelector('body[class]');
+  if (body) {
+    body.removeAttribute('class');
+  }
+} else if (matchDomain('latimes.com')) {
+  const ads = document.querySelectorAll('div.enhancement, div.google-dfp-ad-wrapper');
+  hideDOMElement(...ads);
+} else if (matchDomain('foreignpolicy.com')) {
+  const contentUngated = document.querySelector('div.content-ungated');
+  removeDOMElement(contentUngated);
+  const contentGated = document.querySelector('div.content-gated');
+  if (contentGated) {
+    contentGated.classList.remove('content-gated');
+  }
+} else if (matchDomain('bostonglobe.com')) {
+  // Remove the portion covering the paywall
+  const paywall = document.querySelector('div.meter-paywall');
+  if (paywall) {
+    removeDOMElement(paywall);
+  }
+  // Re-enable scrolling
+  const body = document.querySelector('body');
+  if (body) {
+    document.body.removeAttribute('style');
+  }
+  // Click the button to reveal the rest of the article
+  const buttonDiv = document.querySelector('[id="continue_button"]');
+  if (buttonDiv) {
+    const button = buttonDiv.querySelector('button');
+    if (button) {
+      button.click();
+    }
+  }
+} else if (matchDomain('nationalgeographic.com')) {
+  // prevent modal from showing up, then remove scroll-locking, and article blur
+  new window.MutationObserver(function (mutations) {
+    for (const mutation of mutations) {
+      for (const node of mutation.addedNodes) {
+        if (node instanceof window.HTMLElement) {
+          if (node.matches('#fittPortal_0')) {
+            removeDOMElement(node);
+            const body = document.body;
+            body.removeAttribute('class');
+            body.removeAttribute('style');
+            body.removeAttribute('overflow');
+            const blur = document.querySelector('#natgeo-template1-frame-1-module-1 > div > div > section > article > section > div.Article__Content__Overlay--gated');
+            if (blur) removeDOMElement(blur);
+
+            this.disconnect(); // Stop watching for element being added after one removal
+          }
+        }
+      }
+    }
+  }).observe(document, { subtree: true, childList: true });
+} else if (matchDomain('hbrchina.org')) {
+  const hiddenDiv = document.querySelector('div#the_content');
+  if (hiddenDiv) {
+    hiddenDiv.removeAttribute('style');
+  }
+} else if (matchDomain('scmp.com')) {
+  if (window.location.href.includes('/amp.')) {
+    const divHidden = document.querySelectorAll('div.article-body[amp-access][amp-access-hide]');
+    for (const elem of divHidden) {
+      elem.removeAttribute('amp-access-hide');
+    }
+    const defaultMeters = document.querySelectorAll('div.default-meter, div#archive-article-meter');
+    const ads = document.querySelectorAll('amp-ad, div.ad-banner, div.advert-fly-carpet-container, div.inline-advert');
+    removeDOMElement(...defaultMeters, ...ads);
+  }
+} else if (matchDomain('fortune.com')) {
+  const paywalledArticle = document.querySelector('.paywall.paywallActive');
+  if (paywalledArticle) {
+    for (const clazz of ['paywall', 'paywallActive']) {
+      paywalledArticle.classList.remove(clazz);
+    }
+  }
 }
 
 function matchDomain (domains) {
@@ -510,6 +724,24 @@ function matchDomain (domains) {
   return domains.some(domain => hostname === domain || hostname.endsWith('.' + domain));
 }
 
+function waitDOMElement (selector, tagName = '', callback, multiple = false) {
+  new window.MutationObserver(function (mutations) {
+    for (const mutation of mutations) {
+      for (const node of mutation.addedNodes) {
+        if (!tagName || (node.tagName === tagName)) {
+          if (node.matches(selector)) {
+            callback(node);
+            if (!multiple) { this.disconnect(); }
+          }
+        }
+      }
+    }
+  }).observe(document, {
+    subtree: true,
+    childList: true
+  });
+}
+
 function removeDOMElement (...elements) {
   for (const element of elements) {
     if (element) { element.remove(); }
@@ -524,87 +756,31 @@ function removeClassesByPrefix (el, prefix) {
   }
 }
 
-function pageContains (selector, text) {
+// Prevent element from being added the first time to the DOM
-  const elements = document.querySelectorAll(selector);
+function blockElement (selector, blockAlways = false) {
-  return Array.prototype.filter.call(elements, function (element) {
+  new window.MutationObserver(function (mutations) {
-    return RegExp(text).test(element.textContent);
+    for (const mutation of mutations) {
-  });
+      for (const node of mutation.addedNodes) {
+        if (node instanceof window.HTMLElement) {
+          if (node.matches(selector)) {
+            removeDOMElement(node);
+            if (!blockAlways) {
+              this.disconnect(); // Stop watching for element being added after one removal
+            }
+          }
+        }
+      }
+    }
+  }).observe(document, { subtree: true, childList: true });
 }
 
-function NZHerald () {
+function ampUnhideSubscriptionsSection (ampAdsSel = 'amp-ad, .ad') {
-  const video = document.querySelector('.video-js');
+  const preview = document.querySelector('[subscriptions-section="content-not-granted"]');
-  if (video) {
+  removeDOMElement(preview);
-    const s = document.getElementsByTagName('script')[0];
+  const subscriptionsSection = document.querySelectorAll('[subscriptions-section="content"]');
-    if (s.src === '') {
+  for (const elem of subscriptionsSection) {
-      const vId = video.getAttribute('data-account');
+    elem.removeAttribute('subscriptions-section');
-      const vPlay = video.getAttribute('data-player');
-      const vScript = document.createElement('script');
-      vScript.type = 'text/javascript';
-      vScript.async = true;
-      vScript.src = 'https://players.brightcove.net/' + vId + '/' + vPlay + '_default/index.min.js';
-      s.parentNode.insertBefore(vScript, s);
-      const ticker = document.querySelector('.vcTicker');
-      if (ticker) {
-        ticker.style.display = 'none';
   }
-      const msg = document.querySelector('.vcMsg');
+  const ampAds = document.querySelectorAll(ampAdsSel);
-      if (msg) {
+  removeDOMElement(...ampAds);
-        msg.style.display = 'none';
-      }
-      const overlay = document.querySelector('.vcOverlay');
-      if (overlay) {
-        overlay.style.display = 'none';
-      }
-    }
-  }
-
-  window.setTimeout(function () {
-    const articleBody = document.querySelector('.article__body');
-    if (articleBody) {
-      const childItems = articleBody.getElementsByTagName('*');
-      let classHidden = '';
-      for (const el of childItems) {
-        if (el.getAttribute('class') !== null && el.getAttribute('style') !== null && classHidden === '') {
-          classHidden = el.getAttribute('class');
-        }
-      }
-      if (classHidden !== '') {
-        for (const el of childItems) {
-          el.classList.remove(classHidden);
-          el.removeAttribute('style');
-        }
-      }
-    }
-    const overlay = document.querySelector('#premium-toaster');
-    if (overlay) {
-      overlay.style.display = 'none';
-    }
-    const advert = document.querySelector('.section-iframe.both');
-    if (advert) {
-      advert.style.display = 'none';
-    }
-    const els = document.querySelectorAll('.header__navigation-toggle-button');
-    for (let i = 0; i < els.length; i++) {
-      els[i].addEventListener('click', function (ev) {
-        document.querySelector('.container').classList.toggle('container--sidebar-is-active');
-        ev.stopImmediatePropagation();
-      });
-    }
-    const subEls = document.querySelectorAll('.subnavigation');
-    for (let i = 0; i < subEls.length; i++) {
-      subEls[i].addEventListener('mouseover', function () {
-        this.childNodes[1].classList.add('subnavigation__item-wrapper--is-active');
-      });
-      subEls[i].addEventListener('mouseleave', function () {
-        this.childNodes[1].classList.remove('subnavigation__item-wrapper--is-active');
-      });
-    }
-    const accEls = document.querySelectorAll('.accordion__button');
-    for (let i = 0; i < accEls.length; i++) {
-      accEls[i].addEventListener('click', function (ev) {
-        this.parentNode.classList.toggle('accordion--is-expanded');
-        ev.stopImmediatePropagation();
-      });
-    }
-  }, 1000);
 }

src/js/sites.js

@@ -1,12 +1,13 @@
 // Cookies from this list are blocked by default
 const defaultSites = {
   'Adweek': 'adweek.com',
-  'Algemeen Dagblad': 'ad.nl',
+  '\u00C1mbito': 'ambito.com',
   'American Banker': 'americanbanker.com',
   'Baltimore Sun': 'baltimoresun.com',
   'Barron\'s': 'barrons.com',
   'Bloomberg': 'bloomberg.com',
   'Bloomberg Quint (free articles only)': 'bloombergquint.com',
+  'Boston Globe': 'bostonglobe.com',
   'Brisbane Times': 'brisbanetimes.com.au',
   'Business Insider': 'businessinsider.com',
   'Caixin': 'caixinglobal.com',
@@ -19,19 +20,21 @@ const defaultSites = {
   'De Groene Amsterdammer': 'groene.nl',
   'DeMorgen': 'demorgen.be',
   'Denver Post': 'denverpost.com',
+  'De Speld': 'speld.nl',
   'De Tijd': 'tijd.be',
   'de Volkskrant': 'volkskrant.nl',
-  'DELFI': 'delfi.ee',
   'Diario Financiero': 'df.cl',
   'Domani': 'editorialedomani.it',
   'Dynamed Plus': 'dynamed.com',
-  'Eindhovens Dagblad': 'ed.nl',
+  'El Mercurio': 'elmercurio.com',
-  'El Mercurio':'elmercurio.com',
+  'El Mundo': 'elmundo.es',
   'El Pais': 'elpais.com',
+  'El Periodico': 'elperiodico.com',
   'Elu24': 'elu24.ee',
   'Encyclopedia Britannica': 'britannica.com',
   'Estadão': 'estadao.com.br',
   'Examiner': 'examiner.com.au',
+  'Expansión': 'expansion.com',
   'Financial News': 'fnlondon.com',
   'Financial Post':'financialpost.com',
   'Financial Times': 'ft.com',
@@ -44,15 +47,16 @@ const defaultSites = {
   'Grubstreet' : 'grubstreet.com',
   'Haaretz English': 'haaretz.com',
   'Haaretz': 'haaretz.co.il',
-  'Handelsblatt': 'handelsblatt.com',
   'Harper\'s Magazine': 'harpers.org',
   'Hartford Courant': 'courant.com',
   'Harvard Business Review': 'hbr.org',
+  'Harvard Business Review China': 'hbrchina.org',
   'Herald Sun': 'heraldsun.com.au',
   'Het Financieele Dagblad': 'fd.nl',
   'History Extra': 'historyextra.com',
   'Humo': 'humo.be',
   'Il Manifesto': 'ilmanifesto.it',
+  'Il Messaggero': 'ilmessaggero.it',
   'Inc.com': 'inc.com',
   'Interest NZ': 'interest.co.nz',
   'Investors Chronicle': 'investorschronicle.co.uk',
@@ -60,6 +64,7 @@ const defaultSites = {
   'La Repubblica': 'repubblica.it',
   'La Stampa': 'lastampa.it',
   'La Tercera': 'latercera.com',
+  'La Voix du Nord': 'lavoixdunord.fr',
   'L\'Echo': 'lecho.be',
   'Le Devoir': 'ledevoir.com',
   'Le Parisien': 'leparisien.fr',
@@ -74,13 +79,13 @@ const defaultSites = {
   'MIT Sloan Management Review': 'sloanreview.mit.edu',
   'MIT Technology Review': 'technologyreview.com',
   'Mountain View Voice': 'mv-voice.com',
+  'National Geographic': 'nationalgeographic.com',
   'National Post': 'nationalpost.com',
   'Neue Zürcher Zeitung': 'nzz.ch',
   'New Statesman': 'newstatesman.com',
   'New York Daily News': 'nydailynews.com',
   'New York Magazine': 'nymag.com',
   'New Zealand Herald': 'nzherald.co.nz',
-  'Nikkei Asian Review': 'asia.nikkei.com',
   'NRC': 'nrc.nl',
   'NT News': 'ntnews.com.au',
   'Orange County Register': 'ocregister.com',
@@ -90,7 +95,9 @@ const defaultSites = {
   'Postimees': 'postimees.ee',
   'Quartz (free articles only)': 'qz.com',
   'Quora': 'quora.com',
+  'Quotidiani Gelocal': 'gelocal.it',
   'Republic.ru': 'republic.ru',
+  'Reuters': 'reuters.com',
   'San Diego Union Tribune': 'sandiegouniontribune.com',
   'San Francisco Chronicle': 'sfchronicle.com',
   'Scientific American': 'scientificamerican.com',
@@ -100,13 +107,18 @@ const defaultSites = {
   'Star Tribune': 'startribune.com',
   'Statista': 'statista.com',
   'Stuff': 'stuff.co.nz',
+  "Süddeutsche Zeitung": "sueddeutsche.de",
+  "South China Morning Post": "scmp.com",
   'SunSentinel': 'sun-sentinel.com',
   'Tech in Asia': 'techinasia.com',
   'Telegraaf': 'telegraaf.nl',
+  'Time': 'time.com',
   'The Advertiser': 'adelaidenow.com.au',
   'The Advocate': 'theadvocate.com.au',
   'The Age': 'theage.com.au',
   'The American Interest': 'the-american-interest.com',
+  'The Athletic': 'theathletic.com',
+  'The Athletic (UK)': 'theathletic.co.uk',
   'The Atlantic': 'theatlantic.com',
   'The Australian Financial Review': 'afr.com',
   'The Australian': 'theaustralian.com.au',
@@ -133,14 +145,15 @@ const defaultSites = {
   'The News-Gazette': 'news-gazette.com',
   'The New Yorker': 'newyorker.com',
   'The New York Times': 'nytimes.com',
+  'The Olive Press': 'theolivepress.es',
   'The Philadelphia Inquirer': 'inquirer.com',
   'The Saturday Paper': 'thesaturdaypaper.com.au',
   'The Seattle Times': 'seattletimes.com',
   'The Spectator Australia': 'spectator.com.au',
-  'The Spectator': 'spectator.co.uk',
+  'The Spectator (U.K.)': 'spectator.co.uk',
+  'The Spectator (U.S.)': 'spectator.us',
   'The Sydney Morning Herald': 'smh.com.au',
   'The Telegraph': 'telegraph.co.uk',
-  'The Times': 'thetimes.co.uk',
   'The Toronto Star': 'thestar.com',
   'The Wall Street Journal': 'wsj.com',
   'The Washington Post': 'washingtonpost.com',
@@ -153,6 +166,6 @@ const defaultSites = {
   'Vulture': 'vulture.com',
   'Winston-Salem Journal': 'journalnow.com',
   'Wired': 'wired.com',
-  'World Politics Review': 'worldpoliticsreview.com',
+  'Zeit Online': 'zeit.de',
   '*General Paywall Bypass*': 'generalpaywallbypass'
 };

src/updates/updates.json

@@ -1,9 +1,9 @@
 {
   "addons": {
-    "bypasspaywalls@bypasspaywalls.weebly.com": {
+    "bypasspaywalls@bypasspaywalls": {
       "updates": [
-        { "version": "1.7.7",
+        { "version": "1.7.9",
-            "update_link": "https://github.com/iamadamdev/bypass-paywalls-chrome/releases/download/v1.7.7/bypass-paywalls-firefox.xpi" }
+            "update_link": "https://github.com/iamadamdev/bypass-paywalls-chrome/releases/download/v1.7.9/bypass-paywalls-firefox.xpi" }
         ]
     }
   }

src/updates/updates.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='dcpihecpambacapedldabdbpakmachpb'>
-    <updatecheck codebase='https://github.com/iamadamdev/bypass-paywalls-chrome/releases/download/v1.7.7/bypass-paywalls-chrome.crx' version='1.7.7' />
+    <updatecheck codebase='https://github.com/iamadamdev/bypass-paywalls-chrome/releases/download/v1.7.9/bypass-paywalls-chrome.crx' version='1.7.9' />
   </app>
 </gupdate>

updates.json

@@ -1,11 +0,0 @@
-
-{
-  "addons": {
-    "bypasspaywalls@bypasspaywalls.weebly.com": {
-      "updates": [
-        { "version": "1.7.4",
-            "update_link": "https://github.com/iamadamdev/bypass-paywalls-chrome/releases/download/v1.7.4/bypass-paywalls-firefox.xpi" }
-        ]
-    }
-  }
-}

updates.xml

@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
-  <app appid='dcpihecpambacapedldabdbpakmachpb'>
-    <updatecheck codebase='https://github.com/iamadamdev/bypass-paywalls-chrome/releases/download/v1.7.4/bypass-paywalls-chrome.crx' version='1.7.4' />
-  </app>
-</gupdate>