From ad1b6d917fd14cadfd40401b9a3b28776d334edb Mon Sep 17 00:00:00 2001 From: gitea-action Date: Sat, 19 Apr 2025 12:30:24 +0800 Subject: [PATCH] luci-app-passwall: sync upstream last commit: https://github.com/xiaorouji/openwrt-passwall/commit/63c3c952e8a644151c20c174bc9cefcc1f44babc --- .../luasrc/model/cbi/passwall/client/node_config.lua | 4 ++-- .../luasrc/model/cbi/passwall/client/type/ss-rust.lua | 4 ++-- .../luasrc/model/cbi/passwall/client/type/ss.lua | 4 ++-- .../luasrc/model/cbi/passwall/client/type/ssr.lua | 4 ++-- .../luasrc/model/cbi/passwall/client/type/trojan-plus.lua | 4 ++-- .../luasrc/model/cbi/passwall/client/type/tuic.lua | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua index 64406d6ba..31c6d1291 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua @@ -31,8 +31,8 @@ if api.is_finded("ipt2socks") then s.fields["type"]:value("Socks", translate("Socks")) - o = s:option(ListValue, _n("socks_protocol")) - o:depends({ [_n("socks_hide")] = "1" }) --不存在的依赖，始终隐藏，用于删除 protocol + o = s:option(ListValue, _n("del_protocol")) --始终隐藏，用于删除 protocol + o:depends({ [_n("__hide")] = "1" }) o.rewrite_option = "protocol" o = s:option(Value, _n("address"), translate("Address (Support Domain Name)")) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ss-rust.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ss-rust.lua index b1d03c390..6a352ab73 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ss-rust.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ss-rust.lua @@ -24,8 +24,8 @@ local ssrust_encrypt_method_list = { s.fields["type"]:value(type_name, translate("Shadowsocks Rust")) -o = s:option(ListValue, _n("ss_rust_protocol")) -o:depends({ [_n("ss_rust_hide")] = "1" }) --不存在的依赖，始终隐藏，用于删除 protocol +o = s:option(ListValue, _n("del_protocol")) --始终隐藏，用于删除 protocol +o:depends({ [_n("__hide")] = "1" }) o.rewrite_option = "protocol" o = s:option(Value, _n("address"), translate("Address (Support Domain Name)")) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ss.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ss.lua index 311fef47d..c838e5e9c 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ss.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ss.lua @@ -25,8 +25,8 @@ local ss_encrypt_method_list = { s.fields["type"]:value(type_name, translate("Shadowsocks Libev")) -o = s:option(ListValue, _n("ss_protocol")) -o:depends({ [_n("ss_hide")] = "1" }) --不存在的依赖，始终隐藏，用于删除 protocol +o = s:option(ListValue, _n("del_protocol")) --始终隐藏，用于删除 protocol +o:depends({ [_n("__hide")] = "1" }) o.rewrite_option = "protocol" o = s:option(Value, _n("address"), translate("Address (Support Domain Name)")) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ssr.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ssr.lua index 62d28a025..153ea6154 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ssr.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ssr.lua @@ -37,8 +37,8 @@ local ssr_obfs_list = { s.fields["type"]:value(type_name, translate("ShadowsocksR Libev")) -o = s:option(ListValue, _n("ssr_protocol")) -o:depends({ [_n("ssr_hide")] = "1" }) --不存在的依赖，始终隐藏，用于删除 protocol +o = s:option(ListValue, _n("del_protocol")) --始终隐藏，用于删除 protocol +o:depends({ [_n("__hide")] = "1" }) o.rewrite_option = "protocol" o = s:option(Value, _n("address"), translate("Address (Support Domain Name)")) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/trojan-plus.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/trojan-plus.lua index 362e46077..0f2c207f1 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/trojan-plus.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/trojan-plus.lua @@ -18,8 +18,8 @@ end s.fields["type"]:value(type_name, "Trojan-Plus") -o = s:option(ListValue, _n("trojan_protocol")) -o:depends({ [_n("trojan_hide")] = "1" }) --不存在的依赖，始终隐藏，用于删除 protocol +o = s:option(ListValue, _n("del_protocol")) --始终隐藏，用于删除 protocol +o:depends({ [_n("__hide")] = "1" }) o.rewrite_option = "protocol" o = s:option(Value, _n("address"), translate("Address (Support Domain Name)")) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/tuic.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/tuic.lua index a0cb30ced..cf748a3d4 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/tuic.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/tuic.lua @@ -18,8 +18,8 @@ end s.fields["type"]:value(type_name, translate("TUIC")) -o = s:option(ListValue, _n("tuic_protocol")) -o:depends({ [_n("tuic_hide")] = "1" }) --不存在的依赖，始终隐藏，用于删除 protocol +o = s:option(ListValue, _n("del_protocol")) --始终隐藏，用于删除 protocol +o:depends({ [_n("__hide")] = "1" }) o.rewrite_option = "protocol" o = s:option(Value, _n("address"), translate("Address (Support Domain Name)"))