Merge pull request #900 from DustinWin/dev

更新和精简 fake-ip-filter；rules 模板的命名和图标优化
2025-03-09 06:42:24 +08:00
parent a0279ec4c1 cc11a1fc6a
commit 310dede115
13 changed files with 35 additions and 33 deletions
--- a/public/fake_ip_filter.list
+++ b/public/fake_ip_filter.list
@@ -7,6 +7,7 @@
 *.test
 *.local
 *.home.arpa
+*.direct
 #放行NTP服务
 time.*.com
 time.*.gov
@@ -68,8 +69,8 @@ music.migu.cn
 #QQ登录
 localhost.ptlogin2.qq.com
 localhost.sec.qq.com
-+.qq.com
-+.tencent.com
+#微信登录
+localhost.*.weixin.qq.com
 #Game
 #Steam
 +.steamcontent.com
@@ -85,6 +86,7 @@ xbox.*.*.microsoft.com
 xbox.*.microsoft.com
 xnotify.xboxlive.com
 #Wotgame
+.battle.net
 +.battlenet.com.cn
 +.wotgame.cn
 +.wggames.cn
@@ -128,7 +130,7 @@ ff.dorado.sdo.com
 *.mcdn.bilivideo.cn
 #Disney Plus
 +.media.dssott.com
-#shark007 Codecs 
+#shark007 Codecs
 shark007.net
 #Mijia
 Mijia Cloud
@@ -156,4 +158,4 @@ ps.res.netease.com
 +.orayimg.com
 #LOL语音
 +.gcloudcs.com
-+.gcloudsdk.com
+.gcloudsdk.com
--- a/rules/clash_providers/DustinWin_Geo_Ads.yaml
+++ b/rules/clash_providers/DustinWin_Geo_Ads.yaml
@@ -1,9 +1,9 @@
-#DustinWin-ruleset全分组规则
+#DustinWin-GeoSite去广告规则
 proxy-groups:
  - {name: 🚀 节点选择, type: select, proxies: [🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, 👑 高级节点, 📉 省流节点, {providers_tags}]}
  - {name: 📈 网络测试, type: select, proxies: [🎯 全球直连, 🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, 👑 高级节点, {providers_tags}]}
  - {name: 🤖 人工智能, type: select, proxies: [🚀 节点选择, 🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点]}
-  - {name: 📥 Trackerslist, type: select, proxies: [🎯 全球直连, 🚀 节点选择]}
+  - {name: 📋 Trackerslist, type: select, proxies: [🎯 全球直连, 🚀 节点选择]}
  - {name: 🎮 游戏服务, type: select, proxies: [🎯 全球直连, 👑 高级节点, 🚀 节点选择]}
  - {name: 🪟 微软服务, type: select, proxies: [🎯 全球直连, 🚀 节点选择]}
  - {name: 🇬 谷歌服务, type: select, proxies: [🎯 全球直连, 🚀 节点选择]}
@@ -29,7 +29,7 @@ proxy-groups:
 rules:
  - GEOSITE,private,🎯 全球直连
  - GEOSITE,ads,🛑 广告域名
-  - GEOSITE,trackerslist,📥 Trackerslist
+  - GEOSITE,trackerslist,📋 Trackerslist
  - GEOSITE,microsoft-cn,🪟 微软服务
  - GEOSITE,apple-cn,🍎 苹果服务
  - GEOSITE,google-cn,🇬 谷歌服务
--- a/rules/clash_providers/DustinWin_Geo_Full.yaml
+++ b/rules/clash_providers/DustinWin_Geo_Full.yaml
@@ -1,9 +1,9 @@
-#DustinWin-ruleset全分组规则
+#DustinWin-GeoSite全分组规则
 proxy-groups:
  - {name: 🚀 节点选择, type: select, proxies: [🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, 👑 高级节点, 📉 省流节点, {providers_tags}]}
  - {name: 📈 网络测试, type: select, proxies: [🎯 全球直连, 🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, 👑 高级节点, {providers_tags}]}
  - {name: 🤖 人工智能, type: select, proxies: [🚀 节点选择, 🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点]}
