Merge branch 'DivineEngine:master' into master

4 years ago · 5fa885d536
parent ec9f4395e3 2701d75134
commit 5fa885d536
10 changed files with 106 additions and 24 deletions
--- a/Clash/Outbound.yaml
+++ b/Clash/Outbound.yaml
@ -389,13 +389,6 @@ rule-providers:
    url: https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/RuleSet/China.yaml
    interval: 86400

-  ChinaIP:
-    type: http
-    behavior: ipcidr
-    path: ./RuleSet/Extra/ChinaIP.yaml
-    url: https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/RuleSet/Extra/ChinaIP.yaml
-    interval: 86400
-
 # 规则
 rules:
  # Unbreak
@ -423,9 +416,7 @@ rules:
  - IP-CIDR,100.64.0.0/10,DIRECT
  - IP-CIDR,224.0.0.0/4,DIRECT
  - IP-CIDR,fe80::/10,DIRECT
-
-  # （可选）使用来自 ipipdotnet 的 ChinaIP 以解决数据不准确的问题，使用 ChinaIP.yaml 时可禁用下列直至（包括）「GEOIP,CN」规则
-  # - RULE-SET,ChinaIP,DIRECT
+  
  # Tencent
  - IP-CIDR,119.28.28.28/32,DIRECT
  - IP-CIDR,182.254.116.0/24,DIRECT
--- a/Clash/RuleSet/Extra/Cryptocurrency.yaml
+++ b/Clash/RuleSet/Extra/Cryptocurrency.yaml
@ -7,17 +7,31 @@ payload:
  - DOMAIN-SUFFIX,bibox.com
  - DOMAIN-SUFFIX,binance.cc
  - DOMAIN-SUFFIX,binance.com
+  - DOMAIN-SUFFIX,binance.me
+  - DOMAIN-SUFFIX,binance.us
  - DOMAIN-SUFFIX,bitfinex.com
+  - DOMAIN-SUFFIX,bithumb.com
  - DOMAIN-SUFFIX,bitmex.com
+  - DOMAIN-SUFFIX,bitstamp.net
+  - DOMAIN-SUFFIX,bittrex.com
+  - DOMAIN-SUFFIX,bybit.com
+  - DOMAIN-SUFFIX,coinbase.com
+  - DOMAIN-SUFFIX,coincheck.com
+  - DOMAIN-SUFFIX,coinone.co.kr
  - DOMAIN-SUFFIX,ftx.com
  - DOMAIN-SUFFIX,gate.io
+  - DOMAIN-SUFFIX,gemini.com
  - DOMAIN-SUFFIX,huobi.com
+  - DOMAIN-SUFFIX,korbit.co.kr
+  - DOMAIN-SUFFIX,kraken.com
+  - DOMAIN-SUFFIX,kucoin.com
+  - DOMAIN-SUFFIX,liquid.com
  - DOMAIN-SUFFIX,okex.com
  - DOMAIN-SUFFIX,poloniex.com
  - DOMAIN-SUFFIX,sushi.com
  - DOMAIN-SUFFIX,uniswap.org
  - DOMAIN-SUFFIX,zb.com
-
+  
  # Analysis
  - DOMAIN-SUFFIX,aicoin.com
  - DOMAIN-SUFFIX,aimoon.com
--- a/Clash/RuleSet/Global.yaml
+++ b/Clash/RuleSet/Global.yaml
@ -11,16 +11,35 @@ payload:
  - DOMAIN,a771.dscq.akamai.net
  # > Apple
  - DOMAIN,testflight.apple.com
-  # > Cryptocurrency
+  # > Crypto
  - DOMAIN-SUFFIX,aex.com
  - DOMAIN-SUFFIX,bibox.com
+  - DOMAIN-SUFFIX,binance.cc
  - DOMAIN-SUFFIX,binance.com
+  - DOMAIN-SUFFIX,binance.us
  - DOMAIN-SUFFIX,bitcointalk.org
  - DOMAIN-SUFFIX,bitfinex.com
+  - DOMAIN-SUFFIX,bithumb.com
  - DOMAIN-SUFFIX,bitmex.com
