libdebuff: emulate UnitDebuff API call

api/unitframes.lua

@@ -1138,9 +1138,10 @@ function pfUI.uf:RefreshUnit(unit, component)
           local timeleft = GetPlayerBuffTimeLeft(GetPlayerBuff(unit.debuffs[i]:GetID() - 1, "HARMFUL"),"HARMFUL")
           CooldownFrame_SetTimer(unit.debuffs[i].cd, GetTime(), timeleft, 1)
         elseif libdebuff then
-          local effect = libdebuff:GetDebuffName(unitstr, unit.debuffs[i]:GetID())
-          local start, duration, timeleft = libdebuff:GetDebuffInfo(unitstr, effect)
-          CooldownFrame_SetTimer(unit.debuffs[i].cd, start, duration, 1)
+          local name, rank, texture, stacks, dtype, duration, timeleft = libdebuff:UnitDebuff(unitstr, i)
+          if duration and timeleft then
+            CooldownFrame_SetTimer(unit.debuffs[i].cd, GetTime() + timeleft - duration, duration, 1)
+          end
         end
 
         if stacks > 1 then

libs/libdebuff.lua

@@ -3,56 +3,19 @@ setfenv(1, pfUI:GetEnvironment())
 
 --[[ libdebuff ]]--
 -- A pfUI library that detects and saves all ongoing debuffs of players, NPCs and enemies.
+-- The functions UnitDebuff is exposed to the modules which allows to query debuffs like you
+-- would on later expansions.
 --
---  libdebuff:GetDebuffName(unit, index)
---    Returns the debuff name with the given index of the specified unit
---
---  libdebuff:GetDebuffInfo(unit, effect)
+--  libdebuff:UnitDebuff(unit, id)
 --    Returns debuff informations on the given effect of the specified unit.
---    start, duration, timeleft
+--    name, rank, texture, stacks, dtype, duration, timeleft
+
+-- return instantly when another libdebuff is already active
+if pfUI.api.libdebuff then return end
 
 local libdebuff = CreateFrame("Frame", "pfdebuffsScanner", UIParent)
 local scanner = libtipscan:GetScanner("libdebuff")
 
-function libdebuff:GetDebuffName(unit, index)
-  scanner:SetUnitDebuff(unit, index)
-  local text = scanner:Line(1)
-  return ( text ) and text or ""
-end
-
-function libdebuff:GetDebuffInfo(unit, effect)
-  local unitname = UnitName(unit)
-  local unitlevel = UnitLevel(unit)
-
-  if libdebuff.objects[unitname] and libdebuff.objects[unitname][unitlevel] and libdebuff.objects[unitname][unitlevel][effect] then
-    -- clean up db
-    if libdebuff.objects[unitname][unitlevel][effect].duration and libdebuff.objects[unitname][unitlevel][effect].duration + libdebuff.objects[unitname][unitlevel][effect].start < GetTime() then
-      libdebuff.objects[unitname][unitlevel][effect] = nil
-      return 0, 0, 0
-    end
-    local start = libdebuff.objects[unitname][unitlevel][effect].start
-    local duration = libdebuff.objects[unitname][unitlevel][effect].duration
-    local timeleft = duration + start - GetTime()
-
-    return start, duration, timeleft
-
-  -- no level data
-  elseif libdebuff.objects[unitname] and libdebuff.objects[unitname][0] and libdebuff.objects[unitname][0][effect] then
-    -- clean up db
-    if libdebuff.objects[unitname][0][effect].duration and libdebuff.objects[unitname][0][effect].duration + libdebuff.objects[unitname][0][effect].start < GetTime() then
-      libdebuff.objects[unitname][0][effect] = nil
-      return 0, 0, 0
-    end
-    local start = libdebuff.objects[unitname][0][effect].start
-    local duration = libdebuff.objects[unitname][0][effect].duration
-    local timeleft = duration + start - GetTime()
-
-    return start, duration, timeleft
-  else
-    return 0, 0, 0
-  end
-end
-
 function libdebuff:GetDuration(effect, rank)
   if L["debuffs"][effect] and rank then
     local rank = string.gsub(rank, RANK .. " ", "")
