Fixes #137, reimplement "dispel" wildcard without using isRaid flag

Instead of using the auradata.isRaid flag to know if an aura is dispellable by a player or not, we can use LibDispel to query the player's dispel types.

Author: brittyazel

Globals.lua

@@ -44,8 +44,8 @@ EnhancedRaidFrames.POSITIONS[9] = L["Bottom-Right"]
 
 -- Declare Global iconCache table with pre-populated values
 EnhancedRaidFrames.iconCache = {}
-EnhancedRaidFrames.iconCache["poison"] = 132104
-EnhancedRaidFrames.iconCache["disease"] = 132099
-EnhancedRaidFrames.iconCache["curse"] = 132095
-EnhancedRaidFrames.iconCache["magic"] = 135894
-EnhancedRaidFrames.iconCache["bleed"] = 136168
+EnhancedRaidFrames.iconCache["Poison"] = 132104
+EnhancedRaidFrames.iconCache["Disease"] = 132099
+EnhancedRaidFrames.iconCache["Curse"] = 132095
+EnhancedRaidFrames.iconCache["Magic"] = 135894
+EnhancedRaidFrames.iconCache["Bleed"] = 136168

Modules/AuraIndicators.lua

@@ -8,6 +8,7 @@ local EnhancedRaidFrames = _G.EnhancedRaidFrames
 
 -- Import libraries
 local LibSharedMedia = LibStub:GetLibrary("LibSharedMedia-3.0")
+local LibDispel = LibStub("LibDispel-1.0")
 
 -------------------------------------------------------------------------
 -------------------------------------------------------------------------
@@ -271,10 +272,10 @@ function EnhancedRaidFrames:FindActiveAndTrackedAura(indicatorFrame)
 			if aura.name == auraIdentifier
 					-- Check if the aura is a spellId and the spellId matches our auraString
 					or (tonumber(auraIdentifier) and aura.spellId == tonumber(auraIdentifier))
-					-- Check if the aura is a debuff, if it matches the "RAID" filter, and the auraString matches the "dispel" wildcard
-					or (aura.isHarmful and aura.isRaid and "dispel" == auraIdentifier)
+					-- Check if the aura is a debuff, if the auraString matches the "dispel" wildcard, and if the player can dispel this type
+					or (aura.isHarmful and "dispel" == auraIdentifier and LibDispel:GetMyDispelTypes()[aura.dispelName])
 					-- Check if the aura is a debuff and if the auraString matches one of the debuff type wildcards
-					or (aura.isHarmful and aura.dispelName == auraIdentifier) then
+					or (aura.isHarmful and aura.dispelName:lower() == auraIdentifier) then
 
 				-- Check if we should only show our own auras
 				if not self.db.profile["indicator-" .. i].mineOnly
@@ -501,19 +502,19 @@ function EnhancedRaidFrames:UpdateIndicatorColor(indicatorFrame, remainingTime)
 
 		-- Set the color by debuff type
 		if self.db.profile["indicator-" .. i].colorIndicatorByDebuff and thisAura.isHarmful and thisAura.dispelName then
-			if thisAura.dispelName == "poison" then
+			if thisAura.dispelName == "Poison" then
 				indicatorFrame.Icon:SetColorTexture(self.GREEN_COLOR:GetRGB())
 				return
-			elseif thisAura.dispelName == "curse" then
+			elseif thisAura.dispelName == "Curse" then
 				indicatorFrame.Icon:SetColorTexture(self.PURPLE_COLOR:GetRGB())
 				return
-			elseif thisAura.dispelName == "disease" then
+			elseif thisAura.dispelName == "Disease" then
 				indicatorFrame.Icon:SetColorTexture(self.BROWN_COLOR:GetRGB())
 				return
-			elseif thisAura.dispelName == "magic" then
+			elseif thisAura.dispelName == "Magic" then
 				indicatorFrame.Icon:SetColorTexture(self.BLUE_COLOR:GetRGB())
 				return
-			elseif thisAura.dispelName == "bleed" then
+			elseif thisAura.dispelName == "Bleed" then
 				indicatorFrame.Icon:SetColorTexture(self.PINK_COLOR:GetRGB())
 				return
 			end
