From 016aee997918d6141223edf9827c0d33f11827bb Mon Sep 17 00:00:00 2001 From: SukkaW Date: Fri, 24 Jan 2025 15:43:19 +0800 Subject: [PATCH] Move AdGuardSDNSFilter to extra source --- Build/constants/reject-data-source.ts | 18 ++++++++++-------- Build/lib/parse-dnsmasq.ts | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Build/constants/reject-data-source.ts b/Build/constants/reject-data-source.ts index 4668ebf7..eb9f9293 100644 --- a/Build/constants/reject-data-source.ts +++ b/Build/constants/reject-data-source.ts @@ -140,14 +140,6 @@ export const ADGUARD_FILTERS: AdGuardFilterSource[] = [ 'https://filters.adtidy.org/extension/ublock/filters/118_optimized.txt' ] ], - // AdGuard DNS Filter - [ - 'https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt', - [ - 'https://filters.adtidy.org/extension/ublock/filters/15_optimized.txt', - 'https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt' - ] - ], // AdGuard Base Filter [ 'https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt', @@ -218,6 +210,16 @@ export const ADGUARD_FILTERS_WHITELIST: AdGuardFilterSource[] = [ ]; export const ADGUARD_FILTERS_EXTRA: AdGuardFilterSource[] = [ + // AdGuard DNS Filter + // way too many other countries' domains (JP, Spanish, RU, VN, Turkish, Ukarainian, Dutch, etc.) + // EasyList, EasyPrivacy, Chinese and general filters are already included in base data source + [ + 'https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt', + [ + 'https://filters.adtidy.org/extension/ublock/filters/15_optimized.txt', + 'https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt' + ] + ], // no coin list adguard list is more maintained than its hosts ['https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/nocoin.txt', [], true], // AdGuard Annoyances filter diff --git a/Build/lib/parse-dnsmasq.ts b/Build/lib/parse-dnsmasq.ts index 959c7497..dcd846c8 100644 --- a/Build/lib/parse-dnsmasq.ts +++ b/Build/lib/parse-dnsmasq.ts @@ -2,7 +2,7 @@ import { createReadlineInterfaceFromResponse } from './fetch-text-by-line'; import type { UndiciResponseData } from './fetch-retry'; import type { Response } from 'undici'; -import { fastNormalizeDomainIgnoreWww } from './normalize-domain'; +import { fastNormalizeDomain } from './normalize-domain'; export function extractDomainsFromFelixDnsmasq(line: string): string | null { if (line.startsWith('server=/') && line.endsWith('/114.114.114.114')) { @@ -16,7 +16,7 @@ export async function parseFelixDnsmasqFromResp(resp: UndiciResponseData | Respo for await (const line of createReadlineInterfaceFromResponse(resp, true)) { const domain = extractDomainsFromFelixDnsmasq(line); - if (domain && fastNormalizeDomainIgnoreWww(domain)) { + if (domain && fastNormalizeDomain(domain)) { results.push(domain); } }