Compare commits

...

2 Commits

Author SHA1 Message Date
1c70cabc9a Add ignores to whosniffer 2024-11-26 21:05:47 +01:00
dce05a3c44 Clean up LoginInfo to not eat too much memory 2024-11-26 21:03:37 +01:00
3 changed files with 178 additions and 170 deletions

View File

@@ -1,2 +1,6 @@
aura_env.KickTime = 0 aura_env.KickTime = 0
aura_env.AfkSince = 0 aura_env.AfkSince = 0
WeakAurasSaved.Cyka.LoginInfo = {
[Today] = WeakAurasSaved.Cyka.LoginInfo[Today] or {}
}

View File

@@ -2,50 +2,52 @@
function() function()
for i = 1, GetNumWhoResults() do for i = 1, GetNumWhoResults() do
local name, guild, level, race, class, zone = GetWhoInfo(i) local name, guild, level, race, class, zone = GetWhoInfo(i)
---@type WHOQuery if not aura_env.ignored[name] then
local query = aura_env.lastQuery ---@type WHOQuery
if not query then local query = aura_env.lastQuery
print("No query wtf?") if not query then
return print("No query wtf?")
end return
---@type WHOFilter[] end
local filters = query.filters ---@type WHOFilter[]
for _, filter in pairs(filters) do local filters = query.filters
if not filter(name, guild, level, race, class, zone) then for _, filter in pairs(filters) do
--print("Filter failed", filter, name, guild, level, race, class, if not filter(name, guild, level, race, class, zone) then
-- zone) --print("Filter failed", filter, name, guild, level, race, class,
return -- zone)
end return
end end
end
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 timestamp = date("%Y-%m-%dT%H:%M:%S")
if not WeakAurasSaved.Cyka.WhoSniffer[name] then if not WeakAurasSaved.Cyka.WhoSniffer[name] then
WeakAurasSaved.Cyka.WhoSniffer[name] = {} WeakAurasSaved.Cyka.WhoSniffer[name] = {}
end end
WeakAurasSaved.Cyka.WhoSniffer[name][timestamp] = { WeakAurasSaved.Cyka.WhoSniffer[name][timestamp] = {
["name"] = name, ["name"] = name,
["guild"] = guild, ["guild"] = guild,
["race"] = race, ["race"] = race,
["class"] = class, ["class"] = class,
["zone"] = zone ["zone"] = zone
} }
local stinky = WeakAurasSaved.Cyka.stinkies[name] local stinky = WeakAurasSaved.Cyka.stinkies[name]
if stinky then if stinky then
PlaySoundFile("Interface\\Sounds\\Domination.ogg", "Master") PlaySoundFile("Interface\\Sounds\\Domination.ogg", "Master")
else else
PlaySoundFile("Interface\\Sounds\\Cloak.ogg", "Master") PlaySoundFile("Interface\\Sounds\\Cloak.ogg", "Master")
end end
aura_env.Notify(player) aura_env.Notify(player)
end end
player:Touch() player:Touch()
player.zone = zone player.zone = zone
aura_env.stinkies[name] = player aura_env.stinkies[name] = player
end end
end
-- Turns out WA cannot do this ( -- Turns out WA cannot do this (
-- aura_env.UpdateMacro() -- aura_env.UpdateMacro()
_G["FriendsFrameCloseButton"]:Click() _G["FriendsFrameCloseButton"]:Click()

View File

@@ -1,6 +1,8 @@
if not WeakAurasSaved.Cyka then WeakAurasSaved.Cyka = {} end if not WeakAurasSaved.Cyka then WeakAurasSaved.Cyka = {} end
if not WeakAurasSaved.Cyka.WhoSniffer then WeakAurasSaved.Cyka.WhoSniffer = {} end if not WeakAurasSaved.Cyka.WhoSniffer then WeakAurasSaved.Cyka.WhoSniffer = {} end
aura_env.ignored = { "Maritza", "Goodbones" }
---@class aura_env ---@class aura_env
---@field raceMap table<string, string> ---@field raceMap table<string, string>
---@field stinkies table<string, Player> ---@field stinkies table<string, Player>
@@ -21,69 +23,69 @@ if not WeakAurasSaved.Cyka.WhoSniffer then WeakAurasSaved.Cyka.WhoSniffer = {} e
---@param input string ---@param input string
---@return number ---@return number
local function utf8len(input) local function utf8len(input)
local len = 0 local len = 0
local i = 1 local i = 1
local n = #input local n = #input
while i <= n do while i <= n do
local c = input:byte(i) local c = input:byte(i)
if c >= 0 and c <= 127 then if c >= 0 and c <= 127 then
i = i + 1 i = i + 1
elseif c >= 194 and c <= 223 then elseif c >= 194 and c <= 223 then
i = i + 2 i = i + 2
elseif c >= 224 and c <= 239 then elseif c >= 224 and c <= 239 then
i = i + 3 i = i + 3
elseif c >= 240 and c <= 244 then elseif c >= 240 and c <= 244 then
i = i + 4 i = i + 4
else else
i = i + 1 i = i + 1
end end
len = len + 1 len = len + 1
end end
return len 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({}, { __index = WHOQuery })
self.query = query self.query = query
self.filters = filters self.filters = filters
return self return self
end 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 false end
return zone ~= "Siege of Orgrimmar" 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 return false end
if not aura_env.raceMap[race] then return false end if not aura_env.raceMap[race] then return false end
return aura_env.raceMap[race] == "Alliance" return aura_env.raceMap[race] == "Alliance"
end end
aura_env.messageQueue = {} aura_env.messageQueue = {}
@@ -93,36 +95,36 @@ aura_env.whoQueryIdx = 1
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,65 +138,65 @@ aura_env.stinkies = {}
---@field zone string ---@field zone string
---@field lastSeen number ---@field lastSeen 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({}, { __index = Player })
self.name = name self.name = name
self.guild = guild self.guild = guild
self.race = race self.race = race
self.class = class self.class = class
self.zone = zone self.zone = zone
return self return self
end, end,
Touch = function(self) self.lastSeen = GetTime() end, Touch = function(self) self.lastSeen = GetTime() end,
ToString = function(self) ToString = function(self)
local out = string.format("%s %s %s", padString(self.name, 16, true), local out = string.format("%s %s %s", padString(self.name, 16, true),
padString(self.guild, 26, false), padString(self.guild, 26, false),
padString(self.zone, 26, false)) padString(self.zone, 26, false))
return return
string.format("|cFF%s%s|r", aura_env.classColors[self.class], out) string.format("|cFF%s%s|r", aura_env.classColors[self.class], out)
end 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 return {}, "deliminer is nil" end
if not input then return {}, "input is nil" end if not input then return {}, "input is nil" end
local parts = {} local parts = {}
for part in string.gmatch(input, "([^" .. deliminer .. "]+)") do for part in string.gmatch(input, "([^" .. deliminer .. "]+)") do
table.insert(parts, strtrim(part)) table.insert(parts, strtrim(part))
end end
return parts, nil return parts, nil
end end
---@type string[] ---@type string[]
@@ -207,21 +209,21 @@ 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 return end
local msg = string.format("%s of class %s and guild %s in %s", player.name, local msg = string.format("%s of class %s and guild %s in %s", player.name,
player.class, player.guild, player.zone) player.class, player.guild, player.zone)
for _, rec in ipairs(toNotify) do for _, rec in ipairs(toNotify) do
table.insert(aura_env.messageQueue, {to = rec, message = msg}) table.insert(aura_env.messageQueue, { to = rec, message = msg })
end 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 return end
local msg = string.format("%s of class %s and guild %s left %s", local msg = string.format("%s of class %s and guild %s left %s",
player.name, player.class, player.guild, player.name, player.class, player.guild,
player.zone) player.zone)
for _, rec in ipairs(toNotify) do for _, rec in ipairs(toNotify) do
table.insert(aura_env.messageQueue, {to = rec, message = msg}) table.insert(aura_env.messageQueue, { to = rec, message = msg })
end end
end end