Item Count: Add support for reagent/account bank api (#5389)

WeakAuras/GenericTrigger.lua

@@ -2268,19 +2268,21 @@ do
     end,
     Schedule = function(self, expirationTime, id)
       if (not self.expirationTime[id] or expirationTime < self.expirationTime[id]) and expirationTime > 0 then
-        if self.handles[id] then
-          timer:CancelTimer(self.handles[id])
-          self.handles[id] = nil
-          self.expirationTime[id] = nil
-        end
-
+        self:Cancel(id)
         local duration = expirationTime - GetTime()
         if duration > 0 then
           self.handles[id] = timer:ScheduleTimerFixed(self.Recheck, duration, self, id)
           self.expirationTime[id] = expirationTime
         end
       end
-    end
+    end,
+    Cancel = function(self, id)
+      if self.handles[id] then
+        timer:CancelTimer(self.handles[id])
+        self.handles[id] = nil
+        self.expirationTime[id] = nil
+      end
+    end,
   }
 
   local function FetchSpellCooldown(self, id)
@@ -2419,7 +2421,7 @@ do
   --- @field name string
   --- @field icon number
   --- @field id number
-  --- @field watched number[]
+  --- @field watched table<number, boolean>
 
   -- Basic details like name, icon, charges, times per effective spell id
   -- Also contains the mapping from effective spell id to watched
@@ -2465,10 +2467,10 @@ do
         name = name,
         icon = icon,
         id = spellId,
-        watched = { effectiveSpellId }
+        watched = { [effectiveSpellId] = true }
       }
       if effectiveSpellId ~= userSpellId then
-        tinsert(self.data[effectiveSpellId].watched, userSpellId)
+        self.data[effectiveSpellId].watched[userSpellId] = true
       end
 
       local spellDetail = self.data[effectiveSpellId]
@@ -2506,10 +2508,10 @@ do
               -- There are lots of cases to consider here:
 
               -- For the new effective spell id
-              -- a) We are already tracking it, only add the wathed spell ids
+              -- a) We are already tracking it, only add the watched spell ids
               -- b) We aren't tracking it yet add it
               if self.data[newEffectiveSpellId] then
-                tinsert(self.data[newEffectiveSpellId].watched, userSpellId)
+                self.data[newEffectiveSpellId].watched[userSpellId] = true
               else
                 self:AddEffectiveSpellId(newEffectiveSpellId, userSpellId)
               end
@@ -2530,9 +2532,10 @@ do
               -- For the old effective spell id
               -- * Remove the spell from watched
               -- * If we removed the last mapping, remove the spell details of the effective spell id
-              tremove(oldSpellDetail.watched, userSpellId)
-              if #oldSpellDetail.watched == 0 then
+              oldSpellDetail.watched[userSpellId] = nil
+              if next(oldSpellDetail.watched) == nil then
                 self.data[oldEffectiveSpellId] = nil
+                RecheckHandles:Cancel(oldEffectiveSpellId)
               end
 
               -- Finally update the watchedSpellIds mapping
@@ -2671,9 +2674,7 @@ do
 
       if self.data[effectiveSpellId] then
         -- But we are already tracking the effectiveSpellId, so only add the mapping
-        if not tContains(self.data[effectiveSpellId].watched, userSpellId) then
-          tinsert(self.data[effectiveSpellId].watched, userSpellId)
-        end
+        self.data[effectiveSpellId].watched[userSpellId] = true
         return
       end
 
@@ -2683,7 +2684,7 @@ do
     SendEventsForSpell = function(self, effectiveSpellId, event, ...)
       local watchedSpells = self.data[effectiveSpellId] and self.data[effectiveSpellId].watched
       if watchedSpells then
-        for _, userSpellId in ipairs(watchedSpells) do
+        for userSpellId in pairs(watchedSpells) do
           Private.ScanEventsByID(event, userSpellId, ...)
         end
       end