Stack.fix.4 (#287)

* Category functions that misbehave will no longer break all bag rendering.

* Fixed duplicate items in the bank when stacking.

* Added trade window to interaction event list.

BetterBags.toc

@@ -35,6 +35,7 @@ animations\fade.lua
 debug\debug.lua
 debug\frames.lua
 debug\profile.lua
+debug\items.lua
 
 core\events.lua
 core\localization.lua

BetterBags_Vanilla.toc

@@ -37,6 +37,7 @@ animations\fade.lua
 debug\debug.lua
 debug\frames.lua
 debug\profile.lua
+debug\items.lua
 
 core\events.lua
 core\localization.lua

BetterBags_Wrath.toc

@@ -36,6 +36,7 @@ animations\fade.lua
 debug\debug.lua
 debug\frames.lua
 debug\profile.lua
+debug\items.lua
 
 core\events.lua
 core\localization.lua

core/hooks.lua

@@ -17,6 +17,7 @@ addon.backpackShouldOpen = false
 addon.backpackShouldClose = false
 
 local interactionEvents = {
+  [Enum.PlayerInteractionType.TradePartner] = true,
   [Enum.PlayerInteractionType.Banker] = true,
   [Enum.PlayerInteractionType.Merchant] = true,
   [Enum.PlayerInteractionType.MailInfo] = true,

core/init.lua

@@ -143,6 +143,9 @@ function addon:OnEnable()
 
   events:RegisterMessage('items/RefreshBank/Done', function(_, itemData)
    debug:Log("init/OnInitialize/items", "Drawing bank")
+   if addon.Bags.Bank.currentView then
+    addon.Bags.Bank.currentView.fullRefresh = true
+   end
    addon.Bags.Bank:Draw(itemData)
 
   end)

data/categories.lua

@@ -134,8 +134,9 @@ function categories:GetCustomCategory(kind, data)
   if self.itemsWithNoCategory[itemID] then return nil end
 
   for _, func in pairs(self.categoryFunctions) do
-    local category = func(data)
-    if category then
+    local success, args = xpcall(func, geterrorhandler(), data)
+    if success and args ~= nil then
+      local category = select(1, args) --[[@as string]]
       local found = database:ItemCategoryExists(category)
       database:SaveItemToCategory(itemID, category)
       if not found then

data/items.lua

@@ -473,11 +473,13 @@ function items:BankLoadFunction()
 
   ---@type table<string, ItemData>
   local stacks = {}
-
   for bagid, bag in pairs(items.bankItemsByBagAndSlot) do
     extraSlotInfo.emptySlotByBagAndSlot[bagid] = extraSlotInfo.emptySlotByBagAndSlot[bagid] or {}
     for slotid, data in pairs(bag) do
       items:AttachItemInfo(data, const.BAG_KIND.BANK)
+      data.stackedCount = 0
+      data.stackedOn = nil
+      data.stacks = 0
       table.insert(items.dirtyBankItems, data)
       -- Compute stacking data.
       if items:ShouldItemStack(const.BAG_KIND.BANK, data) then
@@ -498,7 +500,7 @@ function items:BankLoadFunction()
           data.stackedCount = data.itemInfo.currentItemCount
           stacks[data.itemHash] = data
         end
-      elseif data.stackedOn ~= nil or (data.stacks ~= nil and data.stacks > 0) then
+      else
         data.stackedOn = nil
         data.stacks = 0
         data.stackedCount = data.itemInfo.currentItemCount

debug/items.lua

@@ -0,0 +1,17 @@
+local addonName = ... ---@type string
+
+---@class BetterBags: AceAddon
+local addon = LibStub('AceAddon-3.0'):GetAddon(addonName)
+
+---@class Debug
+local debug = addon:GetModule('Debug')
+
+---@param data ItemData
+---@param id number
+---@return boolean
+function debug:IsItem(data, id)
+  if data and data.itemInfo and data.itemInfo.itemID == id then
+    return true
+  end
+  return false
+end