From 45348a2adb998b9956bd536f50c1a006ae6f9b8c Mon Sep 17 00:00:00 2001 From: "Mike \"Xodiv\" Battersby" Date: Tue, 12 Feb 2019 10:01:01 +1100 Subject: [PATCH] Don't send comms to RAID when in LFR --- Communications.lua | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/Communications.lua b/Communications.lua index f7d5000..40d230b 100644 --- a/Communications.lua +++ b/Communications.lua @@ -131,6 +131,18 @@ function AstralComs:NewMessage(prefix, text, channel, target) end end +-- You can be in both a party (LE_PARTY_CATEGORY_HOME) and an instance group (LE_PARTY_CATEGORY_INSTANCE) +function AstralComs:NewGroupsMessage(prefix, text) + if IsInGroup(LE_PARTY_CATEGORY_INSTANCE) then + AstralComs:NewMessage('AstralKeys', text, 'INSTANCE_CHAT') + elseif IsInRaid() then + AstralComs:NewMessage('AstralKeys', text, 'RAID') + end + if IsInGroup(LE_PARTY_CATEGORY_HOME) then + AstralComs:NewMessage('AstralKeys', text, 'PARTY') + end +end + function AstralComs:SendMessage() local msg = table.remove(self.queue, 1) if msg[3] == 'BNET' then @@ -251,11 +263,7 @@ end AstralEvents:Register('PLAYER_LOGIN', GuildVersionCheckOnLogin, 'versionCheck_login_guild') local function GroupVersionCheckOnJoin() - if IsInRaid() then - AstralComs:NewMessage('AstralKeys', 'versionCheck ' .. e.CLIENT_VERSION, 'RAID') - elseif (IsInGroup() and not IsInGroup(LE_PARTY_CATEGORY_INSTANCE) == 'INSTANCE_CHAT') then - AstralComs:NewMessage('AstralKeys', 'versionCheck ' .. e.CLIENT_VERSION, 'PARTY') - end + AstralComs:NewGroupsMessage('AstralKeys', 'versionCheck ' .. e.CLIENT_VERSION) end AstralEvents:Register('GROUP_ROSTER_UPDATE', GroupVersionCheckOnJoin, 'versionCheck_login_group') @@ -265,18 +273,11 @@ local function VersionCheck(version, sender) if not version then return end if not receivedVersionMessage and (tonumber(version) > tonumber(e.CLIENT_VERSION)) then receivedVersionMessage = true - print('You\'re version is out of date, the current version is', version) + print('Your version is out of date, the current version is', version) else - local messageChannel - if IsInRaid() then - messageChannel = (not IsInRaid(LE_PARTY_CATEGORY_HOME) and IsInRaid(LE_PARTY_CATEGORY_INSTANCE)) and "INSTANCE_CHAT" or "RAID" - elseif IsInGroup() then - messageChannel = (not IsInGroup(LE_PARTY_CATEGORY_HOME) and IsInGroup(LE_PARTY_CATEGORY_INSTANCE)) and "INSTANCE_CHAT" or "PARTY" - elseif IsInGuild() then - messageChannel = 'GUILD' - end - if messageChannel then - --AstralComs:NewMessage('AstralKeys', 'versionCheck ' .. e.CLIENT_VERSION, messageChannel) + -- AstralComs:NewGroupsMessage('AstralKeys', 'versionCheck ' .. e.CLIENT_VERSION) + if IsInGuild() then + --AstralComs:NewMessage('AstralKeys', 'versionCheck ' .. e.CLIENT_VERSION, 'GUILD') end end end