Compare commits

...

5 Commits

Author SHA1 Message Date
86a4daaceb Notify channel on player presence 2024-11-28 16:35:56 +01:00
775f6ae076 Implement replying to "who" on channel 2024-11-28 16:35:25 +01:00
cfa3228ca5 Fix whisper who 2024-11-28 16:23:20 +01:00
b30a0a7c94 Add channel messages/notifications 2024-11-28 16:19:59 +01:00
55edf58a68 Clean up whosniffer a little 2024-11-28 16:09:24 +01:00
4 changed files with 113 additions and 32 deletions

View File

@@ -1,9 +1,9 @@
-- TICKER_200
function()
---@type WHOMessage
---@type Message
local message = aura_env.messageQueue[1]
if message == nil then return end
table.remove(aura_env.messageQueue, 1)
SendChatMessage(message.message, "WHISPER", nil, message.to)
SendChatMessage(message.message, message.channel, nil, message.data)
end

View File

@@ -5,10 +5,13 @@
function(event, msg, sender)
if msg == "who" then
for _, player in pairs(aura_env.stinkies) do
table.insert(aura_env.messageQueue, {
to = sender,
message = aura_env.MakeNotifyMessage(player)
})
local msg = aura_env.MakeNotifyMessage(player)
local message = {
channel = "WHISPER",
data = sender,
message = msg
}
table.insert(aura_env.messageQueue, message)
end
end
end

View File

@@ -0,0 +1,22 @@
-- CHAT_MSG_CHANNEL
---@type event string
---@type msg string
---@type sender string
function(event, msg, sender, ...)
local channelId = select(6, ...)
if channelId ~= aura_env.channelId then
return
end
if msg == "who" then
for _, player in pairs(aura_env.stinkies) do
local msg = aura_env.MakeNotifyMessage(player)
local message = {
channel = "CHANNEL",
data = channelId,
message = msg
}
table.insert(aura_env.messageQueue, message)
end
end
end

View File

@@ -14,17 +14,13 @@ aura_env.ignored = {"Maritza", "Goodbones"}
---@field classColors table<string, string>
---@field whoQueries table<number, WHOQuery>
---@field ttl number
---@field messageQueue WHOMessage[]
---@field messageQueue Message[]
---@field UpdateMacro fun()
---@field Notify fun(Player)
---@field NotifyGone fun(Player)
---@field queryPending boolean
---@field lastQuery WHOQuery
---@class WHOMessage
---@field message string
---@field to string
---@param input string
---@return number
local function utf8len(input)
@@ -104,6 +100,12 @@ local AllianceFilter = function(name, guild, level, race, class, zone)
return aura_env.raceMap[race] == "Alliance"
end
---@class Message
---@field message string
---@field channel string
---@field data string
---@type Message[]
aura_env.messageQueue = {}
aura_env.whoQueryIdx = 1
---@type table<number, WHOQuery>
@@ -124,6 +126,7 @@ aura_env.whoQueries[5] = WHOQuery.new(
aura_env.queryPending = false
aura_env.lastQuery = nil
---@type table<string, string>
aura_env.raceMap = {
["Orc"] = "Horde",
["Undead"] = "Horde",
@@ -191,6 +194,7 @@ Player = {
end
}
---@type table<string, string>
aura_env.classColors = {
["Warrior"] = "C69B6D",
["Paladin"] = "F48CBA",
@@ -206,14 +210,6 @@ aura_env.classColors = {
["Demon Hunter"] = "A330C9"
}
aura_env.UpdateMacro = function()
local body = {}
for k, v in pairs(aura_env.stinkies) do
table.insert(body, string.format("/tar %s", v.name))
end
EditMacro("tar", nil, nil, string.join("\n", body))
end
---@param input string
---@param deliminer string
---@return string[], string|nil
@@ -243,35 +239,95 @@ for i, part in ipairs(notifyForD) do
notifyFor[part] = true
end
aura_env.MakeNotifyMessage = function(player)
---@param player Player
---@return string
local MakeNotifyMessage = function(player)
return string.format("%s of class %s and guild %s in %s, first seen: %s, last seen: %s, times seen: %d",
player.name, player.class, player.guild, player.zone, player.firstSeen, player.lastSeen, player.seenCount)
end
---@param msg string
local NotifyAll = function(msg)
for _, rec in ipairs(toNotify) do
---@type Message
local message = {
channel = "WHISPER",
data = rec,
message = msg
}
table.insert(aura_env.messageQueue, message)
end
end
---@param player Player
---@return nil
aura_env.Notify = function(player)
if not notifyFor[player.zone] then
return
end
local msg = aura_env.MakeNotifyMessage(player)
for _, rec in ipairs(toNotify) do
table.insert(aura_env.messageQueue, {
to = rec,
message = msg
})
end
local msg = MakeNotifyMessage(player)
NotifyAll(msg)
aura_env.NotifyChannel(player)
end
---@param player Player
---@return nil
aura_env.NotifyGone = function(player)
if not notifyFor[player.zone] then
return
end
local msg = string.format("%s of class %s and guild %s left %s", player.name, player.class, player.guild,
player.zone)
for _, rec in ipairs(toNotify) do
table.insert(aura_env.messageQueue, {
to = rec,
NotifyAll(msg)
aura_env.NotifyChannelGone(player)
end
-- CHANNEL fuckery
local channel = aura_env.config.channelName or "foobar"
local channelId = nil
local function GetChannelId(channelName)
local channels = {GetChannelList()}
for i = 1, #channels, 2 do
local id = channels[i]
local name = channels[i + 1]
if name == channelName then
return id
end
end
end
channelId = GetChannelId(channel)
if not channelId then
print(string.format("channel %s not found, joining", channel))
JoinPermanentChannel(channel)
end
channelId = GetChannelId(channel)
aura_env.channelId = channelId
print(string.format("channel %s resolved to id %d", channel, channelId))
---@param msg string
local NotifyChannel = function(msg)
if not channelId then
print("cannot notify channel, channelId is nil")
return
end
local message = {
channel = "CHANNEL",
data = channelId,
message = msg
})
}
table.insert(aura_env.messageQueue, message)
end
---@param player Player
---@return nil
aura_env.NotifyChannel = function(player)
local msg = MakeNotifyMessage(player)
NotifyChannel(msg)
end
---@param player Player
---@return nil
aura_env.NotifyChannelGone = function(player)
local msg = string.format("%s of class %s and guild %s left %s", player.name, player.class, player.guild,
player.zone)
NotifyChannel(msg)
end