From 78330aa4b1ad93b0ec138db7180d4511cee37a33 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 11 Mar 2022 02:47:59 -0600
Subject: [PATCH] Use normal chat for now

---
 scripts/client/chatbox.js   |  1 +
 scripts/client/event.js     |  7 ++++++
 scripts/server/chat.js      | 43 +++++++++++++++++++++----------------
 scripts/server/client.js    |  5 ++---
 scripts/server/messaging.js | 10 ++++++++-
 5 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/scripts/client/chatbox.js b/scripts/client/chatbox.js
index d74eb237..64e454f6 100644
--- a/scripts/client/chatbox.js
+++ b/scripts/client/chatbox.js
@@ -46,6 +46,7 @@ function unBindChatBoxKeys() {
 // ===========================================================================
 
 function receiveChatBoxMessageFromServer(messageString, colour) {
+    logToConsole(LOG_DEBUG, `[VRR.ChatBox]: Received chatbox message from server: ${messageString}`);
     let colouredString = replaceColoursInMessage(messageString);
 
     if(bottomMessageIndex >= chatBoxHistory.length-1) {
diff --git a/scripts/client/event.js b/scripts/client/event.js
index a281fa9d..2bc8a09d 100644
--- a/scripts/client/event.js
+++ b/scripts/client/event.js
@@ -224,4 +224,11 @@ function onLocalPlayerSwitchWeapon(oldWeapon, newWeapon) {
 function onCameraProcess(event) {
 }
 
+// ===========================================================================
+
+function onChatOutput(event, messageText, colour) {
+    //event.preventDefault();
+    //receiveChatBoxMessageFromServer(messageText, colour);
+}
+
 // ===========================================================================
\ No newline at end of file
diff --git a/scripts/server/chat.js b/scripts/server/chat.js
index 29678550..554dbeaa 100644
--- a/scripts/server/chat.js
+++ b/scripts/server/chat.js
@@ -16,28 +16,33 @@ function initChatScript() {
 // ===========================================================================
 
 function processPlayerChat(client, messageText) {
-    if(!getPlayerData(client)) {
-        messagePlayerError(client, "You need to login before you can chat!");
-        return false;
-    }
+	if(!isConsole(client)) {
+		if(!getPlayerData(client)) {
+			messagePlayerError(client, "You need to login before you can chat!");
+			return false;
+		}
 
-    if(!isPlayerLoggedIn(client)) {
-        messagePlayerError(client, "You need to login before you can chat!");
-        return false;
-    }
+		if(!isPlayerLoggedIn(client)) {
+			messagePlayerError(client, "You need to login before you can chat!");
+			return false;
+		}
 
-    if(!isPlayerSpawned(client)) {
-        messagePlayerError(client, "You need to spawn before you can chat!");
-        return false;
-    }
+		if(!isPlayerSpawned(client)) {
+			messagePlayerError(client, "You need to spawn before you can chat!");
+			return false;
+		}
 
-    if(isPlayerMuted(client)) {
-        messagePlayerError(client, "You are muted and can't chat!");
-        return false;
-    }
-
-    messageText = messageText.substring(0, 128);
+		if(isPlayerMuted(client)) {
+			messagePlayerError(client, "You are muted and can't chat!");
+			return false;
+		}
 
+		messageText = messageText.substring(0, 128);
+		messagePlayerNormal(null, `💬 ${getCharacterFullName(client)}: ${messageText}`);
+	} else {
+		messagePlayerNormal(null, `🛡️ (ADMIN) - ${messageText}`);
+	}
+	
     /*
     let clients = getClients();
 	for(let i in clients) {
@@ -48,7 +53,7 @@ function processPlayerChat(client, messageText) {
 		messagePlayerNormal(clients[i], `💬 ${getCharacterFullName(client)}: [#FFFFFF]${translatedText}${original}`, clients[i], getColourByName("mediumGrey"));
 	}
     */
-    messagePlayerNormal(null, `💬 ${getCharacterFullName(client)}: ${messageText}`);
+    
     //messageDiscordChatChannel(`💬 ${getCharacterFullName(client)}: ${messageText}`);
 }
 
diff --git a/scripts/server/client.js b/scripts/server/client.js
index ba41871d..5bd79c7c 100644
--- a/scripts/server/client.js
+++ b/scripts/server/client.js
@@ -520,9 +520,8 @@ function sendPlayerRemoveFromVehicle(client) {
 
 // ===========================================================================
 
-function sendChatBoxMessageToPlayer(client, message, colour) {
-    sendNetworkEventToPlayer("vrr.m", client, message, colour)
-    //messageClient(message, client, colour);
+function sendChatBoxMessageToPlayer(client, messageText, colour) {
+    messageClient(messageText, client, colour);
 }
 
 // ===========================================================================
diff --git a/scripts/server/messaging.js b/scripts/server/messaging.js
index c4d11285..e990d2be 100644
--- a/scripts/server/messaging.js
+++ b/scripts/server/messaging.js
@@ -37,7 +37,15 @@ function messagePlayerNormal(client, messageText, colour = COLOUR_WHITE) {
     //    logToConsole(LOG_INFO, `${removeColoursInMessage(messageText)}`);
     //}
 
-    sendChatBoxMessageToPlayer(client, messageText, colour);
+    messageText = replaceColoursInMessage(messageText);
+
+    if(client == null) {
+        message(messageText, colour);
+    } else {
+        messageClient(messageText, client, colour);
+    }
+
+    //sendChatBoxMessageToPlayer(client, messageText, colour);
     return true;
 }