Merge GoodbyeAds Xiaomi Directly into Reject Hosts

Build/constants/reject-data-source.ts

@@ -1,4 +1,5 @@
 export const DEBUG_DOMAIN_TO_FIND: string | null = null; // example.com | null
+// Other useful tools: https://oisd.nl/excludes/[domain] for checking if the domain is included in common block lists
 
 type HostsSource = [main: string, mirrors: string[] | null, includeAllSubDomain: boolean, allowEmptyRemote?: boolean];
 
@@ -9,11 +10,6 @@ export const HOSTS: HostsSource[] = [
   //   ['https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt'],
   //   true
   // ],
-  [
-    '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
-  ]
 ];
 
 export const HOSTS_EXTRA: HostsSource[] = [
@@ -491,8 +487,6 @@ export const PREDEFINED_WHITELIST = [
   '.sb-cd.com', // AdGuard
   '.storage.yandexcloud.net', // phishing list
   '.login.microsoftonline.com', // phishing list
-  'api.xiaomi.com', // https://github.com/jerryn70/GoodbyeAds/issues/281
-  'api.io.mi.com', // https://github.com/jerryn70/GoodbyeAds/issues/281
   '.cdn.userreport.com', // https://github.com/AdguardTeam/AdGuardSDNSFilter/issues/1158
   '.ip-api.com',
   '.fastly-analytics.com',
@@ -506,9 +500,6 @@ export const PREDEFINED_WHITELIST = [
   '.clicks.mlsend.com', // Fuck Peter Lowe Hosts
   'email.accounts.bitly.com', // Fuck Peter Lowe Hosts
   'adsense.google.com', // Fuck Peter Lowe Hosts
-  'api.vip.miui.com', // Fuck Goodbye Xiaomi Ads
-  'api.comm.miui.com', // Xiaomi MIUI phone number database update URL
-  '.ai.api.xiaomi.com', // Fuck Goodbye Xiaomi Ads
   'm.stripe.com', // EasyPrivacy only blocks m.stripe.com wwith $third-party,
   // yet stupid AdGuardDNSFilter blocks all of it. Stupid AdGuard
   '.w3s.link', // stupid phishing.army, introduce both "*.ipfs.w3s.link" and ".w3s.link" to the block list

Source/domainset/reject.conf

@@ -1,4 +1,5 @@
 # $ custom_build_script
+# $ dedupe_use_trie_contains
 
 # --- Blacklist ---
 
@@ -544,11 +545,6 @@ ads-api.twitter.com
 .eyeota.net
 .fwmrm.net
 .adtng.com
-g1.tagtic.cn
-xy-log.tagtic.cn
-.log.tagtic.cn
-.sdownload.stargame.com
-.pgdt.ugdtimg.com
 .getrockerbox.com
 .go-mpulse.net
 .go2cloud.org
@@ -559,7 +555,6 @@ xy-log.tagtic.cn
 .getui.com
 .getui.cn
 .mobileservice.cn
-.img.adnyg.com
 .img.adnyg.com.w.kunlungr.com
 .imrworldwide.com
 .indexww.com
@@ -872,6 +867,8 @@ elads.kocpc.com.tw
 .pttptt.cc
 v923.thenewstack.io
 widgets-test.boomio.workers.dev
+.traffic-media.co
+.ksmobile.com
 
 .trackifyy.com
 .adscholars.com
@@ -956,7 +953,6 @@ track.tiara.kakao.com
 js-agent.newrelic.com
 cdn.pocoiq.cn
 oct.pocoiq.cn
-static.sensorsdata.cn
 dynamicad.kfc.com.cn
 .ads.linkedin.com
 
@@ -1113,7 +1109,6 @@ snap.licdn.com
 informer.yandex.ru
 analytics.slashdotmedia.com
 .bluekai.com
-.ads.pro-market.net
 .stat.xtom.com
 .stat.cat.net
 .stat.peng.you
@@ -1194,7 +1189,6 @@ events.observablehq.com
 visitors.thingiverse.com
 .sentinelpro.com
 .pocustrack.com
-.api-ingest.pocustrack.com
 qm.redbullracing.com
 .hhapk777.getehu.com
 .txdy.2016os.com
@@ -1658,7 +1652,6 @@ logservice-dre.platform.hicloud.com
 .openlocation-drcn.platform.dbankcloud.com
 .grs.platform.dbankcloud.ru
 .opsdata.hicloud.com
-.sdkserver-dra.op.hicloud.com
 .servicesupport.hicloud.com
 .streamback.ff.avast.com
 .ubacollect-drcn.cloud.dbankcloud.cn
@@ -1733,7 +1726,6 @@ agoodm.m.taobao.com
 api.waptest.taobao.com
 atanx.alicdn.com
 atanx2.alicdn.com
-cdn0.mobmore.com
 click.aliyun.com
 click.mz.simba.taobao.com
 click.simba.taobao.com
@@ -1746,8 +1738,6 @@ cm.ipinyou.com
 fms.ipinyou.com
 vt.ipinyou.com
 err.taobao.com
-ex.mobmore.com
-ex.puata.info
 g.tbcdn.cn
 gma.alicdn.com
 gtms01.alicdn.com
@@ -1808,6 +1798,7 @@ adsz.wagbridge.tmall.alimama.com
 pre2-ad.alimama.com
 tf.logview.alimama.com
 logview.uc.alimama.com
+p.alimama.com
 cdn-ads.oss-cn-shanghai.aliyuncs.com
 .dualstack-logs.amap.com
 optimus-ads.amap.com
@@ -1923,7 +1914,6 @@ click.bes.baidu.com
 click.qianqian.com
 nsclick.baidu.com
 .cpro.baidu.com
-cpro.baidustatic.com
 .mpro.baidu.com
 log.music.baidu.com
 .sestat.baidu.com
@@ -1972,8 +1962,6 @@ zzy1.quyaoya.com
 .toolbar.baidu.co
 .tracker.baidu.com
 .tuijian.baidu.com
-.ubmcmm.baidustatic.com
-.cbjs.baidustatic.com
 afd.baidu.com
 afdconf.baidu.com
 als.baidu.com
@@ -2019,22 +2007,17 @@ lookup.api.bsb.baidu.com
 
 # >> Qihoo 360
 .stat.360safe.com
-adapi.shouji.360.cn
-msg.shouji.360.cn
 .lianmeng.360.cn
 dev.tg.wan.360.cn
-huodong.ios.shouji.360.cn
 kuaikan.netmon.360safe.com
 .mobilem.360.cn
 .s.360.cn
 .jiagu.360.cn
-pub.se.360.cn
 soft.data.weather.360.cn
 .hao.360.cn
 .sdk.look.360.cn
 res.qhupdate.com
 .stat.m.360.cn
-api.shuaji.360.cn
 s.qhupdate.com
 hs.qhupdate.com
 top.h.qhimg.com
@@ -2042,12 +2025,9 @@ display.360totalsecurity.com
 .appjiagu.com
 haostat.qihoo.com
 ad.dev.360.cn
-ad.gamebox.360.cn
 .ad.360.cn
 .wan.360.cn
 .union.360.cn
-act.commercial.shouji.360.cn
-commercial.shouji.360.cn
 spro.so.com
 news.qhstatic.com
 show.look.360.cn
@@ -2057,7 +2037,6 @@ mvconf.lato.cloud.360safe.com
 mclean.cloud.360safe.com
 mclean.uk.cloud.360safe.com
 mvconf.uk.cloud.360safe.com
-aicleaner.shouji.360.cn
 ad.360in.com
 ad.iot.360.cn
 ad.jia.360.cn
@@ -2159,7 +2138,6 @@ ac.dun.163.com
 acstatic-dun.126.net
 .live.126.net
 ac.dun.163yun.com
-statistic.live.126.net
 
 dingwei.nos-jd.163yun.com
 .dingwei.netease.com
@@ -2177,7 +2155,6 @@ pingjs.qq.com
 .qzs.qq.com
 .ad.qq.com
 .imtt.qq.com
-adfilter.imtt.qq.com
 adping.qq.com
 adpm.app.qq.com
 adsclick.qq.com
@@ -2238,15 +2215,11 @@ btrace.video.qq.com
 .ad.weixin.qq.com
 badjs.weixinbridge.com
 .wxs.qq.com
-wxsnsdythumb.wxs.qq.com
 adsmind.gdtimg.com
-adsmind.ugdtimg.com
 qzs.gdtimg.com
 rmonitor.qq.com
-sdk.e.qq.com
 sdkconfig.video.qq.com
 tpns.qq.com
-wup.imtt.qq.com
 tpstelemetry.tencent.com
 # .l.qq.com # break fairplay.l.qq.com, vi.l.qq.com
 news.l.qq.com
@@ -2311,14 +2284,9 @@ tmead.y.qq.com
 tmeadquic.y.qq.com
 p.l.qq.com
 us.l.qq.com
-tangram.e.qq.com
 tmeadbak.y.qq.com
 tmeadcomm.y.qq.com
 .imtmp.net
-wxa.wxs.qq.com
-wximg.wxs.qq.com
-wxsmw.wxs.qq.com
-wxsnsdy.wxs.qq.com
 ws.sj.qq.com
 vlive.qqvideo.tc.qq.com
 video.dispatch.tc.qq.com
@@ -2356,6 +2324,9 @@ gatherer.m.qq.com
 browsertdidticket.m.qq.com
 .report.url.cn
 statistic.qzone.qq.com
+pmir.3g.qq.com
+activeqq.3g.qq.com
+mazu.3g.qq.com
 # qcloud P2P Video CDN
 .qvb.qcloud.com
 
@@ -2605,11 +2576,19 @@ tongji.meizu.com
 .ad.intl.xiaomi.com
 .ad.india.xiaomi.com
 .ad.rus.xiaomi.com
-.ad.quickapp.hybrid.xiaomi.com
 .inf.miui.com
 .sdkconfig.xiaomi.com
 .tracker.ai.xiaomi.com
 .huodong.mi.com
+.stat.mi.com
+
+.browser.mi-img.com
+.music.xiaomi.com
+.video.xiaomi.com
+.xiazai.xiaomi.com
+.xitong.xiaomi.com
+.heyue.xiaomi.com
+.browser.miui.com
 
 # why apk installer need network?
 .installer.xiaomi.com
@@ -2653,11 +2632,12 @@ data.sec.miui.com
 .staging-notify.sec.miui.com
 .notify.sec.miui.com
 misc.in.duokanbox.com
+v2.fm.n.duokanbox.com
 ad.hpplay.cn
 adeng.hpplay.cn
 .kuyun.com
 .ad.xiaomi.com
-o2o.api.xiaomi.com
+.o2o.api.xiaomi.com
 .miui.security.xiaomi.com
 .auth.be.sec.miui.com
 tz.sec.xiaomi.com
@@ -2674,6 +2654,7 @@ check.engine.miui.com
 
 .zhwnlapi.etouch.cn
 .analytics3.starschina.com
+shouji.sougou.com
 
 # MI AI Engine location salesforce-like service: isjike.com
 
@@ -2692,7 +2673,6 @@ video.market.xiaomi.com
 xadx.file.market.xiaomi.com
 .pandora.xiaomi.com
 .mi-stat.gslb.mi-idc.com
-mlog.search.xiaomi.net
 config-p2p-other.vcloud.ks-live.com
 slb-p2p.vcloud.ks-live.com
 .adash-emas.cn-hangzhou.aliyuncs.com
@@ -2722,8 +2702,9 @@ tmfsdk.m.qq.com
 a0.app.xiaomi.com
 .yunxinfw.com
 # 远控
-qsb.browser.miui.com
 .sys.miui.com
+.sys.xiaomi.com
+.sys.intl.xiaomi.com
 # 反诈
 flash.sec.miui.com
 flash.sec.intl.miui.com
@@ -2732,14 +2713,10 @@ api.sec.miui.com
 api.sec.intl.miui.com
 
 # 快应用
+.ad.quickapp.hybrid.xiaomi.com
 api.hybrid.xiaomi.com
 liteapp.developer.xiaomi.com
-# 浏览器、浏览器热点
+
-.browser.miui.com
-# nav.browser.miui.com
-# security.browser.miui.com
-# hot.browser.miui.com
-# r.browser.miui.com
 # 牛链云 PCDN - https://www.niulink.io/
 .ietheivaicai.com
 # .aigccdn.com 有赞 CDN CNAME
@@ -2747,6 +2724,53 @@ liteapp.developer.xiaomi.com
 # 小爱音箱
 marketing-aibox.v.mitvos.com
 
+# Misc Xiaomi Reject Extensions
+a.hl.mi.com
+api.d.xiaomi.com
+api.g.micloud.xiaomi.net
+.hybrid.intl.xiaomi.com
+api.jr.mi.com
+.migc.xiaomi.com
+app01.nodes.gslb.mi-idc.com
+app02.nodes.gslb.mi-idc.com
+authbe.sec.intl.miui.com
+awsusor0-cdn.fds-ssl.api.xiaomi.com
+be01.hh.xiaomi.com
+.fe01.c3.xiaomi.com
+.fe02.c3.xiaomi.com
+bk01.hh.xiaomi.com
+c.id.mi.com
+calopenupdate.comm.miui.com
+cdn.fds-ssl.api.xiaomi.com
+.lg.xiaomi.com
+controller.intl.xiaomi.com
+d.g.mi.com
+d.xiaomi.com
+f1.g.mi.com
+gvod.aiseejapp.atianqi.com
+.hd.xiaomi.com
+hm.xiaomi.com
+.huodong.xiaomi.com
+image.box.xiaomi.com
+ime.api.xiaomi.com
+.analysis.kp.sec.miui.com
+info.sec.miui.com
+lxcdn.dl.files.xiaomi.net
+.mibi.api.xiaomi.com
+.mibi.xiaomi.com
+mis.g.mi.com
+t1.g.mi.com
+pdc.micloud.xiaomi.net
+.qiye.xiaomi.com
+r.sg.sec.miui.com
+sa.api.intl.miui.com
+shoes.app-xae.xiaomi.com
+.admin.e.mi.com
+tel.fe01.hh.xiaomi.com
+tw13b093.sandai.net
+xshare.api.xiaomi.com
+yun.rili.cn
+
 # >> PCOnline
 ad-analysis.pconline.com.cn
 iad0ssl.pcauto.com.cn
@@ -2781,7 +2805,6 @@ app-monitor.ele.me
 # >> HunanTV
 .da.mgtv.com
 .log.mgtv.com
-rprain.log.mgtv.com
 .da.hunantv.com
 .log.hunantv.com
 log.v2.hunantv.com
@@ -2811,7 +2834,7 @@ biz.live.xunlei.com
 ct.niu.xunlei.com
 mou.niu.xunlei.com
 scene.vip.xunlei.com
-static.m.sjzhushou.com
+.sjzhushou.com
 etl.xlmc.sandai.net
 
 # >> Zui Mei Tian Qi
@@ -2857,7 +2880,6 @@ mqtt.zhihu.com
 .monsetting.toutiao.com
 .mon.zijieapi.com
 .ad.zijieapi.com
-toblog.ctobsnssdk.com
 frontier-aweme-hl.snssdk.com
 
 .tnc3-bjlgy.snssdk.com
@@ -2888,7 +2910,6 @@ toutiao-frontier.snssdk.com
 is.snssdk.com
 dm.pstatp.com
 dm.bytedance.com
-api-access.pangolin-sdk-toutiao-b.com
 sf6-be-pack.pglstatp-toutiao.com
 sf3-be-pack.pglstatp-toutiao.com
 sf1-be-pack.pglstatp-toutiao.com