Remove Wz.de

README.md

@@ -81,15 +81,13 @@ Although [Orion Browser](https://apps.apple.com/us/app/orion-browser-by-kagi/id1
 * This add-on works best alongside the adblocker [uBlock Origin](https://addons.mozilla.org/firefox/addon/ublock-origin).
 * If you live in the EU, also consider adding these filters to your adblocker (in order to remove cookie warnings): [Easylist Cookies](https://secure.fanboy.co.nz/fanboy-cookiemonster.txt) | [I don't care about cookies custom filter](https://www.i-dont-care-about-cookies.eu/abp). Some sites need to set a consent-cookie for (social) media.
 
+[Go to top](#bypass-paywalls-clean-for-firefox)
+
 ### List of supported websites
 
 _* free articles only._
 
-##### International news
+##### National USA news
-[Foreign Affairs](https://www.foreignaffairs.com) -
-[Foreign Policy](https://www.foreignpolicy.com) -
-[Inkl](https://www.inkl.com) -
-[Newsweek](https://www.newsweek.com) -
 [Reuters](https://www.reuters.com) -
 [The New York Times](https://www.nytimes.com) -
 [The Washington Post](https://www.washingtonpost.com)
@@ -218,11 +216,14 @@ Grouped in options:\
 [Defector](https://defector.com) -
 [Field & Stream](https://www.fieldandstream.com) -
 [First Things](https://www.firstthings.com) -
+[Foreign Affairs](https://www.foreignaffairs.com) -
+[Foreign Policy](https://www.foreignpolicy.com) -
 [Harper's Magazine](https://harpers.org) -
 [Jane's Defence Weekly](https://www.janes.com/defence-news/) -
 [Jazziz](https://www.jazziz.com) -
 [Jazzwise](https://www.jazzwise.com) -
 [National Review](https://www.nationalreview.com) -
+[Newsweek](https://www.newsweek.com) -
 [Outdoor Life](https://www.outdoorlife.com) -
 [Project Syndicate (link to archive.is)](https://www.project-syndicate.org) -
 [Puck.news](https://puck.news) -
@@ -630,8 +631,7 @@ Grouped in options:\
 [Vorarlberg Nachrichten](https://www.vn.at) -
 [Vorarlberg Online](https://www.vol.at) -
 [Weltkunst](https://www.weltkunst.de) -
-[Weser-Kurier](https://www.weser-kurier.de) -
+[Weser-Kurier](https://www.weser-kurier.de)
-[Westdeutsche Zeitung](https://www.wz.de)
 
 Grouped in options:\
 *[Deutscher Fachverlag Mediengruppe](https://www.dfv.de)* (opt-in to custom sites)\
@@ -855,6 +855,7 @@ Grouped in options:\
 ##### Australia/New Zealand
 
 [Crikey](https://www.crikey.com.au) -
+[Inkl](https://www.inkl.com) -
 [MacroBusiness](https://www.macrobusiness.com.au) -
 [New Zealand Herald](https://www.nzherald.co.nz) -
 [The Saturday Paper](https://www.thesaturdaypaper.com.au) -
@@ -1001,6 +1002,8 @@ Grouped in options:\
 
 _* free articles only._
 
+[Go to top](#bypass-paywalls-clean-for-firefox)
+
 ### Sites with limited number of free articles
 The free article limit can normally be bypassed by removing cookies for the site.  
 Click on the BPC-icon and then *clear cookies*-button in the popup (for unsupported sites grant host permission for domain).  
@@ -1056,3 +1059,5 @@ You can also exclude a specific domain which is grouped in options.
 
 ### 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.
+
+[Go to top](#bypass-paywalls-clean-for-firefox)

background.js

@@ -980,6 +980,7 @@ ext_api.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
   }
 });
 
+setTimeout(function () {
 setInterval(function () {
   let current_date_str = currentDateStr();
   if (last_date_str < current_date_str) {
@@ -987,6 +988,7 @@ setInterval(function () {
     last_date_str = current_date_str;
   }
 }, 60 * 60 * 1000);
+}, 1000);
 
 var extraInfoSpec = ['blocking', 'requestHeaders'];
 if (ext_api.webRequest.OnBeforeSendHeadersOptions.hasOwnProperty('EXTRA_HEADERS'))

bpc_count_daily_users.js

@@ -1,5 +1,6 @@
 var ext_api = (typeof browser === 'object') ? browser : chrome;
-var url_loc = (typeof browser === 'object') ? 'firefox' : 'chrome';
+var manifestData = ext_api.runtime.getManifest();
+var url_loc = manifestData.key ? 'chrome' : 'firefox';
 
 // daily users counter
 function bpc_count_daily_users(dateStr) {

changelog.txt

@@ -3,6 +3,7 @@ Changelog Bypass Paywalls Clean - Firefox
 Updates (install signed xpi-file): https://gitlab.com/magnolia1234/bypass-paywalls-firefox-clean/-/releases
 
 Post-release
+Remove Wz.de (fix obsolete)
 
 * v3.5.0.0 (2024-01-07)
 Add Forum Communications (opt-in to custom sites)
@@ -1150,7 +1151,7 @@ Add LeNouvelEconomiste.fr
 Add Muenstersche Zeitung
 Add NewcastleHerald.com.au
 Add S&P Global
-Add Westdeutsche Zeitung
+Add Wz.de
 Remove HBR Taiwan (fix obsolete)
 Fix Australian Community Media (json)
 

custom/manifest.json

@@ -51,5 +51,5 @@
     "webRequestBlocking",
     "*://*/*"
   ],
-  "version": "3.5.0.0"
+  "version": "3.5.0.1"
 }

custom/sites_custom.json

@@ -1,6 +1,6 @@
 {
   "###_remove_sites": {
-    "cs_code": "al-monitor.com, arkansasonline.com, bild.de, doorbraak.be, gp.se, group_haaretz, handelsblatt.com, interestingengineering.com, lastampa.it, politiken.dk, repubblica.it, rp-online.de, sueddeutsche.de, theepochtimes.com, theinformation.com",
+    "cs_code": "al-monitor.com, arkansasonline.com, bild.de, doorbraak.be, gp.se, group_haaretz, handelsblatt.com, politiken.dk, rp-online.de, sueddeutsche.de, theinformation.com",
     "domain": "###"
   },
   "Abajournal.com": {
@@ -303,6 +303,11 @@
     "allow_cookies": 1,
     "domain": "internationalepolitik.de"
   },
+  "Investmentnews.com": {
+    "allow_cookies": 1,
+    "domain": "investmentnews.com",
+    "ld_google_webcache": "div.leaky_paywall_message_wrap|div#article-main-featured-content"
+  },
   "Ipe.com": {
     "allow_cookies": 1,
     "domain": "ipe.com",

manifest.json

@@ -771,7 +771,6 @@
     "*://*.wr.de/*",
     "*://*.wsj.com/*",
     "*://*.wwd.com/*",
-    "*://*.wz.de/*",
     "*://*.yogajournal.com/*",
     "*://*.yorkshirepost.co.uk/*",
     "*://*.zeit.de/*",
@@ -827,5 +826,5 @@
     "*://archive.vn/*",
     "*://webcache.googleusercontent.com/*"
   ],
-  "version": "3.5.0.0"
+  "version": "3.5.0.1"
 }

options/options_custom.js

@@ -326,7 +326,7 @@ function renderOptions() {
     sites_custom: {},
     sites_updated: {}
   }, function (items) {
-    var sites_custom = items.sites_custom;
+    var sites_custom = sortJson(items.sites_custom);
     var sites_custom_domains_new = Object.values(sites_custom).filter(x => x.domain && !defaultSites_domains.includes(x.domain)).map(x => x.group ? x.group.split(',').map(x => x.trim()) : x.domain).flat();
     var sites_updated = items.sites_updated;
     var sites_updated_domains_new = Object.values(sites_updated).filter(x => (x.domain && !defaultSites_domains.includes(x.domain) || x.group)).map(x => x.group ? x.group.filter(y => !defaultSites_domains.includes(y)) : x.domain).flat();

options/version.js

@@ -1,11 +1,14 @@
 var ext_api = (typeof browser === 'object') ? browser : chrome;
-var url_loc = 'firefox';
 
 var manifestData = ext_api.runtime.getManifest();
-var versionString = 'v' + manifestData.version;
+var url_loc = manifestData.key ? 'chrome' : 'firefox';
-document.getElementById('version').innerText = versionString;
+var version_str = 'v' + manifestData.version;
-var versionString_new = document.getElementById('version_new');
+var version_span = document.querySelector('span#version');
-versionString_new.setAttribute('style', 'font-weight: bold;');
+if (version_span)
+  version_span.innerText = version_str;
+var version_span_new = document.querySelector('span#version_new');
+if (version_span_new)
+  version_span_new.setAttribute('style', 'font-weight: bold;');
 var anchorEl;
 
 function show_update(ext_version_new, check = true) {
@@ -19,7 +22,7 @@ function show_update(ext_version_new, check = true) {
         });
         anchorEl = document.createElement('a');
         anchorEl.target = '_blank';
-        let manifest_id = manifestData.applications ? manifestData.applications.gecko.id : '';
+        let manifest_id = manifestData.browser_specific_settings ? manifestData.browser_specific_settings.gecko.id : '';
         if (manifest_id && manifest_id.includes('magnolia')) {
           if (installType === 'development')
             anchorEl.href = 'https://gitlab.com/magnolia1234/bypass-paywalls-' + url_loc + '-clean';
@@ -32,7 +35,7 @@ function show_update(ext_version_new, check = true) {
           ext_version_new = ext_version_new.replace(/\d$/, '0');
         anchorEl.innerText = 'New release v' + ext_version_new;
         anchorEl.target = '_blank';
-        versionString_new.appendChild(anchorEl);
+        version_span_new.appendChild(anchorEl);
         let warning;
         if (!manifestData.name.includes('Clean')) {
           warning = 'fake';
@@ -43,7 +46,7 @@ function show_update(ext_version_new, check = true) {
           let par = document.createElement('p');
           par.innerText = "You've installed a " + warning + " version of BPC (check help/GitLab)";
           par.style = 'font-weight: bold;';
-          versionString_new.appendChild(par);
+          version_span_new.appendChild(par);
         }
       }
     });
@@ -52,7 +55,7 @@ function show_update(ext_version_new, check = true) {
     anchorEl.text = 'Check Twitter for latest update';
     anchorEl.href = 'https://twitter.com/Magnolia1234B';
     anchorEl.target = '_blank';
-    versionString_new.appendChild(anchorEl);
+    version_span_new.appendChild(anchorEl);
   }
 }
 

sites.js

@@ -2665,11 +2665,6 @@ var defaultSites = {
     allow_cookies: 1,
     block_regex: /\.piano\.io\//
   },
-  "Westdeutsche Zeitung": {
-    allow_cookies: 1,
-    domain: "wz.de",
-    useragent: "googlebot"
-  },
   "Winnipeg Free Press": {
     domain: "winnipegfreepress.com",
     allow_cookies: 1,
@@ -2915,7 +2910,7 @@ var custom_flex_not = {
   "###_ca_postmedia": ["canada.com", "canoe.com", "driving.ca"],
   "###_de_dfv_medien": ["dfv.de"],
   "###_de_madsack": ["madsack.de", "madsack-medien-campus.de"],
-  "###_wp_leaky_paywall": ["epsilontheory.com", "heisenbergreport.com", "thewirechina.com"],
+  "###_wp_leaky_paywall": ["epsilontheory.com", "heisenbergreport.com", "investmentnews.com", "thewirechina.com"],
   "###_uk_axate.io": ["thecricketer.com", "thinkofx.net"],
   "###_uk_haymarket": ["gpbusiness.co.uk", "scmagazineuk.com", "thecorporatetreasurer.com"],
   "###_uk_haymarket_medical": ["mycme.com"],
@@ -2944,4 +2939,4 @@ var fr_groupe_ebra_nofix_domains = ['bienpublic.com', 'dna.fr', 'estrepublicain.
 var fr_indigo_nofix_domains = ['africaintelligence.com', 'africaintelligence.fr', 'glitz.paris', 'intelligenceonline.com', 'intelligenceonline.fr', 'lalettre.fr'];
 var it_gedi_nofix_domains = ['gelocal.it', 'limesonline.com'];
 var nl_mediahuis_region_nofix_domains = ['gooieneemlander.nl', 'haarlemsdagblad.nl', 'ijmuidercourant.nl', 'leidschdagblad.nl', 'noordhollandsdagblad.nl'];
-var nofix_sites = ['11freunde.de', 'aamulehti.fi', 'aftenposten.no', 'aftonbladet.se', 'allgaeuer-zeitung.de', 'asahi.com', 'asiatimes.com', 'autosport.com', 'aviationweek.com', 'badische-zeitung.de', 'bhaskar.com', 'bloomberglaw.com', 'bloombergtax.com', 'bnn.de', 'borsen.dk', 'businessinsider.de', 'businessinsider.jp', 'businesslive.co.za', 'businesstimes.com.sg', 'caixin.com', 'caixinglobal.com', 'caravanmagazine.in', 'catalyst-journal.com', 'chegg.com', 'codesports.com.au', 'compactmag.com', 'courrierinternational.com', 'coursehero.com',  'deutsche-wirtschafts-nachrichten.de', 'die-glocke.de', 'dn.no', 'dn.se', 'elordenmundial.com', 'entrepreneur.com', 'epw.in', 'expresso.pt', 'falter.at', 'finance.si', 'ftchinese.com', 'ftchineselive.com', 'gamestar.de', 'geo.de', 'golem.de', 'gp.se', 'handelsblatt.com', 'hbrarabic.com', 'hbrchina.org', 'hbrfrance.fr', 'heise.de', 'hln.be', 'hs.fi', 'ilsole24ore.com', 'information.dk', 'investors.com', 'iltalehti.fi', 'jacobin.com', 'jeuneafrique.com', 'jungefreiheit.de', 'kleinezeitung.at', 'lavie.fr', 'lavozdegalicia.es', 'law360.co.uk', 'law360.com', 'le1hebdo.fr', 'leconomiste.com', 'lefilmfrancais.com', 'lequipe.fr', 'lesjours.fr', 'letemps.ch', 'liberation.fr', 'limburger.nl', 'main-echo.de', 'mainpost.de', 'manager-magazin.de', 'medianama.com', 'mediapart.fr', 'milanofinanza.it', 'mittelbayerische.de', 'monde-diplomatique.fr', 'mondediplo.com', 'money.it', 'moneycontrol.com', 'moodys.com', 'morningstar.com', 'moz.de', 'nachrichten.at', 'nationaljournal.com', 'nature.com', 'nbr.co.nz', 'news24.com', 'newslaundry.com', 'nn.de', 'nwzonline.de', 'observador.pt', 'ouest-france.fr', 'philonomist.com', 'pnp.de', 'politicopro.com', 'politiken.dk', 'pressreader.com', 'publico.pt', 'quillette.com', 'republic.ru', 'rheinpfalz.de', 'risk.net', 'rnz.de', 'saechsische.de', 'schwarzwaelder-bote.de', 'sciencedirect.com', 'springer.com', 'statnews.com', 'stern.de', 'stimme.de', 'straitstimes.com', 'stratfor.com', 'streetinsider.com', 'substack.com', 'suedkurier.de', 'swp.de', 'techcrunch.com', 'the-ken.com', 'theinformation.com', 'theinitium.com', 'themorningcontext.com', 'theparisreview.org', 'thestar.com.my', 'thewirechina.com', 'weltwoche.ch', 'weltwoche.de', 'wissenschaft.de', 'wiwo.de', 'worldpoliticsreview.com', 'ynet.co.il'].concat(be_mediahuis_nofix_domains, de_funke_medien_nofix_domains, de_rp_aachen_medien_nofix_domains, de_westfalen_medien_nofix_domains, fr_groupe_ebra_nofix_domains, fr_indigo_nofix_domains, it_gedi_nofix_domains, nl_mediahuis_region_nofix_domains);
+var nofix_sites = ['11freunde.de', 'aamulehti.fi', 'aftenposten.no', 'aftonbladet.se', 'allgaeuer-zeitung.de', 'asahi.com', 'asiatimes.com', 'autosport.com', 'aviationweek.com', 'badische-zeitung.de', 'bhaskar.com', 'bloomberglaw.com', 'bloombergtax.com', 'bnn.de', 'borsen.dk', 'businessinsider.de', 'businessinsider.jp', 'businesslive.co.za', 'businesstimes.com.sg', 'caixin.com', 'caixinglobal.com', 'caravanmagazine.in', 'catalyst-journal.com', 'chegg.com', 'codesports.com.au', 'compactmag.com', 'courrierinternational.com', 'coursehero.com',  'deutsche-wirtschafts-nachrichten.de', 'die-glocke.de', 'dn.no', 'dn.se', 'elordenmundial.com', 'entrepreneur.com', 'epw.in', 'expresso.pt', 'falter.at', 'finance.si', 'ftchinese.com', 'ftchineselive.com', 'gamestar.de', 'geo.de', 'golem.de', 'gp.se', 'handelsblatt.com', 'hbrarabic.com', 'hbrchina.org', 'hbrfrance.fr', 'heise.de', 'hln.be', 'hs.fi', 'ilsole24ore.com', 'information.dk', 'investors.com', 'iltalehti.fi', 'jacobin.com', 'jeuneafrique.com', 'jungefreiheit.de', 'kleinezeitung.at', 'lavie.fr', 'lavozdegalicia.es', 'law360.co.uk', 'law360.com', 'le1hebdo.fr', 'leconomiste.com', 'lefilmfrancais.com', 'lequipe.fr', 'lesjours.fr', 'letemps.ch', 'liberation.fr', 'limburger.nl', 'main-echo.de', 'mainpost.de', 'manager-magazin.de', 'medianama.com', 'mediapart.fr', 'milanofinanza.it', 'mittelbayerische.de', 'monde-diplomatique.fr', 'mondediplo.com', 'money.it', 'moneycontrol.com', 'moodys.com', 'morningstar.com', 'motorsport.com', 'moz.de', 'nachrichten.at', 'nationaljournal.com', 'nature.com', 'nbr.co.nz', 'news24.com', 'newslaundry.com', 'nn.de', 'nwzonline.de', 'observador.pt', 'ouest-france.fr', 'philonomist.com', 'pnp.de', 'politicopro.com', 'politiken.dk', 'pressreader.com', 'publico.pt', 'quillette.com', 'republic.ru', 'rheinpfalz.de', 'risk.net', 'rnz.de', 'saechsische.de', 'schwarzwaelder-bote.de', 'sciencedirect.com', 'springer.com', 'statnews.com', 'stern.de', 'stimme.de', 'straitstimes.com', 'stratfor.com', 'streetinsider.com', 'substack.com', 'suedkurier.de', 'swp.de', 'techcrunch.com', 'the-ken.com', 'theinformation.com', 'theinitium.com', 'themorningcontext.com', 'theparisreview.org', 'thestar.com.my', 'thewirechina.com', 'weltwoche.ch', 'weltwoche.de', 'wissenschaft.de', 'wiwo.de', 'worldpoliticsreview.com', 'wz.de', 'ynet.co.il'].concat(be_mediahuis_nofix_domains, de_funke_medien_nofix_domains, de_rp_aachen_medien_nofix_domains, de_westfalen_medien_nofix_domains, fr_groupe_ebra_nofix_domains, fr_indigo_nofix_domains, it_gedi_nofix_domains, nl_mediahuis_region_nofix_domains);