+  - DOMAIN-SUFFIX,bitstamp.net
+  - DOMAIN-SUFFIX,bittrex.com
+  - DOMAIN-SUFFIX,bybit.com
+  - DOMAIN-SUFFIX,coinbase.com
+  - DOMAIN-SUFFIX,coincheck.com
+  - DOMAIN-SUFFIX,coingecko.com
+  - DOMAIN-SUFFIX,coinmarketcap.com
+  - DOMAIN-SUFFIX,coinone.co.kr
+  - DOMAIN-SUFFIX,ftx.com
  - DOMAIN-SUFFIX,gate.io
+  - DOMAIN-SUFFIX,gemini.com
  - DOMAIN-SUFFIX,huobi.com
+  - DOMAIN-SUFFIX,korbit.co.kr
+  - DOMAIN-SUFFIX,kraken.com
+  - DOMAIN-SUFFIX,kucoin.com
+  - DOMAIN-SUFFIX,liquid.com
  - DOMAIN-SUFFIX,okex.com
+  - DOMAIN-SUFFIX,poloniex.com
+  - DOMAIN-SUFFIX,uniswap.org
  - DOMAIN-SUFFIX,zb.com
  # > Discord
  - DOMAIN-SUFFIX,discord.com
@ -402,6 +421,7 @@ payload:
  - DOMAIN-SUFFIX,straitstimes.com
  - DOMAIN-SUFFIX,streamable.com
  - DOMAIN-SUFFIX,streema.com
+  - DOMAIN-SUFFIX,substack.com
  - DOMAIN-SUFFIX,t66y.com
  - DOMAIN-SUFFIX,tapatalk.com
  - DOMAIN-SUFFIX,teco-hk.org
@ -456,6 +476,7 @@ payload:
  - DOMAIN-SUFFIX,xn--i2ru8q2qg.com
  - DOMAIN-SUFFIX,xnxx.com
  - DOMAIN-SUFFIX,xvideos.com
+  - DOMAIN-SUFFIX,yadi.sk
  - DOMAIN-SUFFIX,yahoo.com
  - DOMAIN-SUFFIX,yandex.ru
  - DOMAIN-SUFFIX,ycombinator.com
@ -466,6 +487,7 @@ payload:
  - DOMAIN-SUFFIX,zaobao.com
  - DOMAIN-SUFFIX,zello.com
  - DOMAIN-SUFFIX,zeronet.io
+  - DOMAIN-SUFFIX,z-lib.org
  - DOMAIN-SUFFIX,zoom.us

  - DOMAIN,cc.tvbs.com.tw
@ -547,6 +569,7 @@ payload:
  - DOMAIN-SUFFIX,smoot.apple.com
  - DOMAIN,beta.music.apple.com
  - DOMAIN,lookup-api.apple.com
+  # > Web Preview
  - DOMAIN,apps.apple.com
  - DOMAIN,itunes.apple.com
  - DOMAIN,tv.apple.com
@ -564,7 +587,7 @@ payload:
  - DOMAIN-SUFFIX,ifixit.com
  - DOMAIN-SUFFIX,mangakakalot.com
  - DOMAIN-SUFFIX,shopeemobile.com
-  # URL-REGEX,http:\/\/img\.sina\.com\/usweibo\/
+  - DOMAIN-SUFFIX,sushi.com

  # (Network Jitter)
  # > Apple
@ -583,5 +606,4 @@ payload:
  - DOMAIN-SUFFIX,metapix.net
  - DOMAIN-SUFFIX,s3.amazonaws.com
  - DOMAIN-SUFFIX,zaobao.com.sg
-  - DOMAIN,international-gfe.download.nvidia.com
-  - DOMAIN,store-images.s-microsoft.com
+  - DOMAIN,international-gfe.download.nvidia.com
--- a/Quantumult/Filter/Extra/Cryptocurrency.list
+++ b/Quantumult/Filter/Extra/Cryptocurrency.list
@ -6,11 +6,25 @@ DOMAIN-SUFFIX,aex.com,PROXY
 DOMAIN-SUFFIX,bibox.com,PROXY
 DOMAIN-SUFFIX,binance.cc,PROXY
 DOMAIN-SUFFIX,binance.com,PROXY
