From 78f282baff40f62957059232cd99474fe065f4c5 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Tue, 25 Mar 2025 23:26:55 +0800 Subject: [PATCH] Prefer jsDelivr for more reject data source & Minor changes --- Build/build-cdn-download-conf.ts | 2 +- Build/constants/reject-data-source.ts | 24 ++++++++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/Build/build-cdn-download-conf.ts b/Build/build-cdn-download-conf.ts index 21d945f5..6b4e881b 100644 --- a/Build/build-cdn-download-conf.ts +++ b/Build/build-cdn-download-conf.ts @@ -32,7 +32,7 @@ const getS3OSSDomainsPromise = (async (): Promise> => { trie.find('.scw.cloud').forEach((line: string) => { if ( (line.startsWith('s3-') || line.startsWith('s3.')) - && !line.includes('cn-') + // && !line.includes('cn-') ) { S3OSSDomains.add('.' + line); } diff --git a/Build/constants/reject-data-source.ts b/Build/constants/reject-data-source.ts index 848a723f..aed691c3 100644 --- a/Build/constants/reject-data-source.ts +++ b/Build/constants/reject-data-source.ts @@ -9,12 +9,24 @@ export const HOSTS: HostsSource[] = [ ['https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt'], true ], - ['https://raw.githubusercontent.com/jerryn70/GoodbyeAds/master/Extension/GoodbyeAds-Xiaomi-Extension.txt', null, false], - ['https://raw.githubusercontent.com/jerryn70/GoodbyeAds/master/Extension/GoodbyeAds-Huawei-AdBlock.txt', null, false] + [ + 'https://cdn.jsdelivr.net/gh/jerryn70/GoodbyeAds@master/Extension/GoodbyeAds-Xiaomi-Extension.txt', + ['https://raw.githubusercontent.com/jerryn70/GoodbyeAds/master/Extension/GoodbyeAds-Xiaomi-Extension.txt'], + false + ], + [ + 'https://cdn.jsdelivr.net/gh/jerryn70/GoodbyeAds@master/Extension/GoodbyeAds-Huawei-AdBlock.txt', + ['https://raw.githubusercontent.com/jerryn70/GoodbyeAds/master/Extension/GoodbyeAds-Huawei-AdBlock.txt'], + false + ], + [ + 'https://cdn.jsdelivr.net/gh/jerryn70/GoodbyeAds@master/Extension/GoodbyeAds-Samsung-AdBlock.txt', + ['https://raw.githubusercontent.com/jerryn70/GoodbyeAds/master/Extension/GoodbyeAds-Samsung-AdBlock.txt'], + false + ] ]; export const HOSTS_EXTRA: HostsSource[] = [ - ['https://raw.githubusercontent.com/durablenapkin/block/master/tvstream.txt', null, true], // This stupid hosts blocks t.co, so we determine that this is also bullshit, so it is extra [ 'https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext', @@ -34,7 +46,11 @@ export const HOSTS_EXTRA: HostsSource[] = [ false ], // hoshsadiq adblock-nocoin-list extra - ['https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/hosts.txt', [], true] + [ + 'https://cdn.jsdelivr.net/gh/hoshsadiq/adblock-nocoin-list@master/hosts.txt', + ['https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/hosts.txt'], + true + ] ]; export const DOMAIN_LISTS: HostsSource[] = [