Fix banner bug

marcelGoerentz · marcelGoerentz · commit f26f10a4c32d · 2024-08-19T23:02:55.000+02:00
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -61,4 +61,5 @@ jobs:
           push: true
           no-cache: true
           platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8
-          tags: mgoerentz/threadfin:${{  github.ref_name }}
+          tags: |
+            mgoerentz/threadfin:${{  github.ref_name }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -57,4 +57,6 @@ jobs:
           push: true
           no-cache: true
           platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8
-          tags: mgoerentz/threadfin:latest,mgoerentz/threadfin:${{  github.ref_name }}
+          tags: |
+            mgoerentz/threadfin:latest
+            mgoerentz/threadfin:${{  github.ref_name }}
diff --git a/html/index.html b/html/index.html
@@ -22,7 +22,6 @@
 <body onload="javascript: PageReady();">
 
   <div class="banner">
-    Neue Version verfügbar! Klicken Sie <a href="https://github.com/marcelGoerentz/Threadfin/releases/latest">hier</a>, um sie herunterzuladen.
   </div>
 
   <div id="loading" class="modal fade">
diff --git a/src/webUI.go b/src/webUI.go
diff --git a/src/webserver.go b/src/webserver.go
@@ -1188,7 +1188,7 @@ func setDefaultResponseData(response ResponseStruct, data bool) (defaults Respon
 	switch System.Branch {
 
 	case "master":
-		defaults.ClientInfo.Version =System.Version
+		defaults.ClientInfo.Version = System.Version
 
 	default:
 		defaults.ClientInfo.Version = fmt.Sprintf("%s (%s)", System.Version, System.Build)
diff --git a/threadfin.go b/threadfin.go
@@ -42,13 +42,13 @@ var GitHub = GitHubStruct{Branch: "Main", User: "marcelGoerentz", Repo: "Threadf
 const Name = "Threadfin"
 
 // Version : Version, die Build Nummer wird in der main func geparst.
-const Version = "1.3.0-beta"
+const Version = "1.3.1-beta"
 
 // DBVersion : Datanbank Version
 const DBVersion = "0.5.0"
 
 // APIVersion : API Version
-const APIVersion = "1.3.0-beta"
+const APIVersion = "1.3.1-beta"
 
 var homeDirectory = fmt.Sprintf("%s%s.%s%s", src.GetUserHomeDirectory(), string(os.PathSeparator), strings.ToLower(Name), string(os.PathSeparator))
 var samplePath = fmt.Sprintf("%spath%sto%sthreadfin%s", string(os.PathSeparator), string(os.PathSeparator), string(os.PathSeparator), string(os.PathSeparator))
diff --git a/ts/banner.ts b/ts/banner.ts
@@ -9,15 +9,30 @@ async function getNewestReleaseFromGithub() {
         }));
         // Get tag name
         var release_tag = releases[0]["tag_name"];
-        const regex = /[^\d]/gi;
-        // Create Number from tag name
-        const latest_version = Number(release_tag.replace(regex, ''));
-        const version_elemnt = document.getElementById('version') as HTMLInputElement;
-        const current_version = Number(version_elemnt.value.replace(regex, ''));
-        if (latest_version > current_version) {
-            bannerElement.style.display = 'block'; // Show Banner if newer version is available
+        const split = release_tag.split(".");
+        const release_major_version = split[0][1]
+        const release_minor_version = split[1]
+        const release_build_version = split[2]
+        const release_version = [release_major_version, release_minor_version, release_build_version]
+        let current_version = []
+        
+        if ('clientInfo' in SERVER) {
+            var current_version_string = SERVER["clientInfo"]["version"];
+            current_version.push(current_version_string.split(".")[0]);
+            current_version.push(current_version_string.split(".")[1][0]);
+            current_version.push(current_version_string.split("(")[1][0]);
+        }
+        if (current_version.length !== 0) {
+            for (let i = 0; i < 3; i++) {
+                if (release_version[i] > current_version[i]) {
+                    bannerElement.innerHTML = 'New Version available! Click <a href="https://github.com/marcelGoerentz/Threadfin/releases/latest">here</a> to download.';
+                    bannerElement.style.display = 'block'; // Show Banner if newer version is available
+                    break
+                } else if (release_version[i] < current_version[i]) {
+                    break
+                }
+            }
         }
-
     } else {
         console.log('Error fetching releases or no releases found.');
     }
