From 062730bfde2a8c69cbe3f65c4ad98cd6b5727dd3 Mon Sep 17 00:00:00 2001
From: actions <action@github.com>
Date: Thu, 18 Jan 2024 01:30:10 +0800
Subject: [PATCH] luci-app-passwall2: sync upstream

---
 luci-app-passwall2/Makefile                            |  2 +-
 luci-app-passwall2/luasrc/passwall2/util_sing-box.lua  |  2 +-
 luci-app-passwall2/luasrc/passwall2/util_xray.lua      |  2 +-
 .../luasrc/view/passwall2/global/status.htm            |  4 ++--
 .../luasrc/view/passwall2/node_list/link_add_node.htm  | 10 +++++-----
 luci-app-passwall2/po/zh-cn/passwall2.po               |  7 +++++--
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile
index a697e7f1d..3d19ccbca 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.23-3
+PKG_VERSION:=1.24-1
 PKG_RELEASE:=
 
 PKG_CONFIG_DEPENDS:= \
diff --git a/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua b/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua
index 7d504daef..9f4ff8325 100644
--- a/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua
+++ b/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua
@@ -1412,7 +1412,7 @@ function gen_config(var)
 			outbound = "dns-out"
 		})
 
-		local content = flag .. node_id .. jsonc.stringify(dns)
+		local content = flag .. node_id .. jsonc.stringify(route.rules)
 		if api.cacheFileCompareToLogic(CACHE_TEXT_FILE, content) == false then
 			--clear ipset/nftset
 			if direct_ipset then
diff --git a/luci-app-passwall2/luasrc/passwall2/util_xray.lua b/luci-app-passwall2/luasrc/passwall2/util_xray.lua
index d09a418fb..6188c7531 100644
--- a/luci-app-passwall2/luasrc/passwall2/util_xray.lua
+++ b/luci-app-passwall2/luasrc/passwall2/util_xray.lua
@@ -1271,7 +1271,7 @@ function gen_config(var)
 			dns.hosts = nil
 		end
 
-		local content = flag .. node_id .. jsonc.stringify(dns)
+		local content = flag .. node_id .. jsonc.stringify(routing.rules)
 		if api.cacheFileCompareToLogic(CACHE_TEXT_FILE, content) == false then
 			--clear ipset/nftset
 			if direct_ipset then
diff --git a/luci-app-passwall2/luasrc/view/passwall2/global/status.htm b/luci-app-passwall2/luasrc/view/passwall2/global/status.htm
index 008809926..58e2821e0 100644
--- a/luci-app-passwall2/luasrc/view/passwall2/global/status.htm
+++ b/luci-app-passwall2/luasrc/view/passwall2/global/status.htm
@@ -91,7 +91,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
 					</div>
 				</div>
 				<div class="pure-u-2-3">
-					<h4 id="status_node">Xray<br /><span class="red"><%:NOT RUNNING%></span></h4>
+					<h4 id="status_node">Core<br /><span class="red"><%:NOT RUNNING%></span></h4>
 				</div>
 			</div>
 		</div>
@@ -145,7 +145,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
 					if (true) {
 						var status_node = document.getElementById('status_node');
 						if (status_node) {
-							var text = 'Xray<br />';
+							var text = 'Core<br />';
 							if (data["global_status"])
 								text += '<span class="green"><%:RUNNING%></span>';
 							else
diff --git a/luci-app-passwall2/luasrc/view/passwall2/node_list/link_add_node.htm b/luci-app-passwall2/luasrc/view/passwall2/node_list/link_add_node.htm
index 7d1ec1d5f..c981748bd 100644
--- a/luci-app-passwall2/luasrc/view/passwall2/node_list/link_add_node.htm
+++ b/luci-app-passwall2/luasrc/view/passwall2/node_list/link_add_node.htm
@@ -48,9 +48,8 @@ local api = require "luci.passwall2.api"
 	function add_node() {
 		var nodes_link = document.getElementById("nodes_link").value;
 		if (nodes_link.trim() != "") {
-			var supports = "ss ssr vmess vless trojan hysteria";
-			var itype = nodes_link.split('://')[0];
-			if (itype.trim() != "" && supports.indexOf(itype) >= 0) {
+			var s = nodes_link.split('://');
+			if (s.length > 1) {
 				ajax_add_node(nodes_link);
 			}
 			else {
@@ -81,9 +80,10 @@ local api = require "luci.passwall2.api"
 
 <div id="add_link_div">
 	<div class="cbi-value">
-		<label class="cbi-value-title"><%:SS/SSR/Vmess/VLESS/Trojan/Hysteria Link%></label>
+		<label class="cbi-value-title"><%:Share Link%></label>
 		<div class="cbi-value-field">
-			<textarea id="nodes_link" rows="5" cols="50"></textarea>
+			<p><textarea id="nodes_link" rows="5" cols="50"></textarea></p>
+			<font color="red"><%:Not a subscription link!!!%></font>
 		</div>
 	</div>
 	<div class="cbi-value">
diff --git a/luci-app-passwall2/po/zh-cn/passwall2.po b/luci-app-passwall2/po/zh-cn/passwall2.po
index b46156a1f..dc76388d9 100644
--- a/luci-app-passwall2/po/zh-cn/passwall2.po
+++ b/luci-app-passwall2/po/zh-cn/passwall2.po
@@ -256,8 +256,11 @@ msgstr "添加节点"
 msgid "Add the node via the link"
 msgstr "通过链接添加节点"
 
-msgid "SS/SSR/Vmess/VLESS/Trojan/Hysteria Link"
-msgstr "SS/SSR/Vmess/VLESS/Trojan/Hysteria 链接"
+msgid "Share Link"
+msgstr "分享链接"
+
+msgid "Not a subscription link!!!"
+msgstr "不是订阅链接！！！"
 
 msgid "Please enter the correct link."
 msgstr "请输入正确的链接。"