+DOMAIN-SUFFIX,binance.me,PROXY
+DOMAIN-SUFFIX,binance.us,PROXY
 DOMAIN-SUFFIX,bitfinex.com,PROXY
+DOMAIN-SUFFIX,bithumb.com,PROXY
 DOMAIN-SUFFIX,bitmex.com,PROXY
+DOMAIN-SUFFIX,bitstamp.net,PROXY
+DOMAIN-SUFFIX,bittrex.com,PROXY
+DOMAIN-SUFFIX,bybit.com,PROXY
+DOMAIN-SUFFIX,coinbase.com,PROXY
+DOMAIN-SUFFIX,coincheck.com,PROXY
+DOMAIN-SUFFIX,coinone.co.kr,PROXY
 DOMAIN-SUFFIX,ftx.com,PROXY
 DOMAIN-SUFFIX,gate.io,PROXY
+DOMAIN-SUFFIX,gemini.com,PROXY
 DOMAIN-SUFFIX,huobi.com,PROXY
+DOMAIN-SUFFIX,korbit.co.kr,PROXY
+DOMAIN-SUFFIX,kraken.com,PROXY
+DOMAIN-SUFFIX,kucoin.com,PROXY
+DOMAIN-SUFFIX,liquid.com,PROXY
 DOMAIN-SUFFIX,okex.com,PROXY
 DOMAIN-SUFFIX,poloniex.com,PROXY
 DOMAIN-SUFFIX,sushi.com,PROXY
--- a/Quantumult/Filter/Global.list
+++ b/Quantumult/Filter/Global.list
@ -15,12 +15,29 @@ DOMAIN-SUFFIX,aex.com,PROXY
 DOMAIN-SUFFIX,bibox.com,PROXY
 DOMAIN-SUFFIX,binance.cc,PROXY
 DOMAIN-SUFFIX,binance.com,PROXY
+DOMAIN-SUFFIX,binance.us,PROXY
 DOMAIN-SUFFIX,bitcointalk.org,PROXY
 DOMAIN-SUFFIX,bitfinex.com,PROXY
+DOMAIN-SUFFIX,bithumb.com,PROXY
 DOMAIN-SUFFIX,bitmex.com,PROXY
+DOMAIN-SUFFIX,bitstamp.net,PROXY
+DOMAIN-SUFFIX,bittrex.com,PROXY
+DOMAIN-SUFFIX,bybit.com,PROXY
+DOMAIN-SUFFIX,coinbase.com,PROXY
+DOMAIN-SUFFIX,coincheck.com,PROXY
+DOMAIN-SUFFIX,coingecko.com,PROXY
+DOMAIN-SUFFIX,coinmarketcap.com,PROXY
+DOMAIN-SUFFIX,coinone.co.kr,PROXY
+DOMAIN-SUFFIX,ftx.com,PROXY
 DOMAIN-SUFFIX,gate.io,PROXY
+DOMAIN-SUFFIX,gemini.com,PROXY
 DOMAIN-SUFFIX,huobi.com,PROXY
+DOMAIN-SUFFIX,korbit.co.kr,PROXY
+DOMAIN-SUFFIX,kraken.com,PROXY
+DOMAIN-SUFFIX,kucoin.com,PROXY
+DOMAIN-SUFFIX,liquid.com,PROXY
 DOMAIN-SUFFIX,okex.com,PROXY
+DOMAIN-SUFFIX,poloniex.com,PROXY
 DOMAIN-SUFFIX,uniswap.org,PROXY
 DOMAIN-SUFFIX,zb.com,PROXY
 # > Discord
--- a/Surge/Ruleset/Extra/Apple/MusicRadio.list
+++ b/Surge/Ruleset/Extra/Apple/MusicRadio.list
@ -0,0 +1,2 @@
+DOMAIN,radio.itunes.apple.com
+DOMAIN,tv.applemusic.com
--- a/Surge/Ruleset/Extra/Cryptocurrency.list
+++ b/Surge/Ruleset/Extra/Cryptocurrency.list
@ -6,11 +6,25 @@ DOMAIN-SUFFIX,aex.com
 DOMAIN-SUFFIX,bibox.com
 DOMAIN-SUFFIX,binance.cc
 DOMAIN-SUFFIX,binance.com
