refactor: update ItemNotify input

overextended · Mar 26, 2023 · 6fe67b3 · 6fe67b3
1 parent f614249
commit 6fe67b3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/client.lua b/client.lua
@@ -926,7 +926,7 @@ RegisterNetEvent('ox_inventory:updateSlots', function(items, weights, count, rem
  item = PlayerData.inventory[item.slot]
  end
 
- Utils.ItemNotify({item.metadata?.label or item.label, item.metadata?.image or item.metadata?.imageurl or item.name, removed and 'ui_removed' or 'ui_added', count})
+ Utils.ItemNotify({ item, removed and 'ui_removed' or 'ui_added', count })
  end
 
  updateInventory(items, weights)

diff --git a/modules/inventory/server.lua b/modules/inventory/server.lua
@@ -1426,11 +1426,11 @@ lib.callback.register('ox_inventory:swapItems', function(source, data)
  end
 
  if fromOtherPlayer then
- TriggerClientEvent('ox_inventory:itemNotify', fromInventory.id, { fromData.metadata?.label or fromData.label, fromData.metadata?.image or fromData.metadata?.imageurl or fromData.name, 'ui_removed', fromData.count })
- TriggerClientEvent('ox_inventory:itemNotify', fromInventory.id, { toData.metadata?.label or toData.label, toData.metadata?.image or toData.metadata?.imageurl or toData.name, 'ui_added', toData.count })
+ TriggerClientEvent('ox_inventory:itemNotify', fromInventory.id, { fromData, 'ui_removed', fromData.count })
+ TriggerClientEvent('ox_inventory:itemNotify', fromInventory.id, { toData, 'ui_added', toData.count })
  elseif toOtherPlayer then
- TriggerClientEvent('ox_inventory:itemNotify', toInventory.id, { fromData.metadata?.label or fromData.label, fromData.metadata?.image or fromData.metadata?.imageurl or fromData.name, 'ui_added', fromData.count })
- TriggerClientEvent('ox_inventory:itemNotify', toInventory.id, { toData.metadata?.label or toData.label, toData.metadata?.image or toData.metadata?.imageurl or toData.name, 'ui_removed', toData.count })
+ TriggerClientEvent('ox_inventory:itemNotify', toInventory.id, { fromData, 'ui_added', fromData.count })
+ TriggerClientEvent('ox_inventory:itemNotify', toInventory.id, { toData, 'ui_removed', toData.count })
  end
 
  toData, fromData = Inventory.SwapSlots(fromInventory, toInventory, data.fromSlot, data.toSlot) --[[@as table]]
@@ -1473,9 +1473,9 @@ lib.callback.register('ox_inventory:swapItems', function(source, data)
  end
 
  if fromOtherPlayer then
- TriggerClientEvent('ox_inventory:itemNotify', fromInventory.id, { fromData.metadata?.label or fromData.label, fromData.metadata?.image or fromData.metadata?.imageurl or fromData.name, 'ui_removed', data.count })
+ TriggerClientEvent('ox_inventory:itemNotify', fromInventory.id, { fromData, 'ui_removed', data.count })
  elseif toOtherPlayer then
- TriggerClientEvent('ox_inventory:itemNotify', toInventory.id, { toData.metadata?.label or toData.label, toData.metadata?.image or toData.metadata?.imageurl or toData.name, 'ui_added', data.count })
+ TriggerClientEvent('ox_inventory:itemNotify', toInventory.id, { toData, 'ui_added', data.count })
  end
 
  if server.loglevel > 0 then
@@ -1523,9 +1523,9 @@ lib.callback.register('ox_inventory:swapItems', function(source, data)
  end
 
  if fromOtherPlayer then
- TriggerClientEvent('ox_inventory:itemNotify', fromInventory.id, { fromData.metadata?.label or fromData.label, fromData.metadata?.image or fromData.metadata?.imageurl or fromData.name, 'ui_removed', data.count })
+ TriggerClientEvent('ox_inventory:itemNotify', fromInventory.id, { fromData, 'ui_removed', data.count })
  elseif toOtherPlayer then
- TriggerClientEvent('ox_inventory:itemNotify', toInventory.id, { fromData.metadata?.label or fromData.label, fromData.metadata?.image or fromData.metadata?.imageurl or fromData.name, 'ui_added', data.count })
+ TriggerClientEvent('ox_inventory:itemNotify', toInventory.id, { fromData, 'ui_added', data.count })
  end
 
  if server.loglevel > 0 then

diff --git a/modules/weapon/client.lua b/modules/weapon/client.lua
@@ -92,7 +92,7 @@ function Weapon.Equip(item, data)
  end
 
  TriggerEvent('ox_inventory:currentWeapon', item)
- Utils.ItemNotify({item.metadata.label or item.label, item.metadata.image or item.name, 'ui_equipped'})
+ Utils.ItemNotify({ item, 'ui_equipped' })
 
  return item
 end
@@ -129,7 +129,7 @@ function Weapon.Disarm(currentWeapon, noAnim)
 
  ::skipAnim::
 
- Utils.ItemNotify({currentWeapon.metadata.label or currentWeapon.label, currentWeapon.metadata.image or currentWeapon.name, 'ui_holstered'})
+ Utils.ItemNotify({ currentWeapon, 'ui_holstered' })
  TriggerEvent('ox_inventory:currentWeapon')
  end