Skip to content

Commit

Permalink
Merge pull request #757 from bitpredator/dev
Browse files Browse the repository at this point in the history 
feat: added exports to get accounts
  • Loading branch information
@bitpredator
bitpredator authored Jul 27, 2024
2 parents 1a0d924 + 2699ca9 commit 7bde62a
Show file tree
Hide file tree
Showing 2 changed files with 128 additions and 125 deletions.
18 changes: 9 additions & 9 deletions server-data/resources/[bpt_addons]/bpt_addonaccount/server/classes/addonaccount.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@ function CreateAddonAccount(name, owner, money)
self.owner = owner
self.money = money

function self.addMoney(m)
self.money = self.money + m
function self.addMoney(amount)
self.money = self.money + amount
self.save()
TriggerEvent("bpt_addonaccount:addMoney", self.name, m)
TriggerEvent("bpt_addonaccount:addMoney", self.name, amount)
end

function self.removeMoney(m)
self.money = self.money - m
function self.removeMoney(amount)
self.money = self.money - amount
self.save()
TriggerEvent("bpt_addonaccount:removeMoney", self.name, m)
TriggerEvent("bpt_addonaccount:removeMoney", self.name, amount)
end

function self.setMoney(m)
self.money = m
function self.setMoney(amount)
self.money = amount
self.save()
TriggerEvent("bpt_addonaccount:setMoney", self.name, m)
TriggerEvent("bpt_addonaccount:setMoney", self.name, amount)
end

function self.save()
Expand Down
235 changes: 119 additions & 116 deletions server-data/resources/[bpt_addons]/bpt_addonaccount/server/main.lua
View file
Original file line number Diff line number Diff line change
@@ -1,141 +1,144 @@
local AccountsIndex, Accounts, SharedAccounts = {}, {}, {}

