From 469e692eb5fcd19fdf9391c51963b7ead2d92f77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lien=20Sell=C3=A6g?= Date: Fri, 2 Jan 2026 02:13:47 +0100 Subject: [PATCH] remove getall and add inventory scan --- .../Modules/ChannelSync.lua | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/TradeSkillMaster_AuctionDB/Modules/ChannelSync.lua b/TradeSkillMaster_AuctionDB/Modules/ChannelSync.lua index 6934fa1..74afe6e 100644 --- a/TradeSkillMaster_AuctionDB/Modules/ChannelSync.lua +++ b/TradeSkillMaster_AuctionDB/Modules/ChannelSync.lua @@ -68,15 +68,22 @@ local function EnsureChannel() private.channelName = private.channelId and CHANNEL_NAME or nil end -local function GetChannelDisplayName(channelName, channelString) +local function GetChannelDisplayName(channelName, channelString, channelNumber, channelBaseName) + if channelBaseName and channelBaseName ~= "" then return channelBaseName end if channelName and channelName ~= "" then return channelName end + if type(channelString) == "number" then + return select(2, GetChannelName(channelString)) + end if channelString and channelString ~= "" then return channelString:match("^%d+%.%s*(.+)$") or channelString end + if channelNumber then + return select(2, GetChannelName(channelNumber)) + end end -local function ChatFilter(_, _, msg, _, channelString, _, _, _, channelName) - local displayName = GetChannelDisplayName(channelName, channelString) +local function ChatFilter(_, _, msg, _, channelString, _, channelNumber, channelName, channelBaseName) + local displayName = GetChannelDisplayName(channelName, channelString, channelNumber, channelBaseName) if displayName ~= CHANNEL_NAME then return end if strsub(msg, 1, #COMM_PREFIX) == COMM_PREFIX then return true @@ -307,11 +314,11 @@ local function MergeIncomingData(payload, sender) end end -function ChannelSync:OnChannelMessage(_, msg, source, _, channelString, _, _, _, channelName) - local displayName = GetChannelDisplayName(channelName, channelString) +function ChannelSync:OnChannelMessage(_, msg, source, _, channelString, _, channelNumber, channelName, channelBaseName) + local displayName = GetChannelDisplayName(channelName, channelString, channelNumber, channelBaseName) if displayName ~= CHANNEL_NAME then if strsub(msg or "", 1, #COMM_PREFIX) == COMM_PREFIX then - DebugPrint("Prefix received on channel '" .. tostring(displayName) .. "' (expected '" .. CHANNEL_NAME .. "').") + DebugPrint("Prefix received on channel '" .. tostring(displayName or channelNumber or channelString or channelName) .. "' (expected '" .. CHANNEL_NAME .. "').") end return end