Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix xPlayer & Code Cleanup #78

Merged
merged 1 commit into from Jul 15, 2020
Merged

Fix xPlayer & Code Cleanup #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions resources/gcphone/client/client.lua
View file
Open in desktop
Expand Up @@ -46,15 +46,17 @@ end
Ouverture du téphone lié a un item
Un solution ESC basé sur la solution donnée par HalCroves
https://forum.fivem.net/t/tutorial-for-gcphone-with-call-and-job-message-other/177904
]]--

ESX = nil

Citizen.CreateThread(function()
while ESX == nil do
TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
Citizen.Wait(0)
Citizen.Wait(0)
end
end)

--[[
function hasPhone (cb)
if (ESX == nil) then return cb(0) end
ESX.TriggerServerCallback('gcphone:getItemAmount', function(qtty)
Expand Down Expand Up @@ -660,7 +662,7 @@ end)
AddEventHandler('onClientResourceStart', function(res)
DoScreenFadeIn(300)
if res == "gcphone" then
TriggerServerEvent('gcPhone:allUpdate')
TriggerServerEvent('gcPhone:allUpdate')
end
end)

Expand Down
100 changes: 59 additions & 41 deletions resources/gcphone/server/server.lua
View file
Open in desktop
Expand Up @@ -158,25 +158,28 @@ end

RegisterServerEvent('gcPhone:addContact')
AddEventHandler('gcPhone:addContact', function(display, phoneNumber)
local sourcePlayer = tonumber(source)
xplayer = ESX.GetPlayerFromId(source)
identifier = xplayer.identifier
local _source = source
local sourcePlayer = tonumber(_source)
xPlayer = ESX.GetPlayerFromId(_source)
identifier = xPlayer.identifier
addContact(sourcePlayer, identifier, phoneNumber, display)
end)

RegisterServerEvent('gcPhone:updateContact')
AddEventHandler('gcPhone:updateContact', function(id, display, phoneNumber)
local sourcePlayer = tonumber(source)
xplayer = ESX.GetPlayerFromId(source)
identifier = xplayer.identifier
local _source = source
local sourcePlayer = tonumber(_source)
xPlayer = ESX.GetPlayerFromId(_source)
identifier = xPlayer.identifier
updateContact(sourcePlayer, identifier, id, phoneNumber, display)
end)

RegisterServerEvent('gcPhone:deleteContact')
AddEventHandler('gcPhone:deleteContact', function(id)
local sourcePlayer = tonumber(source)
xplayer = ESX.GetPlayerFromId(source)
identifier = xplayer.identifier
local _source = source
local sourcePlayer = tonumber(_source)
xPlayer = ESX.GetPlayerFromId(_source)
identifier = xPlayer.identifier
deleteContact(sourcePlayer, identifier, id)
end)

Expand Down Expand Up @@ -259,9 +262,10 @@ end

RegisterServerEvent('gcPhone:sendMessage')
AddEventHandler('gcPhone:sendMessage', function(phoneNumber, message)
local sourcePlayer = tonumber(source)
xplayer = ESX.GetPlayerFromId(source)
identifier = xplayer.identifier
local _source = source
local sourcePlayer = tonumber(_source)
xPlayer = ESX.GetPlayerFromId(_source)
identifier = xPlayer.identifier
addMessage(sourcePlayer, identifier, phoneNumber, message)
end)

Expand All @@ -272,32 +276,36 @@ end)

RegisterServerEvent('gcPhone:deleteMessageNumber')
AddEventHandler('gcPhone:deleteMessageNumber', function(number)
local sourcePlayer = tonumber(source)
xplayer = ESX.GetPlayerFromId(source)
identifier = xplayer.identifier
local _source = source
local sourcePlayer = tonumber(_source)
xPlayer = ESX.GetPlayerFromId(_source)
identifier = xPlayer.identifier
deleteAllMessageFromPhoneNumber(sourcePlayer,identifier, number)
-- TriggerClientEvent("gcphone:allMessage", sourcePlayer, getMessages(identifier))
end)

RegisterServerEvent('gcPhone:deleteAllMessage')
AddEventHandler('gcPhone:deleteAllMessage', function()
xplayer = ESX.GetPlayerFromId(source)
identifier = xplayer.identifier
local _source = source
xPlayer = ESX.GetPlayerFromId(_source)
identifier = xPlayer.identifier
deleteAllMessage(identifier)
end)

RegisterServerEvent('gcPhone:setReadMessageNumber')
AddEventHandler('gcPhone:setReadMessageNumber', function(num)
xplayer = ESX.GetPlayerFromId(source)
identifier = xplayer.identifier
local _source = source
xPlayer = ESX.GetPlayerFromId(_source)
identifier = xPlayer.identifier
setReadMessageNumber(identifier, num)
end)

RegisterServerEvent('gcPhone:deleteALL')
AddEventHandler('gcPhone:deleteALL', function()
local sourcePlayer = tonumber(source)
xplayer = ESX.GetPlayerFromId(source)
identifier = xplayer.identifier
local _source = source
local sourcePlayer = tonumber(_source)
xPlayer = ESX.GetPlayerFromId(_source)
identifier = xPlayer.identifier
deleteAllMessage(identifier)
deleteAllContact(identifier)
appelsDeleteAllHistorique(identifier)
Expand Down Expand Up @@ -360,9 +368,10 @@ end

RegisterServerEvent('gcPhone:getHistoriqueCall')
AddEventHandler('gcPhone:getHistoriqueCall', function()
local sourcePlayer = tonumber(source)
xplayer = ESX.GetPlayerFromId(source)
identifier = xplayer.identifier
local _source = source
local sourcePlayer = tonumber(_source)
xPlayer = ESX.GetPlayerFromId(_source)
identifier = xPlayer.identifier
local srcPhone = getNumberPhone(identifier)
sendHistoriqueCall(sourcePlayer, num)
end)
Expand All @@ -389,8 +398,8 @@ AddEventHandler('gcPhone:internal_startCall', function(source, phone_number, rtc
lastIndexCall = lastIndexCall + 1

local sourcePlayer = tonumber(source)
local xplayer = ESX.GetPlayerFromId(source)
local identifier = xplayer.identifier
local xPlayer = ESX.GetPlayerFromId(source)
local identifier = xPlayer.identifier

local srcPhone = ''
if extraData ~= nil and extraData.useNumber ~= nil then
Expand Down Expand Up @@ -434,16 +443,17 @@ end)

RegisterServerEvent('gcPhone:startCall')
AddEventHandler('gcPhone:startCall', function(phone_number, rtcOffer, extraData)
TriggerEvent('gcPhone:internal_startCall',source, phone_number, rtcOffer, extraData)
local _source = source
TriggerEvent('gcPhone:internal_startCall',_source, phone_number, rtcOffer, extraData)
end)

RegisterServerEvent('gcPhone:candidates')
AddEventHandler('gcPhone:candidates', function (callId, candidates)
-- print('send cadidate', callId, candidates)
if AppelsEnCours[callId] ~= nil then
local source = source
local _source = source
local to = AppelsEnCours[callId].transmitter_src
if source == to then
if _source == to then
to = AppelsEnCours[callId].receiver_src
end
-- print('TO', to)
Expand Down Expand Up @@ -474,6 +484,7 @@ end)

RegisterServerEvent('gcPhone:rejectCall')
AddEventHandler('gcPhone:rejectCall', function (infoCall)
local _source = source
local id = infoCall.id
if AppelsEnCours[id] ~= nil then
if PhoneFixeInfo[id] ~= nil then
Expand All @@ -497,9 +508,10 @@ end)

RegisterServerEvent('gcPhone:appelsDeleteHistorique')
AddEventHandler('gcPhone:appelsDeleteHistorique', function (numero)
local sourcePlayer = tonumber(source)
local xplayer = ESX.GetPlayerFromId(source)
local identifier = xplayer.identifier
local _source = source
local sourcePlayer = tonumber(_source)
local xPlayer = ESX.GetPlayerFromId(_source)
local identifier = xPlayer.identifier
local srcPhone = getNumberPhone(identifier)
MySQL.Sync.execute("DELETE FROM phone_calls WHERE `owner` = @owner AND `num` = @num", {
['@owner'] = srcPhone,
Expand All @@ -516,9 +528,10 @@ end

RegisterServerEvent('gcPhone:appelsDeleteAllHistorique')
AddEventHandler('gcPhone:appelsDeleteAllHistorique', function ()
local sourcePlayer = tonumber(source)
local xplayer = ESX.GetPlayerFromId(source)
local identifier = xplayer.identifier
local _source = source
local sourcePlayer = tonumber(_source)
local xPlayer = ESX.GetPlayerFromId(_source)
local identifier = xPlayer.identifier
appelsDeleteAllHistorique(identifier)
end)

Expand All @@ -541,9 +554,14 @@ end)

RegisterServerEvent('gcPhone:allUpdate')
AddEventHandler('gcPhone:allUpdate', function()
local sourcePlayer = tonumber(source)
local xplayer = ESX.GetPlayerFromId(source)
local identifier = xplayer.identifier
local _source = source
local sourcePlayer = tonumber(_source)
local xPlayer = ESX.GetPlayerFromId(_source)
while xPlayer == nil do
xPlayer = ESX.GetPlayerFromId(_source)
Citizen.Wait(1000)
end
local identifier = xPlayer.identifier
local num = getNumberPhone(identifier)
TriggerClientEvent("gcPhone:myPhoneNumber", sourcePlayer, num)
TriggerClientEvent("gcPhone:contactList", sourcePlayer, getContacts(identifier))
Expand Down Expand Up @@ -610,8 +628,8 @@ function onCallFixePhone (source, phone_number, rtcOffer, extraData)
phone_number = string.sub(phone_number, 2)
end
local sourcePlayer = tonumber(source)
local xplayer = ESX.GetPlayerFromId(source)
local identifier = xplayer.identifier
local xPlayer = ESX.GetPlayerFromId(source)
local identifier = xPlayer.identifier

local srcPhone = ''
if extraData ~= nil and extraData.useNumber ~= nil then
Expand Down