From 483c2463169bb1dd6b561b37ebb9db53a2433424 Mon Sep 17 00:00:00 2001 From: Alberto Harres Date: Sun, 5 Mar 2023 17:29:41 +0100 Subject: [PATCH] change locations of internalLinkDomainsDefault to utils --- src/js/adn/adn-utils.js | 6 ++++++ src/js/background.js | 4 +++- src/js/contentscript-extra.js | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/js/adn/adn-utils.js b/src/js/adn/adn-utils.js index 05815c2b63c73..7451c534776eb 100644 --- a/src/js/adn/adn-utils.js +++ b/src/js/adn/adn-utils.js @@ -27,6 +27,12 @@ import { i18n$ } from '../i18n.js'; /**************************** exports *********************************/ +// targets on these domains are never internal (may need to be regex) +export const internalLinkDomainsDefault = ['google.com', 'asiaxpat.com', 'nytimes.com', +'columbiagreenemedia.com', '163.com', 'sohu.com', 'zol.com.cn', 'baidu.com', +'yahoo.com', 'facebook.com', 'youtube.com', 'flashback.org' +]; + export const makeCloneable = function (notes) { notes && notes.forEach(function (n) { delete n.func }); // remove func to allow clone // see https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm diff --git a/src/js/background.js b/src/js/background.js index 569528379b2f4..ac1d3af04c4d5 100644 --- a/src/js/background.js +++ b/src/js/background.js @@ -34,6 +34,8 @@ import { originFromURI, } from './uri-utils.js'; +import { internalLinkDomainsDefault } from './adn/adn-utils.js'; // adn + /******************************************************************************/ // Not all platforms may have properly declared vAPI.webextFlavor. @@ -88,7 +90,7 @@ const hiddenSettingsDefault = { userResourcesLocation: 'unset', showAdsDebug: false, // Adn set "true" to show ads that can be potentially be collected #2136 costPerClick: 1.03, // Adn https://github.com/dhowe/AdNauseam/issues/2131 - internalLinkDomains: `google.com, asiaxpat.com, nytimes.com, columbiagreenemedia.com, 163.com, sohu.com, zol.com.cn, baidu.com, yahoo.com, youtube.com, flashback.org`, // Adn + internalLinkDomains: internalLinkDomainsDefault.join(','), // Adn }; const userSettingsDefault = { diff --git a/src/js/contentscript-extra.js b/src/js/contentscript-extra.js index a65a7b52d713a..3ab262c848bf9 100644 --- a/src/js/contentscript-extra.js +++ b/src/js/contentscript-extra.js @@ -511,9 +511,11 @@ class ProceduralFilterer { /* ADN parse procedural selector hits */ if ( nodes.length > 0) { console.log("[ADN] parse procedural selector hits", nodes) + /* for ( const node of nodes ) { vAPI.adCheck && vAPI.adCheck(node); } + */ } /* end ADN */ const t1 = Date.now();