Browse Source

Chore: new sorting for reject hosts

SukkaW 3 years ago
parent
commit
cac947fd62
1 changed files with 13 additions and 13 deletions
  1. 13 13
      Build/build-reject-domainset.js

+ 13 - 13
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 };
-    })
-    .sort((a, b) => {
-      if (a.domain > b.domain) {
-        return 1;
-      }
-      if (a.domain < b.domain) {
-        return -1;
-      }
-      return 0;
+      return { v, domain: getDomain(v.charCodeAt(0) === 46 ? v.slice(1) : v)?.toLowerCase() || v };
     })
-    .map(({ v }) => {
-      return v;
+    .sort(sorter)
+    .map((i) => {
+      return i.v;
     });
 
   await compareAndWriteFile(