diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua index 9537b5f..ac6cf85 100644 --- a/WeakAuras/WeakAuras.lua +++ b/WeakAuras/WeakAuras.lua @@ -4372,14 +4372,10 @@ function WeakAuras.HandleChatAction(message_type, message, message_dest, message elseif UnitInParty("player") then pcall(function() SendChatMessage(message, "PARTY") end) else - if IsInInstance() then - pcall(function() SendChatMessage(message, "SAY") end) - end + pcall(function() SendChatMessage(message, "SAY") end) end elseif(message_type == "SAY" or message_type == "YELL") then - if IsInInstance() then - pcall(function() SendChatMessage(message, message_type, nil, nil) end) - end + pcall(function() SendChatMessage(message, message_type, nil, nil) end) else pcall(function() SendChatMessage(message, message_type, nil, nil) end); end diff --git a/WeakAurasOptions/ActionOptions.lua b/WeakAurasOptions/ActionOptions.lua index f7c9abd..b5a74cf 100644 --- a/WeakAurasOptions/ActionOptions.lua +++ b/WeakAurasOptions/ActionOptions.lua @@ -6,10 +6,6 @@ local L = WeakAuras.L local send_chat_message_types = WeakAuras.send_chat_message_types; local sound_types = WeakAuras.sound_types; -local RestrictedChannelCheck = function(data) - return data.message_type == "SAY" or data.message_type == "YELL" or data.message_type == "SMARTRAID" -end - function WeakAuras.AddActionOption(id, data) local action = { type = "group", @@ -89,13 +85,6 @@ function WeakAuras.AddActionOption(id, data) disabled = function() return not data.actions.start.do_message end, control = "WeakAurasSortedDropdown" }, - start_message_warning = { - type = "description", - width = WeakAuras.doubleWidth, - name = L["Note: Automated Messages to SAY and YELL are blocked outside of Instances."], - order = 2.5, - hidden = function() return not RestrictedChannelCheck(data.actions.start) end - }, start_message_space = { type = "execute", width = WeakAuras.normalWidth, @@ -468,13 +457,6 @@ function WeakAuras.AddActionOption(id, data) disabled = function() return not data.actions.finish.do_message end, control = "WeakAurasSortedDropdown" }, - finish_message_warning = { - type = "description", - width = WeakAuras.doubleWidth, - name = L["Note: Automated Messages to SAY and YELL are blocked outside of Instances."], - order = 22.5, - hidden = function() return not RestrictedChannelCheck(data.actions.finish) end - }, finish_message_space = { type = "execute", width = WeakAuras.normalWidth, diff --git a/WeakAurasOptions/ConditionOptions.lua b/WeakAurasOptions/ConditionOptions.lua index 9b1e0eb..dda92a4 100644 --- a/WeakAurasOptions/ConditionOptions.lua +++ b/WeakAurasOptions/ConditionOptions.lua @@ -650,17 +650,6 @@ local function addControlsForChange(args, order, data, conditionVariable, condit return false; end - args["condition" .. i .. "value" .. j .. "message type warning"] = { - type = "description", - width = WeakAuras.doubleWidth, - name = L["Note: Automated Messages to SAY and YELL are blocked outside of Instances."], - order = order, - hidden = function() - return not (anyMessageType("SAY") or anyMessageType("YELL") or anyMessageType("SMARTRAID")); - end - } - order = order + 1; - args["condition" .. i .. "value" .. j .. "message dest"] = { type = "input", width = WeakAuras.normalWidth,