@@ -181,7 +144,6 @@ libdebuff:SetScript("OnEvent", function()
   if event == "CHAT_MSG_SPELL_PERIODIC_HOSTILEPLAYER_DAMAGE" or event == "CHAT_MSG_SPELL_PERIODIC_CREATURE_DAMAGE" then
     for unit, effect in gfind(arg1, libdebuff.combatlog) do
       local unitlevel = UnitName("target") == unit and UnitLevel("target") or 0
-
       if not libdebuff.objects[unit] or not libdebuff.objects[unit][unitlevel] or not libdebuff.objects[unit][unitlevel][effect] then
         this:AddEffect(unit, unitlevel, effect)
       end
@@ -190,12 +152,9 @@ libdebuff:SetScript("OnEvent", function()
   -- Add Missing Buffs by Iteration
   elseif ( event == "UNIT_AURA" and arg1 == "target" ) or event == "PLAYER_TARGET_CHANGED" then
     for i=1, 16 do
-      texture, _, _ = UnitDebuff("target" , i)
-      if texture then
-        local effect = this:GetDebuffName("target", i)
-        if effect ~= "" and this:GetDebuffInfo("target", effect) == 0 then
-          this:AddEffect(UnitName("target"), UnitLevel("target"), effect)
-        end
+      effect, rank, texture, stacks, dtype, duration, timeleft = this:UnitDebuff("target", i)
+      if texture and effect and duration then
+        this:AddEffect(UnitName("target"), UnitLevel("target"), effect)
       end
     end
 
@@ -244,5 +203,37 @@ hooksecurefunc("UseAction", function(slot, target, button)
   libdebuff:AddPending(UnitName("target"), UnitLevel("target"), effect, duration)
 end, true)
 
+function libdebuff:UnitDebuff(unit, id)
+  scanner:SetUnitDebuff(unit, id)
+  local effect = ( scanner:Line(1) ) or ""
+  local unitname = UnitName(unit)
+  local unitlevel = UnitLevel(unit)
+  local texture, stacks, dtype = UnitDebuff(unit, id)
+  local duration, timeleft = nil, nil
+  local rank = nil -- no backport
+
+  if libdebuff.objects[unitname] and libdebuff.objects[unitname][unitlevel] and libdebuff.objects[unitname][unitlevel][effect] then
+    -- clean up cache
+    if libdebuff.objects[unitname][unitlevel][effect].duration and libdebuff.objects[unitname][unitlevel][effect].duration + libdebuff.objects[unitname][unitlevel][effect].start < GetTime() then
+      libdebuff.objects[unitname][unitlevel][effect] = nil
+    else
+      duration = libdebuff.objects[unitname][unitlevel][effect].duration
+      timeleft = duration + libdebuff.objects[unitname][unitlevel][effect].start - GetTime()
+    end
+
+  -- no level data
+  elseif libdebuff.objects[unitname] and libdebuff.objects[unitname][0] and libdebuff.objects[unitname][0][effect] then
+    -- clean up cache
+    if libdebuff.objects[unitname][0][effect].duration and libdebuff.objects[unitname][0][effect].duration + libdebuff.objects[unitname][0][effect].start < GetTime() then
+      libdebuff.objects[unitname][0][effect] = nil
+    else
+      duration = libdebuff.objects[unitname][0][effect].duration
+      timeleft = duration + libdebuff.objects[unitname][0][effect].start - GetTime()
+    end
+  end
+
+  return name, rank, texture, stacks, dtype, duration, timeleft
+end
+
 -- add libdebuff to pfUI API
 pfUI.api.libdebuff = libdebuff

modules/nameplates.lua

@@ -665,9 +665,8 @@ pfUI:RegisterModule("nameplates", function ()
       pfUI.nameplates.debuffs = {}
       for i = 1, 16 do
         if not UnitDebuff("target", i) then return end
-        local debuff = UnitDebuff("target", i)
-        local effect = (libdebuff and libdebuff:GetDebuffName("target", i)) or ""
-        pfUI.nameplates.debuffs[i] = { debuff, effect }
+        local name, _, texture = libdebuff:UnitDebuff("target", i)
+        pfUI.nameplates.debuffs[i] = { texture, name }
       end
     end
   end)