From 4ede78bd7cd42eb8e60893053f7311412de2ac4a Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Wed, 27 Jul 2022 00:41:56 -0500
Subject: [PATCH] Woops wrong db field name for acct register

---
 scripts/server/account.js | 12 ++++++------
 scripts/server/bitflag.js | 37 +++++++++++++++++++++++++++++++++++--
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/scripts/server/account.js b/scripts/server/account.js
index 0f0c392f..43880047 100644
--- a/scripts/server/account.js
+++ b/scripts/server/account.js
@@ -78,7 +78,7 @@ class AccountData {
 			this.databaseId = dbAssoc["acct_id"];
 			this.name = dbAssoc["acct_name"];
 			this.password = dbAssoc["acct_pass"];
-			this.registerDate = dbAssoc["acct_when_made"];
+			this.registerDate = dbAssoc["acct_when_registered"];
 			this.flags = {
 				moderation: dbAssoc["acct_svr_mod_flags"],
 				admin: dbAssoc["acct_svr_staff_flags"],
@@ -1495,7 +1495,7 @@ function initClient(client) {
 						//	let iso = module.geoip.getCountryISO(getPlayerIP(client));
 						//	let localeId = getLocaleFromCountryISO(iso);
 						//}
-						//showGameMessage(client, getLocaleString(client, "LocaleOffer", `/lang ${getLocaleData(localeId)[2]}`), getColourByName("white"), 10000, "Roboto");
+						//showSmallGameMessage(client, getLocaleString(client, "LocaleOffer", `/lang ${getLocaleData(localeId)[2]}`), getColourByName("white"), 10000, "Roboto");
 					}
 					startLoginTimeoutForPlayer(client);
 					playRadioStreamForPlayer(client, getServerIntroMusicURL(), true, getPlayerStreamingRadioVolume(client));
@@ -1868,10 +1868,10 @@ function sendAccountTwoFactorAuthCode(emailAddress, name, twoFactorAuthCode) {
 
 function startLoginTimeoutForPlayer(client) {
 	getPlayerData(client).loginTimeout = setTimeout(function () {
-		//if (isPlayerLoggedIn(client) == false) {
-		getPlayerData(client).customDisconnectReason = "Kicked - Login timeout";
-		disconnectPlayer(client);
-		//}
+		if (isPlayerLoggedIn(client) == false) {
+			getPlayerData(client).customDisconnectReason = "Kicked - Login timeout";
+			disconnectPlayer(client);
+		}
 	}, getGlobalConfig().loginTimeout);
 }
 
diff --git a/scripts/server/bitflag.js b/scripts/server/bitflag.js
index fbe62cdb..e0635c77 100644
--- a/scripts/server/bitflag.js
+++ b/scripts/server/bitflag.js
@@ -104,6 +104,24 @@ let serverBitFlagKeys = {
 		"ManageRanks",
 		"Owner",
 	],
+	clanDiscordWebhookFlagKeys: [
+		"None",
+		"ClanName",
+		"ClanMOTD",
+		"ClanTag",
+		"ClanRankEdit",
+		"ClanRankSet",
+		"ClanVehicleEdit",
+		"ClanHouseEdit",
+		"ClanBusinessEdit",
+		"ClanNPCEdit",
+		"ClanMemberInvite",
+		"ClanMemberRemove",
+		"ClanMemberSuspend",
+		"ClanRankFlagSet",
+		"ClanTurfWar",
+		"ClanPointWar",
+	],
 	accountSettingsFlagKeys: [
 		"None",
 		"UseWhiteList",
@@ -247,13 +265,14 @@ let serverBitFlagKeys = {
 // ===========================================================================
 
 function initBitFlagScript() {
-	logToConsole(LOG_INFO, "[VRR.BitFlag]: Initializing bit flag script ...");
+	logToConsole(LOG_DEBUG, "[VRR.BitFlag]: Initializing bit flag script ...");
 	serverBitFlags.staffFlags = createBitFlagTable(serverBitFlagKeys.staffFlagKeys);
 	serverBitFlags.moderationFlags = createBitFlagTable(serverBitFlagKeys.moderationFlagKeys);
 	serverBitFlags.accountSettingsFlags = createBitFlagTable(serverBitFlagKeys.accountSettingsFlagKeys);
 	//serverBitFlags.subAccountSettingsFlags = createBitFlagTable(getServerData().subAccountSettingsFlagKeys);
 	serverBitFlags.clanFlags = createBitFlagTable(serverBitFlagKeys.clanFlagKeys);
-	serverBitFlags.clanTypeFlagKeys = createBitFlagTable(serverBitFlagKeys.clanTypeFlagKeys);
+	serverBitFlags.clanTypeFlags = createBitFlagTable(serverBitFlagKeys.clanTypeFlagKeys);
+	serverBitFlags.clanDiscordWebhookFlags = createBitFlagTable(serverBitFlagKeys.clanDiscordWebhookFlagKeys);
 	//serverBitFlags.factionFlags = createBitFlagTable(serverBitFlagKeys.factionFlagKeys);
 	serverBitFlags.npcTriggerTypes = createBitFlagTable(serverBitFlagKeys.npcTriggerTypeKeys);
 	serverBitFlags.npcTriggerConditionTypes = createBitFlagTable(serverBitFlagKeys.npcTriggerConditionTypeKeys);
@@ -410,6 +429,20 @@ function getModerationFlagValue(flagName) {
 
 // ===========================================================================
 
+function getClanDiscordWebhookValue(flagName) {
+	if (flagName == "All") {
+		return -1;
+	}
+
+	if (typeof serverBitFlags.clanDiscordWebhookFlags[flagName] == "undefined") {
+		return false;
+	}
+
+	return serverBitFlags.clanDiscordWebhookFlags[flagName];
+}
+
+// ===========================================================================
+
 function givePlayerStaffFlag(client, flagName) {
 	if (!getStaffFlagValue(flagName)) {
 		return false;