From cac947fd6237ddc6f81ad6d2a60a9258d93c0386 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Sun, 12 Mar 2023 16:27:17 +0800 Subject: [PATCH] Chore: new sorting for reject hosts --- Build/build-reject-domainset.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Build/build-reject-domainset.js b/Build/build-reject-domainset.js index d533b7f3..8ece48c0 100644 --- a/Build/build-reject-domainset.js +++ b/Build/build-reject-domainset.js @@ -250,22 +250,22 @@ const filterRuleWhitelistDomainSets = new Set(PREDEFINED_WHITELIST); console.time('* Write reject.conf'); - const getDomainOpt = { allowPrivateDomains: true }; + const sorter = (a, b) => { + if (a.domain > b.domain) { + return 1; + } + if (a.domain < b.domain) { + return -1; + } + return 0; + }; const sortedDomainSets = [...domainSets] .map((v) => { - return { v, domain: getDomain(v, getDomainOpt)?.toLowerCase() || v }; + return { v, domain: getDomain(v.charCodeAt(0) === 46 ? v.slice(1) : v)?.toLowerCase() || v }; }) - .sort((a, b) => { - if (a.domain > b.domain) { - return 1; - } - if (a.domain < b.domain) { - return -1; - } - return 0; - }) - .map(({ v }) => { - return v; + .sort(sorter) + .map((i) => { + return i.v; }); await compareAndWriteFile(