See description, resolves #38, resolves #36

- Fixed console error when adding invalid number (use _source)
- Fix contacts not refreshing when added (fixed broken code)
- Play sound when message recieved
- Close phone if open when script is stopping
- Get back contacts, etc when restarted mid-game

client/main.lua

@@ -82,13 +82,13 @@ AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts)
 end)
 
 RegisterNetEvent('esx_phone:addContact')
-AddEventHandler('esx_phone:addContact', function(name, phoneNumber)
+AddEventHandler('esx_phone:addContact', function(name, phoneNumber, playerOnline)
 	table.insert(PhoneData.contacts, {
 		name   = name,
 		number = phoneNumber,
-		online = (PhoneNumberSources[contacts[i].number] == nil and false or NetworkIsPlayerActive(GetPlayerFromServerId(PhoneNumberSources[contacts[i].number]))),
+		online = playerOnline
 	})
-	-- CALL HERE RELOADCONTACT
+
 	SendNUIMessage({
 		contactAdded = true,
 		phoneData    = PhoneData
@@ -103,7 +103,7 @@ AddEventHandler('esx_phone:removeContact', function(name, phoneNumber)
 			break
 		end
 	end
-	-- CALL HERE RELOADCONTACT
+
 	SendNUIMessage({
 		contactRemoved = true,
 		phoneData      = PhoneData
@@ -131,7 +131,7 @@ end)
 RegisterNUICallback('add_contact', function(data, cb)
 	local phoneNumber = tonumber(data.phoneNumber)
 	local contactName = tostring(data.contactName)
-	
+
 	if phoneNumber then
 		TriggerServerEvent('esx_phone:addPlayerContact', phoneNumber, contactName)
 	else
@@ -164,6 +164,8 @@ AddEventHandler('esx_phone:onMessage', function(phoneNumber, message, position,
 		ESX.ShowNotification('~b~' .. job .. ': ~s~' .. message)
 	end
 
+	PlaySound(-1, "Menu_Accept", "Phone_SoundSet_Default", 0, 0, 1)
+
 	SendNUIMessage({
 		newMessage  = true,
 		phoneNumber = phoneNumber,
@@ -277,6 +279,14 @@ Citizen.CreateThread(function()
 	end
 end)
 
+AddEventHandler('onResourceStop', function(resource)
+	if resource == GetCurrentResourceName() then
+		if GUI.PhoneIsShowed then
+			ESX.UI.Menu.CloseAll()
+		end
+	end
+end)
+
 -- Key controls
 Citizen.CreateThread(function()
 	while true do

server/main.lua

@@ -1,49 +1,8 @@
-ESX                       = nil
-local DisptachRequestId   = 0
-local PhoneNumbers        = {}
+ESX                     = nil
+local DisptachRequestId = 0
+local PhoneNumbers      = {}
 
-TriggerEvent('esx:getSharedObject', function(obj)
-	ESX = obj
-end)
-
-function GenerateUniquePhoneNumber()
-	local foundNumber, phoneNumber = false, nil
-
-	while not foundNumber do
-		Citizen.Wait(100)
-
-		math.randomseed(GetGameTimer())
-		phoneNumber = math.random(10000, 99999)
-
-		local result = MySQL.Sync.fetchAll('SELECT COUNT(*) as count FROM users WHERE phone_number = @phoneNumber', {
-			['@phoneNumber'] = phoneNumber
-		})
-
-		if tonumber(result[1].count) == 0 then
-			foundNumber = true
-		end
-	end
-
-	return phoneNumber
-end
-
-function GetDistpatchRequestId()
-	local requestId = DisptachRequestId
-
-	if DisptachRequestId < 65535 then
-		DisptachRequestId = DisptachRequestId + 1
-	else
-		DisptachRequestId = 0
-	end
-
-	return requestId
-end
-
-AddEventHandler('esx_phone:getDistpatchRequestId', function(cb)
-	cb(GetDistpatchRequestId())
-end)
-
-AddEventHandler('esx:playerLoaded', function(source)
+function LoadPlayer(source)
 	local xPlayer = ESX.GetPlayerFromId(source)
 
 	for num,v in pairs(PhoneNumbers) do
@@ -101,7 +60,57 @@ AddEventHandler('esx:playerLoaded', function(source)
 			TriggerClientEvent('esx_phone:loaded', source, phoneNumber, contacts)
 		end)
 	end)
+end
 
+TriggerEvent('esx:getSharedObject', function(obj)
+	ESX = obj
+
+	local xPlayers = ESX.GetPlayers()
+
+	for i=1, #xPlayers, 1 do
+		LoadPlayer(xPlayers[i])
+	end
+end)
+
+function GenerateUniquePhoneNumber()
+	local foundNumber, phoneNumber = false, nil
+
+	while not foundNumber do
+		Citizen.Wait(100)
+
+		math.randomseed(GetGameTimer())
+		phoneNumber = math.random(10000, 99999)
+
+		local result = MySQL.Sync.fetchAll('SELECT COUNT(*) as count FROM users WHERE phone_number = @phoneNumber', {
+			['@phoneNumber'] = phoneNumber
+		})
+
+		if tonumber(result[1].count) == 0 then
+			foundNumber = true
+		end
+	end
+
+	return phoneNumber
+end
+
+function GetDistpatchRequestId()
+	local requestId = DisptachRequestId
+
+	if DisptachRequestId < 65535 then
+		DisptachRequestId = DisptachRequestId + 1
+	else
+		DisptachRequestId = 0
+	end
+
+	return requestId
+end
+
+AddEventHandler('esx_phone:getDistpatchRequestId', function(cb)
+	cb(GetDistpatchRequestId())
+end)
+
+AddEventHandler('esx:playerLoaded', function(source)
+	LoadPlayer(source)
 end)
 
 AddEventHandler('esx:playerDropped', function(source)
@@ -140,7 +149,7 @@ AddEventHandler('esx_phone:send', function(phoneNumber, message, anon, position)
 	local _source = source
 	local xPlayer = ESX.GetPlayerFromId(_source)
 
-	print('MESSAGE => ' .. xPlayer.name .. '@' .. phoneNumber .. ' : ' .. message)
+	print(('esx_phone: MESSAGE => %s@%s: %s'):format(xPlayer.name, phoneNumber, message))
 
 	if PhoneNumbers[phoneNumber] ~= nil then
 
@@ -196,15 +205,15 @@ RegisterServerEvent('esx_phone:addPlayerContact')
 AddEventHandler('esx_phone:addPlayerContact', function(phoneNumber, contactName)
 	local _source = source
 	local xPlayer = ESX.GetPlayerFromId(_source)
-	phoneNumber   = tonumber(phoneNumber)
-	
-	-- is the player trying to enter something else into the database?
+	phoneNumber = tonumber(phoneNumber)
+	local playerOnline = false
+
 	if phoneNumber == nil then
-		print('esx_phone: ' .. xPlayer.identifier .. ' attempted to crash the database!')
+		print(('esx_phone: %s attempted SQL injecting!'):format(xPlayer.identifier))
 		return
 	end
 
-	MySQL.Async.fetchAll('SELECT phone_number FROM users WHERE phone_number = @number', {
+	MySQL.Async.fetchAll('SELECT phone_number, identifier FROM users WHERE phone_number = @number', {
 		['@number'] = phoneNumber
 	}, function(result)
 		if result[1] ~= nil then
@@ -213,6 +222,7 @@ AddEventHandler('esx_phone:addPlayerContact', function(phoneNumber, contactName)
 			else
 				local contacts  = xPlayer.get('contacts')
 
+				-- already added player?
 				for i=1, #contacts, 1 do
 					if contacts[i].number == phoneNumber then
 						TriggerClientEvent('esx:showNotification', _source, _U('number_in_contacts'))
@@ -222,11 +232,15 @@ AddEventHandler('esx_phone:addPlayerContact', function(phoneNumber, contactName)
 
 				table.insert(contacts, {
 					name   = contactName,
-					number = phoneNumber,
+					number = phoneNumber
 				})
 
 				xPlayer.set('contacts', contacts)
 
+				-- is the player currently online?
+				local xTarget = ESX.GetPlayerFromIdentifier(result[1].identifier)
+				playerOnline = (xTarget ~= nil)
+
 				MySQL.Async.execute('INSERT INTO user_contacts (identifier, name, number) VALUES (@identifier, @name, @number)',
 				{
 					['@identifier'] = xPlayer.identifier,
@@ -234,7 +248,7 @@ AddEventHandler('esx_phone:addPlayerContact', function(phoneNumber, contactName)
 					['@number']     = phoneNumber
 				}, function(rowsChanged)
 					TriggerClientEvent('esx:showNotification', _source, _U('contact_added'))
-					TriggerClientEvent('esx_phone:addContact', _source, contactName, phoneNumber)
+					TriggerClientEvent('esx_phone:addContact', _source, contactName, phoneNumber, playerOnline)
 				end)
 			end
 		else
@@ -277,7 +291,7 @@ AddEventHandler('esx_phone:removePlayerContact', function(phoneNumber, contactNa
 				TriggerClientEvent('esx_phone:removeContact', _source, contactName, phoneNumber)
 			end)
 		else
-			TriggerClientEvent('esx:showNotification', source, _U('number_not_assigned'))
+			TriggerClientEvent('esx:showNotification', _source, _U('number_not_assigned'))
 		end
 	end)
 end)