Merge pull request #14 from JasonDepp/JasonDepp-patch-20240801

Jason depp patch 20240801

Shitlist.lua

@@ -246,18 +246,31 @@ function Shitlist:UnitPopup_ShowMenu(target, unit, menuList)
     --@debug@
     Shitlist:PrintDebug("Unit: ", unit, ", Target: ", target)
     --@end-debug@
-    if target == "SELF" then
+    --if target == "SELF" then
+    --    return
+    --end
+    --if not (UnitIsPlayer(unit)) or (unit == nil and target == "FRIEND" or target == "COMMUNITIES_GUILD_MEMBER") then
+    --    return
+    --end
+
+    --local name, realm = self.name, GetRealmName()
+    --if unit ~= nil then
+    --    name, realm = UnitName(unit)
+    --    if realm == nil then realm = GetRealmName() end
+    --end
+    -- rewrite code statement to make it more clear for future enhancement - Jason 20240801
+    -- verify the target
+    if target == "SELF" or target == "FRIEND" or target == "COMMUNITIES_GUILD_MEMBER" then
         return
     end
-    if not (UnitIsPlayer(unit)) or (unit == nil and target == "FRIEND" or target == "COMMUNITIES_GUILD_MEMBER") then
+    -- verify the unit
+    if unit == nil or not UnitIsPlayer(unit) then
         return
     end
-
-    local name, realm = self.name, GetRealmName()
-    if unit ~= nil then
-        name, realm = UnitName(unit)
-        if realm == nil then realm = GetRealmName() end
-    end
+    -- retrieve name and realm from wow api
+    local name, realm = UnitName(unit)
+    -- if the unit is from the same realm then realm is empty, use current realm instead
+    if realm == nil then realm = GetRealmName() end
     local listedPlayer = Shitlist:GetListedPlayer(name, realm)
 
     --@debug@

embeds.xml

@@ -3,11 +3,11 @@
 ..\FrameXML\UI.xsd">
 
     <Script file="Libs\LibStub\LibStub.lua"/>
+    <Include file="Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml"/>
+
     <Script file="Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua"/>
     <Script file="Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua"/>
 
-    <Include file="Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml"/>
-
     <Include file="Libs\AceAddon-3.0\AceAddon-3.0.xml"/>
     <Include file="Libs\AceEvent-3.0\AceEvent-3.0.xml"/>
     <Include file="Libs\AceHook-3.0\AceHook-3.0.xml"/>