|
|
|
@ -68,15 +68,22 @@ local function EnsureChannel() |
|
|
|
private.channelName = private.channelId and CHANNEL_NAME or nil |
|
|
|
private.channelName = private.channelId and CHANNEL_NAME or nil |
|
|
|
end |
|
|
|
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 channelName and channelName ~= "" then return channelName end |
|
|
|
|
|
|
|
if type(channelString) == "number" then |
|
|
|
|
|
|
|
return select(2, GetChannelName(channelString)) |
|
|
|
|
|
|
|
end |
|
|
|
if channelString and channelString ~= "" then |
|
|
|
if channelString and channelString ~= "" then |
|
|
|
return channelString:match("^%d+%.%s*(.+)$") or channelString |
|
|
|
return channelString:match("^%d+%.%s*(.+)$") or channelString |
|
|
|
end |
|
|
|
end |
|
|
|
|
|
|
|
if channelNumber then |
|
|
|
|
|
|
|
return select(2, GetChannelName(channelNumber)) |
|
|
|
|
|
|
|
end |
|
|
|
end |
|
|
|
end |
|
|
|
|
|
|
|
|
|
|
|
local function ChatFilter(_, _, msg, _, channelString, _, _, _, channelName) |
|
|
|
local function ChatFilter(_, _, msg, _, channelString, _, channelNumber, channelName, channelBaseName) |
|
|
|
local displayName = GetChannelDisplayName(channelName, channelString) |
|
|
|
local displayName = GetChannelDisplayName(channelName, channelString, channelNumber, channelBaseName) |
|
|
|
if displayName ~= CHANNEL_NAME then return end |
|
|
|
if displayName ~= CHANNEL_NAME then return end |
|
|
|
if strsub(msg, 1, #COMM_PREFIX) == COMM_PREFIX then |
|
|
|
if strsub(msg, 1, #COMM_PREFIX) == COMM_PREFIX then |
|
|
|
return true |
|
|
|
return true |
|
|
|
@ -307,11 +314,11 @@ local function MergeIncomingData(payload, sender) |
|
|
|
end |
|
|
|
end |
|
|
|
end |
|
|
|
end |
|
|
|
|
|
|
|
|
|
|
|
function ChannelSync:OnChannelMessage(_, msg, source, _, channelString, _, _, _, channelName) |
|
|
|
function ChannelSync:OnChannelMessage(_, msg, source, _, channelString, _, channelNumber, channelName, channelBaseName) |
|
|
|
local displayName = GetChannelDisplayName(channelName, channelString) |
|
|
|
local displayName = GetChannelDisplayName(channelName, channelString, channelNumber, channelBaseName) |
|
|
|
if displayName ~= CHANNEL_NAME then |
|
|
|
if displayName ~= CHANNEL_NAME then |
|
|
|
if strsub(msg or "", 1, #COMM_PREFIX) == COMM_PREFIX 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 |
|
|
|
end |
|
|
|
return |
|
|
|
return |
|
|
|
end |
|
|
|
end |
|
|
|
|