-  - {name: 📥 Trackerslist, type: select, proxies: [🎯 全球直连, 🚀 节点选择]}
+  - {name: 📋 Trackerslist, type: select, proxies: [🎯 全球直连, 🚀 节点选择]}
  - {name: 🎮 游戏服务, type: select, proxies: [🎯 全球直连, 👑 高级节点, 🚀 节点选择]}
  - {name: 🪟 微软服务, type: select, proxies: [🎯 全球直连, 🚀 节点选择]}
  - {name: 🇬 谷歌服务, type: select, proxies: [🎯 全球直连, 🚀 节点选择]}
@@ -25,7 +25,7 @@ proxy-groups:

 rules:
  - GEOSITE,private,🎯 全球直连
-  - GEOSITE,trackerslist,📥 Trackerslist
+  - GEOSITE,trackerslist,📋 Trackerslist
  - GEOSITE,microsoft-cn,🪟 微软服务
  - GEOSITE,apple-cn,🍎 苹果服务
  - GEOSITE,google-cn,🇬 谷歌服务
--- a/rules/clash_providers/DustinWin_RS_Ads.yaml
+++ b/rules/clash_providers/DustinWin_RS_Ads.yaml
@@ -1,9 +1,9 @@
-#DustinWin-ruleset全分组规则
+#DustinWin-ruleset去广告规则
 proxy-groups:
  - {name: 🚀 节点选择, type: select, proxies: [🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, 👑 高级节点, 📉 省流节点, {providers_tags}]}
  - {name: 📈 网络测试, type: select, proxies: [🎯 全球直连, 🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, 👑 高级节点, {providers_tags}]}
  - {name: 🤖 人工智能, type: select, proxies: [🚀 节点选择, 🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点]}
-  - {name: 📥 Trackerslist, type: select, proxies: [🎯 全球直连, 🚀 节点选择]}
+  - {name: 📋 Trackerslist, type: select, proxies: [🎯 全球直连, 🚀 节点选择]}
  - {name: 🎮 游戏服务, type: select, proxies: [🎯 全球直连, 👑 高级节点, 🚀 节点选择]}
  - {name: 🪟 微软服务, type: select, proxies: [🎯 全球直连, 🚀 节点选择]}
  - {name: 🇬 谷歌服务, type: select, proxies: [🎯 全球直连, 🚀 节点选择]}
@@ -150,7 +150,7 @@ rule-providers:
 rules:
  - RULE-SET,private,🎯 全球直连
  - RULE-SET,ads,🛑 广告域名
-  - RULE-SET,trackerslist,📥 Trackerslist
+  - RULE-SET,trackerslist,📋 Trackerslist
  - RULE-SET,microsoft-cn,🪟 微软服务
  - RULE-SET,apple-cn,🍎 苹果服务
  - RULE-SET,google-cn,🇬 谷歌服务
--- a/rules/clash_providers/DustinWin_RS_Full.yaml
+++ b/rules/clash_providers/DustinWin_RS_Full.yaml
@@ -3,7 +3,7 @@ proxy-groups:
  - {name: 🚀 节点选择, type: select, proxies: [🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, 👑 高级节点, 📉 省流节点, {providers_tags}]}
  - {name: 📈 网络测试, type: select, proxies: [🎯 全球直连, 🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点, 👑 高级节点, {providers_tags}]}
  - {name: 🤖 人工智能, type: select, proxies: [🚀 节点选择, 🇭🇰 香港节点, 🇹🇼 台湾节点, 🇯🇵 日本节点, 🇸🇬 新加坡节点, 🇺🇸 美国节点]}
-  - {name: 📥 Trackerslist, type: select, proxies: [🎯 全球直连, 🚀 节点选择]}
+  - {name: 📋 Trackerslist, type: select, proxies: [🎯 全球直连, 🚀 节点选择]}
  - {name: 🎮 游戏服务, type: select, proxies: [🎯 全球直连, 👑 高级节点, 🚀 节点选择]}
  - {name: 🪟 微软服务, type: select, proxies: [🎯 全球直连, 🚀 节点选择]}
  - {name: 🇬 谷歌服务, type: select, proxies: [🎯 全球直连, 🚀 节点选择]}
