From d4d07f766a9cc618c52cf3071ec84f4807bb5d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Wed, 11 Oct 2023 22:04:29 +0200
Subject: [PATCH] Fix update logic for custom branches by comparing hashes
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/footer.js | 52 ++++++++++++++++++++++++------------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js
index 4fd4050a..65cb4f29 100644
--- a/scripts/pi-hole/js/footer.js
+++ b/scripts/pi-hole/js/footer.js
@@ -474,6 +474,7 @@ function updateVersionInfo() {
         remote: version.core.remote.version,
         branch: version.core.local.branch,
         hash: version.core.local.hash,
+        hash_remote: version.core.remote.hash,
         url: "https://github.com/pi-hole/pi-hole/releases",
       },
       {
@@ -482,6 +483,7 @@ function updateVersionInfo() {
         remote: version.ftl.remote.version,
         branch: version.ftl.local.branch,
         hash: version.ftl.local.hash,
+        hash_remote: version.ftl.remote.hash,
         url: "https://github.com/pi-hole/FTL/releases",
       },
       {
@@ -490,6 +492,7 @@ function updateVersionInfo() {
         remote: version.web.remote.version,
         branch: version.web.local.branch,
         hash: version.web.local.hash,
+        hash_remote: version.web.remote.hash,
         url: "https://github.com/pi-hole/web/releases",
       },
     ];
@@ -508,23 +511,38 @@ function updateVersionInfo() {
               '" rel="noopener" target="_blank">' +
               localVersion +
               "</a>";
-          } else localVersion = "vDev (" + v.branch + ", " + v.hash + ")";
-
-        if (versionCompare(v.local, v.remote) === -1) {
-          if (v.name === "Docker Tag") dockerUpdate = true;
-          else updateAvailable = true;
-          $("#versions").append(
-            "<li><strong>" +
-              v.name +
-              "</strong> " +
-              localVersion +
-              '&middot; <a class="lookatme" lookatme-text="Update available!" href="' +
-              v.url +
-              '" rel="noopener" target="_blank">Update available!</a></li>'
-          );
-        } else {
-          $("#versions").append("<li><strong>" + v.name + "</strong> " + localVersion + "</li>");
-        }
+            if (versionCompare(v.local, v.remote) === -1) {
+              // Update available
+                $("#versions").append(
+                  "<li><strong>" +
+                    v.name +
+                    "</strong> " +
+                    localVersion +
+                    '&middot; <a class="lookatme" lookatme-text="Update available!" href="' +
+                    v.url +
+                    '" rel="noopener" target="_blank">Update available!</a></li>'
+                );
+              } else {
+                $("#versions").append("<li><strong>" + v.name + "</strong> " + localVersion + "</li>");
+              }
+          } else {
+            // non-master branch
+            localVersion = "vDev (" + v.branch + ", " + v.hash + ")";
+            if (v.hash != v.hash_remote) {
+            // hash differ > Update available
+              $("#versions").append(
+                "<li><strong>" +
+                  v.name +
+                  "</strong> " +
+                  localVersion +
+                  '&middot; <a class="lookatme" lookatme-text="Update available!" href="' +
+                  v.url +
+                  '" rel="noopener" target="_blank">Update available!</a></li>'
+              );
+            } else {
+              $("#versions").append("<li><strong>" + v.name + "</strong> " + localVersion + "</li>");
+            }
+          }
       }
     });