From b266779378c7e362a97ce8d95dbb0730fce35a02 Mon Sep 17 00:00:00 2001 From: gitea-action Date: Thu, 6 Feb 2025 18:30:30 +0800 Subject: [PATCH] luci-app-passwall: sync upstream last commit: https://github.com/xiaorouji/openwrt-passwall/commit/5a73f2c09c7b963644448009f91897c28e3ab2db --- .../model/cbi/passwall/client/node_subscribe.lua | 2 +- .../root/usr/share/passwall/subscribe.lua | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua index 24173c724..b279f18fe 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua @@ -137,7 +137,7 @@ o:value("ipv6_only", translate("IPv6 Only")) o = s:option(Button, "_stop", translate("Delete All Subscribe Node")) o.inputstyle = "remove" function o.write(e, e) - luci.sys.call("lua /usr/share/" .. appname .. "/subscribe.lua truncate all-node > /dev/null 2>&1") + luci.sys.call("lua /usr/share/" .. appname .. "/subscribe.lua truncate > /dev/null 2>&1") m.no_commit = true end diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua index 785827316..f89ab7ba7 100755 --- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua +++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua @@ -1327,13 +1327,11 @@ local function truncate_nodes(add_from) end end end) - if add_from then - uci:foreach(appname, "subscribe_list", function(o) - if add_from == "all-node" or add_from == o.remark then - uci:delete(appname, o['.name'], "md5") - end - end) - end + uci:foreach(appname, "subscribe_list", function(o) + if (not add_from) or add_from == o.remark then + uci:delete(appname, o['.name'], "md5") + end + end) api.uci_save(uci, appname, true) end