@@ -138,7 +138,7 @@ rule-providers:

 rules:
  - RULE-SET,private,🎯 全球直连
-  - RULE-SET,trackerslist,📥 Trackerslist
+  - RULE-SET,trackerslist,📋 Trackerslist
  - RULE-SET,microsoft-cn,🪟 微软服务
  - RULE-SET,apple-cn,🍎 苹果服务
  - RULE-SET,google-cn,🇬 谷歌服务
--- a/rules/clash_providers/ShellCrash_Geo_Nano.yaml
+++ b/rules/clash_providers/ShellCrash_Geo_Nano.yaml
@@ -1,4 +1,4 @@
-#ShellCrash-geoip极简规则
+#ShellCrash-GeoIP极简规则
 proxy-groups:
  - {name: 🚀 节点选择, type: select, proxies: [{providers_tags}], include-all-providers: true}
  - {name: 🐟 漏网之鱼, type: select, proxies: [🚀 节点选择, 🎯 全球直连]}
--- a/rules/clash_providers/clash_providers.list
+++ b/rules/clash_providers/clash_providers.list
@@ -1,6 +1,6 @@
-ShellCrash-geoip极简规则 ShellCrash_Geo_Nano.yaml
+ShellCrash-GeoIP极简规则 ShellCrash_Geo_Nano.yaml
 DustinWin-ruleset轻量规则 DustinWin_RS_Light.yaml
-DustinWin-Geosite全分组规则 DustinWin_Geo_Full.yaml
+DustinWin-GeoSite全分组规则 DustinWin_Geo_Full.yaml
 DustinWin-ruleset全分组规则 DustinWin_RS_Full.yaml
-DustinWin-Geosite去广告规则 DustinWin_Geo_Ads.yaml
+DustinWin-GeoSite去广告规则 DustinWin_Geo_Ads.yaml
 DustinWin-ruleset去广告规则 DustinWin_RS_Ads.yaml
