From 0521e2863537d7750655ef5c22d273305ca14319 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 5 Apr 2022 06:20:16 -0500
Subject: [PATCH] Discord webhooks

---
 scripts/server/account.js |  2 +-
 scripts/server/chat.js    |  1 +
 scripts/server/discord.js | 38 ++++++++++----------------------------
 3 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/scripts/server/account.js b/scripts/server/account.js
index d0130eb3..571fbc9c 100644
--- a/scripts/server/account.js
+++ b/scripts/server/account.js
@@ -621,8 +621,8 @@ function loginSuccess(client) {
 	getPlayerData(client).accountData.ipAddress = client.ip;
 
 	sendPlayerChatScrollLines(client, getPlayerData(client).accountData.chatScrollLines);
-
 	messagePlayerNormal(null, `👋 ${getPlayerName(client)} has joined the server`, getColourByName("softYellow"));
+	messageDiscordChatChannel(`👋 ${getPlayerName(client)} has joined the server`);
 }
 
 // ===========================================================================
diff --git a/scripts/server/chat.js b/scripts/server/chat.js
index 171775f9..cc06b70b 100644
--- a/scripts/server/chat.js
+++ b/scripts/server/chat.js
@@ -39,6 +39,7 @@ function processPlayerChat(client, messageText) {
 
 		messageText = messageText.substring(0, 128);
 		messagePlayerNormal(null, `💬 ${getCharacterFullName(client)}: ${messageText}`);
+		messageDiscordChatChannel(`💬 ${getCharacterFullName(client)}: ${messageText}`);
 	} else {
 		messagePlayerNormal(null, `🛡️ (ADMIN) - ${messageText}`);
 	}
diff --git a/scripts/server/discord.js b/scripts/server/discord.js
index f6116d3d..53aa1cb9 100644
--- a/scripts/server/discord.js
+++ b/scripts/server/discord.js
@@ -88,53 +88,35 @@ function getDiscordUserData(discordUserId) {
 
 // ===========================================================================
 
-function messageDiscordChatChannel(message) {
+function messageDiscordChatChannel(messageString) {
 	if(!getServerConfig().discordConfig.sendChat) {
 		return false;
 	}
 
-	message = removeColoursInMessage(message);
-	console.warn(message);
-	let payloadData = {
-		"username": "Chat",
-		"content": message,
-	};
-
-	triggerWebHook(getServerConfig().discordConfig.chatChannelWebHookURL, JSON.stringify(payloadData));
+	messageString = removeColoursInMessage(messageString);
+	triggerWebHook(getServerConfig().discord.logWebHookURL, JSON.stringify(messageString));
 }
 
 // ===========================================================================
 
-function messageDiscordAdminChannel(message) {
-	if(!getServerConfig().discordConfig.sendAdminEvents) {
+function messageDiscordAdminChannel(messageString) {
+	if(!getServerConfig().discordConfig.sendAdmin) {
 		return false;
 	}
 
-	message = removeColoursInMessage(message);
-	console.warn(message);
-	let payloadData = {
-		"username": "Admin Event",
-		"content": message,
-	};
-
-	triggerWebHook(getServerConfig().discordConfig.adminChannelWebHookURL, JSON.stringify(payloadData));
+	messageString = removeColoursInMessage(messageString);
+	triggerWebHook(getServerConfig().discord.adminWebHookURL, JSON.stringify(messageString));
 }
 
 // ===========================================================================
 
-function messageDiscordEventChannel(message) {
+function messageDiscordEventChannel(messageString) {
 	if(!getServerConfig().discordConfig.sendEvents) {
 		return false;
 	}
 
-	message = removeColoursInMessage(message);
-	console.warn(message);
-	let payloadData = {
-		"username": "Event",
-		"content": message,
-	};
-
-	triggerWebHook(getServerConfig().discordConfig.eventChannelWebHookURL, JSON.stringify(payloadData));
+	messageString = removeColoursInMessage(messageString);
+	triggerWebHook(getServerConfig().discord.logWebHookURL, JSON.stringify(messageString));
 }
 
 // ===========================================================================
\ No newline at end of file