diff --git a/TradeSkillMaster_AuctionDB/Modules/ChannelSync.lua b/TradeSkillMaster_AuctionDB/Modules/ChannelSync.lua index 3763be9..6934fa1 100644 --- a/TradeSkillMaster_AuctionDB/Modules/ChannelSync.lua +++ b/TradeSkillMaster_AuctionDB/Modules/ChannelSync.lua @@ -68,8 +68,16 @@ local function EnsureChannel() private.channelName = private.channelId and CHANNEL_NAME or nil end -local function ChatFilter(_, _, msg, _, _, _, _, _, channelName) - if channelName ~= CHANNEL_NAME then return end +local function GetChannelDisplayName(channelName, channelString) + if channelName and channelName ~= "" then return channelName end + if channelString and channelString ~= "" then + return channelString:match("^%d+%.%s*(.+)$") or channelString + end +end + +local function ChatFilter(_, _, msg, _, channelString, _, _, _, channelName) + local displayName = GetChannelDisplayName(channelName, channelString) + if displayName ~= CHANNEL_NAME then return end if strsub(msg, 1, #COMM_PREFIX) == COMM_PREFIX then return true end @@ -299,10 +307,11 @@ local function MergeIncomingData(payload, sender) end end -function ChannelSync:OnChannelMessage(_, msg, source, _, _, _, _, _, channelName) - if channelName ~= CHANNEL_NAME then +function ChannelSync:OnChannelMessage(_, msg, source, _, channelString, _, _, _, channelName) + local displayName = GetChannelDisplayName(channelName, channelString) + if displayName ~= CHANNEL_NAME then if strsub(msg or "", 1, #COMM_PREFIX) == COMM_PREFIX then - DebugPrint("Prefix received on channel '" .. tostring(channelName) .. "' (expected '" .. CHANNEL_NAME .. "').") + DebugPrint("Prefix received on channel '" .. tostring(displayName) .. "' (expected '" .. CHANNEL_NAME .. "').") end return end