Update whosniffer with more advanced queries
This commit is contained in:
@@ -3,14 +3,16 @@ if not WeakAurasSaved.Cyka.WhoSniffer then WeakAurasSaved.Cyka.WhoSniffer = {} e
|
||||
|
||||
---@class aura_env
|
||||
---@field raceMap table<string, string>
|
||||
---@field alliance table<string, Player>
|
||||
---@field stinkies table<string, Player>
|
||||
---@field classColors table<string, string>
|
||||
---@field whoQuery string
|
||||
---@field whoQueries table<number, WHOQuery>
|
||||
---@field ttl number
|
||||
---@field messageQueue WHOMessage[]
|
||||
---@field UpdateMacro fun()
|
||||
---@field Notify fun(Player)
|
||||
---@field NotifyGone fun(Player)
|
||||
---@field queryPending boolean
|
||||
---@field lastQuery WHOQuery
|
||||
|
||||
---@class WHOMessage
|
||||
---@field message string
|
||||
@@ -19,77 +21,112 @@ if not WeakAurasSaved.Cyka.WhoSniffer then WeakAurasSaved.Cyka.WhoSniffer = {} e
|
||||
---@param input string
|
||||
---@return number
|
||||
local function utf8len(input)
|
||||
local len = 0
|
||||
local i = 1
|
||||
local n = #input
|
||||
while i <= n do
|
||||
local c = input:byte(i)
|
||||
if c >= 0 and c <= 127 then
|
||||
i = i + 1
|
||||
elseif c >= 194 and c <= 223 then
|
||||
i = i + 2
|
||||
elseif c >= 224 and c <= 239 then
|
||||
i = i + 3
|
||||
elseif c >= 240 and c <= 244 then
|
||||
i = i + 4
|
||||
else
|
||||
i = i + 1
|
||||
end
|
||||
len = len + 1
|
||||
end
|
||||
return len
|
||||
local len = 0
|
||||
local i = 1
|
||||
local n = #input
|
||||
while i <= n do
|
||||
local c = input:byte(i)
|
||||
if c >= 0 and c <= 127 then
|
||||
i = i + 1
|
||||
elseif c >= 194 and c <= 223 then
|
||||
i = i + 2
|
||||
elseif c >= 224 and c <= 239 then
|
||||
i = i + 3
|
||||
elseif c >= 240 and c <= 244 then
|
||||
i = i + 4
|
||||
else
|
||||
i = i + 1
|
||||
end
|
||||
len = len + 1
|
||||
end
|
||||
return len
|
||||
end
|
||||
---@param input string
|
||||
---@param targetLength number
|
||||
---@param left boolean
|
||||
---@return string
|
||||
local function padString(input, targetLength, left)
|
||||
left = left or false
|
||||
local len = utf8len(input)
|
||||
if len < targetLength then
|
||||
if left then
|
||||
input = input .. string.rep(" ", targetLength - len)
|
||||
else
|
||||
input = string.rep(" ", targetLength - len) .. input
|
||||
end
|
||||
end
|
||||
return input
|
||||
left = left or false
|
||||
local len = utf8len(input)
|
||||
if len < targetLength then
|
||||
if left then
|
||||
input = input .. string.rep(" ", targetLength - len)
|
||||
else
|
||||
input = string.rep(" ", targetLength - len) .. input
|
||||
end
|
||||
end
|
||||
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
|
||||
|
||||
aura_env.messageQueue = {}
|
||||
aura_env.ttl = 6
|
||||
aura_env.whoQueryIdx = 1
|
||||
aura_env.whoQueries = {
|
||||
"g-\"БеспредеЛ\"",
|
||||
"z-\"Orgrimmar\" z-\"Durotar\" r-\"Human\" r-\"Dwarf\" r-\"Night Elf\" r-\"Gnome\"",
|
||||
"z-\"Orgrimmar\" z-\"Durotar\" r-\"Draenei\" r-\"Worgen\" r-\"Kul Tiran\" r-\"Dark Iron Dwarf\" r-\"Void Elf\" r-\"Lightforged Draenei\" r-\"Mechagnome\""
|
||||
}
|
||||
---@type table<number, WHOQuery>
|
||||
aura_env.whoQueries = {}
|
||||
aura_env.whoQueries[1] = WHOQuery.new("g-\"БеспредеЛ\"", {})
|
||||
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 = {
|
||||
["Orc"] = "Horde",
|
||||
["Undead"] = "Horde",
|
||||
["Tauren"] = "Horde",
|
||||
["Troll"] = "Horde",
|
||||
["Blood Elf"] = "Horde",
|
||||
["Goblin"] = "Horde",
|
||||
["Human"] = "Alliance",
|
||||
["Dwarf"] = "Alliance",
|
||||
["Night Elf"] = "Alliance",
|
||||
["Gnome"] = "Alliance",
|
||||
["Draenei"] = "Alliance",
|
||||
["Worgen"] = "Alliance",
|
||||
["Vulpera"] = "Horde",
|
||||
["Nightborne"] = "Horde",
|
||||
["Zandalari Troll"] = "Horde",
|
||||
["Kul Tiran"] = "Alliance",
|
||||
["Dark Iron Dwarf"] = "Alliance",
|
||||
["Void Elf"] = "Alliance",
|
||||
["Lightforged Draenei"] = "Alliance",
|
||||
["Mechagnome"] = "Alliance",
|
||||
["Mag'har Orc"] = "Horde",
|
||||
["Orc"] = "Horde",
|
||||
["Undead"] = "Horde",
|
||||
["Tauren"] = "Horde",
|
||||
["Troll"] = "Horde",
|
||||
["Blood Elf"] = "Horde",
|
||||
["Goblin"] = "Horde",
|
||||
["Human"] = "Alliance",
|
||||
["Dwarf"] = "Alliance",
|
||||
["Night Elf"] = "Alliance",
|
||||
["Gnome"] = "Alliance",
|
||||
["Draenei"] = "Alliance",
|
||||
["Worgen"] = "Alliance",
|
||||
["Vulpera"] = "Horde",
|
||||
["Nightborne"] = "Horde",
|
||||
["Zandalari Troll"] = "Horde",
|
||||
["Kul Tiran"] = "Alliance",
|
||||
["Dark Iron Dwarf"] = "Alliance",
|
||||
["Void Elf"] = "Alliance",
|
||||
["Lightforged Draenei"] = "Alliance",
|
||||
["Mechagnome"] = "Alliance",
|
||||
["Mag'har Orc"] = "Horde"
|
||||
}
|
||||
|
||||
---@type table<string, Player>
|
||||
aura_env.alliance = {}
|
||||
aura_env.stinkies = {}
|
||||
|
||||
---@class Player
|
||||
---@field name string
|
||||
@@ -99,95 +136,92 @@ aura_env.alliance = {}
|
||||
---@field zone string
|
||||
---@field lastSeen number
|
||||
Player = {
|
||||
---@param name string
|
||||
---@param guild string
|
||||
---@param race string
|
||||
---@param class string
|
||||
---@param zone string
|
||||
---@return Player
|
||||
new = function(name, guild, race, class, zone)
|
||||
local self = setmetatable({}, {
|
||||
__index = Player
|
||||
})
|
||||
self.name = name
|
||||
self.guild = guild
|
||||
self.race = race
|
||||
self.class = class
|
||||
self.zone = zone
|
||||
return self
|
||||
end,
|
||||
Touch = function(self)
|
||||
self.lastSeen = GetTime()
|
||||
end,
|
||||
ToString = function(self)
|
||||
local out = string.format("%s %s %s", padString(self.name, 16, true), padString(self.guild, 26, false),
|
||||
padString(self.zone, 26, false))
|
||||
return string.format("|cFF%s%s|r", aura_env.classColors[self.class], out)
|
||||
end
|
||||
---@param name string
|
||||
---@param guild string
|
||||
---@param race string
|
||||
---@param class string
|
||||
---@param zone string
|
||||
---@return Player
|
||||
new = function(name, guild, race, class, zone)
|
||||
local self = setmetatable({}, {__index = Player})
|
||||
self.name = name
|
||||
self.guild = guild
|
||||
self.race = race
|
||||
self.class = class
|
||||
self.zone = zone
|
||||
return self
|
||||
end,
|
||||
Touch = function(self) self.lastSeen = GetTime() end,
|
||||
ToString = function(self)
|
||||
local out = string.format("%s %s %s", padString(self.name, 16, true),
|
||||
padString(self.guild, 26, false),
|
||||
padString(self.zone, 26, false))
|
||||
return
|
||||
string.format("|cFF%s%s|r", aura_env.classColors[self.class], out)
|
||||
end
|
||||
}
|
||||
|
||||
aura_env.classColors = {
|
||||
["Warrior"] = "C69B6D",
|
||||
["Paladin"] = "F48CBA",
|
||||
["Hunter"] = "AAD372",
|
||||
["Rogue"] = "FFF468",
|
||||
["Priest"] = "FFFFFF",
|
||||
["Death Knight"] = "C41E3A",
|
||||
["Shaman"] = "0070DD",
|
||||
["Mage"] = "3FC7EB",
|
||||
["Warlock"] = "8788EE",
|
||||
["Monk"] = "00FF98",
|
||||
["Druid"] = "FF7C0A",
|
||||
["Demon Hunter"] = "A330C9",
|
||||
["Warrior"] = "C69B6D",
|
||||
["Paladin"] = "F48CBA",
|
||||
["Hunter"] = "AAD372",
|
||||
["Rogue"] = "FFF468",
|
||||
["Priest"] = "FFFFFF",
|
||||
["Death Knight"] = "C41E3A",
|
||||
["Shaman"] = "0070DD",
|
||||
["Mage"] = "3FC7EB",
|
||||
["Warlock"] = "8788EE",
|
||||
["Monk"] = "00FF98",
|
||||
["Druid"] = "FF7C0A",
|
||||
["Demon Hunter"] = "A330C9"
|
||||
}
|
||||
|
||||
aura_env.UpdateMacro = function()
|
||||
local body = {}
|
||||
for k, v in pairs(aura_env.alliance) do
|
||||
table.insert(body, string.format("/tar %s", v.name))
|
||||
end
|
||||
EditMacro("tar", nil, nil, string.join("\n", body))
|
||||
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
|
||||
local function StrSplit(input, deliminer)
|
||||
if not deliminer then return {}, "deliminer is nil" end
|
||||
if not input then return {}, "input is nil" end
|
||||
local parts = {}
|
||||
for part in string.gmatch(input, "([^" .. deliminer .. "]+)") do
|
||||
table.insert(parts, strtrim(part))
|
||||
end
|
||||
return parts, nil
|
||||
if not deliminer then return {}, "deliminer is nil" end
|
||||
if not input then return {}, "input is nil" end
|
||||
local parts = {}
|
||||
for part in string.gmatch(input, "([^" .. deliminer .. "]+)") do
|
||||
table.insert(parts, strtrim(part))
|
||||
end
|
||||
return parts, nil
|
||||
end
|
||||
|
||||
---@type string[]
|
||||
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>
|
||||
local 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
|
||||
aura_env.Notify = function(player)
|
||||
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)
|
||||
for _, rec in ipairs(toNotify) do
|
||||
table.insert(aura_env.messageQueue, {to = rec, message = msg})
|
||||
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)
|
||||
for _, rec in ipairs(toNotify) do
|
||||
table.insert(aura_env.messageQueue, {to = rec, message = msg})
|
||||
end
|
||||
end
|
||||
|
||||
---@param player Player
|
||||
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, message = msg})
|
||||
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)
|
||||
for _, rec in ipairs(toNotify) do
|
||||
table.insert(aura_env.messageQueue, {to = rec, message = msg})
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user