dave/wow-weakauras
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update whosniffer with more advanced queries

Browse Source
This commit is contained in:
PhatPhuckDave
2024-11-11 09:20:42 +01:00
parent d00a21266a
commit 43fe972ee3
5 changed files with 212 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
FreshShit/WhoSniffer/event.lua
View File

@@ -1,42 +1,54 @@
-- WHO_LIST_UPDATE -- WHO_LIST_UPDATE
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)
if zone ~= "Siege of Orgrimmar" then ---@type WHOQuery
local faction = aura_env.raceMap[race] local query = aura_env.lastQuery
if not faction then print("Unknown faction for race", race) end if not query then
if faction == "Alliance" then print("No query wtf?")
local player = aura_env.alliance[name] return
if not player then end
player = Player.new(name, guild, race, class, zone) ---@type WHOFilter[]
local timestamp = date("%Y-%m-%dT%H:%M:%S") local filters = query.filters
if not WeakAurasSaved.Cyka.WhoSniffer[name] then WeakAurasSaved.Cyka.WhoSniffer[name] = {} end for _, filter in pairs(filters) do
WeakAurasSaved.Cyka.WhoSniffer[name][timestamp] = { if not filter(name, guild, level, race, class, zone) then
["name"] = name, --print("Filter failed", filter, name, guild, level, race, class,
["guild"] = guild, -- zone)
["race"] = race, return
["class"] = class, end
["zone"] = zone, end
}
local stinky = WeakAurasSaved.Cyka.stinkies[name] local player = aura_env.stinkies[name]
if stinky then if not player then
PlaySoundFile("Interface\\Sounds\\Domination.ogg", "Master") player = Player.new(name, guild, race, class, zone)
else local timestamp = date("%Y-%m-%dT%H:%M:%S")
PlaySoundFile("Interface\\Sounds\\Cloak.ogg", "Master") if not WeakAurasSaved.Cyka.WhoSniffer[name] then
end WeakAurasSaved.Cyka.WhoSniffer[name] = {}
end
WeakAurasSaved.Cyka.WhoSniffer[name][timestamp] = {
["name"] = name,
["guild"] = guild,
["race"] = race,
["class"] = class,
["zone"] = zone
}
aura_env.Notify(player) local stinky = WeakAurasSaved.Cyka.stinkies[name]
end if stinky then
player:Touch() PlaySoundFile("Interface\\Sounds\\Domination.ogg", "Master")
player.zone = zone else
aura_env.alliance[name] = player PlaySoundFile("Interface\\Sounds\\Cloak.ogg", "Master")
end end
end
end aura_env.Notify(player)
-- Turns out WA cannot do this ( end
-- aura_env.UpdateMacro() player:Touch()
_G["FriendsFrameCloseButton"]:Click() player.zone = zone
aura_env.stinkies[name] = player
end
-- Turns out WA cannot do this (
-- aura_env.UpdateMacro()
_G["FriendsFrameCloseButton"]:Click()
end end
--/run WeakAurasSaved.Cyka.WhoSniffer = {} -- /run WeakAurasSaved.Cyka.WhoSniffer = {}

4
FreshShit/WhoSniffer/event2.lua
View File

@@ -2,11 +2,11 @@
---@type allstates allstates ---@type allstates allstates
function(allstates) function(allstates)
local now = GetTime() local now = GetTime()
for k, v in pairs(aura_env.alliance) do for k, v in pairs(aura_env.stinkies) do
local ago = now - v.lastSeen local ago = now - v.lastSeen
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.alliance[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)

5
FreshShit/WhoSniffer/event3.lua
View File

@@ -1,8 +1,11 @@
-- TICKER_1000 -- TICKER_1000
function() function()
if aura_env.queryPending then return end
SetWhoToUI(1) SetWhoToUI(1)
---@type WHOQuery
local query = aura_env.whoQueries[aura_env.whoQueryIdx] local query = aura_env.whoQueries[aura_env.whoQueryIdx]
SendWho(query) aura_env.lastQuery = query
SendWho(query.query)
aura_env.whoQueryIdx = aura_env.whoQueryIdx + 1 aura_env.whoQueryIdx = aura_env.whoQueryIdx + 1
if aura_env.whoQueryIdx > #aura_env.whoQueries then if aura_env.whoQueryIdx > #aura_env.whoQueries then
aura_env.whoQueryIdx = 1 aura_env.whoQueryIdx = 1

2
FreshShit/WhoSniffer/export
View File

File diff suppressed because one or more lines are too long

280
FreshShit/WhoSniffer/init.lua
View File

@@ -3,14 +3,16 @@ if not WeakAurasSaved.Cyka.WhoSniffer then WeakAurasSaved.Cyka.WhoSniffer = {} e
---@class aura_env ---@class aura_env
---@field raceMap table<string, string> ---@field raceMap table<string, string>
---@field alliance table<string, Player> ---@field stinkies table<string, Player>
---@field classColors table<string, string> ---@field classColors table<string, string>
---@field whoQuery string ---@field whoQueries table<number, WHOQuery>
---@field ttl number ---@field ttl number
---@field messageQueue WHOMessage[] ---@field messageQueue WHOMessage[]
---@field UpdateMacro fun() ---@field UpdateMacro fun()
---@field Notify fun(Player) ---@field Notify fun(Player)
---@field NotifyGone fun(Player) ---@field NotifyGone fun(Player)
---@field queryPending boolean
---@field lastQuery WHOQuery
---@class WHOMessage ---@class WHOMessage
---@field message string ---@field message string
@@ -19,77 +21,112 @@ 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
---@class WHOQuery
---@field query string
---@field filters WHOFilter[]
WHOQuery = {
---@param query string
---@param filters WHOFilter[]
---@return WHOQuery
new = function(query, filters)
local self = setmetatable({}, {__index = WHOQuery})
self.query = query
self.filters = filters
return self
end
}
---@alias WHOFilter fun(name: string, guild: string, level: number, race: string, class: string, zone: string): boolean
---@type WHOFilter
local NotSiegeOfOrgrimmarFilter = function(name, guild, level, race, class, zone)
if not zone then return false end
return zone ~= "Siege of Orgrimmar"
end
---@type WHOFilter
local AllianceFilter = function(name, guild, level, race, class, zone)
if not race then return false 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.ttl = 6
aura_env.whoQueryIdx = 1 aura_env.whoQueryIdx = 1
aura_env.whoQueries = { ---@type table<number, WHOQuery>
"g-\"БеспредеЛ\"", aura_env.whoQueries = {}
"z-\"Orgrimmar\" z-\"Durotar\" r-\"Human\" r-\"Dwarf\" r-\"Night Elf\" r-\"Gnome\"", aura_env.whoQueries[1] = WHOQuery.new("g-\"БеспредеЛ\"", {})
"z-\"Orgrimmar\" z-\"Durotar\" r-\"Draenei\" r-\"Worgen\" r-\"Kul Tiran\" r-\"Dark Iron Dwarf\" r-\"Void Elf\" r-\"Lightforged Draenei\" r-\"Mechagnome\"" aura_env.whoQueries[2] = WHOQuery.new(
} "z-\"Orgrimmar\" z-\"Durotar\" r-\"Human\" r-\"Dwarf\" r-\"Night Elf\" r-\"Gnome\"",
{NotSiegeOfOrgrimmarFilter, AllianceFilter})
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\"",
{NotSiegeOfOrgrimmarFilter, AllianceFilter})
aura_env.queryPending = false
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>
aura_env.alliance = {} aura_env.stinkies = {}
---@class Player ---@class Player
---@field name string ---@field name string
@@ -99,95 +136,92 @@ aura_env.alliance = {}
---@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({}, { local self = setmetatable({}, {__index = Player})
__index = Player self.name = name
}) self.guild = guild
self.name = name self.race = race
self.guild = guild self.class = class
self.race = race self.zone = zone
self.class = class return self
self.zone = zone end,
return self Touch = function(self) self.lastSeen = GetTime() end,
end, ToString = function(self)
Touch = function(self) local out = string.format("%s %s %s", padString(self.name, 16, true),
self.lastSeen = GetTime() padString(self.guild, 26, false),
end, padString(self.zone, 26, false))
ToString = function(self) return
local out = string.format("%s %s %s", padString(self.name, 16, true), padString(self.guild, 26, false), string.format("|cFF%s%s|r", aura_env.classColors[self.class], out)
padString(self.zone, 26, false)) end
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.alliance) 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[]
local toNotify = StrSplit(aura_env.config.notify, ",") local toNotify = StrSplit(aura_env.config.notify, ",")
for i, part in ipairs(toNotify) do for i, part in ipairs(toNotify) do toNotify[i] = strtrim(part) end
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 for i, part in ipairs(notifyForD) do notifyFor[part] = true end
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, player.class, player.guild, player.zone) local msg = string.format("%s of class %s and guild %s in %s", player.name,
for _, rec in ipairs(toNotify) do player.class, player.guild, 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
---@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", player.name, player.class, player.guild, player.zone) local msg = string.format("%s of class %s and guild %s left %s",
for _, rec in ipairs(toNotify) do player.name, player.class, player.guild,
table.insert(aura_env.messageQueue, {to = rec, message = msg}) player.zone)
end for _, rec in ipairs(toNotify) do
table.insert(aura_env.messageQueue, {to = rec, message = msg})
end
end end