--- a/rules/singbox_providers/DustinWin_Geo_Ads.json
+++ b/rules/singbox_providers/DustinWin_Geo_Ads.json
@@ -1,10 +1,10 @@
-//DustinWin-Geodb去广告规则
+//DustinWin-GeoSite去广告规则
 {
  "outbounds": [
    { "tag": "🚀 节点选择", "type": "selector", "outbounds": [ "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", "👑 高级节点", "📉 省流节点", {providers_tags} ] },
    { "tag": "📈 网络测试", "type": "selector", "outbounds": [ "🎯 全球直连", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", "👑 高级节点", {providers_tags} ] },
    { "tag": "🤖 人工智能", "type": "selector", "outbounds": [ "🚀 节点选择", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点" ] },
-    { "tag": "📥 Trackerslist", "type": "selector", "outbounds": [ "🎯 全球直连", "🚀 节点选择" ] },
+    { "tag": "📋 Trackerslist", "type": "selector", "outbounds": [ "🎯 全球直连", "🚀 节点选择" ] },
    { "tag": "🎮 游戏服务", "type": "selector", "outbounds": [ "🎯 全球直连", "👑 高级节点", "🚀 节点选择" ] },
    { "tag": "🪟 微软服务", "type": "selector", "outbounds": [ "🎯 全球直连", "🚀 节点选择" ] },
    { "tag": "🇬 谷歌服务", "type": "selector", "outbounds": [ "🎯 全球直连", "🚀 节点选择" ] },
@@ -35,7 +35,7 @@
      { "clash_mode": [ "Global" ], "outbound": "GLOBAL" },
      { "geosite": [ "private" ], "outbound": "🎯 全球直连" },
      { "geosite": [ "ads" ], "outbound": "🛑 广告域名" },
-      { "geosite": [ "trackerslist" ], "outbound": "📥 Trackerslist" },
+      { "geosite": [ "trackerslist" ], "outbound": "📋 Trackerslist" },
      { "geosite": [ "microsoft-cn" ], "outbound": "🪟 微软服务" },
      { "geosite": [ "apple-cn" ], "outbound": "🍎 苹果服务" },
      { "geosite": [ "google-cn" ], "outbound": "🇬 谷歌服务" },
--- a/rules/singbox_providers/DustinWin_Geo_Full.json
+++ b/rules/singbox_providers/DustinWin_Geo_Full.json
@@ -1,10 +1,10 @@
-//DustinWin-Geodb全分组规则
+//DustinWin-GeoSite全分组规则
 {
  "outbounds": [
    { "tag": "🚀 节点选择", "type": "selector", "outbounds": [ "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", "👑 高级节点", "📉 省流节点", {providers_tags} ] },
    { "tag": "📈 网络测试", "type": "selector", "outbounds": [ "🎯 全球直连", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", "👑 高级节点", {providers_tags} ] },
    { "tag": "🤖 人工智能", "type": "selector", "outbounds": [ "🚀 节点选择", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点" ] },
-    { "tag": "📥 Trackerslist", "type": "selector", "outbounds": [ "🎯 全球直连", "🚀 节点选择" ] },
+    { "tag": "📋 Trackerslist", "type": "selector", "outbounds": [ "🎯 全球直连", "🚀 节点选择" ] },
    { "tag": "🎮 游戏服务", "type": "selector", "outbounds": [ "🎯 全球直连", "👑 高级节点", "🚀 节点选择" ] },
    { "tag": "🪟 微软服务", "type": "selector", "outbounds": [ "🎯 全球直连", "🚀 节点选择" ] },
    { "tag": "🇬 谷歌服务", "type": "selector", "outbounds": [ "🎯 全球直连", "🚀 节点选择" ] },
@@ -32,7 +32,7 @@
      { "clash_mode": [ "Direct" ], "outbound": "DIRECT" },
      { "clash_mode": [ "Global" ], "outbound": "GLOBAL" },
      { "geosite": [ "private" ], "outbound": "🎯 全球直连" },
-      { "geosite": [ "trackerslist" ], "outbound": "📥 Trackerslist" },
+      { "geosite": [ "trackerslist" ], "outbound": "📋 Trackerslist" },
      { "geosite": [ "microsoft-cn" ], "outbound": "🪟 微软服务" },
      { "geosite": [ "apple-cn" ], "outbound": "🍎 苹果服务" },
      { "geosite": [ "google-cn" ], "outbound": "🇬 谷歌服务" },
--- a/rules/singbox_providers/DustinWin_RS_Ads.json
+++ b/rules/singbox_providers/DustinWin_RS_Ads.json
@@ -4,7 +4,7 @@
    { "tag": "🚀 节点选择", "type": "selector", "outbounds": [ "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", "👑 高级节点", "📉 省流节点", {providers_tags} ] },
    { "tag": "📈 网络测试", "type": "selector", "outbounds": [ "🎯 全球直连", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", "👑 高级节点", {providers_tags} ] },
    { "tag": "🤖 人工智能", "type": "selector", "outbounds": [ "🚀 节点选择", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点" ] },
-    { "tag": "📥 Trackerslist", "type": "selector", "outbounds": [ "🎯 全球直连", "🚀 节点选择" ] },
+    { "tag": "📋 Trackerslist", "type": "selector", "outbounds": [ "🎯 全球直连", "🚀 节点选择" ] },
    { "tag": "🎮 游戏服务", "type": "selector", "outbounds": [ "🎯 全球直连", "👑 高级节点", "🚀 节点选择" ] },
    { "tag": "🪟 微软服务", "type": "selector", "outbounds": [ "🎯 全球直连", "🚀 节点选择" ] },
    { "tag": "🇬 谷歌服务", "type": "selector", "outbounds": [ "🎯 全球直连", "🚀 节点选择" ] },
@@ -35,7 +35,7 @@
      { "clash_mode": [ "Global" ], "outbound": "GLOBAL" },
      { "rule_set": [ "private" ], "outbound": "🎯 全球直连" },
      { "rule_set": [ "ads" ], "outbound": "🛑 广告域名" },
-      { "rule_set": [ "trackerslist" ], "outbound": "📥 Trackerslist" },
+      { "rule_set": [ "trackerslist" ], "outbound": "📋 Trackerslist" },
      { "rule_set": [ "microsoft-cn" ], "outbound": "🪟 微软服务" },
      { "rule_set": [ "apple-cn" ], "outbound": "🍎 苹果服务" },
      { "rule_set": [ "google-cn" ], "outbound": "🇬 谷歌服务" },
--- a/rules/singbox_providers/DustinWin_RS_Full.json
+++ b/rules/singbox_providers/DustinWin_RS_Full.json
@@ -4,7 +4,7 @@
    { "tag": "🚀 节点选择", "type": "selector", "outbounds": [ "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", "👑 高级节点", "📉 省流节点", {providers_tags} ] },
    { "tag": "📈 网络测试", "type": "selector", "outbounds": [ "🎯 全球直连", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点", "👑 高级节点", {providers_tags} ] },
    { "tag": "🤖 人工智能", "type": "selector", "outbounds": [ "🚀 节点选择", "🇭🇰 香港节点", "🇹🇼 台湾节点", "🇯🇵 日本节点", "🇸🇬 新加坡节点", "🇺🇸 美国节点" ] },
-    { "tag": "📥 Trackerslist", "type": "selector", "outbounds": [ "🎯 全球直连", "🚀 节点选择" ] },
+    { "tag": "📋 Trackerslist", "type": "selector", "outbounds": [ "🎯 全球直连", "🚀 节点选择" ] },
    { "tag": "🎮 游戏服务", "type": "selector", "outbounds": [ "🎯 全球直连", "👑 高级节点", "🚀 节点选择" ] },
    { "tag": "🪟 微软服务", "type": "selector", "outbounds": [ "🎯 全球直连", "🚀 节点选择" ] },
    { "tag": "🇬 谷歌服务", "type": "selector", "outbounds": [ "🎯 全球直连", "🚀 节点选择" ] },
@@ -32,7 +32,7 @@
      { "clash_mode": [ "Direct" ], "outbound": "DIRECT" },
      { "clash_mode": [ "Global" ], "outbound": "GLOBAL" },
      { "rule_set": [ "private" ], "outbound": "🎯 全球直连" },
-      { "rule_set": [ "trackerslist" ], "outbound": "📥 Trackerslist" },
+      { "rule_set": [ "trackerslist" ], "outbound": "📋 Trackerslist" },
      { "rule_set": [ "microsoft-cn" ], "outbound": "🪟 微软服务" },
      { "rule_set": [ "apple-cn" ], "outbound": "🍎 苹果服务" },
      { "rule_set": [ "google-cn" ], "outbound": "🇬 谷歌服务" },
--- a/rules/singbox_providers/ShellCrash_Geo_Nano.json
+++ b/rules/singbox_providers/ShellCrash_Geo_Nano.json
@@ -1,4 +1,4 @@
-//ShellCrash-geoip极简规则
+//ShellCrash-GeoIP极简规则
 {
  "outbounds": [
    { "tag": "🚀 节点选择", "type": "selector", "outbounds": [ {providers_tags} ], "use_all_providers": true },
--- a/rules/singbox_providers/singbox_providers.list
+++ b/rules/singbox_providers/singbox_providers.list
@@ -1,6 +1,6 @@
-ShellCrash-geoip极简规则 ShellCrash_Geo_Nano.json
+ShellCrash-GeoIP极简规则 ShellCrash_Geo_Nano.json
 DustinWin-ruleset轻量规则 DustinWin_RS_Light.json
 DustinWin-ruleset全分组规则 DustinWin_RS_Full.json
-DustinWin-Geosite全分组规则 DustinWin_Geo_Full.json
+DustinWin-GeoSite全分组规则 DustinWin_Geo_Full.json
 DustinWin-ruleset去广告规则 DustinWin_RS_Ads.json
-DustinWin-Geosite去广告规则 DustinWin_Geo_Ads.json
+DustinWin-GeoSite去广告规则 DustinWin_Geo_Ads.json