From 3f86c715e87590180ecbbabb16506cb1f6566e32 Mon Sep 17 00:00:00 2001 From: gitea-action Date: Tue, 31 Dec 2024 10:30:19 +0800 Subject: [PATCH] luci-app-passwall: sync upstream last commit: https://github.com/xiaorouji/openwrt-passwall/commit/830a60c9966fc5b5c9806683c1257dc644e5b39f --- .../view/passwall/node_list/link_share_man.htm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm b/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm index 5177cf8f7..6258e80cc 100644 --- a/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm +++ b/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm @@ -893,6 +893,11 @@ local hysteria2_type = uci:get(appname, "@global_subscribe[0]", "hysteria2_type" } } } else { + var sstr = b64decsafe(decodeURIComponent(url0)); + var team = sstr.split('@'); + var part1 = team[0].split(':'); + var part2 = team[1].split(':'); + var method = part1[0]; if (ss_type == "sing-box" && has_singbox) { dom_prefix = "singbox_" opt.set('type', "sing-box"); @@ -909,15 +914,11 @@ local hysteria2_type = uci:get(appname, "@global_subscribe[0]", "hysteria2_type" method = method.toLowerCase() === "chacha20-poly1305" ? "chacha20-ietf-poly1305" : method; method = method.toLowerCase() === "xchacha20-poly1305" ? "xchacha20-ietf-poly1305" : method; } - var sstr = b64decsafe(url0); - var team = sstr.split('@'); - var part1 = team[0].split(':'); - var part2 = team[1].split(':'); opt.set(dom_prefix + 'address', part2[0]); opt.set(dom_prefix + 'port', part2[1]); opt.set(dom_prefix + 'password', part1[1]); - opt.set(dom_prefix + 'method', part1[0]); - opt.set(dom_prefix + 'ss_method', part1[0]); + opt.set(dom_prefix + 'method', method); + opt.set(dom_prefix + 'ss_method', method); opt.set(dom_prefix + 'plugin', "none"); //opt.set(dom_prefix + 'plugin_opts', ""); if (param !== undefined) {