From 36a1cb5a1482bc514dc812a463ee32e7dcd410b7 Mon Sep 17 00:00:00 2001
From: VortrexFTW <adrianbram@gmail.com>
Date: Tue, 8 Sep 2020 22:02:35 -0500
Subject: [PATCH] Fix strings

---
 scripts/server/account.js |  4 ++--
 scripts/server/ban.js     | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/server/account.js b/scripts/server/account.js
index 61576039..0fe05b88 100644
--- a/scripts/server/account.js
+++ b/scripts/server/account.js
@@ -694,7 +694,7 @@ function saveClientToDatabase(client) {
 		return false;
 	}
 
-	console.log("[Asshat.Account]: Saving client " + String(client.name) + " to database ...");
+	console.log(`[Asshat.Account]: Saving client ${client.name} to database ...`);
 	saveAccountToDatabase(getClientData(client).accountData);
 	let subAccountData = getClientCurrentSubAccount(client);
 	
@@ -704,7 +704,7 @@ function saveClientToDatabase(client) {
 	}
 
 	saveSubAccountToDatabase(subAccountData);
-	console.log("[Asshat.Account]: Saved client " + String(client.name) + " to database successfully!");
+	console.log(`[Asshat.Account]: Saved client ${client.name} to database successfully!`);
 	return true;
 }
 
diff --git a/scripts/server/ban.js b/scripts/server/ban.js
index ee14957d..bba77cd9 100644
--- a/scripts/server/ban.js
+++ b/scripts/server/ban.js
@@ -61,7 +61,7 @@ function accountBanCommand(command, params, client, fromDiscord) {
         return false;
 	}
 
-	message("[#996600][ADMIN]: [#FFFFFF]" + getClientData(targetClient).accountData.name + " has been banned from the server (account ban).");
+	message(`[#996600][ADMIN]: [#FFFFFF]${getClientData(targetClient).accountData.name} has been banned from the server (account ban).`);
 	banAccount(getClientData(targetClient).accountData.databaseId, getClientData(client).accountData.databaseId, "");
 	targetClient.disconnect();	
 }
@@ -92,7 +92,7 @@ function subAccountBanCommand(command, params, client, fromDiscord) {
 		return false;
 	}
 
-	message("[#996600][ADMIN]: [#FFFFFF]" + getClientData(targetClient).currentSubAccountData.name + " has been banned from the server (character ban).");
+	message(`[#996600][ADMIN]: [#FFFFFF]${getClientData(targetClient).currentSubAccountData.name} has been banned from the server (character ban).`);
 	banSubAccount(getClientData(targetClient).currentSubAccountData.databaseId, getClientData(client).accountData.databaseId, "");
 }
 
@@ -116,7 +116,7 @@ function ipBanCommand(command, params, client, fromDiscord) {
 		return false;
 	}
 
-	message("[#996600][ADMIN]: [#FFFFFF]" + targetClient.name + " has been banned from the server (IP ban).");
+	message(`[#996600][ADMIN]: [#FFFFFF]vtargetClient.name} has been banned from the server (IP ban).`);
 	banIPAddress(targetClient.ip, getClientData(client).accountData.databaseId, "");	
 }
 
@@ -126,7 +126,7 @@ function banAccount(accountId, adminAccountId, reason) {
     let dbConnection = connectToDatabase();
     if(dbConnection) {
         let safeReason = dbConnection.escapeString(reason);
-        let dbQuery = dbConnection.query("INSERT INTO `ban_main` (`ban_type`, `ban_detail`, `ban_who_banned`, `ban_reason`) VALUES (" + banType.account + ", " + accountId + ", " + adminAccountId + ", '" + safeReason + "');");
+        let dbQuery = dbConnection.query(`INSERT INTO ban_main (ban_type, ban_detail, ban_who_banned, ban_reason) VALUES (${banType.account}, ${accountId}, ${adminAccountId}, '${safeReason}');`);
         dbQuery.free();
         dbConnection.close();
         return true;
@@ -141,7 +141,7 @@ function banSubAccount(subAccountId, adminAccountId, reason) {
     let dbConnection = connectToDatabase();
     if(dbConnection) {
         let safeReason = dbConnection.escapeString(reason);
-        let dbQuery = dbConnection.query("INSERT INTO `ban_main` (`ban_type`, `ban_detail`, `ban_who_banned`, `ban_reason`) VALUES (" + banType.subAccount + ", " + subAccountId + ", " + adminAccountId + ", '" + safeReason + "');");
+        let dbQuery = dbConnection.query(`INSERT INTO ban_main (ban_type, ban_detail, ban_who_banned, ban_reason) VALUES (${banType.subAccount}, ${subAccountId}, ${adminAccountId}, '${safeReason}');`);
         dbQuery.free();
         dbConnection.close();
         return true;
@@ -156,7 +156,7 @@ function banIPAddress(ipAddress, adminAccountId, reason) {
     let dbConnection = connectToDatabase();
     if(dbConnection) {
         let safeReason = dbConnection.escapeString(reason);
-        let dbQuery = dbConnection.query("INSERT INTO `ban_main` (`ban_type`, `ban_detail`, `ban_who_banned`, `ban_reason`) VALUES (" + banType.ipAddress + ", " + INET_ATON(ipAddress) + ", " + adminAccountId + ", '" + safeReason + "');");
+        let dbQuery = dbConnection.query(`INSERT INTO ban_main (ban_type, ban_detail, ban_who_banned, ban_reason) VALUES (${banType.ipAddress}, INET_ATON(${ipAddress}), ${adminAccountId}, '${safeReason}');`);
         dbQuery.free();
         dbConnection.close();
         return true;