From 8b98affd42cf9b7cff95030c62de131186e61dd9 Mon Sep 17 00:00:00 2001
From: Shawn <45581750+KOP-XIAO@users.noreply.github.com>
Date: Fri, 25 Sep 2020 09:50:30 +0800
Subject: [PATCH] bug fixed

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

diff --git a/.DS_Store b/.DS_Store
index 8256ee155dac39853b048299cf1c3afcc1b54a62..8a264540def19c41df7113d0ea4020599b7dd39c 100644
GIT binary patch
delta 778
zcmZoEXeromPMpu6R!5=Q(9FU>N5Rs>bn+eXg{)%k9-ds2A4rH!Hk3}}S<NFVC9k5X
zXKZ2XH2I!@E|b9V$$Wyc^#XkSywWmaTrnw$C8@soDVb@RsVM?0IXJKI^6?9ZDT*m`
z2yEqu2FW@Xr2@$mumqQym<Fdn7)MBPW>qRgM4L;OQy`NwBs((?qDIVs%ZNiDg)=lK
zF)1|%VxB3NIfsBZXLwm^QE_H|-W3k8EmmAMlQ#&8$lHrKatNH@hy&T?lUQ8hUyzyy
zwGikM*U16ODwEgCNY&3~Si-P|VH3k1hT{w;7)~*qX1Ks`li?P_9frFM&luh_{9*XV
z@Sl-^k&}^&k%y6&QIb)KQJGPdQH@cX(S*^I(VWqO(U#GT(Vfwg(Tg#FF_JNgF@`ag
zF_kfoF`u!Bv6!)jv6Zonv4gRbaR%c;#zl;a8P_tdW8BWThw&%_!{*~sS&TfA;u2z9
fs<ND%z|fj(E3=Q$eDfcfM()vYAAoSz;ot@UqwdIm

delta 920
zcmZoEXeromPMpuUR!5=Q(9FU>N5Rs>X!0HLg?tk39$a1#naTNi!I@R5lMSVvCNB^$
zmsZi#Gq$jGy28uHFCZwy#TAvAlA2eNnU<MaH2I>iM14qJVs5IyQBF><3NdjBiHOpq
z%)-*ll1c$(4i2!Ww2TB-OiE%&s&9S@NN0+`Dh`Nx1w{#oXpoF^Q7Vv35!edVqN*mr
z6;cdzh(H)rsg^buS4ehdUWz~_)G~boE{XKeoW!Km9Dx*0h*c)0ToU1BsYS(^`FR4~
zP(e#8E{TZb{M=li%ZmjWb)dp__7W0tAj^Fci%a|qQuBcJpMcu$40Ko|NX{`OB{hYE
zWAb}J{rYVTdl-%}oMX7maFyX2!*zxS3@;g8GrVDV%kYhnnUR%|jgg&EfKi4~j!~Xb
zfl-rDkI{h9kkN?In$dyLiP4$Sh0&KWm@$+wj4_-sfiZ(Ii!qxqhq08gj<J!kiLsfn
zhjBLJT*i5f^BGq#ZerZbxP@^m<37g2j7J#2VDo9IG{#9HEF7FFvRt4boNOzzkI`cD
RADKq((dZkx(Wk?~4FIY}^3wnS

diff --git a/Scripts/resource-parser.js b/Scripts/resource-parser.js
index 5e588bc..ae4b3e1 100644
--- a/Scripts/resource-parser.js
+++ b/Scripts/resource-parser.js
@@ -1,5 +1,5 @@
 /** 
-☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧  ⟦2020-09-20 21:59⟧
+☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧  ⟦2020-09-25 09:59⟧
 ----------------------------------------------------------
 🛠 发现 𝐁𝐔𝐆 请反馈: @Shawn_KOP_bot
 ⛳️ 关注 🆃🅶 相关频道: https://t.me/QuanX_API
@@ -302,7 +302,7 @@ function Type_Check(subs) {
       content0 = Clash2QX(subs)
     } else if ( (ModuleK.some(RewriteCheck) || para1.indexOf("dst=rewrite") != -1) && (para1.indexOf("dst=filter") == -1) && subs.indexOf("[Proxy]") == -1) { // Surge 类型 module /rule-set(含url-regex) 类型
       type = "sgmodule"
-    } else if ((subi.indexOf("hostname=") != -1 || RewriteK.some(RewriteCheck)) && subs.indexOf("[Proxy]") == -1 && subs.indexOf("[server_local]") == -1 && subs.indexOf("\nhttp-r") == -1) {
+    } else if ((subi.indexOf("hostname=") != -1 || RewriteK.some(RewriteCheck)) && subs.indexOf("[Proxy]") == -1 && subs.indexOf("[server_local]") == -1 && subs.indexOf("\nhttp-r") == -1 && para1.indexOf("dst=filter")==-1) {
       type = "rewrite" //Quantumult X 类型 rewrite
     } else if (RuleK.some(RuleCheck) && subs.indexOf(html) == -1 && subs.indexOf("[Proxy]") == -1 && subs.indexOf("[server_local]") == -1) {
       type = "Rule";
@@ -391,7 +391,7 @@ function URX2QX(subs) {
     return nrw
 }
 
-//script 转换成 Quantumult X
+//script&rewrite 转换成 Quantumult X
 function SCP2QX(subs) {
     var nrw = []
     var rw = ""
@@ -640,11 +640,11 @@ function Rule_Handle(subs, Pout, Pin) {
 }
 
 function Rule_Policy(content) { //增加、替换 policy
-    var cnt = content.replace(/^\s*\-\s/g,"").trim().split(",");
+    var cnt = content.replace(/^\s*\-\s/g,"").replace(/REJECT-TINYGIF/gi,"reject").trim().split(",");
     var RuleK = ["//", "#", ";"];
     var RuleK1 = ["host", "domain", "ip-cidr", "geoip", "user-agent", "ip6-cidr"];
-    const RuleCheck = (item) => cnt[0].toLowerCase().indexOf(item) != -1; //无视注释行
-    const RuleCheck1 = (item) => cnt[0].toLowerCase().indexOf(item) != -1; //无视 quanx 不支持的规则类别
+    const RuleCheck = (item) => cnt[0].trim().toLowerCase().indexOf(item) == 0; //无视注释行
+    const RuleCheck1 = (item) => cnt[0].trim().toLowerCase().indexOf(item) != -1; //无视 quanx 不支持的规则类别
     if (RuleK1.some(RuleCheck1)) {
         if (cnt.length == 3 && cnt.indexOf("no-resolve") == -1) {
             ply0 = Ppolicy != "Shawn" ? Ppolicy : cnt[2]
@@ -659,7 +659,7 @@ function Rule_Policy(content) { //增加、替换 policy
             ply0 = Ppolicy != "Shawn" ? Ppolicy : cnt[2]
             nn = cnt[0] + ", " + cnt[1] + ", " + ply0 + ", " + cnt[3]
         } else if (!RuleK.some(RuleCheck) && content) {
-            $notify("未能解析" + "⟦" + subtag + "⟧" + "其中部分规则:", content, nan_link);
+            //$notify("未能解析" + "⟦" + subtag + "⟧" + "其中部分规则:", content, nan_link);
             return ""
         } else { return "" }
         if (cnt[0].indexOf("URL-REGEX") != -1 || cnt[0].indexOf("PROCESS") != -1) {