@@ -548,19 +549,19 @@ function EnhancedRaidFrames:UpdateCountdownTextColor(indicatorFrame, remainingTi
 
 		-- Set the color by debuff type
 		if self.db.profile["indicator-" .. i].colorTextByDebuff and thisAura.isHarmful and thisAura.dispelName then
-			if thisAura.dispelName == "poison" then
+			if thisAura.dispelName == "Poison" then
 				indicatorFrame.Countdown:SetTextColor(self.GREEN_COLOR:GetRGB())
 				return
-			elseif thisAura.dispelName == "curse" then
+			elseif thisAura.dispelName == "Curse" then
 				indicatorFrame.Countdown:SetTextColor(self.PURPLE_COLOR:GetRGB())
 				return
-			elseif thisAura.dispelName == "disease" then
+			elseif thisAura.dispelName == "Disease" then
 				indicatorFrame.Countdown:SetTextColor(self.BROWN_COLOR:GetRGB())
 				return
-			elseif thisAura.dispelName == "magic" then
+			elseif thisAura.dispelName == "Magic" then
 				indicatorFrame.Countdown:SetTextColor(self.BLUE_COLOR:GetRGB())
 				return
-			elseif thisAura.dispelName == "bleed" then
+			elseif thisAura.dispelName == "Bleed" then
 				indicatorFrame.Countdown:SetTextColor(self.PINK_COLOR:GetRGB())
 				return
 			end
@@ -618,12 +619,8 @@ function EnhancedRaidFrames:Tooltip_OnEnter(indicatorFrame, parentFrame)
 				GameTooltip:SetUnitDebuffByAuraInstanceID(parentFrame.unit, thisAura.auraInstanceID)
 			elseif thisAura.auraIndex then
 				-- The legacy way to set the tooltip for an aura
-				if thisAura.isRaid then
-					-- This is a raid debuff (aka dispellable), it uses a different UnitAura filter
-					GameTooltip:SetUnitAura(parentFrame.unit, thisAura.auraIndex, "RAID|HARMFUL")
-				else
-					GameTooltip:SetUnitAura(parentFrame.unit, thisAura.auraIndex, "HARMFUL")
-				end
+				GameTooltip:SetUnitAura(parentFrame.unit, thisAura.auraIndex, "HARMFUL")
+
 			end
 		end
 	else

Modules/AuraListeners.lua

@@ -165,16 +165,9 @@ end
 function EnhancedRaidFrames:addToAuraTable(parentFrame, auraData)
 	-- Inject bleed debuff types into our auraData, courtesy of LibDispel
 	if not self.isWoWClassicEra and not self.isWoWClassic then
-		-- Get our list of bleeds from LibDispel
-		local bleedList = LibDispel:GetBleedList()
-		
 		-- Check if the aura is harmful and if it's a known bleed (as defined by LibDispel)
-		if auraData.isHarmful and bleedList[auraData.spellId] then
-			auraData.dispelName = "bleed"
-			-- Set our raid debuff flag to true if the aura is a bleed and we can dispel bleeds
-			if LibDispel:IsDispellableByMe("Bleed") then
-				auraData.isRaid = true
-			end
+		if auraData.isHarmful and LibDispel:GetBleedList()[auraData.spellId] then
+			auraData.dispelName = "Bleed"
 		end
 	end
 
@@ -183,19 +176,14 @@ function EnhancedRaidFrames:addToAuraTable(parentFrame, auraData)
 	-- otherwise strings with parentheses in them will fail to be found
 	if self.allAuras:find(" " .. auraData.name:lower() .. " ", 1, true)
 			or self.allAuras:find(auraData.spellId, 1, true)
-			-- Check if the aura is a debuff, if it matches the "RAID" filter, and if we're tracking the wildcard for "dispel"
-			or (auraData.isHarmful and auraData.isRaid and self.allAuras:find("dispel", 1, true))
+			-- Check if the aura is a debuff, if aura string contains the "dispel" wildcard, and if the player can dispel this type
+			or (auraData.isHarmful and self.allAuras:find("dispel", 1, true) and auraData.dispelName and LibDispel:GetMyDispelTypes()[auraData.dispelName])
 			-- Check if the aura is a debuff, and if it has a dispelName see if we're tracking the wildcard for it
 			or (auraData.isHarmful and auraData.dispelName and auraData.dispelName ~= "" and self.allAuras:find(auraData.dispelName:lower(), 1, true)) then
 
 		-- Lowercase the aura name for consistency
 		auraData.name = auraData.name:lower()
 
-		-- Check to see if we have a dispel name, and lowercase it if we do
-		if auraData.dispelName then
-			auraData.dispelName = auraData.dispelName:lower()
-		end
-
 		if auraData.auraInstanceID then
 			-- For 10.0 and newer
 			-- Add our auraData to the ERF_unitAuras table using the auraInstanceID as the key
@@ -238,7 +226,7 @@ function EnhancedRaidFrames:UpdateUnitAuras_Classic(parentFrame, forceRefresh)
 	parentFrame.ERF_unitAuras = {}
 
 	-- Iterate through all buffs and debuffs on the unit
-	for _, filter in pairs({ "HELPFUL", "HARMFUL", "RAID|HARMFUL" }) do
+	for _, filter in pairs({ "HELPFUL", "HARMFUL" }) do
 		-- Counter to keep track of our aura index
 		local auraIndex = 1
 
@@ -264,9 +252,6 @@ function EnhancedRaidFrames:UpdateUnitAuras_Classic(parentFrame, forceRefresh)
 					auraData.isHelpful = true
 				elseif filter == "HARMFUL" then
 					auraData.isHarmful = true
-				elseif filter == "RAID|HARMFUL" then
-					auraData.isHarmful = true
-					auraData.isRaid = true
 				end
 
 				-- Add our auraIndex into the table