Merge branch '3.5'

# Conflicts:
#	.luacheckrc
#	AutoSellPlus/Selling.lua

Author: Mikolaj Graf

.luacheckrc

@@ -91,6 +91,13 @@ read_globals = {
 
     -- WoW API: Tooltip
     "TooltipDataProcessor",
+    "C_TooltipInfo",
+
+    -- WoW API: Binding globals (localized by Blizzard)
+    "ITEM_BIND_TO_BNETACCOUNT",
+    "ITEM_BNETACCOUNTBOUND",
+    "ITEM_ACCOUNTBOUND",
+    "ITEM_BIND_TO_ACCOUNT",
 
     -- WoW API: Chat
     "ChatEdit_InsertLink",
@@ -109,6 +116,8 @@ read_globals = {
     -- WoW API: Instance
     "GetInstanceInfo",
     "GetExpansionLevel",
+    "NUM_TOTAL_EQUIPPED_BAG_SLOTS",
+    "C_DateAndTime",
 
     -- WoW API: Misc
     "strsplit",
@@ -118,6 +127,7 @@ read_globals = {
     "GetAddOnMetadata",
     "date",
     "time",
+    "GetBuybackItemLink",
     "GetLootSlotLink",
     "LootSlot",
     "CursorHasItem",

AutoSellPlus/Bindings.xml

@@ -1,5 +1,5 @@
 <Bindings>
-    <Binding name="ASP_TOGGLE_POPUP" header="AUTOSELLPLUS" runOnUp="false">
+    <Binding name="ASP_TOGGLE_POPUP" runOnUp="false">
         AutoSellPlus_KeybindSell()
     </Binding>
 </Bindings>

AutoSellPlus/Config.lua

@@ -51,6 +51,8 @@ ns.globalDefaults = {
     allowBoESell = false,
     onlySoulbound = false,
     protectQuestItems = true,
+    protectMountEquipment = true,
+    protectWarband = false,
     -- Display
     showSummary = true,
     showItemized = false,

AutoSellPlus/ConfirmList.lua

@@ -159,6 +159,37 @@ local function CreateDividerRow(parent, index)
     return row
 end
 
+-- ============================================================
+-- Row Creation & Pooling
+-- ============================================================
+
+local rowPool = {}
+
+local function GetRow(parent, index, isDivider)
+    local row
+    -- Find an existing hidden row of the correct type
+    for i, r in ipairs(rowPool) do
+        if not r:IsShown() and ((isDivider and r.isDivider) or (not isDivider and not r.isDivider)) then
+            row = r
+            row:SetParent(parent)
+            row:ClearAllPoints()
+            row:SetPoint("TOPLEFT", parent, "TOPLEFT", 0, -(index - 1) * ROW_HEIGHT)
+            break
+        end
+    end
+
+    if not row then
+        if isDivider then
+            row = CreateDividerRow(parent, index)
+        else
+            row = CreateRow(parent, index)
+        end
+        rowPool[#rowPool + 1] = row
+    end
+
+    return row
+end
+
 -- ============================================================
 -- Public API
 -- ============================================================
@@ -168,10 +199,9 @@ function ns:ShowConfirmList(queue, parentFrame)
 
     local f = GetOrCreatePanel()
 
-    -- Clear old rows
-    for _, row in ipairs(f.rows) do
+    -- Hide all pooled rows first
+    for _, row in ipairs(rowPool) do
         row:Hide()
-        row:SetParent(nil)
     end
     wipe(f.rows)
 
@@ -184,13 +214,13 @@ function ns:ShowConfirmList(queue, parentFrame)
         -- Insert divider before item 13
         if i == BUYBACK_LIMIT + 1 then
             rowIndex = rowIndex + 1
-            local divider = CreateDividerRow(scrollChild, rowIndex)
+            local divider = GetRow(scrollChild, rowIndex, true)
             f.rows[#f.rows + 1] = divider
             divider:Show()
         end
 
         rowIndex = rowIndex + 1
-        local row = CreateRow(scrollChild, rowIndex)
+        local row = GetRow(scrollChild, rowIndex, false)
         f.rows[#f.rows + 1] = row
 
         -- Icon

AutoSellPlus/Helpers.lua

@@ -250,10 +250,20 @@ function ns:DeserializeList(str)
     return imported > 0, imported
 end
 
+function ns:GetMaxBagID()
+    -- On Retail/Midnight, bag 5 is the reagent bag.
+    -- Future-proofing: use NUM_TOTAL_EQUIPPED_BAG_SLOTS if available (Modern WoW).
+    return (NUM_TOTAL_EQUIPPED_BAG_SLOTS or 5)
+end
+
+function ns:GetServerTime()
+    return C_DateAndTime and C_DateAndTime.GetServerTime() or GetServerTime()
+end
+
 -- Count free bag slots
 function ns:CountFreeSlots()
     local free = 0
-    for bag = 0, 4 do
+    for bag = 0, self:GetMaxBagID() do
         local numSlots = C_Container.GetContainerNumSlots(bag)
         for slot = 1, numSlots do
             local itemInfo = C_Container.GetContainerItemInfo(bag, slot)
@@ -265,11 +275,10 @@ function ns:CountFreeSlots()
     return free
 end
 
--- Calculate total vendor value of all bag items
 -- Count total quantity of an item across all bags
 function ns:GetItemCount(itemID)
     local count = 0
-    for bag = 0, 4 do
+    for bag = 0, self:GetMaxBagID() do
         local numSlots = C_Container.GetContainerNumSlots(bag)
         for slot = 1, numSlots do
             local itemInfo = C_Container.GetContainerItemInfo(bag, slot)
@@ -281,21 +290,9 @@ function ns:GetItemCount(itemID)
     return count
 end
 
--- Check if item exceeds its stack limit, returns excess count (0 if within limit)
-function ns:ExceedsStackLimit(itemID)
-    local limits = self.db.stackLimits
-    if not limits or not limits[itemID] then return 0 end
-    local limit = limits[itemID]
-    local current = self:GetItemCount(itemID)
-    if current > limit then
-        return current - limit
-    end
-    return 0
-end
-
 function ns:GetTotalBagVendorValue()
     local total = 0
-    for bag = 0, 4 do
+    for bag = 0, self:GetMaxBagID() do
         local numSlots = C_Container.GetContainerNumSlots(bag)
         for slot = 1, numSlots do
             local itemInfo = C_Container.GetContainerItemInfo(bag, slot)
@@ -312,7 +309,7 @@ end
 
 -- Iterate all bag items. Callback receives (bag, slot, itemInfo). Return true to stop.
 function ns:IterateBagItems(callback)
-    for bag = 0, 4 do
+    for bag = 0, self:GetMaxBagID() do
         local numSlots = C_Container.GetContainerNumSlots(bag)
         for slot = 1, numSlots do
             local itemInfo = C_Container.GetContainerItemInfo(bag, slot)
@@ -327,7 +324,7 @@ end
 
 -- Format a timestamp as "Xs ago", "Xm ago", "Xh ago", "Xd ago"
 function ns:FormatTimeAgo(timestamp)
-    local elapsed = GetServerTime() - timestamp
+    local elapsed = self:GetServerTime() - timestamp
     if elapsed < 60 then
         return elapsed .. "s ago"
     elseif elapsed < 3600 then

AutoSellPlus/Popup.lua

@@ -3,7 +3,7 @@ local addonName, ns = ...
 -- Layout constants
 local ROW_HEIGHT = 28
 local POPUP_WIDTH = 580
-local POPUP_HEIGHT = 650
+local POPUP_HEIGHT = 694
 
 local FLAT_BACKDROP = ns.FLAT_BACKDROP
 
@@ -718,6 +718,38 @@ local function CreateFilterSection(f)
     end)
     f.soulboundCheck = soulboundCheck
     rowY = rowY - 22
+
+    -- Protect mount equipment checkbox
+    local mountEquipCheck = CreateStyledCheck(f, 18)
+    mountEquipCheck:SetPoint("TOPLEFT", filterLeft, filterTop + rowY)
+    local mountEquipLabel = f:CreateFontString(nil, "OVERLAY", "GameFontHighlight")
+    mountEquipLabel:SetPoint("LEFT", mountEquipCheck, "RIGHT", 6, 0)
+    mountEquipLabel:SetText("Protect Mount Equipment")
+    mountEquipLabel:SetTextColor(0.70, 0.70, 0.70)
+    mountEquipCheck:SetScript("OnClick", function(self)
+        ns.db.protectMountEquipment = self:GetChecked()
+        displayList = ns:BuildDisplayList()
+        ns:ApplyFilters(displayList, userUnchecked)
+        ns:RefreshPopupList()
+    end)
+    f.mountEquipCheck = mountEquipCheck
+    rowY = rowY - 22
+
+    -- Protect warband checkbox
+    local warbandCheck = CreateStyledCheck(f, 18)
+    warbandCheck:SetPoint("TOPLEFT", filterLeft, filterTop + rowY)
+    local warbandLabel = f:CreateFontString(nil, "OVERLAY", "GameFontHighlight")
+    warbandLabel:SetPoint("LEFT", warbandCheck, "RIGHT", 6, 0)
+    warbandLabel:SetText("Protect Warband")
+    warbandLabel:SetTextColor(0.70, 0.70, 0.70)
+    warbandCheck:SetScript("OnClick", function(self)
+        ns.db.protectWarband = self:GetChecked()
+        displayList = ns:BuildDisplayList()
+        ns:ApplyFilters(displayList, userUnchecked)
+        ns:RefreshPopupList()
+    end)
+    f.warbandCheck = warbandCheck
+    rowY = rowY - 22
     rowY = rowY - 4
 
     -- Category filters
@@ -992,7 +1024,7 @@ local function CreateBottomBar(f)
             return
         end
         -- Find the item in bags and sell it
-        for bag = 0, 4 do
+        for bag = 0, ns:GetMaxBagID() do
             local numSlots = C_Container.GetContainerNumSlots(bag)
             for slot = 1, numSlots do
                 local itemInfo = C_Container.GetContainerItemInfo(bag, slot)
@@ -1210,6 +1242,8 @@ local function SyncFiltersFromDB(f)
     f.equipCheck:SetChecked(ns.db.onlyEquippable)
     f.transmogCheck:SetChecked(not ns.db.protectUncollectedTransmog)
     f.soulboundCheck:SetChecked(ns.db.onlySoulbound)
+    f.mountEquipCheck:SetChecked(ns.db.protectMountEquipment)
+    f.warbandCheck:SetChecked(ns.db.protectWarband)
 
     if f.whiteSlider then
         f.whiteSlider:SetValue(ns.db.whiteMaxIlvl)

AutoSellPlus/PopupFilters.lua

@@ -6,7 +6,7 @@ local addonName, ns = ...
 
 function ns:BuildDisplayList()
     local list = {}
-    for bag = 0, 4 do
+    for bag = 0, self:GetMaxBagID() do
         local numSlots = C_Container.GetContainerNumSlots(bag)
         for slot = 1, numSlots do
             local itemInfo = C_Container.GetContainerItemInfo(bag, slot)
@@ -23,11 +23,13 @@ function ns:BuildDisplayList()
                     local isAlwaysSell = self:IsAlwaysSell(itemID)
                     local isMarked = self:IsMarked(itemID)
 
+                    local _, _, _, _, _, bClassID, bSubclassID = C_Item.GetItemInfoInstant(itemID)
                     if not self:IsNeverSell(itemID)
                         and not isLocked
                         and not self:IsRefundable(bag, slot)
                         and (sellPrice and sellPrice > 0 or isAlwaysSell)
                         and not hasNoValue
+                        and not (self.db.protectMountEquipment and bClassID == 15 and bSubclassID == 6)
                         and not (self.db.protectEquipmentSets and self:IsInEquipmentSet(itemID))
                         and not (self.db.protectUncollectedTransmog and self:HasTransmogAppearance(itemID) and self:IsUncollectedTransmog(itemID))
                         and not (self.db.protectTransmogSource and self:HasTransmogAppearance(itemID) and self:IsUncollectedTransmogSource(itemID))
@@ -37,28 +39,20 @@ function ns:BuildDisplayList()
                             -- Skip: soulbound-only mode, item is not bound to player
                         elseif self.db.protectBoE and isBoe and not self.db.allowBoESell and not isAlwaysSell then
                             -- Skip: BoE protection
+                        elseif self.db.protectWarband and self:IsWarband(bag, slot) and not isAlwaysSell then
+                            -- Skip: Warband protection
                         elseif self.db.protectCurrentExpMaterials
-                            and self:GetItemClassID(itemID) == 7
+                            and bClassID == 7
                             and self:GetItemExpansion(itemLink) == ns.CURRENT_EXPANSION
                             and not isAlwaysSell then
                             -- Skip current expansion trade goods
                         else
                             local ilvl = self:GetEffectiveItemLevel(itemLink)
                             local isEquippable = self:IsEquippable(itemID)
                             local equippedIlvl = isEquippable and self:GetEquippedIlvlForItem(itemID) or 0
-                            local classID = self:GetItemClassID(itemID)
+                            local classID = bClassID
                             local expansionID = self:GetItemExpansion(itemLink)
 
-                            -- AH value lookup
-                            local ahValue = 0
-                            if TSM_API and TSM_API.GetCustomPriceValue then
-                                local ok, val = pcall(TSM_API.GetCustomPriceValue, "DBMarket", "i:" .. itemID)
-                                if ok and val then ahValue = val end
-                            elseif Auctionator and Auctionator.API and Auctionator.API.v1 and Auctionator.API.v1.GetAuctionPriceByItemLink then
-                                local ok, val = pcall(Auctionator.API.v1.GetAuctionPriceByItemLink, "AutoSellPlus", itemLink)
-                                if ok and val then ahValue = val end
-                            end
-
                             list[#list + 1] = {
                                 bag = bag,
                                 slot = slot,
@@ -74,9 +68,10 @@ function ns:BuildDisplayList()
                                 isAlwaysSell = isAlwaysSell,
                                 isMarked = isMarked,
                                 isBoe = isBoe,
-                                classID = classID,
+                                classID = bClassID,
+                                subclassID = bSubclassID,
                                 expansionID = expansionID,
-                                ahValue = ahValue,
+                                ahValue = 0,
                                 checked = false,
                                 visible = false,
                             }
@@ -204,6 +199,7 @@ function ns:ApplyFilters(displayList, userUnchecked)
 
         -- Category filters (non-equippable items)
         if not visible then
+            local isMountEquip = (item.classID == 15 and item.subclassID == 6)
             if item.classID == 0 and db.sellConsumables then
                 visible = true
                 autoChecked = true
@@ -214,13 +210,29 @@ function ns:ApplyFilters(displayList, userUnchecked)
                 visible = true
                 autoChecked = not db.protectQuestItems
             elseif item.classID == 15 and db.sellMiscItems then
-                visible = true
-                autoChecked = true
+                if db.protectMountEquipment and isMountEquip then
+                    visible = false
+                    autoChecked = false
+                else
+                    visible = true
+                    autoChecked = true
+                end
             end
         end
 
         item.visible = visible
 
+        -- Deferred AH value lookup: only query for visible items
+        if visible and item.ahValue == 0 then
+            if TSM_API and TSM_API.GetCustomPriceValue then
+                local ok, val = pcall(TSM_API.GetCustomPriceValue, "DBMarket", "i:" .. item.itemID)
+                if ok and val then item.ahValue = val end
+            elseif Auctionator and Auctionator.API and Auctionator.API.v1 and Auctionator.API.v1.GetAuctionPriceByItemLink then
+                local ok, val = pcall(Auctionator.API.v1.GetAuctionPriceByItemLink, "AutoSellPlus", item.itemLink)
+                if ok and val then item.ahValue = val end
+            end
+        end
+
         local key = item.bag .. ":" .. item.slot
         if userUnchecked[key] then
             item.checked = false