Fix naming in echoer and emoter
This commit is contained in:
@@ -9,27 +9,30 @@ function shared.Echoer.Init()
|
|||||||
local frame = CreateFrame("Frame")
|
local frame = CreateFrame("Frame")
|
||||||
frame:RegisterEvent("CHAT_MSG_CHANNEL")
|
frame:RegisterEvent("CHAT_MSG_CHANNEL")
|
||||||
frame:SetScript("OnEvent", function(self, event, msg, sender, ...)
|
frame:SetScript("OnEvent", function(self, event, msg, sender, ...)
|
||||||
-- if Heimdall_Data.config.echoer.debug then
|
--if Heimdall_Data.config.echoer.debug then
|
||||||
-- print(string.format("[%s] Channel message received from: %s", ModuleName, sender))
|
-- print(string.format("[%s] Channel message received from: %s", ModuleName, sender))
|
||||||
-- end
|
--end
|
||||||
|
|
||||||
if not Heimdall_Data.config.echoer.enabled then
|
if not Heimdall_Data.config.echoer.enabled then
|
||||||
-- if Heimdall_Data.config.echoer.debug then
|
--if Heimdall_Data.config.echoer.debug then
|
||||||
-- print(string.format("[%s] Module disabled, ignoring message", ModuleName))
|
-- print(string.format("[%s] Module disabled, ignoring message", ModuleName))
|
||||||
-- end
|
--end
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local channelId = select(6, ...)
|
local channelId = select(6, ...)
|
||||||
local _, channelname = GetChannelName(channelId)
|
local _, channelname = GetChannelName(channelId)
|
||||||
-- if Heimdall_Data.config.echoer.debug then
|
local ok = false
|
||||||
-- print(string.format("[%s] Processing message from channel: %s", ModuleName, channelname))
|
for _, channel in pairs(Heimdall_Data.config.echoer.channels) do
|
||||||
-- end
|
if channel == channelname then
|
||||||
|
ok = true
|
||||||
if channelname ~= Heimdall_Data.config.echoer.masterChannel then
|
break
|
||||||
-- if Heimdall_Data.config.echoer.debug then
|
end
|
||||||
-- print(string.format("[%s] Ignoring message from non-master channel", ModuleName))
|
end
|
||||||
-- end
|
if not ok then
|
||||||
|
if Heimdall_Data.config.echoer.debug then
|
||||||
|
print(string.format("[%s] Channel name does not match any of the channels", ModuleName))
|
||||||
|
end
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
if Heimdall_Data.config.echoer.debug then
|
if Heimdall_Data.config.echoer.debug then
|
||||||
|
@@ -9,29 +9,33 @@ function shared.Emoter.Init()
|
|||||||
local frame = CreateFrame("Frame")
|
local frame = CreateFrame("Frame")
|
||||||
frame:RegisterEvent("CHAT_MSG_CHANNEL")
|
frame:RegisterEvent("CHAT_MSG_CHANNEL")
|
||||||
frame:SetScript("OnEvent", function(self, event, msg, sender, ...)
|
frame:SetScript("OnEvent", function(self, event, msg, sender, ...)
|
||||||
-- if Heimdall_Data.config.emoter.debug then
|
--if Heimdall_Data.config.emoter.debug then
|
||||||
-- print(string.format("[%s] Channel message received from: %s", ModuleName, sender))
|
-- print(string.format("[%s] Channel message received from: %s", ModuleName, sender))
|
||||||
-- end
|
--end
|
||||||
|
|
||||||
if not Heimdall_Data.config.emoter.enabled then
|
if not Heimdall_Data.config.emoter.enabled then
|
||||||
-- if Heimdall_Data.config.emoter.debug then
|
--if Heimdall_Data.config.emoter.debug then
|
||||||
-- print(string.format("[%s] Module disabled, ignoring message", ModuleName))
|
-- print(string.format("[%s] Module disabled, ignoring message", ModuleName))
|
||||||
-- end
|
--end
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local channelId = select(6, ...)
|
local channelId = select(6, ...)
|
||||||
local _, channelname = GetChannelName(channelId)
|
local _, channelname = GetChannelName(channelId)
|
||||||
-- if Heimdall_Data.config.emoter.debug then
|
local ok = false
|
||||||
-- print(string.format("[%s] Processing message from channel: %s", ModuleName, channelname))
|
for _, channel in pairs(Heimdall_Data.config.emoter.channels) do
|
||||||
-- end
|
if channel == channelname then
|
||||||
|
ok = true
|
||||||
if channelname ~= Heimdall_Data.config.emoter.masterChannel then
|
break
|
||||||
-- if Heimdall_Data.config.emoter.debug then
|
end
|
||||||
-- print(string.format("[%s] Ignoring message from non-master channel", ModuleName))
|
end
|
||||||
-- end
|
if not ok then
|
||||||
|
if Heimdall_Data.config.emoter.debug then
|
||||||
|
print(string.format("[%s] Channel name does not match any of the channels", ModuleName))
|
||||||
|
end
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
if Heimdall_Data.config.emoter.debug then
|
if Heimdall_Data.config.emoter.debug then
|
||||||
print(string.format("[%s] Processing message from master channel: %s", ModuleName, sender))
|
print(string.format("[%s] Processing message from master channel: %s", ModuleName, sender))
|
||||||
shared.dumpTable(Heimdall_Data.config.emoter)
|
shared.dumpTable(Heimdall_Data.config.emoter)
|
||||||
|
Reference in New Issue
Block a user