From b75ec4530cf74eb523f75208751bc40bc689e061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Thu, 1 Sep 2022 09:03:15 +0200
Subject: [PATCH 1/2] Add interpretation for Pi-hole message type ADLIST
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 scripts/pi-hole/js/groups-adlists.js | 25 +++++++++++++++++++++++++
 scripts/pi-hole/js/messages.js       | 13 +++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/scripts/pi-hole/js/groups-adlists.js b/scripts/pi-hole/js/groups-adlists.js
index 452c6aedf..e8e9cb2c5 100644
--- a/scripts/pi-hole/js/groups-adlists.js
+++ b/scripts/pi-hole/js/groups-adlists.js
@@ -10,6 +10,7 @@
 var table;
 var groups = [];
 var token = $("#token").text();
+var GETDict = {};
 
 function getGroups() {
   $.post(
@@ -24,6 +25,13 @@ function getGroups() {
 }
 
 $(function () {
+  window.location.search
+    .substr(1)
+    .split("&")
+    .forEach(function (item) {
+      GETDict[item.split("=")[0]] = item.split("=")[1];
+    });
+
   $("#btnAdd").on("click", addAdlist);
 
   utils.setBsSelectDefaults();
@@ -289,6 +297,11 @@ function initTable() {
 
       var applyBtn = "#btn_apply_" + data.id;
 
+      // Highlight row (if url parameter "adlistid=" is used)
+      if ("adlistid" in GETDict && data.id === parseInt(GETDict.adlistid, 10)) {
+        $(row).find("td").addClass("highlight");
+      }
+
       var button =
         '<button type="button" class="btn btn-danger btn-xs" id="deleteAdlist_' +
         data.id +
@@ -371,6 +384,18 @@ function initTable() {
       // Apply loaded state to table
       return data;
     },
+    initComplete: function () {
+      if ("adlistid" in GETDict) {
+        var pos = table
+          .column(0, { order: "current" })
+          .data()
+          .indexOf(parseInt(GETDict.adlistid, 10));
+        if (pos >= 0) {
+          var page = Math.floor(pos / table.page.info().length);
+          table.page(page).draw(false);
+        }
+      }
+    },
   });
 
   table.on("init select deselect", function () {
diff --git a/scripts/pi-hole/js/messages.js b/scripts/pi-hole/js/messages.js
index b3d8827a6..b0d99afe7 100644
--- a/scripts/pi-hole/js/messages.js
+++ b/scripts/pi-hole/js/messages.js
@@ -126,6 +126,19 @@ function renderMessage(data, type, row) {
         "</pre>"
       );
 
+    case "ADLIST":
+      return (
+        '<a href="groups-adlists.php?adlistid=' +
+        row.blob1 +
+        '">' +
+        "Adlist with ID " +
+        parseInt(row.blob1, 10) +
+        "</a> was inaccessible during last gravity run." +
+        "<pre>" +
+        utils.escapeHtml(row.message) +
+        "</pre>"
+      );
+
     default:
       return "Unknown message type<pre>" + JSON.stringify(row) + "</pre>";
   }

From dff293902a64b4593677349f1fdd0a8d9e6c6b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Thu, 8 Sep 2022 11:31:15 +0200
Subject: [PATCH 2/2] Guard database data
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 scripts/pi-hole/js/messages.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/messages.js b/scripts/pi-hole/js/messages.js
index b0d99afe7..a480d550c 100644
--- a/scripts/pi-hole/js/messages.js
+++ b/scripts/pi-hole/js/messages.js
@@ -129,7 +129,7 @@ function renderMessage(data, type, row) {
     case "ADLIST":
       return (
         '<a href="groups-adlists.php?adlistid=' +
-        row.blob1 +
+        parseInt(row.blob1, 10) +
         '">' +
         "Adlist with ID " +
         parseInt(row.blob1, 10) +