ソースを参照

Refactor: disable adguardhome append whitelist

SukkaW 1 年間 前
コミット
6bc65c4088

+ 1 - 1
Build/build-reject-domainset.ts

@@ -164,7 +164,7 @@ export const buildRejectDomainSet = task(require.main === module, __filename)(as
           '! Description: The domainset supports AD blocking, tracking protection, privacy protection, anti-phishing, anti-mining',
           '!'
         ],
-        rejectOutput.adguardhome(filterRuleWhitelistDomainSets)
+        rejectOutput.adguardhome(/* filterRuleWhitelistDomainSets */)
       ),
       path.join(OUTPUT_INTERNAL_DIR, 'reject-adguardhome.txt')
     )

+ 10 - 11
Build/lib/rules/domainset.ts

@@ -1,6 +1,5 @@
 import { invariant } from 'foxact/invariant';
 import createKeywordFilter from '../aho-corasick';
-import { sortDomains } from '../stable-sort-domain';
 import { RuleOutput } from './base';
 import type { SingboxSourceFormat } from '../singbox';
 
@@ -96,18 +95,18 @@ export class DomainsetOutput extends RuleOutput<Preprocessed> {
 
   mitmSgmodule = undefined;
 
-  adguardhome(whitelist: Set<string | `.${string}`>): string[] {
+  adguardhome(): string[] {
     const results: string[] = [];
 
-    const whitelistArray = sortDomains(Array.from(whitelist));
-    for (let i = 0, len = whitelistArray.length; i < len; i++) {
-      const domain = whitelistArray[i];
-      if (domain[0] === '.') {
-        results.push(`@@||${domain.slice(1)}^`);
-      } else {
-        results.push(`@@|${domain}^`);
-      }
-    }
+    // const whitelistArray = sortDomains(Array.from(whitelist));
+    // for (let i = 0, len = whitelistArray.length; i < len; i++) {
+    //   const domain = whitelistArray[i];
+    //   if (domain[0] === '.') {
+    //     results.push(`@@||${domain.slice(1)}^`);
+    //   } else {
+    //     results.push(`@@|${domain}^`);
+    //   }
+    // }
 
     for (let i = 0, len = this.$preprocessed.length; i < len; i++) {
       const domain = this.$preprocessed[i];

+ 1 - 1
Source/domainset/reject_sukka.conf

@@ -958,7 +958,7 @@ stat.u.sb
 
 .stats.mokeedev.com
 tongji.tom.com
-ads.tvb.com
+.ads.tvb.com
 ad.juksy.com
 tag.clearbitscripts.com