From f1b1449909f318b606e4977bf0ba36e8a2f7f7f9 Mon Sep 17 00:00:00 2001
From: NoobishSVK <ardoniceksvk@gmail.com>
Date: Mon, 4 Mar 2024 22:59:51 +0100
Subject: [PATCH] bugfixes

---
 datahandler.js     | 2 +-
 index.js           | 7 ++++++-
 web/index.ejs      | 2 +-
 web/js/chat.js     | 7 ++++++-
 web/js/main.js     | 1 +
 web/js/settings.js | 8 +++++++-
 6 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/datahandler.js b/datahandler.js
index d989dcb..1358902 100644
--- a/datahandler.js
+++ b/datahandler.js
@@ -412,5 +412,5 @@ function showOnlineUsers(currentUsers) {
 }
 
 module.exports = {
-  handleData, showOnlineUsers, dataToSend, initialData
+  handleData, showOnlineUsers, dataToSend, initialData, resetToDefault
 };
diff --git a/index.js b/index.js
index e1a6e8c..faa697a 100644
--- a/index.js
+++ b/index.js
@@ -533,10 +533,14 @@ wss.on('connection', (ws, request) => {
       return;
     }
 
+    if(command.includes('\'')) {
+      return;
+    }
+
     if(command.startsWith('T')) {
       let tuneFreq = Number(command.slice(1)) / 1000;
       
-      if(serverConfig.webserver.tuningLimit === true && (tuneFreq < serverConfig.webserver.tuningLowerLimit || tuneFreq > serverConfig.webserver.tuningUpperLimit)) {
+      if(serverConfig.webserver.tuningLimit === true && (tuneFreq < serverConfig.webserver.tuningLowerLimit || tuneFreq > serverConfig.webserver.tuningUpperLimit) || isNaN(tuneFreq)) {
         return;
       }
     }
@@ -569,6 +573,7 @@ wss.on('connection', (ws, request) => {
       setTimeout(function() {
         if(currentUsers === 0) {
           client.write('T' + Math.round(serverConfig.defaultFreq * 1000) +'\n');
+          dataHandler.resetToDefault();
           dataHandler.dataToSend.freq = Number(serverConfig.defaultFreq).toFixed(3);
         }
       }, 10000)
diff --git a/web/index.ejs b/web/index.ejs
index 03b3d50..815c409 100644
--- a/web/index.ejs
+++ b/web/index.ejs
@@ -145,7 +145,7 @@
                     
                     <div class="panel-33 flex-container flex-phone" id="tune-buttons">
                         <button id="freq-down" aria-label="Tune down by 100 KHz"><i class="fa-solid fa-chevron-left"></i></button>
-                        <input type="text" id="commandinput" inputmode="numeric" placeholder="Frequency" aria-label="Current frequency: ">
+                        <input type="text" id="commandinput" inputmode="numeric" placeholder="Frequency" autocomplete="off" aria-label="Current frequency: ">
                         <button id="freq-up" aria-label="Tune up by 100 KHz"><i class="fa-solid fa-chevron-right"></i></button>
                     </div>
                     
diff --git a/web/js/chat.js b/web/js/chat.js
index 755b1d3..3db3085 100644
--- a/web/js/chat.js
+++ b/web/js/chat.js
@@ -27,7 +27,9 @@ $(document).ready(function() {
       messages.append(chatMessage);
   
       if($('#chat-chatbox').is(':visible')) { 
+        setTimeout(function() {
           $('#chat-chatbox').scrollTop($('#chat-chatbox')[0].scrollHeight);
+        }, 100)
       } else {
           if(messageData.history !== true) {
               chatMessageCount++;
@@ -50,11 +52,14 @@ $(document).ready(function() {
   });
 
   $('.chatbutton').click(function() {
-    $('#chat-chatbox').scrollTop($('#chat-chatbox')[0].scrollHeight);
     chatMessageCount = 0;
     $('.chat-messages-count').text(chatMessageCount);
     $('.chatbutton').removeClass('bg-color-4').addClass('bg-color-2');
     $('#chat-send-message').focus();
+
+    setTimeout(function() {
+      $('#chat-chatbox').scrollTop($('#chat-chatbox')[0].scrollHeight);
+    }, 100)
   });
 
   $('#chat-nickname').keypress(function(event) {
diff --git a/web/js/main.js b/web/js/main.js
index 165fd74..16c5197 100644
--- a/web/js/main.js
+++ b/web/js/main.js
@@ -366,6 +366,7 @@ function checkKey(e) {
         return; 
     }
 
+    $('#volumeSlider').blur();
     getCurrentFreq();
 
     if (socket.readyState === WebSocket.OPEN) {
diff --git a/web/js/settings.js b/web/js/settings.js
index a2bef41..d9aa3b3 100644
--- a/web/js/settings.js
+++ b/web/js/settings.js
@@ -1,4 +1,10 @@
-    var currentVersion = 'v1.1.2 [3.3.2024]';
+var currentDate = new Date('March 4, 2024 22:00:00');
+var day = currentDate.getDate();
+var month = currentDate.getMonth() + 1; // Months are zero-indexed, so add 1
+var year = currentDate.getFullYear();
+var formattedDate = day + '/' + month + '/' + year;
+var currentVersion = 'v1.1.2a [' + formattedDate + ']';
+
     
     /**
     * Themes