From 48f80afb0d474421fb4d5625d86eabade30fc65f Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 28 Jun 2021 16:30:46 -0500
Subject: [PATCH] Replace AG references with server name str replace

---
 config/email.json            | 12 ++++++------
 scripts/server/account.js    |  6 +++---
 scripts/server/subaccount.js |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/email.json b/config/email.json
index 6c56eeb2..95211284 100644
--- a/config/email.json
+++ b/config/email.json
@@ -10,11 +10,11 @@
         "useTLS":"true"
     },
     "bodyContent": {
-		"confirmEmail": "Welcome to Asshat Gaming Roleplay for GTA Connected!\nPlease confirm your email by using the command /verifyemail in-game.\n\nYour verification code is: {VERIFICATIONCODE}",
-		"emailConfirmed": "Your email has been confirmed on Asshat Gaming Roleplay for GTA Connected!\nYou may now use this email to reset your password, require two-factor authentication on login, receive offline notifications, and more!",
-		"twoFactorAuthentication": "Please enter the following code to continue on Asshat Gaming's roleplay server for {GAMENAME}: {2FACODE}",
-		"accountAuthSuccessAlert": "You or someone else has successfully logged in to your account on the Asshat Gaming roleplay server for {GAMENAME}.\nIP Address: {IPADDRESS}\nLocation: {LOCATION}\nTimestamp: {TIMESTAMP}",
-		"accountAuthFailAlert": "You or someone else has failed to login to your account on the Asshat Gaming roleplay server for {GAMENAME}.\nIP Address: {IPADDRESS}\nLocation: {LOCATION}\nTimestamp: {TIMESTAMP}",
-		"offlineMessageAlert": "You have received a private message on the Asshat Gaming roleplay server for {GAMENAME}. You are receiving this notification because you enabled message notifications via email when you're not connected to the server.\nFrom: {FROMNAME}\nTimestamp: {TIMESTAMP}\nMessage: {MESSAGE}"
+		"confirmEmail": "Welcome to {SERVERNAME}!\nPlease confirm your email by using the command /verifyemail in-game.\n\nYour verification code is: {VERIFICATIONCODE}",
+		"emailConfirmed": "Your email has been confirmed on {SERVERNAME}!\nYou may now use this email to reset your password, require two-factor authentication on login, receive offline notifications, and more!",
+		"twoFactorAuthentication": "Please enter the following code to continue on {SERVERNAME} for {GAMENAME}: {2FACODE}",
+		"accountAuthSuccessAlert": "You or someone else has successfully logged in to your account on {SERVERNAME} for {GAMENAME}.\nIP Address: {IPADDRESS}\nLocation: {LOCATION}\nTimestamp: {TIMESTAMP}",
+		"accountAuthFailAlert": "You or someone else has failed to login to your account on {SERVERNAME} for {GAMENAME}.\nIP Address: {IPADDRESS}\nLocation: {LOCATION}\nTimestamp: {TIMESTAMP}",
+		"offlineMessageAlert": "You have received a private message on {SERVERNAME} for {GAMENAME}. You are receiving this notification because you enabled message notifications via email when you're not connected to the server.\nFrom: {FROMNAME}\nTimestamp: {TIMESTAMP}\nMessage: {MESSAGE}"
     }
 }
\ No newline at end of file
diff --git a/scripts/server/account.js b/scripts/server/account.js
index f463633d..3bedd3ba 100644
--- a/scripts/server/account.js
+++ b/scripts/server/account.js
@@ -80,7 +80,7 @@ function toggleAccountGUICommand(command, params, client) {
 				showPlayerLoginGUI(client);
 				logToConsole(LOG_DEBUG, `[VRR.Account] ${getPlayerDisplayForConsole(client)} is being shown the login GUI`);
 			} else {
-				messagePlayerNormal(client, `👋 Welcome back to Asshat Gaming RP, ${getPlayerName(client)}! Please /login to continue.`, getColourByName("softGreen"));
+				messagePlayerNormal(client, `👋 Welcome back to ${getServerName()}, ${getPlayerName(client)}! Please /login to continue.`, getColourByName("softGreen"));
 				logToConsole(LOG_DEBUG, `[VRR.Account] ${getPlayerDisplayForConsole(client)} is being shown the login message (GUI disabled)`);
 			}
 		} else {
@@ -88,7 +88,7 @@ function toggleAccountGUICommand(command, params, client) {
 				showPlayerRegistrationGUI(client);
 				logToConsole(LOG_DEBUG, `[VRR.Account] ${getPlayerDisplayForConsole(client)} is being shown the register GUI`);
 			} else {
-				messagePlayerNormal(client, `👋 Welcome to Asshat Gaming RP, ${getPlayerName(client)}! Please /register to continue.`, getColourByName("softGreen"));
+				messagePlayerNormal(client, `👋 Welcome to ${getServerName()}, ${getPlayerName(client)}! Please /register to continue.`, getColourByName("softGreen"));
 				logToConsole(LOG_DEBUG, `[VRR.Account] ${getPlayerDisplayForConsole(client)} is being shown the register message (GUI disabled)`);
 			}
 		}
@@ -802,7 +802,7 @@ function checkRegistration(client, password, confirmPassword = "", emailAddress
 			messagePlayerAlert(client, "Your account could not be created!");
 		}
 
-		messagePlayerAlert(client, "Asshat Gaming staff have been notified of the problem and will fix it shortly.");
+		messagePlayerAlert(client, `${getServerName()} staff have been notified of the problem and will fix it shortly.`);
 		return false;
 	}
 
diff --git a/scripts/server/subaccount.js b/scripts/server/subaccount.js
index 7ab0a9d0..3f680d24 100644
--- a/scripts/server/subaccount.js
+++ b/scripts/server/subaccount.js
@@ -267,7 +267,7 @@ function checkNewCharacter(client, firstName, lastName) {
 		} else {
 			messagePlayerAlert(client, "Your character could not be created!");
 		}
-		messagePlayerAlert(client, "Asshat Gaming staff have been notified of the problem and will fix it shortly.");
+		messagePlayerAlert(client, `${getServerName()} staff have been notified of the problem and will fix it shortly.`);
 		return false;
 	}