From bd9aad65b16ae54f749705446bd16bf6e2a83a98 Mon Sep 17 00:00:00 2001
From: bottomash
Date: Tue, 19 Nov 2024 13:33:36 +0000
Subject: [PATCH] update rules
---
emoji.toml | 378 +++++++++++++++++++++++++++++++++++++++++++++++++++++
emoji.txt | 95 --------------
pref.ini | 6 +-
3 files changed, 382 insertions(+), 97 deletions(-)
create mode 100644 emoji.toml
delete mode 100644 emoji.txt
diff --git a/emoji.toml b/emoji.toml
new file mode 100644
index 0000000..7a423d0
--- /dev/null
+++ b/emoji.toml
@@ -0,0 +1,378 @@
+[[emoji]]
+match = "(?i:Bandwidth|expire|流量|时间|应急|过期)"
+emoji = "🏳️🌈"
+
+[[emoji]]
+match = "(?i:\\bHK[G]?\\b|Hong.*?Kong|\\bHKT\\b|\\bHKBN\\b|\\bHGC\\b|\\bWTT\\b|\\bCMI\\b|[^-]港)"
+emoji = "🇭🇰"
+
+[[emoji]]
+match = "(?i:\\bTW[N]?\\b|Taiwan|新北|彰化|\\bCHT\\b|台湾|[^-]台|\\bHINET\\b)"
+emoji = "🇨🇳"
+
+[[emoji]]
+match = "(?i:\\bSG[P]?\\b|Singapore|新加坡|狮城|[^-]新)"
+emoji = "🇸🇬"
+
+[[emoji]]
+match = "(尼日利亚|Nigeria)"
+emoji = "🇳🇬"
+
+[[emoji]]
+match = "(?i:\\bJP[N]?\\b|Japan|Tokyo|Osaka|Saitama|日本|东京|大阪|埼玉|[^-]日)"
+emoji = "🇯🇵"
+
+[[emoji]]
+match = "(?i:\\bK[O]?R\\b|Korea|首尔|韩|韓)"
+emoji = "🇰🇷"
+
+[[emoji]]
+match = "(?i:\\bUS[A]?\\b|America|United.*?States|美国|[^-]美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥)"
+emoji = "🇺🇸"
+
+[[emoji]]
+match = "(Ascension|阿森松)"
+emoji = "🇦🇨"
+
+[[emoji]]
+match = "(?i:\\bUAE\\b|Dubai|阿联酋|迪拜)"
+emoji = "🇦🇪"
+
+[[emoji]]
+match = "(阿尔巴尼亚|Albania)"
+emoji = "🇦🇱"
+
+[[emoji]]
+match = "(南极|Antarctica)"
+emoji = "🇦🇶"
+
+[[emoji]]
+match = "(Argentina|阿根廷)"
+emoji = "🇦🇷"
+
+[[emoji]]
+match = "(Austria|Vienna|奥地利|维也纳)"
+emoji = "🇦🇹"
+
+[[emoji]]
+match = "(?i:\\bAU[S]?\\b|Australia|Sydney|澳大利亚|澳洲|悉尼)"
+emoji = "🇦🇺"
+
+[[emoji]]
+match = "(阿塞拜疆|Azerbaijan)"
+emoji = "🇦🇿"
+
+[[emoji]]
+match = "(波黑共和国|波士尼亚与赫塞哥维纳|Bosnia|Herzegovina)"
+emoji = "🇧🇦"
+
+[[emoji]]
+match = "(Belgium|比利时)"
+emoji = "🇧🇪"
+
+[[emoji]]
+match = "(保加利亚|Bulgaria)"
+emoji = "🇧🇬"
+
+[[emoji]]
+match = "(Brazil|Paulo|巴西|圣保罗)"
+emoji = "🇧🇷"
+
+[[emoji]]
+match = "(?i:\\bCA[N]?\\b|Canada|Toronto|Montreal|Vancouver|加拿大|蒙特利尔|温哥华|楓葉|枫叶)"
+emoji = "🇨🇦"
+
+[[emoji]]
+match = "(Switzerland|Zurich|瑞士|苏黎世)"
+emoji = "🇨🇭"
+
+[[emoji]]
+match = "(智利|Chile)"
+emoji = "🇨🇱"
+
+[[emoji]]
+match = "(Colombia|哥伦比亚)"
+emoji = "🇨🇴"
+
+[[emoji]]
+match = "(Costa Rica|哥斯达黎加)"
+emoji = "🇨🇷"
+
+[[emoji]]
+match = "(塞浦路斯|Cyprus)"
+emoji = "🇨🇾"
+
+[[emoji]]
+match = "(Czech|捷克)"
+emoji = "🇨🇿"
+
+[[emoji]]
+match = "(?i:\\bDE[U]?\\b|Germany|法兰克福|德(国|意志)|中德|^德$)"
+emoji = "🇩🇪"
+
+[[emoji]]
+match = "(?i:\\bD[N]?K\\b|Denmark|丹麦)"
+emoji = "🇩🇰"
+
+[[emoji]]
+match = "(爱沙尼亚|Estonia)"
+emoji = "🇪🇪"
+
+[[emoji]]
+match = "(埃及|Egypt)"
+emoji = "🇪🇬"
+
+[[emoji]]
+match = "(?i:\\bES[P]?\\b|Spain|西班牙)"
+emoji = "🇪🇸"
+
+[[emoji]]
+match = "(Europe|欧洲)"
+emoji = "🇪🇺"
+
+[[emoji]]
+match = "(Finland|Helsinki|芬兰|赫尔辛基)"
+emoji = "🇫🇮"
+
+[[emoji]]
+match = "(?i:\\bFR[A]?\\b|France|Paris|法国|巴黎)"
+emoji = "🇫🇷"
+
+[[emoji]]
+match = "(?i:\\bUK\\b|\\bGB[R]?\\b|England|United.*?Kingdom|London|英国|[^-]英|伦敦)"
+emoji = "🇬🇧"
+
+[[emoji]]
+match = "(希腊|Greece)"
+emoji = "🇬🇷"
+
+[[emoji]]
+match = "(格鲁吉亚|Georgia)"
+emoji = "🇬🇪"
+
+[[emoji]]
+match = "(克罗地亚|Croatia)"
+emoji = "🇭🇷"
+
+[[emoji]]
+match = "(Hungary|匈牙利)"
+emoji = "🇭🇺"
+
+[[emoji]]
+match = "(Indonesia|Jakarta|印尼|印度尼西亚|雅加达)"
+emoji = "🇮🇩"
+
+[[emoji]]
+match = "(Ireland|Dublin|爱尔兰|都柏林)"
+emoji = "🇮🇪"
+
+[[emoji]]
+match = "(Israel|以色列)"
+emoji = "🇮🇱"
+
+[[emoji]]
+match = "(马恩岛|Mann)"
+emoji = "🇮🇲"
+
+[[emoji]]
+match = "(?i:\\bIN[D]?\\b|India|Mumbai|印度|孟买|加尔各答|贾坎德|泰米尔纳德)"
+emoji = "🇮🇳"
+
+[[emoji]]
+match = "(伊朗|Iran)"
+emoji = "🇮🇷"
+
+[[emoji]]
+match = "(?i:\\bIS[L]?\\b|Iceland|冰岛)"
+emoji = "🇮🇸"
+
+[[emoji]]
+match = "(Italy|Milan|意大利|米兰)"
+emoji = "🇮🇹"
+
+[[emoji]]
+match = "(约旦|Jordan)"
+emoji = "🇯🇴"
+
+[[emoji]]
+match = "(肯尼亚|Kenya)"
+emoji = "🇰🇪"
+
+[[emoji]]
+match = "(吉尔吉斯斯坦|Kyrgyzstan)"
+emoji = "🇰🇬"
+
+[[emoji]]
+match = "(柬埔寨|Cambodia)"
+emoji = "🇰🇭"
+
+[[emoji]]
+match = "(North.*?Korea|朝鲜)"
+emoji = "🇰🇵"
+
+[[emoji]]
+match = "(哈萨克斯坦|Kazakhstan)"
+emoji = "🇰🇿"
+
+[[emoji]]
+match = "(立陶宛|Lietuvos)"
+emoji = "🇱🇹"
+
+[[emoji]]
+match = "(卢森堡|Luxemburg|Luxembourg)"
+emoji = "🇱🇺"
+
+[[emoji]]
+match = "(拉脱维亚|Latvia)"
+emoji = "🇱🇻"
+
+[[emoji]]
+match = "(Moldova|摩尔多瓦)"
+emoji = "🇲🇩"
+
+[[emoji]]
+match = "(北马其顿|Macedonia)"
+emoji = "🇲🇰"
+
+[[emoji]]
+match = "(缅甸|Myanmar)"
+emoji = "🇲🇲"
+
+[[emoji]]
+match = "(蒙古|Монголулс|Mongolia)"
+emoji = "🇲🇳"
+
+[[emoji]]
+match = "(Macao|澳门|\\bCTM\\b)"
+emoji = "🇲🇴"
+
+[[emoji]]
+match = "(墨西哥|Mexico)"
+emoji = "🇲🇽"
+
+[[emoji]]
+match = "(Malaysia|马来|MY)"
+emoji = "🇲🇾"
+
+[[emoji]]
+match = "(?i:\\bNL[D]?\\b|Netherlands|荷兰|阿姆斯特丹)"
+emoji = "🇳🇱"
+
+[[emoji]]
+match = "(挪威|Norway)"
+emoji = "🇳🇴"
+
+[[emoji]]
+match = "(新西兰|纽西兰|New Zealand)"
+emoji = "🇳🇿"
+
+[[emoji]]
+match = "(Philippines|菲律宾)"
+emoji = "🇵🇭"
+
+[[emoji]]
+match = "(Pakistan|巴基斯坦)"
+emoji = "🇵🇰"
+
+[[emoji]]
+match = "(?i:\\bP[O]?L\\b|Poland|波兰)"
+emoji = "🇵🇱"
+
+[[emoji]]
+match = "(巴拿马|Panama)"
+emoji = "🇵🇦"
+
+[[emoji]]
+match = "(秘鲁|Peru)"
+emoji = "🇵🇪"
+
+[[emoji]]
+match = "(葡萄牙|Portugal)"
+emoji = "🇵🇹"
+
+[[emoji]]
+match = "(Romania|罗马尼亚)"
+emoji = "🇷🇴"
+
+[[emoji]]
+match = "(塞尔维亚|Serbia)"
+emoji = "🇷🇸"
+
+[[emoji]]
+match = "(?i:\\bRU[S]?\\b|Russia|Moscow|Petersburg|Siberia|伯力|莫斯科|圣彼得堡|西伯利亚|新西伯利亚|哈巴罗夫斯克|俄罗斯|[^-]俄)"
+emoji = "🇷🇺"
+
+[[emoji]]
+match = "(Arabia|沙特)"
+emoji = "🇸🇦"
+
+[[emoji]]
+match = "(Sweden|瑞典)"
+emoji = "🇸🇪"
+
+[[emoji]]
+match = "(斯洛文尼亚|Slovenia)"
+emoji = "🇸🇮"
+
+[[emoji]]
+match = "(斯洛伐克|Slovensko)"
+emoji = "🇸🇰"
+
+[[emoji]]
+match = "(Thailand|泰国|曼谷)"
+emoji = "🇹🇭"
+
+[[emoji]]
+match = "(突尼斯|Tunisia)"
+emoji = "🇹🇳"
+
+[[emoji]]
+match = "(Turkey|土耳其|伊斯坦布尔)"
+emoji = "🇹🇷"
+
+[[emoji]]
+match = "(乌拉圭|Uruguay)"
+emoji = "🇺🇾"
+
+[[emoji]]
+match = "(梵蒂冈|Vatican)"
+emoji = "🇻🇦"
+
+[[emoji]]
+match = "(Vietnam|越南)"
+emoji = "🇻🇳"
+
+[[emoji]]
+match = "(Africa|南非)"
+emoji = "🇿🇦"
+
+[[emoji]]
+match = "(Ukraine|UA|乌克兰)"
+emoji = "🇺🇦"
+
+[[emoji]]
+match = "(Puerto.*?Rico|波多黎各)"
+emoji = "🇵🇷"
+
+[[emoji]]
+match = "(Ecuador|厄瓜多尔)"
+emoji = "🇪🇨"
+
+
+[[emoji]]
+match = "(Morocco|摩洛哥)"
+emoji = "🇲🇦"
+
+
+[[emoji]]
+match = "(Nepal|尼泊尔)"
+emoji = "🇳🇵"
+
+
+[[emoji]]
+match = "(Bengal|孟加拉)"
+emoji = "🇧🇩"
+
+[[emoji]]
+match = "(?i:\\bC[H]?N\\b|China|back|回国|中国[^-]|江苏[^-]|北京[^-]|上海[^-]|广州[^-]|深圳[^-]|杭州[^-]|常州[^-]|徐州[^-]|青岛[^-]|宁波[^-]|镇江[^-]|成都[^-]|河北[^-]|山西[^-]|辽宁[^-]|吉林[^-]|黑龙江[^-]|江苏[^-]|浙江[^-]|安徽[^-]|福建[^-]|江西[^-]|山东[^-]|河南[^-]|湖北[^-]|湖南[^-]|广东[^-]|海南[^-]|四川[^-]|贵州[^-]|云南[^-]|陕西[^-]|甘肃[^-]|青海[^-]|内蒙古[^-]|广西[^-]|西藏[^-]|宁夏[^-]|新疆[^-])"
+emoji = "🇨🇳"
diff --git a/emoji.txt b/emoji.txt
deleted file mode 100644
index e490950..0000000
--- a/emoji.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-(?i:Bandwidth|expire|流量|时间|应急|过期),🏳️🌈
-(?i:\bHK[G]?\b|Hong.*?Kong|\bHKT\b|\bHKBN\b|\bHGC\b|\bWTT\b|\bCMI\b|[^-]港),🇭🇰
-(?i:\bTW[N]?\b|Taiwan|新北|彰化|\bCHT\b|台湾|[^-]台|\bHINET\b),🇨🇳
-(?i:\bSG[P]?\b|Singapore|新加坡|狮城|[^-]新),🇸🇬
-(尼日利亚|Nigeria),🇳🇬
-(?i:\bJP[N]?\b|Japan|Tokyo|Osaka|Saitama|日本|东京|大阪|埼玉|[^-]日),🇯🇵
-(?i:\bK[O]?R\b|Korea|首尔|韩|韓),🇰🇷
-(?i:\bUS[A]?\b|America|United.*?States|美国|[^-]美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥),🇺🇸
-(Ascension|阿森松),🇦🇨
-(?i:\bUAE\b|Dubai|阿联酋|迪拜),🇦🇪
-(阿尔巴尼亚|Albania),🇦🇱
-(南极|Antarctica),🇦🇶
-(Argentina|阿根廷),🇦🇷
-(Austria|Vienna|奥地利|维也纳),🇦🇹
-(?i:\bAU[S]?\b|Australia|Sydney|澳大利亚|澳洲|悉尼),🇦🇺
-(阿塞拜疆|Azerbaijan),🇦🇿
-(波黑共和国|波士尼亚与赫塞哥维纳|Bosnia|Herzegovina),🇧🇦
-(Belgium|比利时),🇧🇪
-(保加利亚|Bulgaria),🇧🇬
-(Brazil|Paulo|巴西|圣保罗),🇧🇷
-(?i:\bCA[N]?\b|Canada|Toronto|Montreal|Vancouver|加拿大|蒙特利尔|温哥华|楓葉|枫叶),🇨🇦
-(Switzerland|Zurich|瑞士|苏黎世),🇨🇭
-(智利|Chile),🇨🇱
-(Colombia|哥伦比亚),🇨🇴
-(Costa Rica|哥斯达黎加),🇨🇷
-(塞浦路斯|Cyprus),🇨🇾
-(Czech|捷克),🇨🇿
-(?i:\bDE[U]?\b|Germany|法兰克福|德(国|意志)|中德|^德$),🇩🇪
-(?i:\bD[N]?K\b|Denmark|丹麦),🇩🇰
-(爱沙尼亚|Estonia),🇪🇪
-(埃及|Egypt),🇪🇬
-(?i:\bES[P]?\b|Spain|西班牙),🇪🇸
-(Europe|欧洲),🇪🇺
-(Finland|Helsinki|芬兰|赫尔辛基),🇫🇮
-(?i:\bFR[A]?\b|France|Paris|法国|巴黎),🇫🇷
-(?i:\bUK\b|\bGB[R]?\b|England|United.*?Kingdom|London|英国|[^-]英|伦敦),🇬🇧
-(希腊|Greece),🇬🇷
-(格鲁吉亚|Georgia),🇬🇪
-(克罗地亚|Croatia),🇭🇷
-(Hungary|匈牙利),🇭🇺
-(Indonesia|Jakarta|印尼|印度尼西亚|雅加达),🇮🇩
-(Ireland|Dublin|爱尔兰|都柏林),🇮🇪
-(Israel|以色列),🇮🇱
-(马恩岛|Mann),🇮🇲
-(?i:\bIN[D]?\b|India|Mumbai|印度|孟买|加尔各答|贾坎德|泰米尔纳德),🇮🇳
-(伊朗|Iran),🇮🇷
-(?i:\bIS[L]?\b|Iceland|冰岛),🇮🇸
-(Italy|Milan|意大利|米兰),🇮🇹
-(约旦|Jordan),🇯🇴
-(肯尼亚|Kenya),🇰🇪
-(吉尔吉斯斯坦|Kyrgyzstan),🇰🇬
-(柬埔寨|Cambodia),🇰🇭
-(North.*?Korea|朝鲜),🇰🇵
-(哈萨克斯坦|Kazakhstan),🇰🇿
-(立陶宛|Lietuvos),🇱🇹
-(卢森堡|Luxemburg|Luxembourg),🇱🇺
-(拉脱维亚|Latvia),🇱🇻
-(Moldova|摩尔多瓦),🇲🇩
-(北马其顿|Macedonia),🇲🇰
-(缅甸|Myanmar),🇲🇲
-(蒙古|Монголулс|Mongolia),🇲🇳
-(Macao|澳门|\bCTM\b),🇲🇴
-(墨西哥|Mexico),🇲🇽
-(Malaysia|马来|MY),🇲🇾
-(?i:\bNL[D]?\b|Netherlands|荷兰|阿姆斯特丹),🇳🇱
-(挪威|Norway),🇳🇴
-(新西兰|纽西兰|New Zealand),🇳🇿
-(Philippines|菲律宾),🇵🇭
-(Pakistan|巴基斯坦),🇵🇰
-(?i:\bP[O]?L\b|Poland|波兰),🇵🇱
-(巴拿马|Panama),🇵🇦
-(秘鲁|Peru),🇵🇪
-(葡萄牙|Portugal),🇵🇹
-(Romania|罗马尼亚),🇷🇴
-(塞尔维亚|Serbia),🇷🇸
-(?i:\bRU[S]?\b|Russia|Moscow|Petersburg|Siberia|伯力|莫斯科|圣彼得堡|西伯利亚|新西伯利亚|哈巴罗夫斯克|俄罗斯|[^-]俄),🇷🇺
-(Arabia|沙特),🇸🇦
-(Sweden|瑞典),🇸🇪
-(斯洛文尼亚|Slovenia),🇸🇮
-(斯洛伐克|Slovensko),🇸🇰
-(Thailand|泰国|曼谷),🇹🇭
-(突尼斯|Tunisia),🇹🇳
-(Turkey|土耳其|伊斯坦布尔),🇹🇷
-(乌拉圭|Uruguay),🇺🇾
-(梵蒂冈|Vatican),🇻🇦
-(Vietnam|越南),🇻🇳
-(Africa|南非),🇿🇦
-(Ukraine|UA|乌克兰),🇺🇦
-(Puerto.*?Rico|波多黎各),🇵🇷
-(Ecuador|厄瓜多尔),🇪🇨
-(Venezuela|委内瑞拉),🇻🇪
-(Morocco|摩洛哥),🇲🇦
-(Nepal|尼泊尔),🇳🇵
-(Bengal|孟加拉),🇧🇩
-(?i:\bC[H]?N\b|China|back|回国|中国[^-]|江苏[^-]|北京[^-]|上海[^-]|广州[^-]|深圳[^-]|杭州[^-]|常州[^-]|徐州[^-]|青岛[^-]|宁波[^-]|镇江[^-]|成都[^-]|河北[^-]|山西[^-]|辽宁[^-]|吉林[^-]|黑龙江[^-]|江苏[^-]|浙江[^-]|安徽[^-]|福建[^-]|江西[^-]|山东[^-]|河南[^-]|湖北[^-]|湖南[^-]|广东[^-]|海南[^-]|四川[^-]|贵州[^-]|云南[^-]|陕西[^-]|甘肃[^-]|青海[^-]|内蒙古[^-]|广西[^-]|西藏[^-]|宁夏[^-]|新疆[^-]),🇨🇳
\ No newline at end of file
diff --git a/pref.ini b/pref.ini
index 8ba5220..1a88a5a 100644
--- a/pref.ini
+++ b/pref.ini
@@ -1,13 +1,15 @@
[common]
surge_rule_base=base/surge.conf
clash_rule_base=base/clash.yml
+exclude_remarks=家宽
[node_pref]
rename_node=(\S{2})(\d{2}) (\|) ([A-Z]{2})@$1 $2
+rename_node=\d{1,2)x@\d{1,2}X
rename_node=新加坡@狮城
[emojis]
add_emoji=true
remove_old_emoji=true
-rule=!!import:emoji.txt
+rule=!!import:emoji.toml
[rulesets]
enabled=true
overwrite_original_rules=true
@@ -22,4 +24,4 @@ custom_proxy_group=PROXY`select`.*
[server]
enable_cache=false
listen=0.0.0.0
-port=25500
\ No newline at end of file
+port=25500