From 79353cee901f99521dbe72704387e86f18606464 Mon Sep 17 00:00:00 2001
From: Tercio Jose <terciob19@hotmail.com>
Date: Sat, 8 Jul 2023 15:21:40 -0300
Subject: [PATCH] Fix icon things, improvements to class detection by using
 GetPlayerInfoByGUID()

---
 classes/class_damage.lua     | 43 ++++++++++++++++++++----------------
 classes/container_actors.lua | 34 ++++++++++++++++++----------
 2 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/classes/class_damage.lua b/classes/class_damage.lua
index 54fdb947..ee8dd2a4 100644
--- a/classes/class_damage.lua
+++ b/classes/class_damage.lua
@@ -3040,16 +3040,10 @@ function Details:SetBarLeftText(bar, instance, enemy, arenaEnemy, arenaAlly, usi
 	setLineTextSize (bar, instance)
 end
 
---[[ exported]] function Details:SetBarColors(bar, instance, r, g, b, a)
+function Details:SetBarColors(bar, instance, r, g, b, a) --[[exported]]
 	a = a or 1
 
 	if (instance.row_info.texture_class_colors) then
-		--[[ Deprecation of right_to_left_texture in favor of StatusBar:SetReverseFill 5/2/2022 - Flamanis
-		if (instance.bars_inverted) then
-			bar.right_to_left_texture:SetVertexColor(r, g, b, a)
-		else
-			bar.textura:SetVertexColor(r, g, b, a)
-		end]]
 		bar.textura:SetVertexColor(r, g, b, a)
 	end
 
@@ -3117,6 +3111,18 @@ function Details:SetClassIcon(texture, instance, class) --[[ exported]]
 			end
 		end
 
+		local localizedClass, englishClass
+		if (self.serial ~= "") then
+			localizedClass, englishClass = GetPlayerInfoByGUID(self.serial)
+		end
+
+		if (englishClass) then
+			texture:SetTexture(instance.row_info.icon_file or [[Interface\AddOns\Details\images\classes_small]])
+			texture:SetTexCoord(unpack(Details.class_coords[englishClass]))
+			texture:SetVertexColor(1, 1, 1)
+			return
+		end
+
 		if (self.enemy) then
 			if (Details.faction_against == "Horde") then
 				texture:SetTexture("Interface\\ICONS\\Achievement_Character_Troll_Male")
@@ -3144,22 +3150,20 @@ function Details:SetClassIcon(texture, instance, class) --[[ exported]]
 		texture:SetVertexColor(actor_class_color_r, actor_class_color_g, actor_class_color_b)
 
 	else
-		if (self.spec == 1473) then
-			if (instance and instance.row_info.use_spec_icons) then
-				if (self.spec and Details.class_specs_coords[self.spec]) then
-					texture:SetTexture(instance.row_info.spec_file)
-					texture:SetTexCoord(unpack(Details.class_specs_coords[self.spec]))
-					texture:SetVertexColor(1, 1, 1)
-				else
-					texture:SetTexture(instance.row_info.icon_file or [[Interface\AddOns\Details\images\classes_small]])
-					texture:SetTexCoord(unpack(Details.class_coords[class]))
-					texture:SetVertexColor(1, 1, 1)
-				end
+		if (instance and instance.row_info.use_spec_icons) then
+			if (self.spec and Details.class_specs_coords[self.spec]) then
+				texture:SetTexture(instance.row_info.spec_file)
+				texture:SetTexCoord(unpack(Details.class_specs_coords[self.spec]))
+				texture:SetVertexColor(1, 1, 1)
 			else
-				texture:SetTexture(instance and instance.row_info.icon_file or [[Interface\AddOns\Details\images\classes_small]])
+				texture:SetTexture(instance.row_info.icon_file or [[Interface\AddOns\Details\images\classes_small]])
 				texture:SetTexCoord(unpack(Details.class_coords[class]))
 				texture:SetVertexColor(1, 1, 1)
 			end
+		else
+			texture:SetTexture(instance and instance.row_info.icon_file or [[Interface\AddOns\Details\images\classes_small]])
+			texture:SetTexCoord(unpack(Details.class_coords[class]))
+			texture:SetVertexColor(1, 1, 1)
 		end
 	end
 end
@@ -3177,6 +3181,7 @@ function Details:RefreshBarra(thisLine, instance, fromResize) --[[ exported]]
 	if (fromResize) then
 		actor_class_color_r, actor_class_color_g, actor_class_color_b = self:GetBarColor()
 	end
+
 	--icon
 	self:SetClassIcon(thisLine.icone_classe, instance, class)
 
diff --git a/classes/container_actors.lua b/classes/container_actors.lua
index 1478caa2..17daa8d1 100644
--- a/classes/container_actors.lua
+++ b/classes/container_actors.lua
@@ -464,22 +464,32 @@ end
 		if (engClass) then
 			actorObject.classe = engClass
 			return
-		else
-			if (actorFlags) then
-				--check if the actor is a player
-				if (bitBand(actorFlags, OBJECT_TYPE_PLAYER) ~= 0) then
-					actorObject.classe = "UNGROUPPLAYER"
-					return
+		end
 
-				elseif (bitBand(actorFlags, OBJECT_TYPE_PETGUARDIAN) ~= 0) then
-					actorObject.classe = "PET"
+		if (actorObject.serial and actorObject.serial ~= "") then
+			local a, b = pcall(function()
+				local _, englishClass = GetPlayerInfoByGUID(actorObject.serial)
+				if (englishClass) then
+					actorObject.classe = englishClass
 					return
 				end
-			end
-
-			actorObject.classe = "UNKNOW" --it's a typo, can't be changed at this point
-			return true
+			end)
 		end
+
+		if (actorFlags) then
+			--check if the actor is a player
+			if (bitBand(actorFlags, OBJECT_TYPE_PLAYER) ~= 0) then
+				actorObject.classe = "UNGROUPPLAYER"
+				return
+
+			elseif (bitBand(actorFlags, OBJECT_TYPE_PETGUARDIAN) ~= 0) then
+				actorObject.classe = "PET"
+				return
+			end
+		end
+
+		actorObject.classe = "UNKNOW" --it's a typo, can't be changed at this point
+		return true
 	end
 
 	--check if the nickname fit some minimal rules to be presented to other players