From 12de07db55c3df367b0e35867332b46862494fcc Mon Sep 17 00:00:00 2001
From: Shawn <45581750+KOP-XIAO@users.noreply.github.com>
Date: Sat, 30 May 2020 23:21:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=88=E6=94=B9=E5=9B=9E=E6=9D=A5=E4=BA=86?=
 =?UTF-8?q?=E3=80=82emoji=20=E4=BC=98=E5=85=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                  | Bin 14340 -> 14340 bytes
 Scripts/resource-parser.js |  25 +++++++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index b3d87e2d58fda8df4f5c941ef22af100025ecbc4..6b60ec969665bbfa680efb07b78710eefae3e3f7 100644
GIT binary patch
delta 1286
zcmeH_-D}fO7>CcVcJt&+-B~GVt4XJ8$8@%g&CxkGq_X*ij!kK`ZbQkI2*EY&noj&c
zids=n1e*)51V3)4h@v-oDL7COVONUch2pKE_w%Gt{{?TBi$H!)-uL8v@>Yx0;=?x~
zU#iD>8+riQIl!;_S%3v=O1Ls^>V{P|kDEqGYVnUq8B5C>i>uc(b2%hOD38(H+>|*x
zXO>UbQ>MsKi9ex}x>hzu3c6dVd+#f98>JI&K2$Qq-HTbf+#zv|W^D6}*O+y(gv4zr
zbHcR#)^@RO%5^C_qfHqzUb|kFqI{op_@q&?&4T5H{cM1?AR*<Z3;DeGaNCQw%W29N
z=u!9Z{hD1KEgJt?EAp^27K_&c(aJn|M4pqEWP!XQugN>|o_ru5$tUuSd?!E1Px1=@
zLlagZj16c*9PQ}D7W5*8J`7?fc3}_pViY+X!2~9uBM%F+DB&!sxP;5Nf}6OFJGhH^
z+{aTq!wXWsd~j|B);V9-c0qMM2fj3BO-naUIjxa!g|BpnqKk4U9BEyzs@$E%dz9iT
z6TYQ7+ZY$j_lG2sf~*i~J=WdBRNf#YdUdHj#<*W-_UOQ%ppC+(N7Fk5CGHQGXe{k$
z!QpYTga$Mtga{O<h@u0Vuo(#?#q?Xzk8K#L8`zC897G0L9KtbZm=+ccVWB82*eK&1
kDmae|xQJ`GjvJ^sOTpx0O;wtfcW-(3!jb>5d&zt3H^l!Y{Qv*}

delta 1134
zcmeIx&r8#B9LMqZb1nORzt#H8Wt)Q;Y>9)KZfQR-&AFtIGQ=!03K{vOmb!$k3?pVC
zMdj_wgrYihC?be*)u|2@L<H5L=+`AWc!}!JrE6dJg@R800e)_8UZ>ZC*Jom6V&v{C
zziUII^~Qh46WF@V=-it*cr?2!GiF-jt5UvxrH<vy9&;$2&m1>9(s?sysc@AZNyer8
zN-tH6g02uvswFH<(jwi`Cj&AnlTwr^xh}Wmp*)i3@><@?d-)(A<*R&?@A5-_%5U6M
zum}w=A!=Ajlo$=fNzhCi?WEYk4tnTiH+$&k5E+gzNS;%SbDA?;3~-q%T;&=!xyLjm
z?(>+ZJhO_G5o;#c;0fB*>gH4}^tYP+X~|O0GUcuGEw8GHMAszNZ%SIjKC4its|T9m
z-3ou8I#?TAt!c_tK8*TcTvusLEpW0%W1Xf3bhXe)HyX{l%IV7Oq^(Aqrnc*<!bwv`
zhwgQE=}NRnGV18|X4Au_{vU1OpY1J~mM6CBXZa#Cw&^e1Q*28QfwE<o2({GPo(a~{
zL@S#~+NQIjUF@WrKK8Mn1Gej7+jWp3vW#+qF;3dPXF11tE-*=vDK0t8E^d@sLhXy^
R_cHqx=JztEy~JJ^e*i>*{fYnp

diff --git a/Scripts/resource-parser.js b/Scripts/resource-parser.js
index 9641bd7..b55fe37 100644
--- a/Scripts/resource-parser.js
+++ b/Scripts/resource-parser.js
@@ -1,5 +1,5 @@
 /** 
-# Quantumult X 资源解析器 (2020-05-30: 22:59 )
+# Quantumult X 资源解析器 (2020-05-30: 23:59 )
 
 解析器作者: Shawn(请勿私聊问怎么用)
 有bug请反馈: @Shawn_KOP_bot
@@ -136,17 +136,17 @@ if(flag==3){
 			if(Pntf0!=0){
 		$notify("🐷 "+"["+subtag+"]"+" 开始转换节点订阅","🐼️ 如需筛选节点请使用in/out及其他参数，可参考此示范:","👉 https://t.me/QuanXNews/110");}
 	}
+	if(Pemoji){
+				if(Pntf0!=0){
+				$notify("🏳️‍🌈 "+"["+subtag+"]"+" 开始更改旗帜 emoji","清除emoji请用参数 -1, 国行设备添加emoji请使用参数 2","你当前所用的参数为 emoji="+Pemoji)};
+				total=emoji_handle(total,Pemoji);
+			}
 	if(Prname){
 		if(Pntf0!=0){ 
 		$notify("🏳️‍🌈 "+"["+subtag+"]"+" 开始节点重命名","格式为 \"旧名字@新名字\"","你当前所用的参数为"+Prname);}
 		var Prn=Prname;
 		total=total.map(Rename);
 	}
-	if(Pemoji){
-			if(Pntf0!=0){
-			$notify("🏳️‍🌈 "+"["+subtag+"]"+" 开始更改旗帜 emoji","清除emoji请用参数 -1, 国行设备添加emoji请使用参数 2","你当前所用的参数为 emoji="+Pemoji)};
-			total=emoji_handle(total,Pemoji);
-		}
 	if(Psort0==1 || Psort0==-1){
 		total=QXSort(total,Psort0);
 	}
@@ -722,7 +722,7 @@ function Rename(str){
 	var server=str;
 	if(server.indexOf("tag=")!=-1){
 		hd=server.split("tag=")[0]
-		name=server.split("tag=")[1]
+		name=server.split("tag=")[1].trim()
 		for(i=0;i<Prn.length;i++){
 			nname=Prn[i].split("@")[1];
 			oname=Prn[i].split("@")[0];
@@ -731,9 +731,14 @@ function Rename(str){
 				while(name.indexOf(oname)!=-1){
 					name=name.replace(oname,nname)
 				}
-				}else if(oname){
-					name=oname+name
-				}else if(nname){
+				}else if(oname){//前缀
+					var nemoji=emoji_del(name)
+					if(name==nemoji){
+						name=oname+" "+name
+					}else if(Pemoji==1 || Pemoji==2){
+						name=name.split(" ")[0]+" "+oname+name.split(" ")[1]
+					}else { name=oname+" "+name}
+				}else if(nname){//后缀
 					name=name+nname
 				}else(name=name)	
 			nserver=hd+"tag="+name