ソースを参照

Prefer jsDelivr for more reject data source & Minor changes

SukkaW 1 年間 前
コミット
78f282baff
2 ファイル変更21 行追加5 行削除
  1. 1 1
      Build/build-cdn-download-conf.ts
  2. 20 4
      Build/constants/reject-data-source.ts

+ 1 - 1
Build/build-cdn-download-conf.ts

@@ -32,7 +32,7 @@ const getS3OSSDomainsPromise = (async (): Promise<Set<string>> => {
   trie.find('.scw.cloud').forEach((line: string) => {
   trie.find('.scw.cloud').forEach((line: string) => {
     if (
     if (
       (line.startsWith('s3-') || line.startsWith('s3.'))
       (line.startsWith('s3-') || line.startsWith('s3.'))
-      && !line.includes('cn-')
+      // && !line.includes('cn-')
     ) {
     ) {
       S3OSSDomains.add('.' + line);
       S3OSSDomains.add('.' + line);
     }
     }

+ 20 - 4
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'],
     ['https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt'],
     true
     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[] = [
 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
   // 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',
     'https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext',
@@ -34,7 +46,11 @@ export const HOSTS_EXTRA: HostsSource[] = [
     false
     false
   ],
   ],
   // hoshsadiq adblock-nocoin-list extra
   // 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[] = [
 export const DOMAIN_LISTS: HostsSource[] = [