From 4f0877690c67d7dd924e1a3143f4c1fd363ba530 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Thu, 30 Jan 2025 18:46:37 +0800 Subject: [PATCH] Update Reject Data Source --- Build/constants/reject-data-source.ts | 5 ++++- Build/lib/trie.ts | 10 ++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Build/constants/reject-data-source.ts b/Build/constants/reject-data-source.ts index 90158dd7..96204bf0 100644 --- a/Build/constants/reject-data-source.ts +++ b/Build/constants/reject-data-source.ts @@ -200,7 +200,10 @@ export const ADGUARD_FILTERS: AdGuardFilterSource[] = [ ], // GameConsoleAdblockList // Update almost once per 1 to 3 months, let's set a 10 days cache ttl - ['https://raw.githubusercontent.com/DandelionSprout/adfilt/master/GameConsoleAdblockList.txt', null], + [ + 'https://cdn.jsdelivr.net/gh/DandelionSprout/adfilt@master/GameConsoleAdblockList.txt', + ['https://raw.githubusercontent.com/DandelionSprout/adfilt/master/GameConsoleAdblockList.txt'] + ], // PiHoleBlocklist // Update almost once per 3 months, let's set a 10 days cache ttl [ diff --git a/Build/lib/trie.ts b/Build/lib/trie.ts index 1c141aea..9bb4e31c 100644 --- a/Build/lib/trie.ts +++ b/Build/lib/trie.ts @@ -506,6 +506,16 @@ abstract class Triebase { public [util.inspect.custom](depth: number) { return this.inspect(depth); }; + + public merge(trie: Triebase) { + const handleSuffix = (suffix: string[], subdomain: boolean, meta: Meta) => { + this.add(fastStringArrayJoin(suffix, '.'), subdomain, meta); + }; + + trie.walk(handleSuffix); + + return this; + } } export class HostnameSmolTrie extends Triebase {