From 230a623210ace8d32d552bdc2bdfb191b6d8dc1d Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Sun, 12 Jun 2022 09:20:18 -0500 Subject: [PATCH] Kick reason --- scripts/server/utilities.js | 175 ++++++++++++++++-------------------- 1 file changed, 76 insertions(+), 99 deletions(-) diff --git a/scripts/server/utilities.js b/scripts/server/utilities.js index a89a7821..275680a7 100644 --- a/scripts/server/utilities.js +++ b/scripts/server/utilities.js @@ -12,13 +12,13 @@ // =========================================================================== function getPositionArea(position) { - if(typeof position == "Vec3") { + if (typeof position == "Vec3") { position = vec3ToVec2(position); } let gameAreas = getGameAreas(getGame()); - for(let i in gameAreas) { - if(isPositionInArea(position, gameAreas[i][1])) { + for (let i in gameAreas) { + if (isPositionInArea(position, gameAreas[i][1])) { return i; } } @@ -30,7 +30,7 @@ function getPositionArea(position) { function getAreaName(position) { let areaId = getPositionArea(position); - if(!areaId) { + if (!areaId) { return false; } @@ -50,8 +50,8 @@ function getGameAreas(gameId) { * @return {ClientData} The player/client's data (class instancee) */ function getPlayerData(client) { - if(client != null) { - if(isClientInitialized(client)) { + if (client != null) { + if (isClientInitialized(client)) { return getServerData().clients[getPlayerId(client)]; } } @@ -61,7 +61,7 @@ function getPlayerData(client) { // =========================================================================== function initAllClients() { - getClients().forEach(function(client) { + getClients().forEach(function (client) { initClient(client); }); } @@ -72,17 +72,17 @@ function updateServerRules() { logToConsole(LOG_DEBUG, `[VRR.Utilities]: Updating all server rules ...`); logToConsole(LOG_DEBUG, `[VRR.Utilities]: Time support: ${isTimeSupported()}`); - if(isTimeSupported()) { - if(getServerConfig() != false) { + if (isTimeSupported()) { + if (getServerConfig() != false) { let value = makeReadableTime(getServerConfig().hour, getServerConfig().minute); logToConsole(LOG_DEBUG, `[VRR.Utilities]: Setting server rule "Time" as ${value}`); server.setRule("Time", value); } } - if(isWeatherSupported()) { - if(getServerConfig() != false) { - if(typeof getGameConfig().weatherNames[getGame()] != "undefined") { + if (isWeatherSupported()) { + if (getServerConfig() != false) { + if (typeof getGameConfig().weatherNames[getGame()] != "undefined") { let value = getGameConfig().weatherNames[getGame()][getServerConfig().weather]; logToConsole(LOG_DEBUG, `[VRR.Utilities]: Setting server rule "Weather" as ${value}`); server.setRule("Weather", value); @@ -90,8 +90,8 @@ function updateServerRules() { } } - if(isSnowSupported()) { - if(getServerConfig() != false) { + if (isSnowSupported()) { + if (getServerConfig() != false) { let value = getYesNoFromBool(getServerConfig().fallingSnow); logToConsole(LOG_DEBUG, `[VRR.Utilities]: Setting server rule "Snowing" as ${value}`); server.setRule("Snowing", value); @@ -103,14 +103,14 @@ function updateServerRules() { // =========================================================================== function getWeatherFromParams(params) { - if(isNaN(params)) { - for(let i in getGameConfig().weatherNames[getGame()]) { - if(toLowerCase(getGameConfig().weatherNames[getGame()][i]).indexOf(toLowerCase(params)) != -1) { + if (isNaN(params)) { + for (let i in getGameConfig().weatherNames[getGame()]) { + if (toLowerCase(getGameConfig().weatherNames[getGame()][i]).indexOf(toLowerCase(params)) != -1) { return i; } } } else { - if(typeof getGameConfig().weatherNames[getGame()][params] != "undefined") { + if (typeof getGameConfig().weatherNames[getGame()][params] != "undefined") { return toInteger(params); } } @@ -121,14 +121,14 @@ function getWeatherFromParams(params) { // =========================================================================== function getFightStyleFromParams(params) { - if(isNaN(params)) { - for(let i in getGameConfig().fightStyles[getGame()]) { - if(toLowerCase(getGameConfig().fightStyles[getGame()][i][0]).indexOf(toLowerCase(params)) != -1) { + if (isNaN(params)) { + for (let i in getGameConfig().fightStyles[getGame()]) { + if (toLowerCase(getGameConfig().fightStyles[getGame()][i][0]).indexOf(toLowerCase(params)) != -1) { return i; } } } else { - if(typeof getGameConfig().fightStyles[getGame()][params] != "undefined") { + if (typeof getGameConfig().fightStyles[getGame()][params] != "undefined") { return toInteger(params); } } @@ -139,12 +139,12 @@ function getFightStyleFromParams(params) { // =========================================================================== function getClosestHospital(position) { - if(typeof getGameConfig().hospitals[getGame()] == "undefined") { - return {position: getServerConfig().newCharacter.spawnPosition}; + if (typeof getGameConfig().hospitals[getGame()] == "undefined") { + return { position: getServerConfig().newCharacter.spawnPosition }; } else { let closest = 0; - for(let i in getGameConfig().hospitals[getGame()]) { - if(getDistance(getGameConfig().hospitals[getGame()][i].position, position) < getDistance(getGameConfig().hospitals[getGame()][closest].position, position)) { + for (let i in getGameConfig().hospitals[getGame()]) { + if (getDistance(getGameConfig().hospitals[getGame()][i].position, position) < getDistance(getGameConfig().hospitals[getGame()][closest].position, position)) { closest = i; } } @@ -156,12 +156,12 @@ function getClosestHospital(position) { // =========================================================================== function getClosestPoliceStation(position) { - if(typeof getGameConfig().policeStations[getGame()] == "undefined") { - return {position: getServerConfig().newCharacter.spawnPosition}; + if (typeof getGameConfig().policeStations[getGame()] == "undefined") { + return { position: getServerConfig().newCharacter.spawnPosition }; } else { let closest = 0; - for(let i in getGameConfig().policeStations[getGame()]) { - if(getDistance(getGameConfig().policeStations[getGame()][i].position, position) < getDistance(getGameConfig().policeStations[getGame()][closest].position, position)) { + for (let i in getGameConfig().policeStations[getGame()]) { + if (getDistance(getGameConfig().policeStations[getGame()][i].position, position) < getDistance(getGameConfig().policeStations[getGame()][closest].position, position)) { closest = i; } } @@ -173,7 +173,7 @@ function getClosestPoliceStation(position) { // =========================================================================== function getPlayerDisplayForConsole(client) { - if(isNull(client)) { + if (isNull(client)) { return "(Unknown client)"; } return `${getPlayerName(client)}[${getPlayerId(client)}]`; @@ -182,7 +182,7 @@ function getPlayerDisplayForConsole(client) { // =========================================================================== function getPlayerNameForNameTag(client) { - if(isPlayerSpawned(client)) { + if (isPlayerSpawned(client)) { return `${getPlayerCurrentSubAccount(client).firstName} ${getPlayerCurrentSubAccount(client).lastName}`; } return getPlayerName(client); @@ -191,7 +191,7 @@ function getPlayerNameForNameTag(client) { // =========================================================================== function isPlayerSpawned(client) { - if(!getPlayerData(client)) { + if (!getPlayerData(client)) { return false; } return getPlayerData(client).spawned; @@ -206,8 +206,8 @@ function getPlayerIsland(client) { // =========================================================================== function isAtPayAndSpray(position) { - for(let i in getGameConfig().payAndSprays[getGame()]) { - if(getDistance(position, getGameConfig().payAndSprays[getGame()][i]) <= getGlobalConfig().payAndSprayDistance) { + for (let i in getGameConfig().payAndSprays[getGame()]) { + if (getDistance(position, getGameConfig().payAndSprays[getGame()][i]) <= getGlobalConfig().payAndSprayDistance) { return true; } } @@ -220,15 +220,15 @@ function isAtPayAndSpray(position) { function resetClientStuff(client) { logToConsole(LOG_DEBUG, `[VRR.Utilities] Resetting client data for ${getPlayerDisplayForConsole(client)}`); - if(!getPlayerData(client)) { + if (!getPlayerData(client)) { return false; } - if(isPlayerOnJobRoute(client)) { + if (isPlayerOnJobRoute(client)) { stopJobRoute(client, false, false); } - if(getPlayerData(client).rentingVehicle) { + if (getPlayerData(client).rentingVehicle) { stopRentingVehicle(client); } @@ -241,9 +241,9 @@ function resetClientStuff(client) { function getPlayerFromCharacterId(subAccountId) { let clients = getClients(); - for(let i in clients) { - for(let j in getPlayerData(clients[i]).subAccounts) { - if(getPlayerData(clients[i]).subAccounts[j].databaseId == subAccountId) { + for (let i in clients) { + for (let j in getPlayerData(clients[i]).subAccounts) { + if (getPlayerData(clients[i]).subAccounts[j].databaseId == subAccountId) { return clients[i]; } } @@ -256,11 +256,11 @@ function getPlayerFromCharacterId(subAccountId) { function checkPlayerPedStates() { let clients = getClients(); - for(let i in clients) { - if(getPlayerData(clients[i])) { - if(getPlayerData(clients[i]).pedState) { - if(isPlayerInAnyVehicle(clients[i])) { - if(getPlayerData(clients[i]).pedState == VRR_PEDSTATE_EXITINGVEHICLE) { + for (let i in clients) { + if (getPlayerData(clients[i])) { + if (getPlayerData(clients[i]).pedState) { + if (isPlayerInAnyVehicle(clients[i])) { + if (getPlayerData(clients[i]).pedState == VRR_PEDSTATE_EXITINGVEHICLE) { getPlayerData(clients[i]).pedState == VRR_PEDSTATE_READY; } } @@ -272,11 +272,11 @@ function checkPlayerPedStates() { // =========================================================================== function showConnectCameraToPlayer(client) { - if(isFadeCameraSupported()) { + if (isFadeCameraSupported()) { fadeCamera(client, true, 1); } - if(isCustomCameraSupported()) { + if (isCustomCameraSupported()) { //setPlayerInterior(client, 0); //setPlayerDimension(client, 0); setPlayerCameraLookAt(client, getServerConfig().connectCameraPosition, getServerConfig().connectCameraLookAt); @@ -295,9 +295,9 @@ function showCharacterSelectCameraToPlayer(client) { function getClosestPlayer(position, exemptPlayer) { let clients = getClients(); let closest = 0; - for(let i in clients) { - if(exemptClient != clients[i]) { - if(getDistance(getPlayerPosition(clients[i]), position) < getDistance(getPlayerPosition(clients[closest]), position)) { + for (let i in clients) { + if (exemptClient != clients[i]) { + if (getDistance(getPlayerPosition(clients[i]), position) < getDistance(getPlayerPosition(clients[closest]), position)) { closest = i; } } @@ -315,20 +315,20 @@ function isPlayerMuted(client) { function getPlayerFromParams(params) { let clients = getClients(); - if(isNaN(params)) { - for(let i in clients) { - if(!clients[i].console) { - if(toLowerCase(clients[i].name).indexOf(toLowerCase(params)) != -1) { + if (isNaN(params)) { + for (let i in clients) { + if (!clients[i].console) { + if (toLowerCase(clients[i].name).indexOf(toLowerCase(params)) != -1) { return clients[i]; } - if(toLowerCase(getCharacterFullName(clients[i])).indexOf(toLowerCase(params)) != -1) { + if (toLowerCase(getCharacterFullName(clients[i])).indexOf(toLowerCase(params)) != -1) { return clients[i]; } } } } else { - if(typeof clients[toInteger(params)] != "undefined") { + if (typeof clients[toInteger(params)] != "undefined") { return clients[toInteger(params)]; } } @@ -339,7 +339,7 @@ function getPlayerFromParams(params) { // =========================================================================== function updateConnectionLogOnQuit(client, quitReasonId) { - if(getPlayerData(client) != false) { + if (getPlayerData(client) != false) { quickDatabaseQuery(`UPDATE conn_main SET conn_when_disconnect=NOW(), conn_how_disconnect=${quitReasonId} WHERE conn_id = ${getPlayerData(client).sessionId}`); } } @@ -353,12 +353,12 @@ function updateConnectionLogOnAuth(client, authId) { // =========================================================================== function updateConnectionLogOnClientInfoReceive(client, clientVersion, screenWidth, screenHeight) { - if(getPlayerData(client) != false) { + if (getPlayerData(client) != false) { getPlayerData(client).clientVersion = clientVersion; } let dbConnection = connectToDatabase(); - if(dbConnection) { + if (dbConnection) { let safeClientVersion = escapeDatabaseString(dbConnection, clientVersion); let safeScreenWidth = escapeDatabaseString(dbConnection, toString(screenWidth)); let safeScreenHeight = escapeDatabaseString(dbConnection, toString(screenHeight)); @@ -377,8 +377,8 @@ function generateRandomPhoneNumber() { function doesNameContainInvalidCharacters(name) { let disallowedCharacters = getGlobalConfig().subAccountNameAllowedCharacters; name = toLowerCase(name); - for(let i = 0; i < name.length; i++) { - if(disallowedCharacters.toLowerCase().indexOf(name.charAt(i)) == -1) { + for (let i = 0; i < name.length; i++) { + if (disallowedCharacters.toLowerCase().indexOf(name.charAt(i)) == -1) { return true; } } @@ -394,36 +394,12 @@ function getClientFromSyncerId(syncerId) { // =========================================================================== -function triggerWebHook(messageString, serverId = getServerId(), type = VRR_DISCORD_WEBHOOK_LOG) { - if(!getGlobalConfig().discord.webhook.enabled) { - return false; - } - - let tempURL = getGlobalConfig().discord.webhook.webhookBaseURL; - tempURL = tempURL.replace("{0}", encodeURI(messageString)); - tempURL = tempURL.replace("{1}", serverId); - tempURL = tempURL.replace("{2}", type); - tempURL = tempURL.replace("{3}", getGlobalConfig().discord.webhook.pass); - - httpGet( - tempURL, - "", - function(data) { - - }, - function(data) { - } - ); -} - -// =========================================================================== - function clearTemporaryVehicles() { let vehicles = getElementsByType(ELEMENT_VEHICLE); - for(let i in vehicles) { - if(!getVehicleData(vehicles[i])) { + for (let i in vehicles) { + if (!getVehicleData(vehicles[i])) { let occupants = vehicles[i].getOccupants(); - for(let j in occupants) { + for (let j in occupants) { destroyGameElement(occupants[j]); } destroyGameElement(vehicles[i]); @@ -435,11 +411,11 @@ function clearTemporaryVehicles() { function clearTemporaryPeds() { let peds = getElementsByType(ELEMENT_PED); - for(let i in peds) { - if(peds[i].owner == -1) { - if(!peds[i].isType(ELEMENT_PLAYER)) { - if(peds[i].vehicle == null) { - if(!getNPCData(peds[i])) { + for (let i in peds) { + if (peds[i].owner == -1) { + if (!peds[i].isType(ELEMENT_PLAYER)) { + if (peds[i].vehicle == null) { + if (!getNPCData(peds[i])) { destroyElement(peds[i]); } } @@ -452,6 +428,7 @@ function clearTemporaryPeds() { function kickAllClients() { getClients().forEach((client) => { + getPlayerData(client).customDisconnectReason = `Kicked - All clients are being disconnected`; disconnectPlayer(client); }) } @@ -459,7 +436,7 @@ function kickAllClients() { // =========================================================================== function updateTimeRule() { - if(isTimeSupported()) { + if (isTimeSupported()) { server.setRule("Time", makeReadableTime(game.time.hour, game.time.minute)); } } @@ -473,7 +450,7 @@ function isClientInitialized(client) { // =========================================================================== function getPedForNetworkEvent(ped) { - if(getGame() == VRR_GAME_GTA_IV) { + if (getGame() == VRR_GAME_GTA_IV) { return ped; } else { return ped.id; @@ -485,10 +462,10 @@ function getPedForNetworkEvent(ped) { // Get how many times a player connected in the last month by name function getPlayerConnectionsInLastMonthByName(name) { let dbConnection = connectToDatabase(); - if(dbConnection) { + if (dbConnection) { let safeName = escapeDatabaseString(dbConnection, name); let result = quickDatabaseQuery(`SELECT COUNT(*) AS count FROM conn_main WHERE conn_when_connect >= NOW() - INTERVAL 1 MONTH AND conn_name = '${safeName}'`); - if(result) { + if (result) { return result[0].count; } } @@ -500,7 +477,7 @@ function getPlayerConnectionsInLastMonthByName(name) { function addPrefixNumberFill(number, amount) { let numberString = toString(number); - while(numberString.length < amount) { + while (numberString.length < amount) { numberString = toString(`0${numberString}`); } return toString(numberString);