From bc743fc1698aeea4946255798f26230971bdc908 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Fri, 26 Aug 2022 21:47:40 +0200
Subject: [PATCH] try now

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

diff --git a/files/assets/js/chat.js b/files/assets/js/chat.js
index d0de235a0..ad06123ab 100644
--- a/files/assets/js/chat.js
+++ b/files/assets/js/chat.js
@@ -68,8 +68,6 @@ socket.on('speak', function(json) {
 	let users = document.getElementsByClassName('userlink');
 	let last_user = users[users.length-1].innerHTML;
 
-	let scrolled_down = (box.scrollHeight - box.scrollTop <= window.innerHeight)
-
 	if (last_user == json['username']) {
 		document.getElementsByClassName('chat-line')[0].classList.remove('diff')
 		document.getElementsByClassName('userlink')[0].classList.add('d-none')
@@ -93,14 +91,9 @@ socket.on('speak', function(json) {
 	let line = document.getElementsByClassName('chat-line')[0].cloneNode(true)
 	bs_trigger(line)
 	box.append(line)
-	if (scrolled_down) box.scrollTo(0, box.scrollHeight)
+	box.scrollTo(0, box.scrollHeight)
 })
 
-function scroll_chat() {
-    setTimeout(function () {
-		box.scrollTo(0, box.scrollHeight)
-    }, 0200);
-}
 
 function send() {
 	text = textbox.value.trim()
@@ -112,8 +105,6 @@ function send() {
 		socket.emit('typing', false);
 	}
 	autoExpand(textbox);
-	box.scrollTo(0, box.scrollHeight);
-	scroll_chat();
 }
 
 function quote(t) {
@@ -130,8 +121,6 @@ textbox.addEventListener("keyup", function(e) {
 	if (e.key === 'Enter') {
 		e.preventDefault();
 		send();
-		box.scrollTo(0, box.scrollHeight);
-		scroll_chat();
 	}
 })
 
@@ -189,6 +178,10 @@ socket.on('typing', function (users){
 	}
 })
 
-scroll_chat()
+function scroll_chat() {
+    setTimeout(function () {
+		box.scrollTo(0, box.scrollHeight)
+    }, 200);
+}
 
 box.scrollTo(0, box.scrollHeight)
\ No newline at end of file
diff --git a/files/templates/chat.html b/files/templates/chat.html
index d95e4c260..9deca60fb 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -214,6 +214,6 @@
 <script src="{{asset('js/lozad.js')}}"></script>
 <script src="/assets/js/lite-youtube.js?v=241"></script>
 
-<script src="/chat.js?v=3038"></script>
+<script src="/chat.js?v=3039"></script>
 
 </body>
\ No newline at end of file