From cd255dd7ce923ecd6db188a6472a780402f38efa Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sun, 10 Apr 2022 00:00:21 -0500
Subject: [PATCH] Fix discord webhooks

---
 scripts/server/discord.js | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/scripts/server/discord.js b/scripts/server/discord.js
index e2d97bc4..9e492b5f 100644
--- a/scripts/server/discord.js
+++ b/scripts/server/discord.js
@@ -89,34 +89,46 @@ function getDiscordUserData(discordUserId) {
 // ===========================================================================
 
 function messageDiscordChatChannel(messageString) {
+	if(getServerConfig().devServer) {
+		return false;
+	}
+
 	if(!getServerConfig().discord.sendChat) {
 		return false;
 	}
 
 	messageString = removeColoursInMessage(messageString);
-	triggerWebHook(encodeURI(getServerConfig().discord.logChannelWebhookURL), encodeURI(messageString));
-}
-
-// ===========================================================================
-
-function messageDiscordAdminChannel(messageString) {
-	if(!getServerConfig().discord.sendAdmin) {
-		return false;
-	}
-
-	messageString = removeColoursInMessage(messageString);
-	triggerWebHook(encodeURI(getServerConfig().discord.adminChannelWebhookURL), encodeURI(messageString));
+	triggerWebHook(messageString, getServerId(), VRR_DISCORD_WEBHOOK_LOG);
 }
 
 // ===========================================================================
 
 function messageDiscordEventChannel(messageString) {
+	if(getServerConfig().devServer) {
+		return false;
+	}
+
 	if(!getServerConfig().discord.sendEvents) {
 		return false;
 	}
 
 	messageString = removeColoursInMessage(messageString);
-	triggerWebHook(encodeURI(getServerConfig().discord.logChannelWebhookURL), encodeURI(messageString));
+	triggerWebHook(messageString, getServerId(), VRR_DISCORD_WEBHOOK_LOG);
+}
+
+// ===========================================================================
+
+function messageDiscordAdminChannel(messageString) {
+	if(getServerConfig().devServer) {
+		return false;
+	}
+
+	if(!getServerConfig().discord.sendAdmin) {
+		return false;
+	}
+
+	messageString = removeColoursInMessage(messageString);
+	triggerWebHook(messageString, getServerId(), VRR_DISCORD_WEBHOOK_ADMIN);
 }
 
 // ===========================================================================
\ No newline at end of file