Guild MOTD: protect the check by combat restriction

Author: kodewdle

ElvUI/Game/Shared/Modules/Chat/Chat.lua

@@ -21,7 +21,6 @@ local GetBNPlayerCommunityLink = GetBNPlayerCommunityLink
 local GetChannelName = GetChannelName
 local GetChatWindowInfo = GetChatWindowInfo
 local GetCursorPosition = GetCursorPosition
-local GetGuildRosterMOTD = GetGuildRosterMOTD
 local GetInstanceInfo = GetInstanceInfo
 local GetNumGroupMembers = GetNumGroupMembers
 local GetPlayerCommunityLink = GetPlayerCommunityLink
@@ -68,6 +67,7 @@ local GetGroupQueues = E.Retail and C_SocialQueue.GetGroupQueues
 local GetCVar = C_CVar.GetCVar
 local GetCVarBool = C_CVar.GetCVarBool
 
+local GetGuildRosterMOTD = C_GuildInfo.GetMOTD or GetGuildRosterMOTD
 local C_ClassColor_GetClassColor = C_ClassColor and C_ClassColor.GetClassColor
 local IsTimerunningPlayer = C_ChatInfo.IsTimerunningPlayer
 local IsChatLineCensored = C_ChatInfo.IsChatLineCensored
@@ -2961,11 +2961,14 @@ end
 tremove(_G.ChatTypeGroup.GUILD, 2)
 function CH:DelayGuildMOTD()
 	local delay, checks, delayFrame = 0, 0, CreateFrame('Frame')
+
 	tinsert(_G.ChatTypeGroup.GUILD, 2, 'GUILD_MOTD')
+
 	delayFrame:SetScript('OnUpdate', function(df, elapsed)
 		delay = delay + elapsed
+
 		if delay < 5 then return end
-		local msg = GetGuildRosterMOTD()
+		local msg = not InCombatLockdown() and GetGuildRosterMOTD()
 		if msg and strlen(msg) > 0 then
 			for _, frameName in ipairs(_G.CHAT_FRAMES) do
 				local chat = _G[frameName]
@@ -2974,9 +2977,11 @@ function CH:DelayGuildMOTD()
 					chat:RegisterEvent('GUILD_MOTD')
 				end
 			end
+
 			df:SetScript('OnUpdate', nil)
 		else -- 5 seconds can be too fast for the API response. let's try once every 5 seconds (max 5 checks).
 			delay, checks = 0, checks + 1
+
 			if checks >= 5 then
 				df:SetScript('OnUpdate', nil)
 			end

ElvUI/Game/Shared/Modules/DataTexts/Guild.lua

@@ -7,16 +7,16 @@ local format, strfind, strjoin, strsplit, strmatch = format, strfind, strjoin, s
 
 local GetGuildInfo = GetGuildInfo
 local GetGuildRosterInfo = GetGuildRosterInfo
-local GetGuildRosterMOTD = GetGuildRosterMOTD
-local MouseIsOver = MouseIsOver
 local GetNumGuildMembers = GetNumGuildMembers
 local GetQuestDifficultyColor = GetQuestDifficultyColor
+local InCombatLockdown = InCombatLockdown
+local IsAltKeyDown = IsAltKeyDown
 local IsInGuild = IsInGuild
 local IsShiftKeyDown = IsShiftKeyDown
+local MouseIsOver = MouseIsOver
 local ToggleGuildFrame = ToggleGuildFrame
 local UnitInParty = UnitInParty
 local UnitInRaid = UnitInRaid
-local IsAltKeyDown = IsAltKeyDown
 
 local LoadAddOn = C_AddOns.LoadAddOn
 
@@ -25,6 +25,7 @@ local REMOTE_CHAT = REMOTE_CHAT
 local GUILD_MOTD = GUILD_MOTD
 local GUILD = GUILD
 
+local GetGuildRosterMOTD = C_GuildInfo.GetMOTD or GetGuildRosterMOTD
 local C_GuildInfo_GuildRoster = C_GuildInfo.GuildRoster
 local GetGuildFactionData = C_Reputation.GetGuildFactionData
 local GetMemberIdsSortedByName = CommunitiesUtil.GetMemberIdsSortedByName
@@ -158,7 +159,7 @@ local function BuildGuildTable()
 end
 
 local function UpdateGuildMessage()
-	guildMotD = GetGuildRosterMOTD()
+	guildMotD = not InCombatLockdown() and GetGuildRosterMOTD() or ''
 end
 
 local FRIEND_ONLINE = select(2, strsplit(' ', _G.ERR_FRIEND_ONLINE_SS, 2))
@@ -188,6 +189,7 @@ local eventHandlers = {
 		else
 			BuildGuildTable()
 			UpdateGuildMessage()
+
 			if MouseIsOver(frame) then
 				frame:GetScript('OnEnter')(frame, nil, true)
 			end