From 0bee718f82e8b9fdca84f334639ec5d692555cd1 Mon Sep 17 00:00:00 2001 From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com> Date: Thu, 5 Mar 2020 19:51:29 +0100 Subject: [PATCH] Show badge-notification for regional Ad.nl sites Only Ad.nl option for regional sites (and therefore in enabledSites). --- background.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/background.js b/background.js index eef9e912..f0e68930 100644 --- a/background.js +++ b/background.js @@ -122,6 +122,7 @@ const use_google_bot_default = [ ]; var use_google_bot_custom = []; var use_google_bot = use_google_bot_default.concat(use_google_bot_custom); + // block paywall-scripts individually var blockedRegexes = { 'adweek.com': /.+\.lightboxcdn\.com\/.+/, @@ -312,6 +313,8 @@ browser.webRequest.onBeforeRequest.addListener(function(details) { }, ["blocking"]); +// list of regional ad.nl sites +const ad_region_domains = ['bd.nl', 'ed.nl', 'tubantia.nl', 'bndestem.nl', 'pzc.nl', 'destentor.nl', 'gelderlander.nl']; browser.webRequest.onBeforeSendHeaders.addListener(function(details) { var requestHeaders = details.requestHeaders; @@ -335,7 +338,6 @@ browser.webRequest.onBeforeSendHeaders.addListener(function(details) { // remove cookies for regional ADR sites of ad.nl (mainfest.json needs in permissions: ) if (isSiteEnabled({url: '.ad.nl'})) { - const ad_region_domains = ['bd.nl', 'ed.nl', 'tubantia.nl', 'bndestem.nl', 'pzc.nl', 'destentor.nl', 'gelderlander.nl']; var domainVar = new URL(details.url).hostname.replace('www.', ''); if (ad_region_domains.includes(domainVar)) { browser.cookies.getAll({domain: domainVar}, function(cookies) { @@ -475,7 +477,13 @@ function updateBadge() { } function getTextB(currentUrl) { - return currentUrl && isSiteEnabled({url: currentUrl}) ? 'ON' : ''; + // check regional ad.nl site + let is_adr_site = false; + if (currentUrl && isSiteEnabled({url: '.ad.nl'})) { + let domainVar = new URL(currentUrl).hostname.replace('www.', ''); + is_adr_site = ad_region_domains.includes(domainVar); + } + return currentUrl && (isSiteEnabled({url: currentUrl}) || is_adr_site) ? 'ON' : ''; } // remove cookies after page load