Skip to content

Commit

Permalink
CHAT_MSG_GUILD_DEATHS was removed
Browse files Browse the repository at this point in the history
  • Loading branch information
kodewdle committed Apr 3, 2024
1 parent a9d6198 commit ffff65f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ElvUI/Core/General/Install.lua
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ function E:SetupChat(noDisplayMsg)
end

-- keys taken from `ChatTypeGroup` but doesnt add: 'OPENING', 'TRADESKILLS', 'PET_INFO', 'COMBAT_MISC_INFO', 'COMMUNITIES_CHANNEL', 'PET_BATTLE_COMBAT_LOG', 'PET_BATTLE_INFO', 'TARGETICONS'
local chatGroup = { 'SYSTEM', 'CHANNEL', 'SAY', 'EMOTE', 'YELL', 'WHISPER', 'PARTY', 'PARTY_LEADER', 'RAID', 'RAID_LEADER', 'RAID_WARNING', 'INSTANCE_CHAT', 'INSTANCE_CHAT_LEADER', 'GUILD', E.ClassicHC and 'GUILD_DEATHS' or nil, 'OFFICER', 'MONSTER_SAY', 'MONSTER_YELL', 'MONSTER_EMOTE', 'MONSTER_WHISPER', 'MONSTER_BOSS_EMOTE', 'MONSTER_BOSS_WHISPER', 'ERRORS', 'AFK', 'DND', 'IGNORED', 'BG_HORDE', 'BG_ALLIANCE', 'BG_NEUTRAL', 'ACHIEVEMENT', 'GUILD_ACHIEVEMENT', 'BN_WHISPER', 'BN_INLINE_TOAST_ALERT' }
local chatGroup = { 'SYSTEM', 'CHANNEL', 'SAY', 'EMOTE', 'YELL', 'WHISPER', 'PARTY', 'PARTY_LEADER', 'RAID', 'RAID_LEADER', 'RAID_WARNING', 'INSTANCE_CHAT', 'INSTANCE_CHAT_LEADER', 'GUILD', 'OFFICER', 'MONSTER_SAY', 'MONSTER_YELL', 'MONSTER_EMOTE', 'MONSTER_WHISPER', 'MONSTER_BOSS_EMOTE', 'MONSTER_BOSS_WHISPER', 'ERRORS', 'AFK', 'DND', 'IGNORED', 'BG_HORDE', 'BG_ALLIANCE', 'BG_NEUTRAL', 'ACHIEVEMENT', 'GUILD_ACHIEVEMENT', 'BN_WHISPER', 'BN_INLINE_TOAST_ALERT' }
ChatFrame_RemoveAllMessageGroups(_G.ChatFrame1)
for _, v in next, chatGroup do
ChatFrame_AddMessageGroup(_G.ChatFrame1, v)
Expand Down
4 changes: 1 addition & 3 deletions ElvUI/Core/Modules/Chat/Chat.lua
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ local historyTypes = { -- most of these events are set in FindURL_Events, this i
CHAT_MSG_BN_WHISPER_INFORM = 'WHISPER',
CHAT_MSG_GUILD = 'GUILD',
CHAT_MSG_GUILD_ACHIEVEMENT = 'GUILD',
CHAT_MSG_GUILD_DEATHS = E.ClassicHC and 'GUILD' or nil,
CHAT_MSG_PARTY = 'PARTY',
CHAT_MSG_PARTY_LEADER = 'PARTY',
CHAT_MSG_RAID = 'RAID',
Expand Down Expand Up @@ -1961,7 +1960,7 @@ function CH:MessageFormatter(frame, info, chatType, chatGroup, chatTarget, chann
end
else
if not showLink or arg2 == '' then
if chatType == 'TEXT_EMOTE' or chatType == 'GUILD_DEATHS' then
if chatType == 'TEXT_EMOTE' then
body = message
else
body = format(_G['CHAT_'..chatType..'_GET']..message, pflag..arg2, arg2)
Expand Down Expand Up @@ -2953,7 +2952,6 @@ local FindURL_Events = {
'CHAT_MSG_BN_WHISPER_INFORM',
'CHAT_MSG_BN_INLINE_TOAST_BROADCAST',
'CHAT_MSG_GUILD_ACHIEVEMENT',
E.ClassicHC and 'CHAT_MSG_GUILD_DEATHS' or nil,
'CHAT_MSG_GUILD',
'CHAT_MSG_PARTY',
'CHAT_MSG_PARTY_LEADER',
Expand Down

0 comments on commit ffff65f

Please sign in to comment.