diff --git a/Scripts/resource-parser.js b/Scripts/resource-parser.js index 974855b..b2d8ed4 100644 --- a/Scripts/resource-parser.js +++ b/Scripts/resource-parser.js @@ -1,5 +1,5 @@ /** -☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧 ⟦2022-06-05 20:50⟧ +☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧 ⟦2022-06-07 17:20⟧ ---------------------------------------------------------- 🛠 发现 𝐁𝐔𝐆 请反馈: @Shawn_Parser_Bot ⛳️ 关注 🆃🅶 相关频道: https://t.me/QuanX_API @@ -2092,6 +2092,7 @@ function emoji_del(str) { function get_emoji(emojip, sname) { var Lmoji = { "🏳️‍🌈": ["流量", "时间", "应急", "过期", "Bandwidth", "expire"], + "🇦🇩": ["安道尔"], "🇦🇿": ["阿塞拜疆"], "🇦🇹": ["奥地利", "奧地利", "Austria", "维也纳"], "🇦🇺": ["AU", "Australia", "Sydney", "澳大利亚", "澳洲", "墨尔本", "悉尼" ,"土澳", "京澳","廣澳","滬澳","沪澳","广澳"], @@ -2099,6 +2100,7 @@ function get_emoji(emojip, sname) { "🇧🇬": ["保加利亚", "保加利亞","Bulgaria"], "🇵🇰": ["巴基斯坦"], "🇧🇭": ["巴林"], + "🇵🇾": ["巴拉圭"], "🇰🇭": ["柬埔寨"], "🇺🇦": ["烏克蘭","乌克兰"], "🇭🇷": ["克罗地亚","HR","克羅地亞"], @@ -2116,6 +2118,7 @@ function get_emoji(emojip, sname) { "🇪🇺": ["EU", "欧盟", "欧罗巴","欧洲"], "🇫🇮": ["Finland", "芬兰","芬蘭","赫尔辛基"], "🇫🇷": ["FR", "France", "法国", "法國", "巴黎"], + "🇷🇪": ["留尼汪"], "🇬🇧": ["UK", "GB ", "England", "United Kingdom", "英国", "伦敦", "英"], "🇲🇴": ["MO", "Macao","Macau", "MAC", "澳门", "澳門", "CTM"], "🇰🇿": ["哈萨克斯坦"], @@ -2480,14 +2483,19 @@ function YAMLFix(cnt){ cnt = cnt.replace(/{|}/g,"").replace(/,/g,"\n ") } cnt = cnt.replace(/ -\n.*name/g," - name").replace(/\$|\`/g,"").split("proxy-providers:")[0].split("proxy-groups:")[0].replace(/\"(name|type|server|port|cipher|password|)(\"*)/g,"$1") - console.log("part-fix:\n"+cnt.split("proxies:")[1]) - cnt = cnt.indexOf("proxies:") == -1? "proxies:\n" + cnt :"proxies:"+cnt.split("proxies:")[1] + // console.log("part-fix:\n"+cnt.split("proxies:")[1]) + // cnt = cnt.indexOf("proxies:") == -1? "proxies:\n" + cnt :"proxies:"+cnt.split("proxies:")[1] cnt = cnt.replace(/name\:(.*?)\:(.*?)\n/gmi,"name:$1冒号$2\n").replace(/\s{6}Host\:/g," Host:")//.replace(/\{\s*(Host\:.*)\}/gmi,"$1") //罕见bug情况 修复 items=cnt.split("\n").map(yamlcheck) cnt=items.join("\n") //console.log(cnt.replace(/name\:(.*?)\:(.*?)\n/gmi,"name:$1冒号$2")) //2022-05-11 增加⬇️ - cnt = cnt.replace(/\n\s{4}headers/g,"\n headers").replace(/\n\s{6}(H|h)ost/g,"\n Host").replace(/\t/g,"") + //cnt = cnt.replace(/\n\s{4}headers/g,"\n headers").replace(/\n\s{6}(H|h)ost/g,"\n Host").replace(/\t/g,"") + //2022-06-07 修改为👇,解决部分无 proxies 字段的 + cnt = cnt.indexOf("proxies:") != -1?cnt.replace(/\n\s{4}headers/g,"\n headers").replace(/\n\s{6}(H|h)ost/g,"\n Host").replace(/\t/g,""):cnt + + //console.log("part-fix:\n"+cnt.split("proxies:")[1]) + cnt = cnt.indexOf("proxies:") == -1? "proxies:\n" + cnt :"proxies:"+cnt.split("proxies:")[1] console.log("after-fix\n"+cnt) //$notify("After-Fix","this is", cnt)