Merge branch 'iamadamdev:master' into master

README.md

@@ -26,16 +26,13 @@
 ### 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)\
-[BN De Stem](https://www.bndestem.nl)\
 [Boston Globe](https://www.bostonglobe.com)\
-[Brabants Dagblad](https://www.bd.nl)\
 [Brisbane Times](https://www.brisbanetimes.com.au)\
 [Business Insider](https://www.businessinsider.com)\
 [Caixin](https://www.caixinglobal.com)\
@@ -45,9 +42,7 @@
 [Corriere Della Sera](https://www.corriere.it)\
 [Crain's Chicago Business](https://www.chicagobusiness.com)\
 [Daily Press](https://www.dailypress.com)\
-[De Gelderlander](https://www.gelderlander.nl)\
 [De Groene Amsterdammer](https://www.groene.nl)\
-[De Stentor](https://www.destentor.nl)\
 [De Speld](https://speld.nl)\
 [De Tijd](https://www.tijd.be)\
 [De Volkskrant](https://www.volkskrant.nl)\
@@ -56,7 +51,6 @@
 [Diario Financiero](https://www.df.cl)\
 [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 Periodico](https://www.elperiodico.com)\
@@ -119,7 +113,6 @@
 [New Zealand Herald](https://www.nzherald.co.nz)\
 [Orange County Register](https://www.ocregister.com)\
 [Orlando Sentinel](https://www.orlandosentinel.com)\
-[PZC](https://www.pzc.nl)\
 [Palo Alto Online](https://www.paloaltoonline.com)\
 [Parool](https://www.parool.nl)\
 [Postimees](https://www.postimees.ee)\
@@ -188,7 +181,6 @@
 [Times Literary Supplement](https://www.the-tls.co.uk)\
 [Towards Data Science](https://www.towardsdatascience.com)\
 [Trouw](https://www.trouw.nl)\
-[Tubantia](https://www.tubantia.nl)\
 [Vanity Fair](https://www.vanityfair.com)\
 [Vrij Nederland](https://www.vn.nl)\
 [Vulture](https://www.vulture.com)\

manifest-ff.json

@@ -9,7 +9,6 @@
   "content_scripts": [
     {
     "matches": [
-    "*://*.ad.nl/*",
     "*://*.afr.com/*",
     "*://*.americanbanker.com/*",
     "*://*.ambito.com/*",
@@ -20,7 +19,6 @@
     "*://*.caixinglobal.com/*",
     "*://*.canberratimes.com.au/*",
     "*://*.economist.com/*",
-    "*://*.ed.nl/*",
     "*://*.editorialedomani.it/*",
     "*://*.elmercurio.com/*",
     "*://*.elpais.com/*",
@@ -125,7 +123,6 @@
     "*://*.poool.fr/*",
     "*://*.qiota.com/*",
     "*://*.tinypass.com/*",
-    "*://*.ad.nl/*",
     "*://*.adelaidenow.com.au/*",
     "*://*.adweek.com/*",
     "*://*.afr.com/*",
@@ -153,7 +150,6 @@
     "*://*.denverpost.com/*",
     "*://*.dynamed.com/*",
     "*://*.economist.com/*",
-    "*://*.ed.nl/*",
     "*://*.elmercurio.com/*",
     "*://*.elu24.ee/*",
     "*://*.examiner.com.au/*",
@@ -266,12 +262,6 @@
     "*://*.startribune.com/*",
     "*://*.df.cl/*",
     "*://*.financialpost.com/*",
-    "*://*.gelderlander.nl/*",
-    "*://*.bndestem.nl/*",
-    "*://*.bd.nl/*",
-    "*://*.tubantia.nl/*",
-    "*://*.pzc.nl/*",
-    "*://*.destentor.nl/*",
     "*://*.ambito/*",
     "*://*.sueddeutsche.de/*",
     "*://*.spectator.us/*",

src/js/background.js

@@ -11,19 +11,13 @@ const restrictions = {
 
 // Don't remove cookies before page load
 const allowCookies = [
-  'ad.nl',
-  'bd.nl',
-  'bndestem.nl',
   'brisbanetimes.com.au',
   'canberratimes.com.au',
   'cen.acs.org',
   'demorgen.be',
   'denverpost.com',
-  'destentor.nl',
-  'ed.nl',
   'examiner.com.au',
   'gelocal.it',
-  'gelderlander.nl',
   'grubstreet.com',
   'harpers.org',
   'hbr.org',
@@ -37,7 +31,6 @@ const allowCookies = [
   'nymag.com',
   'ocregister.com',
   'parool.nl',
-  'pzc.nl',
   'qz.com',
   'scientificamerican.com',
   'seattletimes.com',
@@ -45,7 +38,6 @@ const allowCookies = [
   'sofrep.com',
   'spectator.co.uk',
   'speld.nl',
-  'tubantia.nl',
   'techinasia.com',
   'telegraaf.nl',
   'the-american-interest.com',
@@ -79,20 +71,14 @@ const allowCookies = [
 
 // Removes cookies after page load
 const removeCookies = [
-  'ad.nl',
-  'bd.nl',
   'bloomberg.com',
   'bloombergquint.com',
-  'bndestem.nl',
   'brisbanetimes.com.au',
   'canberratimes.com.au',
   'cen.acs.org',
   'demorgen.be',
   'denverpost.com',
-  'destentor.nl',
-  'ed.nl',
   'examiner.com.au',
-  'gelderlander.nl',
   'globes.co.il',
   'grubstreet.com',
   'harpers.org',
@@ -104,7 +90,6 @@ const removeCookies = [
   'nrc.nl',
   'nymag.com',
   'ocregister.com',
-  'pzc.nl',
   'qz.com',
   'scientificamerican.com',
   'seattletimes.com',
@@ -118,7 +103,6 @@ const removeCookies = [
   'thecut.com',
   'thediplomat.com',
   'towardsdatascience.com',
-  'tubantia.nl',
   'vn.nl',
   'vulture.com',
   'wsj.com',
@@ -139,19 +123,11 @@ const removeCookiesSelectHold = {
 
 // select only specific cookie(s) to drop from removeCookies domains
 const removeCookiesSelectDrop = {
-  'ad.nl': ['temptationTrackingId'],
   'ambito.com': ['TDNotesRead'],
-  'bd.nl': ['temptationTrackingId'],
-  'bndestem.nl': ['temptationTrackingId'],
   'demorgen.be': ['TID_ID'],
-  'destentor.nl': ['temptationTrackingId'],
-  'ed.nl': ['temptationTrackingId'],
   'fd.nl': ['socialread'],
-  'gelderlander.nl': ['temptationTrackingId'],
   'humo.be': ['TID_ID'],
   'nrc.nl': ['counter'],
-  'pzc.nl': ['temptationTrackingId'],
-  'tubantia.nl': ['temptationTrackingId'],
   'speld.nl': ['speld-paywall']
 };
 

src/js/contentScript.js

@@ -73,9 +73,6 @@ if (matchDomain('elmercurio.com')) {
       }
     }
   }
-} else if (matchDomain(['ad.nl', 'ed.nl', 'bndestem.nl', 'bd.nl', 'tubantia.nl', 'destentor.nl', 'pzc.nl', 'gelderlander.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"]');

src/js/sites.js

@@ -1,16 +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',
-  'BN De Stem': 'bndestem.nl',
   'Boston Globe': 'bostonglobe.com',
-  'Brabants Dagblad': 'bd.nl',
   'Brisbane Times': 'brisbanetimes.com.au',
   'Business Insider': 'businessinsider.com',
   'Caixin': 'caixinglobal.com',
@@ -20,18 +17,15 @@ const defaultSites = {
   'Corriere Della Sera': 'corriere.it',
   'Crain\'s Chicago Business': 'chicagobusiness.com',
   'Daily Press': 'dailypress.com',
-  'De Gelderlander': 'gelderlander.nl',
   'De Groene Amsterdammer': 'groene.nl',
   'DeMorgen': 'demorgen.be',
   'Denver Post': 'denverpost.com',
   'De Speld': 'speld.nl',
-  'De Stentor': 'destentor.nl',
   'De Tijd': 'tijd.be',
   'de Volkskrant': 'volkskrant.nl',
   'Diario Financiero': 'df.cl',
   'Domani': 'editorialedomani.it',
   'Dynamed Plus': 'dynamed.com',
-  'Eindhovens Dagblad': 'ed.nl',
   'El Mercurio': 'elmercurio.com',
   'El Mundo': 'elmundo.es',
   'El Pais': 'elpais.com',
@@ -99,7 +93,6 @@ const defaultSites = {
   'Palo Alto Online': 'paloaltoonline.com',
   'Parool': 'parool.nl',
   'Postimees': 'postimees.ee',
-  'PZC': 'pzc.nl',
   'Quartz (free articles only)': 'qz.com',
   'Quora': 'quora.com',
   'Quotidiani Gelocal': 'gelocal.it',
@@ -168,7 +161,6 @@ const defaultSites = {
   'Times Literary Supplement': 'the-tls.co.uk',
   'Towards Data Science': 'towardsdatascience.com',
   'Trouw': 'trouw.nl',
-  'Tubantia': 'tubantia.nl',
   'Vanity Fair': 'vanityfair.com',
   'Vrij Nederland': 'vn.nl',
   'Vulture': 'vulture.com',