From 98135f55c6228634b6d57c65ba3c3eacf3be4ec1 Mon Sep 17 00:00:00 2001
From: Aevann <randomname42029@gmail.com>
Date: Sat, 21 Jan 2023 13:44:22 +0200
Subject: [PATCH] more chat fixes

---
 files/assets/js/chat.js   | 9 +--------
 files/templates/chat.html | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/files/assets/js/chat.js b/files/assets/js/chat.js
index de381a38d..efbce8729 100644
--- a/files/assets/js/chat.js
+++ b/files/assets/js/chat.js
@@ -153,6 +153,7 @@ socket.on('catchup', function(json) {
 		if (existing) break
 		handle_message(message)
 	}
+	box.scrollTo(0, box.scrollHeight)
 })
 
 function send() {
@@ -323,11 +324,3 @@ document.onpaste = function(event) {
 		document.getElementById('filename').textContent = filename;
 	}
 }
-
-setTimeout(function () {
-	box.scrollTo(0, box.scrollHeight)
-}, 3000);
-
-setTimeout(function () {
-	box.scrollTo(0, box.scrollHeight)
-}, 5000);
diff --git a/files/templates/chat.html b/files/templates/chat.html
index 7a93fd145..9e6b9944f 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -39,7 +39,7 @@
 									</a>
 								</div>
 
-								<div class="chat-message text-black text-break"></div>
+								<span class="chat-message text-black text-break"></span>
 								<span class="text d-none"></span>
 								{% if v.admin_level > 1 %}
 									<i class="btn del fas fa-trash-alt"></i>