瀏覽代碼

Move AdGuardSDNSFilter to extra source

SukkaW 1 年之前
父節點
當前提交
016aee9979
共有 2 個文件被更改,包括 12 次插入10 次删除
  1. 10 8
      Build/constants/reject-data-source.ts
  2. 2 2
      Build/lib/parse-dnsmasq.ts

+ 10 - 8
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

+ 2 - 2
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);
     }
   }