Location is now based when picture is taken

Project-Sloth · Apr 18, 2023 · d36586e · d36586e
1 parent eee0774
commit d36586e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/client/cl_main.lua b/client/cl_main.lua
@@ -208,21 +208,27 @@ function CameraLoop()
     end)
 end
 
+RegisterNetEvent("ps-camera:getStreetName", function(url, coords)
+    local streetHash, crossingHash = GetStreetNameAtCoord(coords.x, coords.y, coords.z)
+    local streetName = GetStreetNameFromHashKey(streetHash)
+
+    TriggerServerEvent("ps-camera:savePhoto", url, streetName)
+end)
+
 
 RegisterNetEvent("ps-camera:usePhoto", function(url, location)
     photo = not photo
 
     if photo then
-        SetNuiFocus(true, true)
-        SendNUIMessage({action = "openPhoto", image = url})
+        SetNuiFocus(true, true);
+        SendNUIMessage({action = "openPhoto", image = url, location = location})
 
         local ped = PlayerPedId()
         SharedRequestAnimDict("amb@world_human_tourist_map@male@base", function()
             TaskPlayAnim(ped, "amb@world_human_tourist_map@male@base", "base", 2.0, 2.0, -1, 1, 0, false, false, false)
         end)
 
         local coords = GetEntityCoords(ped)
-        SetLocation(location.x, location.y, location.z)
 
         if not HasModelLoaded("prop_cs_planning_photo") then
             LoadPropDict("prop_cs_planning_photo")
@@ -234,6 +240,7 @@ RegisterNetEvent("ps-camera:usePhoto", function(url, location)
     end
 end)
 
+
 RegisterNUICallback("close", function()
     SetNuiFocus(false, false)
     photo = false

diff --git a/server/sv_main.lua b/server/sv_main.lua
@@ -1,8 +1,7 @@
 local QBCore = exports['qb-core']:GetCoreObject()
-local json = require("json")
 
 -- Add Discord webhook here.
-local webhook = "https://discord.com/api/webhooks/1092328311235018752/Wk77hKe1KXH7Ltg3DF5uC1jDOKg_3F-NolpClxHyqgS_qgHd5z5fCX-xn7qsX4THjKcM"
+local webhook = ""
 
 RegisterNetEvent("ps-camera:cheatDetect", function()
     DropPlayer(source, "Cheater Detected")
@@ -19,11 +18,16 @@ RegisterNetEvent("ps-camera:CreatePhoto", function(url)
     if not player then return end
 
     local coords = GetEntityCoords(GetPlayerPed(source))
-    local location = {
-        x = coords.x,
-        y = coords.y,
-        z = coords.z
-    }
+
+    TriggerClientEvent("ps-camera:getStreetName", source, url, coords)
+end)
+
+RegisterNetEvent("ps-camera:savePhoto", function(url, streetName)
+    local source = source
+    local player = QBCore.Functions.GetPlayer(source)
+    if not player then return end
+
+    local location = streetName
 
     local info = {
         image = url,