From c05d39b4a46a9104414e02963e4621bcc541bca2 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@mcgalaxy.de>
Date: Mon, 11 Feb 2019 19:37:12 +0100
Subject: [PATCH] Improved update handling

---
 ChangeLog.md          |  4 ++++
 shared/html/index.php |  6 +++---
 shared/js/load.ts     | 44 ++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 7006ac09..0c96a933 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,10 +1,14 @@
 # Changelog:
+* **11.02.19**
+    - Added a detection to the loader to avoid cached files on updates
+    
 * **09.02.19**
     - Improved UI now using the material design framework based on bootstrap
     - Fixed several UI overflow or small screen issues
     - Improved permission editor performance
     - Added hash rate to identity improve
     - Merged CSS files in release mode
+    - Fixed overlapping avatars
     
 * **04.02.19**
     - Fixed channel permissions
diff --git a/shared/html/index.php b/shared/html/index.php
index 05e9dd2e..07c7c003 100644
--- a/shared/html/index.php
+++ b/shared/html/index.php
@@ -46,10 +46,10 @@
         <!-- PHP generated properties -->
         <x-properties id="properties">
 			<?php
-				function spawn_property($name, $value)
+				function spawn_property($name, $value, $element_id = null)
 				{
 				    if(isset($value))
-					    echo "\t\t\t<x-property key=\"" . $name . "\" value=\"" . urlencode($value) . "\"></x-property>\r\n";
+					    echo "\t\t\t<x-property key=\"" . $name . "\" " . (isset($element_id) ? "id=\"" . $element_id . "\" " : "") . "value=\"" . urlencode($value) . "\"></x-property>\r\n";
 				}
 
 				spawn_property('connect_default_host', $localhost ? "localhost" : "ts.TeaSpeak.de");
@@ -61,7 +61,7 @@
 				$version = file_get_contents("./version");
 				if ($version === false)
 				    $version = "unknown";
-				spawn_property("version", $version);
+				spawn_property("version", $version, "app_version");
 			?>
         </x-properties>
 
diff --git a/shared/js/load.ts b/shared/js/load.ts
index 5e55bfe6..bce7483e 100644
--- a/shared/js/load.ts
+++ b/shared/js/load.ts
@@ -53,6 +53,7 @@ namespace loader {
         DONE
     }
 
+    export let allow_cached_files: boolean = false;
     let current_stage: Stage = Stage.INITIALIZING;
     const tasks: {[key:number]:Task[]} = {};
 
@@ -204,7 +205,8 @@ namespace loader {
                 };
 
                 document.getElementById("scripts").appendChild(tag);
-                tag.src = path;
+
+                tag.src = path + (allow_cached_files ? "" : "?_ts=" + Date.now());
             });
         }
     }
@@ -309,7 +311,7 @@ namespace loader {
                 };
 
                 document.getElementById("style").appendChild(tag);
-                tag.href = path;
+                tag.href = path + (allow_cached_files ? "" : "?_ts=" + Date.now());
             });
         }
     }
@@ -642,7 +644,7 @@ const loader_style = {
 
 async function load_templates() {
     try {
-        const response = await $.ajax("templates.html");
+        const response = await $.ajax("templates.html" + (loader.allow_cached_files ? "" : "?_ts" + Date.now()));
 
         let node = document.createElement("html");
         node.innerHTML = response;
@@ -668,6 +670,37 @@ async function load_templates() {
     }
 }
 
+/* test if all files shall be load from cache or fetch again */
+async function check_updates() {
+    const app_version = (() => {
+        const version_node = document.getElementById("app_version");
+        if(!version_node) return undefined;
+
+        const version = version_node.hasAttribute("value") ? version_node.getAttribute("value") : undefined;
+        if(!version) return undefined;
+
+        if(version == "unknown" || version.replace("0", "").length == 0)
+            return undefined;
+
+        return version;
+    })();
+
+    if(!app_version) {
+        /* TODO add warning */
+        loader.allow_cached_files = false;
+        return;
+    }
+    const cached_version = localStorage.getItem("cached_version");
+    if(!cached_version || cached_version != app_version) {
+        loader.allow_cached_files = false;
+        /* loading screen */
+        return;
+    }
+
+    loader.allow_cached_files = true;
+    console.error(app_version);
+}
+
 interface Window {
     $: JQuery;
 }
@@ -780,6 +813,11 @@ loader.register_task(loader.Stage.INITIALIZING, {
     priority: 20
 });
 
+loader.register_task(loader.Stage.INITIALIZING, {
+    name: "update tester",
+    priority: 60,
+    function: check_updates
+});
 
 loader.register_task(loader.Stage.JAVASCRIPT, {
     name: "javascript",