Count how many times who visit orgrimmar and display in alert

This commit is contained in:
2024-11-26 22:09:58 +01:00
parent 1c70cabc9a
commit 9f3ddebcee
3 changed files with 191 additions and 157 deletions

View File

@@ -19,20 +19,21 @@ function()
end end
end end
local timestamp = date("%Y-%m-%dT%H:%M:%S")
local player = aura_env.stinkies[name] local player = aura_env.stinkies[name]
if not player then if not player then
player = Player.new(name, guild, race, class, zone) player = Player.new(name, guild, race, class, zone)
local timestamp = date("%Y-%m-%dT%H:%M:%S") local existing = WeakAurasSaved.Cyka.WhoSniffer[name]
if not WeakAurasSaved.Cyka.WhoSniffer[name] then
WeakAurasSaved.Cyka.WhoSniffer[name] = {} if not existing then WeakAurasSaved.Cyka.WhoSniffer[name] = {}
else
player.lastSeen = existing.lastSeen or "never"
player.firstSeen = existing.firstSeen or "never"
player.seenCount = existing.seenCount or 0
if player.lastSeen == "never" then
player.firstSeen = timestamp
end
end end
WeakAurasSaved.Cyka.WhoSniffer[name][timestamp] = {
["name"] = name,
["guild"] = guild,
["race"] = race,
["class"] = class,
["zone"] = zone
}
local stinky = WeakAurasSaved.Cyka.stinkies[name] local stinky = WeakAurasSaved.Cyka.stinkies[name]
if stinky then if stinky then
@@ -42,9 +43,13 @@ function()
end end
aura_env.Notify(player) aura_env.Notify(player)
player.lastSeen = timestamp
player.seenCount = player.seenCount + 1
WeakAurasSaved.Cyka.WhoSniffer[name] = player
end end
player:Touch() player.lastSeenInternal = GetTime()
player.zone = zone player.zone = zone
player.lastSeen = timestamp
aura_env.stinkies[name] = player aura_env.stinkies[name] = player
end end
end end

View File

@@ -3,22 +3,12 @@
function(allstates) function(allstates)
local now = GetTime() local now = GetTime()
for k, v in pairs(aura_env.stinkies) do for k, v in pairs(aura_env.stinkies) do
local ago = now - v.lastSeen local ago = now - v.lastSeenInternal
if ago > aura_env.ttl then if ago > aura_env.ttl then
allstates[k] = { show = false, changed = true } allstates[k] = { show = false, changed = true }
aura_env.stinkies[k] = nil aura_env.stinkies[k] = nil
PlaySoundFile("Interface\\Sounds\\Uncloak.ogg", "Master") PlaySoundFile("Interface\\Sounds\\Uncloak.ogg", "Master")
aura_env.NotifyGone(v) aura_env.NotifyGone(v)
local timestamp = date("%Y-%m-%dT%H:%M:%S")
WeakAurasSaved.Cyka.WhoSniffer[v.name][timestamp] = {
["name"] = v.name,
["guild"] = v.guild,
["race"] = v.race,
["class"] = v.class,
["zone"] = v.zone,
["left"] = true,
}
else else
if allstates[k] then if allstates[k] then
allstates[k].ago = string.format("%6.1fs", ago) allstates[k].ago = string.format("%6.1fs", ago)

View File

