hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added partial acct loading for quick data grab

Browse Source
This commit is contained in:
Vortrex
2020-12-16 07:53:45 -06:00
parent cecabc7b65
commit f22a8dc288
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/server/account.js
View File

@@ -174,7 +174,7 @@ function isAccountPasswordCorrect(accountData, password) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function loadAccountFromName(accountName) { function loadAccountFromName(accountName, fullLoad = false) {
let dbConnection = connectToDatabase(); let dbConnection = connectToDatabase();
if(dbConnection) { if(dbConnection) {
accountName = escapeDatabaseString(dbConnection, accountName); accountName = escapeDatabaseString(dbConnection, accountName);
@@ -184,12 +184,14 @@ function loadAccountFromName(accountName) {
if(dbQuery.numRows > 0) { if(dbQuery.numRows > 0) {
let dbAssoc = fetchQueryAssoc(dbQuery); let dbAssoc = fetchQueryAssoc(dbQuery);
let tempAccountData = new serverClasses.accountData(dbAssoc); let tempAccountData = new serverClasses.accountData(dbAssoc);
tempAccountData.keyBinds = loadAccountKeybindsFromDatabase(tempAccountData.databaseId);
tempAccountData.messages = loadAccountMessagesFromDatabase(tempAccountData.databaseId);
tempAccountData.notes = loadAccountStaffNotesFromDatabase(tempAccountData.databaseId);
tempAccountData.contacts = loadAccountContactsFromDatabase(tempAccountData.databaseId);
freeDatabaseQuery(dbQuery); freeDatabaseQuery(dbQuery);
if(fullLoad) {
tempAccountData.keyBinds = loadAccountKeybindsFromDatabase(tempAccountData.databaseId);
tempAccountData.messages = loadAccountMessagesFromDatabase(tempAccountData.databaseId);
tempAccountData.notes = loadAccountStaffNotesFromDatabase(tempAccountData.databaseId);
tempAccountData.contacts = loadAccountContactsFromDatabase(tempAccountData.databaseId);
}
return tempAccountData; return tempAccountData;
} }
} }
@@ -201,15 +203,23 @@ function loadAccountFromName(accountName) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function loadAccountFromId(accountId) { function loadAccountFromId(accountId, fullLoad = false) {
let dbConnection = connectToDatabase(); let dbConnection = connectToDatabase();
if(dbConnection) { if(dbConnection) {
let dbQueryString = `SELECT * FROM acct_main WHERE acct_id = ${accountId} LIMIT 1;`; let dbQueryString = `SELECT * FROM acct_main WHERE acct_id = ${accountId} LIMIT 1;`;
let dbQuery = queryDatabase(dbConnection, dbQueryString); let dbQuery = queryDatabase(dbConnection, dbQueryString);
if(dbQuery) { if(dbQuery) {
let dbAssoc = fetchQueryAssoc(dbQuery); let dbAssoc = fetchQueryAssoc(dbQuery);
let tempAccountData = new serverClasses.accountData(dbAssoc);
freeDatabaseQuery(dbQuery); freeDatabaseQuery(dbQuery);
return new serverClasses.accountData(dbAssoc); if(fullLoad) {
tempAccountData.keyBinds = loadAccountKeybindsFromDatabase(tempAccountData.databaseId);
tempAccountData.messages = loadAccountMessagesFromDatabase(tempAccountData.databaseId);
tempAccountData.notes = loadAccountStaffNotesFromDatabase(tempAccountData.databaseId);
tempAccountData.contacts = loadAccountContactsFromDatabase(tempAccountData.databaseId);
}
return tempAccountData;
} }
disconnectFromDatabase(dbConnection); disconnectFromDatabase(dbConnection);
} }
@@ -259,7 +269,7 @@ function getAccountHashingFunction() {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function isNameRegistered(name) { function isNameRegistered(name) {
let accountData = loadAccountFromName(name); let accountData = loadAccountFromName(name, true);
if(accountData.databaseId > 0) { if(accountData.databaseId > 0) {
return true; return true;
} }
@@ -555,7 +565,7 @@ function initClient(client) {
setEntityData(client, "ag.session", sessionId, false); setEntityData(client, "ag.session", sessionId, false);
clearChatBox(client); clearChatBox(client);
let tempAccountData = loadAccountFromName(client.name); let tempAccountData = loadAccountFromName(client.name, true);
let tempSubAccounts = loadSubAccountsFromAccount(tempAccountData.databaseId); let tempSubAccounts = loadSubAccountsFromAccount(tempAccountData.databaseId);
getServerData().clients[client.index] = new serverClasses.clientData(client, tempAccountData, tempSubAccounts); getServerData().clients[client.index] = new serverClasses.clientData(client, tempAccountData, tempSubAccounts);