Update Reject Hosts & Reject Data Source

Build/constants/reject-data-source.ts

@@ -13,16 +13,6 @@ export const HOSTS: HostsSource[] = [
     '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
   ]
 ];
 
@@ -57,6 +47,20 @@ export const HOSTS_EXTRA: HostsSource[] = [
     'https://cdn.jsdelivr.net/gh/hoshsadiq/adblock-nocoin-list@master/hosts.txt',
     ['https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/hosts.txt'],
     true
+  ],
+  // GoodbyeAds - Huawei AdBlock, most of its content has been covered by reject.conf, the rest should belongs to reject_extra now
+  [
+    '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
+  ],
+  // GoodbyeAds - Samsung AdBlock
+  // most of its content has covered by reject.conf. Remaining domains, some are not even owned by samsung, some are normal API/SSO/DNS
+  // blocking them doesn't make sense, yet will not breaking anything anyway, so we move it to extra
+  [
+    '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
   ]
 ];
 
@@ -199,11 +203,12 @@ export const ADGUARD_FILTERS: AdGuardFilterSource[] = [
     [
       'https://easylist-downloads.adblockplus.org/easyprivacy.txt',
       'https://secure.fanboy.co.nz/easyprivacy.txt',
-      'https://ublockorigin.github.io/uAssetsCDN/thirdparties/easyprivacy.txt',
-      'https://ublockorigin.pages.dev/thirdparties/easyprivacy.txt',
       'https://filters.adtidy.org/extension/ublock/filters/118_optimized.txt',
-      'https://raw.githubusercontent.com/easylist/easylist/gh-pages/easyprivacy.txt'
+      'https://raw.githubusercontent.com/easylist/easylist/gh-pages/easyprivacy.txt',
+      'https://ublockorigin.github.io/uAssetsCDN/thirdparties/easyprivacy.txt',
+      'https://ublockorigin.pages.dev/thirdparties/easyprivacy.txt'
     ]
+    // 3p is included in AdGuardDNSFilter, which we will use that in reject_extra
   ],
   // AdGuard Base Filter: Use AdGuard Base Filter w/ EasyList
   // [
@@ -213,12 +218,13 @@ export const ADGUARD_FILTERS: AdGuardFilterSource[] = [
   // AdGuard Mobile AD
   [
     'https://filters.adtidy.org/extension/ublock/filters/11_optimized.txt',
-    ['https://proxy.cdn.skk.moe/https/filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt']
+    ['https://proxy.cdn.skk.moe/https/filters.adtidy.org/extension/ublock/filters/11_optimized.txt']
   ],
   // AdGuard Tracking Protection
   [
     'https://filters.adtidy.org/extension/ublock/filters/3_optimized.txt',
     ['https://proxy.cdn.skk.moe/https/filters.adtidy.org/extension/ublock/filters/3_optimized.txt']
+    // 3p is included in AdGuardDNSFilter
   ],
   // AdGuard Chinese filter (EasyList China + AdGuard Chinese filter)
   [
@@ -282,6 +288,7 @@ 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
+  // Including extra $third-party rules
   [
     'https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt',
     [
@@ -315,7 +322,6 @@ export const ADGUARD_FILTERS_EXTRA: AdGuardFilterSource[] = [
   [
     'https://filters.adtidy.org/extension/ublock/filters/7_optimized.txt',
     ['https://proxy.cdn.skk.moe/https/filters.adtidy.org/extension/ublock/filters/7_optimized.txt']
-
   ],
   // uBlock Origin Filter List
   [

Source/domainset/reject.conf

@@ -1547,6 +1547,7 @@ logservice-dre.platform.hicloud.com
 .logtransform.hicloud.com
 .mvconf.cloud.360safe.com
 .openlocation-drcn.platform.dbankcloud.com
+.grs.platform.dbankcloud.ru
 .opsdata.hicloud.com
 .sdkserver-dra.op.hicloud.com
 .servicesupport.hicloud.com
@@ -2522,6 +2523,10 @@ sentry.d.xiaomi.net
 
 .api.miwifi.com
 .log.miwifi.com
+.stats.xiaomi.com
+.igame.xiaomi.com
+.migcreport.g.mi.com
+.migc.g.mi.com
 
 adv.sec.miui.com
 adv.sec.intl.miui.com
@@ -2546,9 +2551,13 @@ check.engine.miui.com
 .gc.sec.miui.com
 .sec.resource.xiaomi.net
 .sec-cdn.static.xiaomi.net
+.proxy.sec.miui.com
 
 .idm.api.io.mi.com
 
+.zhwnlapi.etouch.cn
+.analytics3.starschina.com
+
 # MI AI Engine location salesforce-like service: isjike.com
 
 .tracking.miui.com
@@ -2578,6 +2587,7 @@ vd1.market.xiaomi.com
 cdn.exp.xiaomi.com
 fyb-2.cdn.bcebos.com
 # CNAME to k1-biligame.gslb.ksyuncdn.com
+f4.market.xiaomi.com
 f6.market.xiaomi.com
 f7.market.xiaomi.com
 f8.market.xiaomi.com
@@ -2600,8 +2610,10 @@ qsb.browser.miui.com
 .sys.miui.com
 # 反诈
 flash.sec.miui.com
+flash.sec.intl.miui.com
 mazu.sec.miui.com
 api.sec.miui.com
+api.sec.intl.miui.com
 
 # 快应用
 api.hybrid.xiaomi.com
@@ -2971,6 +2983,7 @@ samsungcloudsolution.net
 .samsungacr.com
 .gld.samsungosp.com
 analytics-api.samsunghealthcn.com
+.samsungtvads.com
 
 # >> Sonos
 msmetrics.ws.sonos.com

Source/domainset/reject_extra.conf

@@ -3484,3 +3484,10 @@ vietpool.vddns.vn
 .rs-scs-xmr-to-unlv.scsv.nevada.edu
 .scriptproxy.pie.net.pk
 .us.stratum.ltc.nushor.net
+
+# >> Migrate from Huawei AdBlock List / ftprivacy list
+# Collected 5 years ago: https://github.com/ftpmorph/ftprivacy/blob/510a4154154033e5457556df5fa661cff82be6b5/blocklists/huawei-trackers.txt#L19
+# > MediaTek services phoning home, not sure what for, but many Huawei phones use MediaTek especially cheap models
+mgepodownload.mediatek.com
+mepodownload.mediatek.com
+lepodownload.mediatek.com