From 4c3cdcb68e8fec3969d2dec73714e1f11c1c749c Mon Sep 17 00:00:00 2001
From: Stan Grishin <stangri@melmac.ca>
Date: Wed, 6 Dec 2023 10:27:01 +0000
Subject: luci-app-adblock-fast: sync with principal package

* add support for smartdns ipset/nftset-based blocking

Signed-off-by: Stan Grishin <stangri@melmac.ca>
---
 .../resources/view/adblock-fast/overview.js        | 26 +++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast')

diff --git a/applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js b/applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js
index ae8a4f2a08..f34855a6f8 100644
--- a/applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js
+++ b/applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js
@@ -38,9 +38,12 @@ return view.extend({
 				ipset_installed: false,
 				nft_installed: false,
 				dnsmasq_installed: false,
-				unbound_installed: false,
 				dnsmasq_ipset_support: false,
 				dnsmasq_nftset_support: false,
+				smartdns_installed: false,
+				smartdns_ipset_support: false,
+				smartdns_nftset_support: false,
+				unbound_installed: false,
 				leds: [],
 			},
 		};
@@ -102,6 +105,21 @@ return view.extend({
 				_("Please note that %s is not supported on this system.").format(
 					"<i>smartdns.domainset</i>"
 				);
+		} else {
+			if (!reply.platform.smartdns_ipset_support) {
+				text +=
+					"<br />" +
+					_("Please note that %s is not supported on this system.").format(
+						"<i>smartdns.ipset</i>"
+					);
+			}
+			if (!reply.platform.smartdns_nftset_support) {
+				text +=
+					"<br />" +
+					_("Please note that %s is not supported on this system.").format(
+						"<i>smartdns.nftset</i>"
+					);
+			}
 		}
 		if (!reply.platform.unbound_installed) {
 			text =
@@ -132,6 +150,12 @@ return view.extend({
 		}
 		if (reply.platform.smartdns_installed) {
 			o.value("smartdns.domainset", _("smartdns domain set"));
+			if (reply.platform.smartdns_ipset_support) {
+				o.value("smartdns.ipset", _("smartdns ipset"));
+			}
+			if (reply.platform.smartdns_nftset_support) {
+				o.value("smartdns.nftset", _("smartdns nft set"));
+			}
 		}
 		if (reply.platform.unbound_installed) {
 			o.value("unbound.adb_list", _("unbound adblock list"));
-- 
cgit v1.2.3