From d768a347c9ffbc48f33f6ae880fede87eeaf14c1 Mon Sep 17 00:00:00 2001
From: gitea-action <git@cooluc.com>
Date: Mon, 24 Feb 2025 15:00:28 +0800
Subject: [PATCH] luci-app-nikki: sync upstream

last commit: https://github.com/nikkinikki-org/OpenWrt-nikki/commit/8db4e27cf1143383d52cbd61581cb5f914281d6d
---
 luci-app-nikki/Makefile                                     | 2 +-
 .../htdocs/luci-static/resources/view/nikki/app.js          | 4 ++--
 .../htdocs/luci-static/resources/view/nikki/proxy.js        | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/luci-app-nikki/Makefile b/luci-app-nikki/Makefile
index 54e974fbb..b6612d086 100644
--- a/luci-app-nikki/Makefile
+++ b/luci-app-nikki/Makefile
@@ -1,6 +1,6 @@
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=1.19.1
+PKG_VERSION:=1.19.2
 
 LUCI_TITLE:=LuCI Support for nikki
 LUCI_DEPENDS:=+luci-base +nikki
diff --git a/luci-app-nikki/htdocs/luci-static/resources/view/nikki/app.js b/luci-app-nikki/htdocs/luci-static/resources/view/nikki/app.js
index 277be6107..b480f2a58 100644
--- a/luci-app-nikki/htdocs/luci-static/resources/view/nikki/app.js
+++ b/luci-app-nikki/htdocs/luci-static/resources/view/nikki/app.js
@@ -28,8 +28,8 @@ return view.extend({
     },
     render: function (data) {
         const subscriptions = uci.sections('nikki', 'subscription');
-        const appVersion = data[1]?.app || '';
-        const coreVersion = data[1]?.core || '';
+        const appVersion = data[1].app ?? '';
+        const coreVersion = data[1].core ?? '';
         const running = data[2];
         const profiles = data[3];
 
diff --git a/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js b/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js
index 0c3bfd003..34f98f134 100644
--- a/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js
+++ b/luci-app-nikki/htdocs/luci-static/resources/view/nikki/proxy.js
@@ -77,7 +77,7 @@ return view.extend({
         for (const mac in hosts) {
             const host = hosts[mac];
             for (const ip of host.ipaddrs) {
-                const hint = host.name || mac;
+                const hint = host.name ?? mac;
                 o.value(ip, hint ? '%s (%s)'.format(ip, hint) : ip);
             };
         };
@@ -91,7 +91,7 @@ return view.extend({
         for (const mac in hosts) {
             const host = hosts[mac];
             for (const ip of host.ip6addrs) {
-                const hint = host.name || mac;
+                const hint = host.name ?? mac;
                 o.value(ip, hint ? '%s (%s)'.format(ip, hint) : ip);
             };
         };
@@ -104,7 +104,7 @@ return view.extend({
 
         for (const mac in hosts) {
             const host = hosts[mac];
-            const hint = host.name || host.ipaddrs[0];
+            const hint = host.name ?? host.ipaddrs[0];
             o.value(mac, hint ? '%s (%s)'.format(mac, hint) : mac);
         };