@@ -1,7 +1,12 @@
if not WeakAurasSaved.Cyka then WeakAurasSaved.Cyka = {} end if not WeakAurasSaved.Cyka then
if not WeakAurasSaved.Cyka.WhoSniffer then WeakAurasSaved.Cyka.WhoSniffer = {} end WeakAurasSaved.Cyka = {}
end
if not WeakAurasSaved.Cyka.WhoSniffer then
WeakAurasSaved.Cyka.WhoSniffer = {}
end
aura_env.ignored = { "Maritza", "Goodbones" } aura_env.ttl = 6
aura_env.ignored = {"Maritza", "Goodbones"}
---@class aura_env ---@class aura_env
---@field raceMap table<string, string> ---@field raceMap table<string, string>
@@ -23,108 +28,118 @@ aura_env.ignored = { "Maritza", "Goodbones" }
---@param input string ---@param input string
---@return number ---@return number
local function utf8len(input) local function utf8len(input)
local len = 0 if not input then
local i = 1 return 0
local n = #input end
while i <= n do local len = 0
local c = input:byte(i) local i = 1
if c >= 0 and c <= 127 then local n = #input
i = i + 1 while i <= n do
elseif c >= 194 and c <= 223 then local c = input:byte(i)
i = i + 2 if c >= 0 and c <= 127 then
elseif c >= 224 and c <= 239 then i = i + 1
i = i + 3 elseif c >= 194 and c <= 223 then
elseif c >= 240 and c <= 244 then i = i + 2
i = i + 4 elseif c >= 224 and c <= 239 then
else i = i + 3
i = i + 1 elseif c >= 240 and c <= 244 then
end i = i + 4
len = len + 1 else
end i = i + 1
return len end
len = len + 1
end
return len
end end
---@param input string ---@param input string
---@param targetLength number ---@param targetLength number
---@param left boolean ---@param left boolean
---@return string ---@return string
local function padString(input, targetLength, left) local function padString(input, targetLength, left)
left = left or false left = left or false
local len = utf8len(input) local len = utf8len(input)
if len < targetLength then if len < targetLength then
if left then if left then
input = input .. string.rep(" ", targetLength - len) input = input .. string.rep(" ", targetLength - len)
else else
input = string.rep(" ", targetLength - len) .. input input = string.rep(" ", targetLength - len) .. input
end end
end end
return input return input
end end
---@class WHOQuery ---@class WHOQuery
---@field query string ---@field query string
---@field filters WHOFilter[] ---@field filters WHOFilter[]
WHOQuery = { WHOQuery = {
---@param query string ---@param query string
---@param filters WHOFilter[] ---@param filters WHOFilter[]
---@return WHOQuery ---@return WHOQuery
new = function(query, filters) new = function(query, filters)
local self = setmetatable({}, { __index = WHOQuery }) local self = setmetatable({}, {
self.query = query __index = WHOQuery
self.filters = filters })
return self self.query = query
end self.filters = filters
return self
end
} }
---@alias WHOFilter fun(name: string, guild: string, level: number, race: string, class: string, zone: string): boolean ---@alias WHOFilter fun(name: string, guild: string, level: number, race: string, class: string, zone: string): boolean
---@type WHOFilter ---@type WHOFilter
local NotSiegeOfOrgrimmarFilter = function(name, guild, level, race, class, zone) local NotSiegeOfOrgrimmarFilter = function(name, guild, level, race, class, zone)
if not zone then return false end if not zone then
return zone ~= "Siege of Orgrimmar" return false
end
return zone ~= "Siege of Orgrimmar"
end end
---@type WHOFilter ---@type WHOFilter
local AllianceFilter = function(name, guild, level, race, class, zone) local AllianceFilter = function(name, guild, level, race, class, zone)
if not race then return false end if not race then
if not aura_env.raceMap[race] then return false end return false
return aura_env.raceMap[race] == "Alliance" end
if not aura_env.raceMap[race] then
return false
end
return aura_env.raceMap[race] == "Alliance"
end end
aura_env.messageQueue = {} aura_env.messageQueue = {}
aura_env.ttl = 6
aura_env.whoQueryIdx = 1 aura_env.whoQueryIdx = 1
---@type table<number, WHOQuery> ---@type table<number, WHOQuery>
aura_env.whoQueries = {} aura_env.whoQueries = {}
aura_env.whoQueries[1] = WHOQuery.new("g-\"БеспредеЛ\"", {}) aura_env.whoQueries[1] = WHOQuery.new("g-\"БеспредеЛ\"", {})
aura_env.whoQueries[2] = WHOQuery.new( aura_env.whoQueries[2] = WHOQuery.new(
"z-\"Orgrimmar\" z-\"Durotar\" r-\"Human\" r-\"Dwarf\" r-\"Night Elf\" r-\"Gnome\"", "z-\"Orgrimmar\" z-\"Durotar\" r-\"Human\" r-\"Dwarf\" r-\"Night Elf\" r-\"Gnome\"",
{ NotSiegeOfOrgrimmarFilter, AllianceFilter }) {NotSiegeOfOrgrimmarFilter, AllianceFilter})
aura_env.whoQueries[3] = WHOQuery.new( aura_env.whoQueries[3] = WHOQuery.new(
"z-\"Orgrimmar\" z-\"Durotar\" r-\"Draenei\" r-\"Worgen\" r-\"Kul Tiran\" r-\"Dark Iron Dwarf\" r-\"Void Elf\" r-\"Lightforged Draenei\" r-\"Mechagnome\"", "z-\"Orgrimmar\" z-\"Durotar\" r-\"Draenei\" r-\"Worgen\" r-\"Kul Tiran\" r-\"Dark Iron Dwarf\" r-\"Void Elf\" r-\"Lightforged Draenei\" r-\"Mechagnome\"",
{ NotSiegeOfOrgrimmarFilter, AllianceFilter }) {NotSiegeOfOrgrimmarFilter, AllianceFilter})
aura_env.queryPending = false aura_env.queryPending = false
aura_env.lastQuery = nil aura_env.lastQuery = nil
aura_env.raceMap = { aura_env.raceMap = {
["Orc"] = "Horde", ["Orc"] = "Horde",
["Undead"] = "Horde", ["Undead"] = "Horde",
["Tauren"] = "Horde", ["Tauren"] = "Horde",
["Troll"] = "Horde", ["Troll"] = "Horde",
["Blood Elf"] = "Horde", ["Blood Elf"] = "Horde",
["Goblin"] = "Horde", ["Goblin"] = "Horde",
["Human"] = "Alliance", ["Human"] = "Alliance",
["Dwarf"] = "Alliance", ["Dwarf"] = "Alliance",
["Night Elf"] = "Alliance", ["Night Elf"] = "Alliance",
["Gnome"] = "Alliance", ["Gnome"] = "Alliance",
["Draenei"] = "Alliance", ["Draenei"] = "Alliance",
["Worgen"] = "Alliance", ["Worgen"] = "Alliance",
["Vulpera"] = "Horde", ["Vulpera"] = "Horde",
["Nightborne"] = "Horde", ["Nightborne"] = "Horde",
["Zandalari Troll"] = "Horde", ["Zandalari Troll"] = "Horde",
["Kul Tiran"] = "Alliance", ["Kul Tiran"] = "Alliance",
["Dark Iron Dwarf"] = "Alliance", ["Dark Iron Dwarf"] = "Alliance",
["Void Elf"] = "Alliance", ["Void Elf"] = "Alliance",
["Lightforged Draenei"] = "Alliance", ["Lightforged Draenei"] = "Alliance",
["Mechagnome"] = "Alliance", ["Mechagnome"] = "Alliance",
["Mag'har Orc"] = "Horde" ["Mag'har Orc"] = "Horde"
} }
---@type table<string, Player> ---@type table<string, Player>
@@ -136,94 +151,118 @@ aura_env.stinkies = {}
---@field race string ---@field race string
---@field class string ---@field class string
---@field zone string ---@field zone string
---@field lastSeen number ---@field lastSeenInternal number
---@field lastSeen string
---@field firstSeen string
---@field seenCount number
Player = { Player = {
---@param name string ---@param name string
---@param guild string ---@param guild string
---@param race string ---@param race string
---@param class string ---@param class string
---@param zone string ---@param zone string
---@return Player ---@return Player
new = function(name, guild, race, class, zone) new = function(name, guild, race, class, zone)
local self = setmetatable({}, { __index = Player }) local self = setmetatable({}, {
self.name = name __index = Player
self.guild = guild })
self.race = race self.name = name
self.class = class self.guild = guild
self.zone = zone self.race = race
return self self.class = class
end, self.zone = zone
Touch = function(self) self.lastSeen = GetTime() end, self.lastSeenInternal = GetTime()
ToString = function(self) self.lastSeen = "never"
local out = string.format("%s %s %s", padString(self.name, 16, true), self.firstSeen = "never"
padString(self.guild, 26, false), self.seenCount = 0
padString(self.zone, 26, false)) return self
return end,
string.format("|cFF%s%s|r", aura_env.classColors[self.class], out) ToString = function(self)
end local out = string.format("%s %s %s\nFirst: %s Last: %s Seen: %3d", padString(self.name, 16, true),
padString(self.guild, 26, false), padString(self.zone, 26, false), padString(self.firstSeen, 10, true),
padString(self.lastSeen, 10, true), self.seenCount)
return string.format("|cFF%s%s|r", aura_env.classColors[self.class], out)
end
} }
aura_env.classColors = { aura_env.classColors = {
["Warrior"] = "C69B6D", ["Warrior"] = "C69B6D",
["Paladin"] = "F48CBA", ["Paladin"] = "F48CBA",
["Hunter"] = "AAD372", ["Hunter"] = "AAD372",
["Rogue"] = "FFF468", ["Rogue"] = "FFF468",
["Priest"] = "FFFFFF", ["Priest"] = "FFFFFF",
["Death Knight"] = "C41E3A", ["Death Knight"] = "C41E3A",
["Shaman"] = "0070DD", ["Shaman"] = "0070DD",
["Mage"] = "3FC7EB", ["Mage"] = "3FC7EB",
["Warlock"] = "8788EE", ["Warlock"] = "8788EE",
["Monk"] = "00FF98", ["Monk"] = "00FF98",
["Druid"] = "FF7C0A", ["Druid"] = "FF7C0A",
["Demon Hunter"] = "A330C9" ["Demon Hunter"] = "A330C9"
} }
aura_env.UpdateMacro = function() aura_env.UpdateMacro = function()
local body = {} local body = {}
for k, v in pairs(aura_env.stinkies) do for k, v in pairs(aura_env.stinkies) do
table.insert(body, string.format("/tar %s", v.name)) table.insert(body, string.format("/tar %s", v.name))
end end
EditMacro("tar", nil, nil, string.join("\n", body)) EditMacro("tar", nil, nil, string.join("\n", body))
end end
---@param input string ---@param input string
---@param deliminer string ---@param deliminer string
---@return string[], string|nil ---@return string[], string|nil
local function StrSplit(input, deliminer) local function StrSplit(input, deliminer)
if not deliminer then return {}, "deliminer is nil" end if not deliminer then
if not input then return {}, "input is nil" end return {}, "deliminer is nil"
local parts = {} end
for part in string.gmatch(input, "([^" .. deliminer .. "]+)") do if not input then
table.insert(parts, strtrim(part)) return {}, "input is nil"
end end
return parts, nil local parts = {}
for part in string.gmatch(input, "([^" .. deliminer .. "]+)") do
table.insert(parts, strtrim(part))
end
return parts, nil
end end
---@type string[] ---@type string[]
local toNotify = StrSplit(aura_env.config.notify, ",") local toNotify = StrSplit(aura_env.config.notify, ",")
for i, part in ipairs(toNotify) do toNotify[i] = strtrim(part) end for i, part in ipairs(toNotify) do
toNotify[i] = strtrim(part)
end
---@type table<string, boolean> ---@type table<string, boolean>
local notifyFor = {} local notifyFor = {}
local notifyForD = StrSplit(aura_env.config.notifyFor, ",") local notifyForD = StrSplit(aura_env.config.notifyFor, ",")
for i, part in ipairs(notifyForD) do notifyFor[part] = true end for i, part in ipairs(notifyForD) do
notifyFor[part] = true
end
---@param player Player ---@param player Player
aura_env.Notify = function(player) aura_env.Notify = function(player)
if not notifyFor[player.zone] then return end if not notifyFor[player.zone] then
local msg = string.format("%s of class %s and guild %s in %s", player.name, return
player.class, player.guild, player.zone) end
for _, rec in ipairs(toNotify) do local msg = string.format("%s of class %s and guild %s in %s, first seen: %s, last seen: %s, times seen: %d",
table.insert(aura_env.messageQueue, { to = rec, message = msg }) player.name, player.class, player.guild, player.zone, player.firstSeen, player.lastSeen, player.seenCount)
end for _, rec in ipairs(toNotify) do
table.insert(aura_env.messageQueue, {
to = rec,
message = msg
})
end
end end
---@param player Player ---@param player Player
aura_env.NotifyGone = function(player) aura_env.NotifyGone = function(player)
if not notifyFor[player.zone] then return end if not notifyFor[player.zone] then
local msg = string.format("%s of class %s and guild %s left %s", return
player.name, player.class, player.guild, end
player.zone) local msg = string.format("%s of class %s and guild %s left %s", player.name, player.class, player.guild,
for _, rec in ipairs(toNotify) do player.zone)
table.insert(aura_env.messageQueue, { to = rec, message = msg }) for _, rec in ipairs(toNotify) do
end table.insert(aura_env.messageQueue, {
to = rec,
message = msg
})
end
end end