+DOMAIN-SUFFIX,binance.me
+DOMAIN-SUFFIX,binance.us
 DOMAIN-SUFFIX,bitfinex.com
+DOMAIN-SUFFIX,bithumb.com
 DOMAIN-SUFFIX,bitmex.com
+DOMAIN-SUFFIX,bitstamp.net
+DOMAIN-SUFFIX,bittrex.com
+DOMAIN-SUFFIX,bybit.com
+DOMAIN-SUFFIX,coinbase.com
+DOMAIN-SUFFIX,coincheck.com
+DOMAIN-SUFFIX,coinone.co.kr
 DOMAIN-SUFFIX,ftx.com
 DOMAIN-SUFFIX,gate.io
+DOMAIN-SUFFIX,gemini.com
 DOMAIN-SUFFIX,huobi.com
+DOMAIN-SUFFIX,korbit.co.kr
+DOMAIN-SUFFIX,kraken.com
+DOMAIN-SUFFIX,kucoin.com
+DOMAIN-SUFFIX,liquid.com
 DOMAIN-SUFFIX,okex.com
 DOMAIN-SUFFIX,poloniex.com
 DOMAIN-SUFFIX,sushi.com
--- a/Surge/Ruleset/Global.list
+++ b/Surge/Ruleset/Global.list
@ -15,13 +15,27 @@ DOMAIN-SUFFIX,aex.com
 DOMAIN-SUFFIX,bibox.com
 DOMAIN-SUFFIX,binance.cc
 DOMAIN-SUFFIX,binance.com
+DOMAIN-SUFFIX,binance.us
 DOMAIN-SUFFIX,bitcointalk.org
 DOMAIN-SUFFIX,bitfinex.com
+DOMAIN-SUFFIX,bithumb.com
 DOMAIN-SUFFIX,bitmex.com
+DOMAIN-SUFFIX,bitstamp.net
+DOMAIN-SUFFIX,bittrex.com
+DOMAIN-SUFFIX,bybit.com
+DOMAIN-SUFFIX,coinbase.com
+DOMAIN-SUFFIX,coincheck.com
 DOMAIN-SUFFIX,coingecko.com
 DOMAIN-SUFFIX,coinmarketcap.com
+DOMAIN-SUFFIX,coinone.co.kr
+DOMAIN-SUFFIX,ftx.com
 DOMAIN-SUFFIX,gate.io
+DOMAIN-SUFFIX,gemini.com
 DOMAIN-SUFFIX,huobi.com
+DOMAIN-SUFFIX,korbit.co.kr
+DOMAIN-SUFFIX,kraken.com
+DOMAIN-SUFFIX,kucoin.com
+DOMAIN-SUFFIX,liquid.com
 DOMAIN-SUFFIX,okex.com
 DOMAIN-SUFFIX,poloniex.com
 DOMAIN-SUFFIX,uniswap.org
--- a/Surge/Ruleset/StreamingMedia/Region/US.list
+++ b/Surge/Ruleset/StreamingMedia/Region/US.list
@ -1,12 +1,3 @@
-# > Disney+
-USER-AGENT,Disney+*
-DOMAIN-SUFFIX,bamgrid.com
-DOMAIN-SUFFIX,disneyplus.com
-DOMAIN-SUFFIX,disney-plus.net
-DOMAIN-SUFFIX,disneystreaming.com
-DOMAIN-SUFFIX,dssott.com
-DOMAIN,cdn.registerdisney.go.com
-
 # > encoreTVB
 USER-AGENT,encoreTVB*
 DOMAIN-SUFFIX,encoretvb.com
--- a/Surge/Ruleset/StreamingMedia/Streaming.list
+++ b/Surge/Ruleset/StreamingMedia/Streaming.list
@ -8,6 +8,9 @@ DOMAIN-SUFFIX,twitch.tv
 DOMAIN-SUFFIX,twitchcdn.net

 # (Music)
+# > Apple Music Radio
+DOMAIN,radio.itunes.apple.com
+DOMAIN,tv.applemusic.com
 # > Deezer
 USER-AGENT,Deezer*
 DOMAIN-SUFFIX,deezer.com