fix: notify spam

Qbox-project · Oct 3, 2024 · b0c33ea · b0c33ea
1 parent 51f1a3a
commit b0c33ea
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/bridge/qb/server.lua b/bridge/qb/server.lua
@@ -4,7 +4,10 @@ local function giveKeys(source, plate)
     local vehicles = plate and GetVehiclesFromPlate(plate) or {GetVehiclePedIsIn(GetPlayerPed(source), false)}
     local success = nil
     for i = 1, #vehicles do
-        success = success or GiveKeys(source, vehicles[i])
+        success = success or GiveKeys(source, vehicles[i], true)
+    end
+    if success then
+        exports.qbx_core:Notify(source, locale('notify.keys_taken'))
     end
     return success
 end
@@ -14,8 +17,9 @@ CreateQbExport('GiveKeys', giveKeys)
 local function removeKeys(source, plate)
     local vehicles = GetVehiclesFromPlate(plate)
     for i = 1, #vehicles do
-        RemoveKeys(source, vehicles[i])
+        RemoveKeys(source, vehicles[i], true)
     end
+    exports.qbx_core:Notify(source, locale('notify.keys_removed'))
 end
 
 CreateQbExport('RemoveKeys', removeKeys)

diff --git a/server/keys.lua b/server/keys.lua
@@ -59,7 +59,8 @@ end, {debug = debug})
 --- Removing the vehicle keys from the user
 ---@param source number ID of the player
 ---@param vehicle number
-function RemoveKeys(source, vehicle)
+---@param skipNotification? boolean
+function RemoveKeys(source, vehicle, skipNotification)
     local citizenid = getCitizenId(source)
     if not citizenid then return end
 
@@ -73,7 +74,9 @@ function RemoveKeys(source, vehicle)
     Player(source).state:set('keysList', keys, true)
 
     TriggerClientEvent('qbx_vehiclekeys:client:OnLostKeys', source)
-    exports.qbx_core:Notify(source, locale('notify.keys_removed'))
+    if not skipNotification then
+        exports.qbx_core:Notify(source, locale('notify.keys_removed'))
+    end
 
     return true
 end
@@ -82,7 +85,8 @@ exports('RemoveKeys', RemoveKeys)
 
 ---@param source number
 ---@param vehicle number
-function GiveKeys(source, vehicle)
+---@param skipNotification? boolean
+function GiveKeys(source, vehicle, skipNotification)
     local citizenid = getCitizenId(source)
     if not citizenid then return end
 
@@ -93,7 +97,9 @@ function GiveKeys(source, vehicle)
     keys[sessionId] = true
 
     Player(source).state:set('keysList', keys, true)
-    exports.qbx_core:Notify(source, locale('notify.keys_taken'))
+    if not skipNotification then
+        exports.qbx_core:Notify(source, locale('notify.keys_taken'))
+    end
     return true
 end