AddEventHandler('onResourceStart', function(resourceName)
if resourceName == GetCurrentResourceName() then
local accounts = MySQL.query.await(
'SELECT * FROM addon_account LEFT JOIN addon_account_data ON addon_account.name = addon_account_data.account_name UNION SELECT * FROM addon_account RIGHT JOIN addon_account_data ON addon_account.name = addon_account_data.account_name')

local newAccounts = {}
for i = 1, #accounts do
local account = accounts[i]
if account.shared == 0 then
if not Accounts[account.name] then
AccountsIndex[#AccountsIndex + 1] = account.name
Accounts[account.name] = {}
end
Accounts[account.name][#Accounts[account.name] + 1] = CreateAddonAccount(account.name, account.owner,
account.money)
else
if account.money then
SharedAccounts[account.name] = CreateAddonAccount(account.name, nil, account.money)
else
newAccounts[#newAccounts + 1] = { account.name, 0 }
end
end
end
GlobalState.SharedAccounts = SharedAccounts

if next(newAccounts) then
MySQL.prepare('INSERT INTO addon_account_data (account_name, money) VALUES (?, ?)', newAccounts)
for i = 1, #newAccounts do
local newAccount = newAccounts[i]
SharedAccounts[newAccount[1]] = CreateAddonAccount(newAccount[1], nil, 0)
end
GlobalState.SharedAccounts = SharedAccounts
end
end
AddEventHandler("onResourceStart", function(resourceName)
if resourceName == GetCurrentResourceName() then
local accounts = MySQL.query.await(
'SELECT * FROM addon_account LEFT JOIN addon_account_data ON addon_account.name = addon_account_data.account_name UNION SELECT * FROM addon_account RIGHT JOIN addon_account_data ON addon_account.name = addon_account_data.account_name')

local newAccounts = {}
for i = 1, #accounts do
local account = accounts[i]
if account.shared == 0 then
if not Accounts[account.name] then
AccountsIndex[#AccountsIndex + 1] = account.name
Accounts[account.name] = {}
end
Accounts[account.name][#Accounts[account.name] + 1] = CreateAddonAccount(account.name, account.owner,
account.money)
else
if account.money then
SharedAccounts[account.name] = CreateAddonAccount(account.name, nil, account.money)
else
newAccounts[#newAccounts + 1] = { account.name, 0 }
end
end
end
GlobalState.SharedAccounts = SharedAccounts

if next(newAccounts) then
MySQL.prepare('INSERT INTO addon_account_data (account_name, money) VALUES (?, ?)', newAccounts)
for i = 1, #newAccounts do
local newAccount = newAccounts[i]
SharedAccounts[newAccount[1]] = CreateAddonAccount(newAccount[1], nil, 0)
end
GlobalState.SharedAccounts = SharedAccounts
end
end
end)

function GetAccount(name, owner)
for i = 1, #Accounts[name], 1 do
if Accounts[name][i].owner == owner then
return Accounts[name][i]
end
end
for i = 1, #Accounts[name], 1 do
if Accounts[name][i].owner == owner then
return Accounts[name][i]
end
end
end

function GetSharedAccount(name)
return SharedAccounts[name]
return SharedAccounts[name]
end

function AddSharedAccount(society, amount)
-- society.name = job_name/society_name
-- society.label = label for the job/account
-- amount = if the shared account should start with x amount
if type(society) ~= 'table' or not society?.name or not society?.label then return end

-- check if account already exist?
if SharedAccounts[society.name] ~= nil then return SharedAccounts[society.name] end

-- addon account:
local account = MySQL.insert.await('INSERT INTO `addon_account` (name, label, shared) VALUES (?, ?, ?)', {
society.name, society.label, 1
})
if not account then return end

-- if addon account inserted, insert addon account data:
local account_data = MySQL.insert.await('INSERT INTO `addon_account_data` (account_name, money) VALUES (?, ?)', {
society.name, (amount or 0)
})
if not account_data then return end

-- if all data inserted successfully to sql:
SharedAccounts[society.name] = CreateAddonAccount(society.name, nil, (amount or 0))

return SharedAccounts[society.name]
-- society.name = job_name/society_name
-- society.label = label for the job/account
-- amount = if the shared account should start with x amount
if type(society) ~= 'table' or not society?.name or not society?.label then return end

-- check if account already exist?
if SharedAccounts[society.name] ~= nil then return SharedAccounts[society.name] end

-- addon account:
local account = MySQL.insert.await('INSERT INTO `addon_account` (name, label, shared) VALUES (?, ?, ?)', {
society.name, society.label, 1
})
if not account then return end

-- if addon account inserted, insert addon account data:
local account_data = MySQL.insert.await('INSERT INTO `addon_account_data` (account_name, money) VALUES (?, ?)', {
society.name, (amount or 0)
})
if not account_data then return end

-- if all data inserted successfully to sql:
SharedAccounts[society.name] = CreateAddonAccount(society.name, nil, (amount or 0))

return SharedAccounts[society.name]
end

AddEventHandler('bpt_addonaccount:getAccount', function(name, owner, cb)
cb(GetAccount(name, owner))
AddEventHandler("bpt_addonaccount:getAccount", function(name, owner, cb)
cb(GetAccount(name, owner))
end)

AddEventHandler('bpt_addonaccount:getSharedAccount', function(name, cb)
cb(GetSharedAccount(name))
AddEventHandler("bpt_addonaccount:getSharedAccount", function(name, cb)
cb(GetSharedAccount(name))
end)

AddEventHandler('esx:playerLoaded', function(playerId, xPlayer)
local addonAccounts = {}
AddEventHandler("esx:playerLoaded", function(_, xPlayer)
local addonAccounts = {}

for i = 1, #AccountsIndex, 1 do
local name = AccountsIndex[i]
local account = GetAccount(name, xPlayer.identifier)
for i = 1, #AccountsIndex, 1 do
local name = AccountsIndex[i]
local account = GetAccount(name, xPlayer.identifier)

if account == nil then
MySQL.insert('INSERT INTO addon_account_data (account_name, money, owner) VALUES (?, ?, ?)',
{ name, 0, xPlayer.identifier })
if account == nil then
MySQL.insert('INSERT INTO addon_account_data (account_name, money, owner) VALUES (?, ?, ?)',
{ name, 0, xPlayer.identifier })

account = CreateAddonAccount(name, xPlayer.identifier, 0)
Accounts[name][#Accounts[name] + 1] = account
end
account = CreateAddonAccount(name, xPlayer.identifier, 0)
Accounts[name][#Accounts[name] + 1] = account
end

addonAccounts[#addonAccounts + 1] = account
end
addonAccounts[#addonAccounts + 1] = account
end

xPlayer.set('addonAccounts', addonAccounts)
xPlayer.set('addonAccounts', addonAccounts)
end)

RegisterNetEvent('bpt_addonaccount:refreshAccounts')
AddEventHandler('bpt_addonaccount:refreshAccounts', function()
local result = MySQL.query.await('SELECT * FROM addon_account')

for i = 1, #result, 1 do
local name = result[i].name
local label = result[i].label
local shared = result[i].shared

local result2 = MySQL.query.await('SELECT * FROM addon_account_data WHERE account_name = ?', { name })

if shared == 0 then
table.insert(AccountsIndex, name)
Accounts[name] = {}

for j = 1, #result2, 1 do
local addonAccount = CreateAddonAccount(name, result2[j].owner, result2[j].money)
table.insert(Accounts[name], addonAccount)
end
else
local money = nil

if #result2 == 0 then
MySQL.insert('INSERT INTO addon_account_data (account_name, money, owner) VALUES (?, ?, ?)',
{ name, 0, NULL })
money = 0
else
money = result2[1].money
end

local addonAccount = CreateAddonAccount(name, nil, money)
SharedAccounts[name] = addonAccount
end
end
RegisterNetEvent("bpt_addonaccount:refreshAccounts")
AddEventHandler("bpt_addonaccount:refreshAccounts", function()
local addonAccounts = MySQL.query.await('SELECT * FROM addon_account')

for i = 1, #addonAccounts, 1 do
local name = addonAccounts[i].name
local shared = addonAccounts[i].shared

local addonAccountData = MySQL.query.await('SELECT * FROM addon_account_data WHERE account_name = ?', { name })

if shared == 0 then
table.insert(AccountsIndex, name)
Accounts[name] = {}

for j = 1, #addonAccountData, 1 do
local addonAccount = CreateAddonAccount(name, addonAccountData[j].owner, addonAccountData[j].money)
table.insert(Accounts[name], addonAccount)
end
else
local money = nil

if #addonAccountData == 0 then
MySQL.insert('INSERT INTO addon_account_data (account_name, money, owner) VALUES (?, ?, ?)',
{ name, 0, nil })
money = 0
else
money = addonAccountData[1].money
end

local addonAccount = CreateAddonAccount(name, nil, money)
SharedAccounts[name] = addonAccount
end
end
end)

exports("getAccount", GetSharedAccount)

exports("getSharedAccount", GetSharedAccount)

0 comments on commit 7bde62a

Please sign in to comment.