starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-29 01:08:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(esx_identity): Lint errors

Browse Source
This commit is contained in:
TheFantomas
2023-06-29 18:06:18 +02:00
parent f3b2b9898e
commit 255decaa0d
3 changed files with 86 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.editorconfig
+13
View File
@@ -0,0 +1,13 @@
# EditorConfig is awesome: https://EditorConfig.org
# top-most EditorConfig file
root = true
[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8
trim_trailing_whitespace = true
indent_size = 4
indent_style = space
max_line_length = 900
[core]/esx_identity/locales/hu.lua
+6 -6
View File
@@ -1,7 +1,7 @@
Locales["hu"] = {
["show_active_character"] = "Aktív karakterek mutatása",
["active_character"] = "Aktív karakter: %s",
["error_active_character"] = "A név nem megfelelő",
["error_active_character"] = "A név nem megfelelő",
["delete_character"] = "Töröld a karaktered és csinálj újat",
["deleted_character"] = "A karaktered törölve",
["error_delete_character"] = "Hiba történt a karakter törlésekor. Kérjük, lépjen kapcsolatba egy Adminisztrátorral.",
@@ -30,9 +30,9 @@ Locales["hu"] = {
["missing_identity"] = "Hiba történt a karaktered betöltésekor! \n Hibakód: hiányzik az identitás \n és \nNem úgy tűnik, hogy hiányzik a személyazonosságod, próbálkozz újra.",
["deleted_identity"] = "A karaktered törölve",
["already_registered"] = "Már regisztráltál.",
["invalid_firstname_format"] = "Érvénytelen formátum (Keresztnév): Próbáld újra.",
["invalid_lastname_format"] = "Érvénytelen formátum (Vezetéknév): Próbáld újra.",
["invalid_dob_format"] = "Érvénytelen formátum (Születési Idő): Próbáld újra.",
["invalid_sex_format"] = "Érvénytelen formátum (Nem): Próbáld újra.",
["invalid_height_format"] = "Érvénytelen formátum (Magasság): Próbáld újra."
["invalid_firstname_format"] = "Érvénytelen formátum (Keresztnév): Próbáld újra.",
["invalid_lastname_format"] = "Érvénytelen formátum (Vezetéknév): Próbáld újra.",
["invalid_dob_format"] = "Érvénytelen formátum (Születési Idő): Próbáld újra.",
["invalid_sex_format"] = "Érvénytelen formátum (Nem): Próbáld újra.",
["invalid_height_format"] = "Érvénytelen formátum (Magasság): Próbáld újra."
}
[core]/esx_identity/server/main.lua
+67 -65
View File
@@ -5,14 +5,14 @@ local multichar = ESX.GetConfig().Multichar
local function deleteIdentityFromDatabase(xPlayer)
MySQL.query.await(
'UPDATE users SET firstname = ?, lastname = ?, dateofbirth = ?, sex = ?, height = ?, skin = ? WHERE identifier = ?',
{nil, nil, nil, nil, nil, nil, xPlayer.identifier})
{ nil, nil, nil, nil, nil, nil, xPlayer.identifier })
if Config.FullCharDelete then
MySQL.update.await('UPDATE addon_account_data SET money = 0 WHERE account_name IN (?) AND owner = ?',
{{'bank_savings', 'caution'}, xPlayer.identifier})
{ { 'bank_savings', 'caution' }, xPlayer.identifier })
MySQL.prepare.await('UPDATE datastore_data SET data = ? WHERE name IN (?) AND owner = ?',
{'\'{}\'', {'user_ears', 'user_glasses', 'user_helmet', 'user_mask'}, xPlayer.identifier})
{ '\'{}\'', { 'user_ears', 'user_glasses', 'user_helmet', 'user_mask' }, xPlayer.identifier })
end
end
@@ -33,7 +33,7 @@ end
local function saveIdentityToDatabase(identifier, identity)
MySQL.update.await(
'UPDATE users SET firstname = ?, lastname = ?, dateofbirth = ?, sex = ?, height = ? WHERE identifier = ?',
{identity.firstName, identity.lastName, identity.dateOfBirth, identity.sex, identity.height, identifier})
{ identity.firstName, identity.lastName, identity.dateOfBirth, identity.sex, identity.height, identifier })
end
local function checkDOBFormat(str)
@@ -41,9 +41,9 @@ local function checkDOBFormat(str)
if not string.match(str, '(%d%d)/(%d%d)/(%d%d%d%d)') then
return false
end
local d, m, y = string.match(str, '(%d+)/(%d+)/(%d+)')
m = tonumber(m)
d = tonumber(d)
y = tonumber(y)
@@ -126,7 +126,7 @@ if Config.UseDeferrals then
if identifier then
MySQL.single('SELECT firstname, lastname, dateofbirth, sex, height FROM users WHERE identifier = ?',
{identifier}, function(result)
{ identifier }, function(result)
if result then
if result.firstname then
playerIdentity[identifier] = {
@@ -204,7 +204,7 @@ if Config.UseDeferrals then
if not checkHeightFormat(data.height) then
return deferrals.done(TranslateCap('invalid_height_format'))
end
playerIdentity[identifier] = {
firstName = formatName(data.firstname),
lastName = formatName(data.lastname),
@@ -246,8 +246,8 @@ if Config.UseDeferrals then
playerIdentity[xPlayer.identifier] = nil
end)
else
local function setIdentity(xPlayer)
if not alreadyRegistered[xPlayer.identifier] then
local function setIdentity(xPlayer)
if not alreadyRegistered[xPlayer.identifier] then
return
end
local currentIdentity = playerIdentity[xPlayer.identifier]
@@ -264,10 +264,11 @@ else
end
playerIdentity[xPlayer.identifier] = nil
end
local function checkIdentity(xPlayer)
MySQL.single('SELECT firstname, lastname, dateofbirth, sex, height FROM users WHERE identifier = ?', {xPlayer.identifier},
end
local function checkIdentity(xPlayer)
MySQL.single('SELECT firstname, lastname, dateofbirth, sex, height FROM users WHERE identifier = ?',
{ xPlayer.identifier },
function(result)
if not result then
return TriggerClientEvent('esx_identity:showRegisterIdentity', xPlayer.source)
@@ -290,18 +291,19 @@ else
setIdentity(xPlayer)
end
)
end
end
if not multichar then
AddEventHandler('playerConnecting', function(_, _, deferrals)
deferrals.defer()
local _, identifier = source, ESX.GetIdentifier(source)
Wait(40)
if not multichar then
AddEventHandler('playerConnecting', function(_, _, deferrals)
deferrals.defer()
local _, identifier = source, ESX.GetIdentifier(source)
Wait(40)
if not identifier then
if not identifier then
return deferrals.done(TranslateCap('no_identifier'))
end
MySQL.single('SELECT firstname, lastname, dateofbirth, sex, height FROM users WHERE identifier = ?', {identifier},
MySQL.single('SELECT firstname, lastname, dateofbirth, sex, height FROM users WHERE identifier = ?',
{ identifier },
function(result)
if not result then
playerIdentity[identifier] = nil
@@ -326,9 +328,9 @@ else
deferrals.done()
end)
end)
end)
AddEventHandler('onResourceStart', function(resource)
AddEventHandler('onResourceStart', function(resource)
if resource ~= GetCurrentResourceName() then
return
end
@@ -345,8 +347,8 @@ else
end
end)
RegisterNetEvent('esx:playerLoaded', function(_, xPlayer)
local currentIdentity = playerIdentity[xPlayer.identifier]
RegisterNetEvent('esx:playerLoaded', function(_, xPlayer)
local currentIdentity = playerIdentity[xPlayer.identifier]
if currentIdentity and alreadyRegistered[xPlayer.identifier] then
xPlayer.setName(('%s %s'):format(currentIdentity.firstName, currentIdentity.lastName))
@@ -368,35 +370,35 @@ else
else
TriggerClientEvent('esx_identity:showRegisterIdentity', xPlayer.source)
end
end)
end
end)
end
ESX.RegisterServerCallback('esx_identity:registerIdentity', function(source, cb, data)
local xPlayer = ESX.GetPlayerFromId(source)
if not checkNameFormat(data.firstname) then
TriggerClientEvent('esx:showNotification',source,TranslateCap('invalid_firstname_format'), "error")
return cb(false)
end
if not checkNameFormat(data.lastname) then
TriggerClientEvent('esx:showNotification',source,TranslateCap('invalid_lastname_format'), "error")
return cb(false)
end
if not checkSexFormat(data.sex) then
TriggerClientEvent('esx:showNotification',source,TranslateCap('invalid_sex_format'), "error")
return cb(false)
end
if not checkDOBFormat(data.dateofbirth) then
TriggerClientEvent('esx:showNotification',source,TranslateCap('invalid_dob_format'), "error")
return cb(false)
end
if not checkHeightFormat(data.height) then
TriggerClientEvent('esx:showNotification',source,TranslateCap('invalid_height_format'), "error")
return cb(false)
end
if xPlayer then
if alreadyRegistered[xPlayer.identifier] then
xPlayer.showNotification(TranslateCap('already_registered'), "error")
return cb(false)
ESX.RegisterServerCallback('esx_identity:registerIdentity', function(source, cb, data)
local xPlayer = ESX.GetPlayerFromId(source)
if not checkNameFormat(data.firstname) then
TriggerClientEvent('esx:showNotification', source, TranslateCap('invalid_firstname_format'), "error")
return cb(false)
end
if not checkNameFormat(data.lastname) then
TriggerClientEvent('esx:showNotification', source, TranslateCap('invalid_lastname_format'), "error")
return cb(false)
end
if not checkSexFormat(data.sex) then
TriggerClientEvent('esx:showNotification', source, TranslateCap('invalid_sex_format'), "error")
return cb(false)
end
if not checkDOBFormat(data.dateofbirth) then
TriggerClientEvent('esx:showNotification', source, TranslateCap('invalid_dob_format'), "error")
return cb(false)
end
if not checkHeightFormat(data.height) then
TriggerClientEvent('esx:showNotification', source, TranslateCap('invalid_height_format'), "error")
return cb(false)
end
if xPlayer then
if alreadyRegistered[xPlayer.identifier] then
xPlayer.showNotification(TranslateCap('already_registered'), "error")
return cb(false)
end
playerIdentity[xPlayer.identifier] = {
@@ -445,19 +447,19 @@ else
TriggerEvent('esx_identity:completedRegistration', source, data)
TriggerClientEvent('esx_identity:setPlayerData', source, Identity)
cb(true)
end)
end)
end
if Config.EnableCommands then
ESX.RegisterCommand('char', 'user', function(xPlayer)
ESX.RegisterCommand('char', 'user', function(xPlayer)
if xPlayer and xPlayer.getName() then
xPlayer.showNotification(TranslateCap('active_character', xPlayer.getName()))
else
xPlayer.showNotification(TranslateCap('error_active_character'))
end
end, false, {help = TranslateCap('show_active_character')})
end, false, { help = TranslateCap('show_active_character') })
ESX.RegisterCommand('chardel', 'user', function(xPlayer)
ESX.RegisterCommand('chardel', 'user', function(xPlayer)
if xPlayer and xPlayer.getName() then
if Config.UseDeferrals then
xPlayer.kick(TranslateCap('deleted_identity'))
@@ -476,7 +478,7 @@ if Config.EnableCommands then
else
xPlayer.showNotification(TranslateCap('error_delete_character'))
end
end, false, {help = TranslateCap('delete_character')})
end, false, { help = TranslateCap('delete_character') })
end
if Config.EnableDebugging then
@@ -486,7 +488,7 @@ if Config.EnableDebugging then
else
xPlayer.showNotification(TranslateCap('error_debug_xPlayer_get_first_name'))
end
end, false, {help = TranslateCap('debug_xPlayer_get_first_name')})
end, false, { help = TranslateCap('debug_xPlayer_get_first_name') })
ESX.RegisterCommand('xPlayerGetLastName', 'user', function(xPlayer)
if xPlayer and xPlayer.get('lastName') then
@@ -494,7 +496,7 @@ if Config.EnableDebugging then
else
xPlayer.showNotification(TranslateCap('error_debug_xPlayer_get_last_name'))
end
end, false, {help = TranslateCap('debug_xPlayer_get_last_name')})
end, false, { help = TranslateCap('debug_xPlayer_get_last_name') })
ESX.RegisterCommand('xPlayerGetFullName', 'user', function(xPlayer)
if xPlayer and xPlayer.getName() then
@@ -502,7 +504,7 @@ if Config.EnableDebugging then
else
xPlayer.showNotification(TranslateCap('error_debug_xPlayer_get_full_name'))
end
end, false, {help = TranslateCap('debug_xPlayer_get_full_name')})
end, false, { help = TranslateCap('debug_xPlayer_get_full_name') })
ESX.RegisterCommand('xPlayerGetSex', 'user', function(xPlayer)
if xPlayer and xPlayer.get('sex') then
@@ -510,7 +512,7 @@ if Config.EnableDebugging then
else
xPlayer.showNotification(TranslateCap('error_debug_xPlayer_get_sex'))
end
end, false, {help = TranslateCap('debug_xPlayer_get_sex')})
end, false, { help = TranslateCap('debug_xPlayer_get_sex') })
ESX.RegisterCommand('xPlayerGetDOB', 'user', function(xPlayer)
if xPlayer and xPlayer.get('dateofbirth') then
@@ -518,7 +520,7 @@ if Config.EnableDebugging then
else
xPlayer.showNotification(TranslateCap('error_debug_xPlayer_get_dob'))
end
end, false, {help = TranslateCap('debug_xPlayer_get_dob')})
end, false, { help = TranslateCap('debug_xPlayer_get_dob') })
ESX.RegisterCommand('xPlayerGetHeight', 'user', function(xPlayer)
if xPlayer and xPlayer.get('height') then
@@ -526,5 +528,5 @@ if Config.EnableDebugging then
else
xPlayer.showNotification(TranslateCap('error_debug_xPlayer_get_height'))
end
end, false, {help = TranslateCap('debug_xPlayer_get_height')})
end, false, { help = TranslateCap('debug_xPlayer_get_height') })
end