From d2410a0c716fc5a54eaee5fd5cfc4fbb40df5a7e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 23:36:16 +0800
Subject: [PATCH] update 2023-09-01 23:36:16

---
 luci-app-passwall2/Makefile                                   | 2 +-
 .../luasrc/model/cbi/passwall2/client/type/ss.lua             | 2 +-
 .../luasrc/model/cbi/passwall2/client/type/ssr.lua            | 2 +-
 .../luasrc/model/cbi/passwall2/server/type/ray.lua            | 4 ++--
 luci-app-passwall2/root/usr/share/passwall2/subscribe.lua     | 2 +-
 luci-app-wechatpush/root/usr/share/wechatpush/wechatpush      | 4 ++--
 sing-box/Makefile                                             | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile
index a0d6932b7..571091ce5 100644
--- a/luci-app-passwall2/Makefile
+++ b/luci-app-passwall2/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall2
-PKG_VERSION:=1.19-4
+PKG_VERSION:=1.19-5
 PKG_RELEASE:=
 
 PKG_CONFIG_DEPENDS:= \
diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ss.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ss.lua
index 6df5d2af7..43d7e2958 100644
--- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ss.lua
+++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ss.lua
@@ -2,7 +2,7 @@ local m, s = ...
 
 local api = require "luci.passwall2.api"
 
-if not api.is_finded("ss-redir") then
+if not api.is_finded("ss-local") then
 	return
 end
 
diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ssr.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ssr.lua
index b8ae094ed..61daf66d9 100644
--- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ssr.lua
+++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ssr.lua
@@ -2,7 +2,7 @@ local m, s = ...
 
 local api = require "luci.passwall2.api"
 
-if not api.is_finded("ssr-redir") then
+if not api.is_finded("ssr-local") then
 	return
 end
 
diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/ray.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/ray.lua
index 2a03c3217..77daaf368 100644
--- a/luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/ray.lua
+++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/ray.lua
@@ -100,8 +100,8 @@ add_v2ray_depends(o)
 o = s:option(Flag, option_name("auth"), translate("Auth"))
 o.validate = function(self, value, t)
 	if value and value == "1" then
-		local user_v = s.fields["xray_username"]:formvalue(t) or ""
-		local pass_v = s.fields["xray_password"]:formvalue(t) or ""
+		local user_v = s.fields[option_name("username")]:formvalue(t) or ""
+		local pass_v = s.fields[option_name("password")]:formvalue(t) or ""
 		if user_v == "" or pass_v == "" then
 			return nil, translate("Username and Password must be used together!")
 		end
diff --git a/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua b/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
index 646645ade..70763fd23 100755
--- a/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
+++ b/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
@@ -234,7 +234,7 @@ do
 
 			for k, e in pairs(rules) do
 				local _node_id = node[e[".name"]] or nil
-				if _node_id and (_node_id:find("socks://") == 1 or _node_id:find("http://") == 1) then
+				if _node_id and api.parseURL(_node_id) then
 				else
 					CONFIG[#CONFIG + 1] = {
 						log = false,
diff --git a/luci-app-wechatpush/root/usr/share/wechatpush/wechatpush b/luci-app-wechatpush/root/usr/share/wechatpush/wechatpush
index 0f38d782d..0cb0cc6eb 100755
--- a/luci-app-wechatpush/root/usr/share/wechatpush/wechatpush
+++ b/luci-app-wechatpush/root/usr/share/wechatpush/wechatpush
@@ -160,7 +160,7 @@ function diy_send(){
 
 # 清理临时文件
 function deltemp(){
-	unset title	content ipAddress_logrow online_list online_mac mac_online_status gatewayinfo gateway_iplist
+	unset title	content ipAddress_logrow online_list online_mac mac_online_status gateway_iplist
 	rm -f ${dir}title ${dir}content ${dir}tmp_downlist ${dir}send_enable.lock ${tempjsonpath} ${dir}cookies.txt ${dir}tmp_sort_file >/dev/null 2>&1
 	[ ! -f ${dir}ipAddress ] && rm -f ${dir}client/* >/dev/null 2>&1
 	LockFile unlock
@@ -1756,4 +1756,4 @@ while [ "$enable" -eq "1" ]; do
 	done
 
 	sleep $sleeptime
-done
\ No newline at end of file
+done
diff --git a/sing-box/Makefile b/sing-box/Makefile
index 761f05298..e96429154 100644
--- a/sing-box/Makefile
+++ b/sing-box/Makefile
@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sing-box
-PKG_VERSION:=1.4.0
+PKG_VERSION:=1.4.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=ab6698545442e9197339f459553e241ff91396ba39a8e5d14e0a792e78d290a0
+PKG_HASH:=5b8a576639e24640b76f5ee175aa83a54bf9a68f3a6de1650c3067f0f0405e7d
 
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=LICENSE