From 6bc65c40880feddc18cc621c9ac8ca98518ee197 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Wed, 13 Nov 2024 17:21:20 +0800 Subject: [PATCH] Refactor: disable adguardhome append whitelist --- Build/build-reject-domainset.ts | 2 +- Build/lib/rules/domainset.ts | 21 ++++++++++----------- Source/domainset/reject_sukka.conf | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Build/build-reject-domainset.ts b/Build/build-reject-domainset.ts index 9242242e..9ffad24d 100644 --- a/Build/build-reject-domainset.ts +++ b/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') ) diff --git a/Build/lib/rules/domainset.ts b/Build/lib/rules/domainset.ts index 51b2b8a9..be70afb1 100644 --- a/Build/lib/rules/domainset.ts +++ b/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 { mitmSgmodule = undefined; - adguardhome(whitelist: Set): 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]; diff --git a/Source/domainset/reject_sukka.conf b/Source/domainset/reject_sukka.conf index aca49693..8a304a06 100644 --- a/Source/domainset/reject_sukka.conf +++ b/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