diff --git a/Clash/RuleSet/China.yaml b/Clash/RuleSet/China.yaml index eb8bb2f..2f0cdfd 100644 --- a/Clash/RuleSet/China.yaml +++ b/Clash/RuleSet/China.yaml @@ -40,6 +40,7 @@ payload: - DOMAIN-SUFFIX,baidubcr.com - DOMAIN-SUFFIX,baidupan.com - DOMAIN-SUFFIX,baidupcs.com + - DOMAIN-SUFFIX,bdimg.com - DOMAIN-SUFFIX,bdstatic.com - DOMAIN-SUFFIX,yunjiasu-cdn.net # > bilibili @@ -85,6 +86,11 @@ payload: - DOMAIN-SUFFIX,meitudata.com - DOMAIN-SUFFIX,meitustat.com - DOMAIN-SUFFIX,meipai.com + # > Meituan + - DOMAIN-SUFFIX,dianping.com + - DOMAIN-SUFFIX,dpfile.com + - DOMAIN-SUFFIX,meituan.com + - DOMAIN-SUFFIX,meituan.net # > MI - DOMAIN-SUFFIX,duokan.com - DOMAIN-SUFFIX,mi.com @@ -167,9 +173,11 @@ payload: - DOMAIN-SUFFIX,ip.sb - DOMAIN-SUFFIX,ip-cdn.com - DOMAIN-SUFFIX,ipv6-test.com + - DOMAIN-SUFFIX,myip.la - DOMAIN-SUFFIX,test-ipv6.com - DOMAIN-SUFFIX,whatismyip.com - DOMAIN,ip.istatmenus.app + - DOMAIN,sms.imagetasks.com # > Speed Test - DOMAIN-SUFFIX,netspeedtestmaster.com - DOMAIN,speedtest.macpaw.com @@ -252,6 +260,7 @@ payload: - DOMAIN-SUFFIX,cmbimg.com - DOMAIN-SUFFIX,ctrip.com - DOMAIN-SUFFIX,dfcfw.com + - DOMAIN-SUFFIX,dji.net - DOMAIN-SUFFIX,docschina.org - DOMAIN-SUFFIX,douban.com - DOMAIN-SUFFIX,doubanio.com @@ -295,8 +304,6 @@ payload: - DOMAIN-SUFFIX,luojilab.com - DOMAIN-SUFFIX,maoyan.com - DOMAIN-SUFFIX,maoyun.tv - - DOMAIN-SUFFIX,meituan.com - - DOMAIN-SUFFIX,meituan.net - DOMAIN-SUFFIX,mls-cdn.com - DOMAIN-SUFFIX,mobike.com - DOMAIN-SUFFIX,moke.com diff --git a/Clash/RuleSet/Guard/Hijacking.yaml b/Clash/RuleSet/Guard/Hijacking.yaml index ccb6726..28173ac 100644 --- a/Clash/RuleSet/Guard/Hijacking.yaml +++ b/Clash/RuleSet/Guard/Hijacking.yaml @@ -158,6 +158,7 @@ payload: - IP-CIDR,124.14.21.151/32,no-resolve - IP-CIDR,180.166.52.24/32,no-resolve - IP-CIDR,211.161.101.106/32,no-resolve + - IP-CIDR,211.161.101.110/32,no-resolve - IP-CIDR,220.115.251.25/32,no-resolve - IP-CIDR,222.73.156.235/32,no-resolve diff --git a/Quantumult/Filter/China.list b/Quantumult/Filter/China.list index a0efe7b..c89c7d3 100644 --- a/Quantumult/Filter/China.list +++ b/Quantumult/Filter/China.list @@ -39,6 +39,7 @@ DOMAIN-SUFFIX,baidu.com,DIRECT DOMAIN-SUFFIX,baidubcr.com,DIRECT DOMAIN-SUFFIX,baidupan.com,DIRECT DOMAIN-SUFFIX,baidupcs.com,DIRECT +DOMAIN-SUFFIX,bdimg.com,DIRECT DOMAIN-SUFFIX,bdstatic.com,DIRECT DOMAIN-SUFFIX,yunjiasu-cdn.net,DIRECT # > bilibili @@ -84,6 +85,11 @@ DOMAIN-SUFFIX,meitu.com,DIRECT DOMAIN-SUFFIX,meitudata.com,DIRECT DOMAIN-SUFFIX,meitustat.com,DIRECT DOMAIN-SUFFIX,meipai.com,DIRECT +# > Meituan +DOMAIN-SUFFIX,dianping.com,DIRECT +DOMAIN-SUFFIX,dpfile.com,DIRECT +DOMAIN-SUFFIX,meituan.com,DIRECT +DOMAIN-SUFFIX,meituan.net,DIRECT # > MI DOMAIN-SUFFIX,duokan.com,DIRECT DOMAIN-SUFFIX,mi.com,DIRECT @@ -167,9 +173,11 @@ DOMAIN-SUFFIX,ip.la,DIRECT DOMAIN-SUFFIX,ip.sb,DIRECT DOMAIN-SUFFIX,ip-cdn.com,DIRECT DOMAIN-SUFFIX,ipv6-test.com,DIRECT +DOMAIN-SUFFIX,myip.la,DIRECT DOMAIN-SUFFIX,test-ipv6.com,DIRECT DOMAIN-SUFFIX,whatismyip.com,DIRECT DOMAIN,ip.istatmenus.app,DIRECT +DOMAIN,sms.imagetasks.com,DIRECT # > Speed Test # DOMAIN-SUFFIX,speedtest.net,DIRECT DOMAIN-SUFFIX,netspeedtestmaster.com,DIRECT @@ -253,6 +261,7 @@ DOMAIN-SUFFIX,cmbchina.com,DIRECT DOMAIN-SUFFIX,cmbimg.com,DIRECT DOMAIN-SUFFIX,ctrip.com,DIRECT DOMAIN-SUFFIX,dfcfw.com,DIRECT +DOMAIN-SUFFIX,dji.net,DIRECT DOMAIN-SUFFIX,docschina.org,DIRECT DOMAIN-SUFFIX,douban.com,DIRECT DOMAIN-SUFFIX,doubanio.com,DIRECT @@ -296,8 +305,6 @@ DOMAIN-SUFFIX,loli.net,DIRECT DOMAIN-SUFFIX,luojilab.com,DIRECT DOMAIN-SUFFIX,maoyan.com,DIRECT DOMAIN-SUFFIX,maoyun.tv,DIRECT -DOMAIN-SUFFIX,meituan.com,DIRECT -DOMAIN-SUFFIX,meituan.net,DIRECT DOMAIN-SUFFIX,mls-cdn.com,DIRECT DOMAIN-SUFFIX,mobike.com,DIRECT DOMAIN-SUFFIX,moke.com,DIRECT diff --git a/Quantumult/Filter/Guard/Hijacking.list b/Quantumult/Filter/Guard/Hijacking.list index f490d2c..eaa3ac1 100644 --- a/Quantumult/Filter/Guard/Hijacking.list +++ b/Quantumult/Filter/Guard/Hijacking.list @@ -158,6 +158,7 @@ IP-CIDR,124.14.21.147/32,REJECT IP-CIDR,124.14.21.151/32,REJECT IP-CIDR,180.166.52.24/32,REJECT IP-CIDR,211.161.101.106/32,REJECT +IP-CIDR,211.161.101.110/32,REJECT IP-CIDR,220.115.251.25/32,REJECT IP-CIDR,222.73.156.235/32,REJECT diff --git a/Quantumult/Rewrite/Block/YouTubeAds.conf b/Quantumult/Rewrite/Block/YouTubeAds.conf index 7a239bf..aee1371 100644 --- a/Quantumult/Rewrite/Block/YouTubeAds.conf +++ b/Quantumult/Rewrite/Block/YouTubeAds.conf @@ -1,3 +1,4 @@ hostname = *.googlevideo.com -^https://[\s\S]*\.googlevideo\.com/.*&(oad|ctier) url reject-200 +(^https?:\/\/[\w-]+\.googlevideo\.com\/.+)(ctier=L)(&.+) url 302 $1$3 +^https?:\/\/[\w-]+\.googlevideo\.com\/.+&(oad|ctier) url reject \ No newline at end of file diff --git a/Surge/Module/Block/YouTubeAds.sgmodule b/Surge/Module/Block/YouTubeAds.sgmodule index f2cd5d5..9ffed56 100644 --- a/Surge/Module/Block/YouTubeAds.sgmodule +++ b/Surge/Module/Block/YouTubeAds.sgmodule @@ -1,10 +1,10 @@ #!name=Block YouTube Advertising -#!desc=跳过 YouTube 视频片头广告,Premium 勿用且版本需 ≤ 15.26.4。 +#!desc=跳过 YouTube 视频片头广告,Premium 勿用。 #!system=ios [Script] -# > By Choler -http-request ^https://[\s\S]*\.googlevideo\.com/.*&(oad|ctier) script-path=https://raw.githubusercontent.com/Choler/Surge/master/Script/YouTube.js +(^https?:\/\/[\w-]+\.googlevideo\.com\/.+)(ctier=L)(&.+) $1$3 302 +^https?:\/\/[\w-]+\.googlevideo\.com\/.+&(oad|ctier) - reject [MITM] -hostname = %APPEND% *.googlevideo.com \ No newline at end of file +hostname = %APPEND% *.googlevideo.com \ No newline at end of file diff --git a/Surge/Ruleset/China.list b/Surge/Ruleset/China.list index 11e45c5..5b793d4 100644 --- a/Surge/Ruleset/China.list +++ b/Surge/Ruleset/China.list @@ -39,6 +39,7 @@ DOMAIN-SUFFIX,baidu.com DOMAIN-SUFFIX,baidubcr.com DOMAIN-SUFFIX,baidupan.com DOMAIN-SUFFIX,baidupcs.com +DOMAIN-SUFFIX,bdimg.com DOMAIN-SUFFIX,bdstatic.com DOMAIN-SUFFIX,yunjiasu-cdn.net # > bilibili @@ -84,6 +85,11 @@ DOMAIN-SUFFIX,meitu.com DOMAIN-SUFFIX,meitudata.com DOMAIN-SUFFIX,meitustat.com DOMAIN-SUFFIX,meipai.com +# > Meituan +DOMAIN-SUFFIX,dianping.com +DOMAIN-SUFFIX,dpfile.com +DOMAIN-SUFFIX,meituan.com +DOMAIN-SUFFIX,meituan.net # > MI DOMAIN-SUFFIX,duokan.com DOMAIN-SUFFIX,mi.com @@ -167,9 +173,11 @@ DOMAIN-SUFFIX,ip.la DOMAIN-SUFFIX,ip.sb DOMAIN-SUFFIX,ip-cdn.com DOMAIN-SUFFIX,ipv6-test.com +DOMAIN-SUFFIX,myip.la DOMAIN-SUFFIX,test-ipv6.com DOMAIN-SUFFIX,whatismyip.com DOMAIN,ip.istatmenus.app +DOMAIN,sms.imagetasks.com # > Speed Test # DOMAIN-SUFFIX,speedtest.net DOMAIN-SUFFIX,netspeedtestmaster.com @@ -253,6 +261,7 @@ DOMAIN-SUFFIX,cmbchina.com DOMAIN-SUFFIX,cmbimg.com DOMAIN-SUFFIX,ctrip.com DOMAIN-SUFFIX,dfcfw.com +DOMAIN-SUFFIX,dji.net DOMAIN-SUFFIX,docschina.org DOMAIN-SUFFIX,douban.com DOMAIN-SUFFIX,doubanio.com @@ -296,8 +305,6 @@ DOMAIN-SUFFIX,loli.net DOMAIN-SUFFIX,luojilab.com DOMAIN-SUFFIX,maoyan.com DOMAIN-SUFFIX,maoyun.tv -DOMAIN-SUFFIX,meituan.com -DOMAIN-SUFFIX,meituan.net DOMAIN-SUFFIX,mls-cdn.com DOMAIN-SUFFIX,mobike.com DOMAIN-SUFFIX,moke.com diff --git a/Surge/Ruleset/Guard/Hijacking.list b/Surge/Ruleset/Guard/Hijacking.list index 84417a9..52969ba 100644 --- a/Surge/Ruleset/Guard/Hijacking.list +++ b/Surge/Ruleset/Guard/Hijacking.list @@ -158,6 +158,7 @@ IP-CIDR,124.14.21.147/32,no-resolve IP-CIDR,124.14.21.151/32,no-resolve IP-CIDR,180.166.52.24/32,no-resolve IP-CIDR,211.161.101.106/32,no-resolve +IP-CIDR,211.161.101.110/32,no-resolve IP-CIDR,220.115.251.25/32,no-resolve IP-CIDR,222.73.156.235/32,no-resolve