Update who queries a lil

FreshShit/Spotter/export

@@ -1 +1 @@
-!fJrdVPXn0FlJPQr0sqHKQonP2TrsinHbh0CxsKAuoodNpWngBMTVKqN69BFpBFFY3RAstGG787t)87l)8B6757oZ3nu)fEKhROeg23T)TEDV2PTVBeNPCjFf7708eF3x7hfjXkFNJbciY5u0cp8RkF33m33DrjGi24PCXaoHbapVTJx7B0lsMHueotlkPcju6hulMdcKX1InmwyqyODrjEmNfk9bEmdry7p2regroDVXhOymNYfabonnFpX87PMFFR(xafuSc2t9NRzH0IAUau8jtOW)Xs8fy5y)r(UpHxa0qPl6ZOWtm0maElkLa2gCsahw93bDchHIPknbVqcvtTYcK)kS2WpPIWEkLJLKvjUyLJRbVCPuM1NQznqBxmBcS4Om5qyZJvfSYnJvF2y7ms)RMhPwcDAcNZZaujgxMInWjPw0yPIpt7EC78qKcie)mMzTJCTFW47n472cEhwDCMDn31qPvkIXjjKp0Yp)ZY4mOi8XiAsW4PigdtVomj4djbmcnPtsNJo6O)ymfjLjb9WsjAc2UwebtbeNLUwGujiSjvGLYV1cd2iOcawqAZxUuE4XKoiWpBiM9CJuP8PyCm2OC)93QsKcnIIFVLDhMX3FReheOX4EO5wIbAdSFEOwFX4ApAwU2vCriU2HLHElleJc3ccEGeWSTHGGtPBb(zuohShTPrBbPpYhb(gBbHRINHYHNfBufLlEbjI2okoKjtvv0L1J3hz8z4DinbcZWKTJ09CXe8ou77IPZXc0w27gTEexWWBbPpJyHiksqsc21jYFgdUSEeXonOiXtjbxl4SKG9W4EhNeUh22U6DtK2WayVxwXEyiqBYUps6HM8ttrIKGvC5t6KgoLeC(vTCCA3njikE8tyXIKovtoyilpQcY7hrM0ihgh4ETioFesulNY5qYJxa5SnshKHtNCYIIzMmzjbxsyH9fDGAGNBXUEkvoqE1dleWbf72v4XhXQZZsVvM8s0SeTPijTPmkOVlrQQFW3wLUi9UNyqVjOv)ygdGNpbs4XxLILKiXAIYO7bYJ7KeDLLLikj4NbfylKsIYPRGqhZcQPy2Mjm7JaRIfmJ(UrCXS1aSYI2xYFTAXN944YSn4QkuUE9Foumqv3wtObCkb1mRxl3N9nYu(eXJzHWH1xahnati4PSX5G14POvHcV7TB80UVdWGSzqT792po3yrL4VFEFWEDu89EqK5ouqyhddRYOngexDJV7ZkbwYPpRZoQ42yM3ew6S6WskI(mlnqr3X1AtazauK1rnvWvkk2JmdlwlbzyyZ2184vinVnJ8EuMJeOzW2e6YhlSrALBjkfSUfLQaYSSMwXY1dhUIeTWDoimS12MLMREHeo0YVvtjY4VKDWQ3J1xfJYMadQL2ypuiHhTgGJxoIey)rlZK3VIHD9blPB417yUr14dwX2zLDYUo0xotIfF9UkLsDjYABszZ5oyk192R7qhmNbnAauz(QFca6gpQe8nLamvNZBOUAJQlfDARENwSUCz(Sp2(R)qPGH1GuzzTui31WkySnIdP0))d6GSkoyAdqP9tPsIM2XBqysSqv)Em6PwWbG0fbHTnoFXtOg9k1q)H5kYbPzoQCZtZDGaLBYeSO0TfTluC7US7YiJhzUEKBCue5vF3HN3Y1BORxRB8YV40vyevFHPmChiWgCDh0UB3mwnCkjuFRrWFnSG96EKCA1R9WbDB51E4Tox7nS1fx0(Ivx(M296FhaOtE4PryW2ngUm2AImZQLFlawBIRVeEffUHMzTODTCG5ejf1n4PMkaBcMubCd8YYcyj8d52un2KaIy86RaUCWv2v13vfXkSpcT1kCvKt6D5Eq))JPrP5T8UVnXShBU9VxMSpAVdZediyiUH)mw8IGO0hyz2K9YcwmCI)RTHRlwuMQWpWSPt)F0(PvXcgVDfz91dRZwBXVn32JnHJnZG039FxSnKczoMcjxL2PSKM5WMrknzJwHsbRd38DT5q1diAeKJYZG7vT7o4YB7ArQi3Mj3NEGopJ9Sl2JdjLCoQ5XAic8eiTILdkZ4dHMNWcgIEhKRupFqNtENV7xaTcSq(UDBFjKeu3P19c0CF37ZFIaP4SwqHo17R4W7tNb1Xhdla9NGHuUqnfD630HsEPEvRWDp)M2TD0tcKgLoRYZ6751VNEEGAxA70OYh52Osd07SSXHzYZZh)CMQ)lhFQw4qs6Bm7ZuJOEqQ(UxkiFnj4tXOqHPsNNNruHevbMuoYmmw4mASz(S6zSLzvnZ0ALvL6j0U0I6ZeT9P399LV8RZ(R29wyq139KgnFxJt9DFgSkV9e9qb9)Nd
+!fJXAVTTnWFlladldiXipk6WaA3MtIstYSLtdvsaAqLfTfLmxOj9OOYJou9BF3rsjl)io5ddyqgws3D8ErEVu8(XrXKPXKu8h8OQ0i4swmzW1r9opmiMKPKgc)BS4W9piMqlntu6bZmCLSawqOLbMNNblXOYZfW9Yc2jSIXXJIj3ZEgwJq88aPaEkLLrlfgeJKofiTRqWPYXSQefqWVhtEKNAMGC1ehEWQS2YVcdxEVNJTKLJJelYg(1sITz9HiR9aoOwiC5SsZ8LqahdCNB9h12Y3uOZrWK5wETxTy)IfoOn9COgHs5DZnapVBPUZLElb6ywOYWZaB44juPKj8IEC9BTL(cA4IIhnfEXmb95i2tWl)4SyYZdYYkyGQblf87Ww5LkUeqECqyuWviq(ukU5IQEHHQn4dPLAlWHoJPGnwjtlQTnjA7apMs5Y3o1zCjVyYBMEyfp1s5hRekT78h(7a7)hA))DU9yY4YcJAkA7xplLAawXEGH2kCgwHg54BTBbKUW7a0X1NPBS72APb3d5oVHAOJ3XhvlLyYU7U7FmwqlkQs6ZkkO5SQlqyzCMiTkzQhwsHrZL5lGZVXUwCGItNJWHc9lns5UVwDbfCGdzYh64LYNlzLafFSk5F((IlYqhjyFWXUDQ57V1IdA6ywF6m3IH1M4UUBRb6XB9vl4TotPtzBTtBSxltz00nqqeibMCteOvcXgWFKqPa)rGiBde9j1iiwydeCw5uAd(6KplsYjps1zBMKqE(eZc6Y6P7ts1u2RinnLjz8nt0TkDo7vu7BkfZyA6gSDRwpsPLSnq0xOYuQGQ5vjV2oYFwchzJ46x1Hs13xLCUwjRsEdo3Bu803GVThAnzOJbO(n5f7ZGaT8xFlPpn)NMq1vjRCKV6cB4KqnMcMUzIwzmcweFktBjRjkcsGLXZ7utbunciy)9wzPnrAnHPZOA60QemRnthcvdwmRGhngLUicnZuQbhSKlAfn7kKqMbcdDtGKYkL28CBpxc7443pp3h41sP6r7A(eZG242RsrBxGL0wg2DZLWxDoG9MVEEMN97Umt(WkowZeMC(kRV8gCdCMmD(lVOA8rNyVyflbRRV29qlIL0Btn9Ov5xjEkzRxszB4o4kXofWIsG7mPthyv2F4tass5Ow4xY4wwNBQPSyU66RMYkOQD8zDddd61(KE9LReZAmDpdwZsAlz3PWoqOiutD7TohGWam)iuiKAW7)ai0KfoUHUJww33BTXH1N6WLfmTz7Bz077c6ubH(alTZXpFpTt)wv42PrraMzDrU(eafkpNPB1EQdW8UXQlAxuoY2taPmlJ)umz4XDjrdjrDVkQPBHZyub2LqnTxQzwAjxg0Rh282iyXrw2EwqVlp9Aayj2PaXzZEgb9Ze2TFWWl71nky41HNhnS7jNeCsvYYGVkO)GBcoX1myHR1dNc7BqYRyfZycX5Plqb2hYQCCZcQ6IMKcwodUvu)xt(aQpk)AanUvU9s0zJoSebvrCKDEXLwVGN0xi(WlaxAnVaUcEzzbSe9PQ6oLXup6s2QuIQ0YNRRNh5L0MMaJ2SpJkkyVmTlihFtu3H3)Qp3qtTMxtQRv6R34wBUVncepDyNqIZG4t1dm9JAUb3WQ9jVjp48jW(V2hUUy(cVcFN0Le))r)hQIZz8MvK1xfEB5Al5UwPAFXLyRodWeEkoomuzmfJ6lLZZTzZ9HtX8alYbSVcioCxyoraJMLdH4Uevg7aHWGFmTKkUbYvIt8fEW7Jj)fihqBJj9cofNrgA85wnfgD82MN4Pq2pR1OXbXKP86jNWbMGguyqgxOOcM91pL5PiuNSjhFvqqios)4hQf8VS3H7bd1vICU)TdkE8xN(3b9F29XhIjNQ5FRk5ZL0uTTwvuKnD8vwlYl3cMiZpl7rdIIg0hND7jw6T(XSr(luu7h5aYCo2(DpWHNR9C2H3wbAb(LpwcOXA1qCaIOzQ8U5UHlR)yhhTWhQyu9NoWZ2yYbD2)9DomM8a4ME3b4eRX)7p

FreshShit/Spotter/init.lua

@@ -1,5 +1,3 @@
-local channelId = nil
-
 ---@class Message
 ---@field message string
 ---@field channel string
@@ -33,38 +31,6 @@ aura_env.raceMap = {
     ["Mag'har Orc"] = "Horde"
 }
 
--- CHANNEL fuckery
-local channel = aura_env.config.channel or "foobar"
-local password = aura_env.config.channelPassword
-
-local function FindOrJoinChannel(channelName, password)
-    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(channelName)
-    if not channelId then
-        print(string.format("channel %s not found, joining", channelName))
-        if password then
-            JoinPermanentChannel(channelName, password)
-        else
-            JoinPermanentChannel(channelName)
-        end
-    end
-    channelId = GetChannelId(channelName)
-    return channelId
-end
-channelId = FindOrJoinChannel(channel, password)
-print(string.format("channel %s resolved to id %d", channel, channelId))
-local zone = aura_env.config.zone
-
 local throttleTimer = aura_env.config.throttle or 10
 local throttleMap = {}
 
@@ -86,7 +52,7 @@ aura_env.NotifySpotted = function(playerName, race)
 
 	local message = {
 		channel = "CHANNEL",
-		data = channelId,
+		data = aura_env.config.channel,
 		message = string.format("I see %s at %s!", playerName, zone)
 	}
 	table.insert(WeakAurasSaved.Cyka.MessageQueue, message)

FreshShit/WhoSniffer/init.lua

@@ -5,7 +5,6 @@ if not WeakAurasSaved.Cyka.WhoSniffer then
     WeakAurasSaved.Cyka.WhoSniffer = {}
 end
 
-aura_env.ttl = 12
 aura_env.ignored = {"Maritza", "Goodbones"}
 local channelId = nil
 
@@ -125,7 +124,9 @@ aura_env.whoQueries[4] = WHOQuery.new(
 aura_env.whoQueries[5] = WHOQuery.new(
     "z-\"Orgrimmar\" z-\"Durotar\" z-\"Valley of Trials\" z-\"Echo Isles\" r-\"Lightforged Draenei\" r-\"Mechagnome\"",
     {NotSiegeOfOrgrimmarFilter, AllianceFilter})
+aura_env.whoQueries[6] = WHOQuery.new("Kekv Demonboo Dotmada Firobot", {})
 aura_env.queryPending = false
+aura_env.ttl = #aura_env.whoQueries * 2
 aura_env.lastQuery = nil
 
 ---@type table<string, string>

FreshShit/_Shared/Messenger.lua

@@ -7,12 +7,31 @@ function()
 	local message = WeakAurasSaved.Cyka.MessageQueue[1]
 	if message == nil then return end
 
+    -- Map channel names to ids
+    if message.channel == "CHANNEL" and string.match(message.data, "%D") then
+        print("Channel presented as string:", message.data)
+        local channelId = aura_env.channelIdMap[message.data]
+        if not channelId then
+            print("Channel not found, scanning")
+            aura_env.ScanChannels()
+            channelId = aura_env.channelIdMap[message.data]
+        end
+        if not channelId then
+            print("Channel not joined, joining")
+            channelId = aura_env.FindOrJoinChannel(message.data)
+        end
+        print("Channel resolved to id", channelId)
+        message.data = channelId
+    end
+
 	table.remove(WeakAurasSaved.Cyka.MessageQueue, 1)
 	SendChatMessage(message.message, message.channel, nil, message.data)
 end
 
 --INIT
-local function FindOrJoinChannel(channelName, password)
+---@type table<string, number>
+aura_env.channelIdMap = {}
+aura_env.FindOrJoinChannel = function(channelName, password)
     local function GetChannelId(channelName)
         local channels = {GetChannelList()}
         for i = 1, #channels, 2 do
@@ -24,7 +43,7 @@ local function FindOrJoinChannel(channelName, password)
         end
     end
 
-    channelId = GetChannelId(channelName)
+    local channelId = GetChannelId(channelName)
     if not channelId then
         print("Channel", channelName, "not found, joining")
         if password then
@@ -34,10 +53,19 @@ local function FindOrJoinChannel(channelName, password)
         end
     end
     channelId = GetChannelId(channelName)
+    aura_env.channelIdMap[channelName] = channelId
     return channelId
 end
-aura_env.channelId = FindOrJoinChannel(aura_env.config.channel, aura_env.config.channelPassword)
+aura_env.ScanChannels = function()
-print("Channel", aura_env.config.channel, "resolved to id", aura_env.channelId)
+    local channels = {GetChannelList()}
+    for i = 1, #channels, 2 do
+        local id = channels[i]
+        local name = channels[i + 1]
+        aura_env.channelIdMap[name] = id
+    end
+end
+local channelId = aura_env.FindOrJoinChannel(aura_env.config.channel, aura_env.config.channelPassword)
+print("Channel", aura_env.config.channel, "resolved to id", channelId)
 --aura_env.iterator = 0
 --WeakAurasSaved.Cyka.MessageQueue = {}
 --for i = 1, 100 do

FreshShit/_Shared/Messenger_Export

@@ -1 +1 @@
-!DEr)VjUn0)xyAsuTccO3U9tt66XOFnAGwNU(dNMjgId4RbBKTdx7v183(Ep7ei81v2jqGZZVV)o020qkzoLeJFHJQmBQqYPKbpe2)6GEusIsAjIVZPbT7qjppijXWT0GwabcZIu2lH8NTuYVUGsEPYLA(uHsg(YcGxwhggEAYqLqch)8GWWb3sjSm7mLEWclGQbeFGtDSoIeYfzaQzg(FXntOJPKVjITZqCiX8ewwkClO7W)cNkdyizZbk7oJjL808Oa3JPC5uhDGw9e)fkzI)EhV77VCmf06o)Vf(wYBiZy(MshVPCwdTQMSHEVPIaSEIkvP9oe8Bh3VN5(9d4VikzgRAo68FyrmZc6bFjhDUGtvnNzftE0PYKZHNbOtkDYeJLPTWba3eHuyM5pdhrOKy1ipVPFUukGQRMWalmjt64tE0fcz8a9nq8SW8RxyUOt)08Offw9j53Kh5)SdpUKBli(64QKxHMTOTajtE0FMh96A67lm26N82U0LO05rch6TbT6xkzaCUtEuSAxk2sIIyhXL09fX)(UKGzfBruE0VbkWpGurYk6wtyGdGDgxEycl)O52mT0PVhexUCpxUbq)dRECsz0Xzohr4Yzgk7guUF9FHg6euVwbdRD6ggn8unhBsuzYy4PVc5zc50A7jZafzzY275SW01HC9CMeQuo682voNud)NN3NCuU(FwhFz4FnH34yiltZgXLlBUjh3T6DnIkzIyAj(Gh5a3mCTJA3y5H5wnn3OsxYXyLctx3e9sTe4AJgRalSCnZILYGU3cV6ro7PZHRnegWRMDF5jwZB5gdBk)UmEMV(713qu3Qfq7wT8f(nAu68SSXP8McPHRT1FpodS41QeVviZjNADV68GGE9bBBpycDRzo021S3l(Z9s3Z5WEKWA5rnBI2ufKFZ5XkQF9drSAX0PCDLbREaRhZv2D3Kn2n8GKLKiEMsg19Cs4is453hUASYvCwkooPe3HAUdxYWE97Jtfhde7N3FvV(dV4baygosHGljas1ZidLeED3)U39JGarl)iuJFaKxBg5vTcPwQHOHwqxhiaEt5qK67R5ZEcHfDg2)v(uLnRa)rmBRmTdY59MrUvx4vNA0OXNqtppQGQDgCwnp49K2xQoSbTL1edulfPLQDzJJdOv(sdnFUAj)yknAxjEqaEc9eSfOuVqfAw8)PRuQkThanRcCSs5exNmiVBbpfQq2mxzMig3VumNhJqZKRtXDLa4wpl5HEG3QaKdAaBFH3iNaREwSpA3EbH9UhxbcA0izP)du1ajxWIxFKs(kikrcSpx)ExaLdypVh1myD3hxDsa6hALWoCyIo00lwuUUfULLgsYHQpWACBq6L9fiuFbdP7996fagIAYYsr)hTodRp8nqXs2vRTMOuJz69SFz7oN5eNcTPl0IVNhDxglw763eg6QDV3TxEHIXKcCtrqCvwlKedHyeyrLOHJ2JPSNHub7Sc0oNjKhp2Rw084W3rXZ8y)kSbDqprQI5EffiryI7TwWnOld0tsbVWoqn47TSfqmnbJxpD5Dt4Z)9eZLehQusNMT)yZZOKLqq6dDWLSP)3p
+!TIr)VPTr0)xyQseTakq76KM2MwkL0MmIHMZD5hQ6HpSpdxJ5mY3zAsRQ)BFV3D(lmMssvvJO239((7NPdOUuYAkja)dEmovhjKCkz67DNCPZykjmwQjIVWPodgsjSu9Q4KPB0IyPcqWXqa9dBaueYnPAkjvXFnx5txqjFweOxHWqc4HS0i4wkrYwdapAftk5rzEoMxVJ)aL4BpJsI4YLgepdeoanHrMwyO9e7DlOAQZWNmZRZNzmL6ZXjbn4rDM3qwRWyxbbiDGqTjI9Gl)E4LNTHsEyAyOIdcjqMe(sWE5AeuTbcDS)wEIcoL687N98ZaG8JJItSMu8VHMFFU53xG)cyDFnA6NQ0XRr(9(nbmnqz(wUuBCrXRzAH)Tgda5C4D4u)cxgrPzjA4ba2qHuOwzFgEepLeep3sB6Rk4cL0RxV)bn0zEA2Ii(FQ0jc5YtZ8KPRxWt(7SRyPjS5C52(5w3ldUMTjZ7VY8(63QD7fczW0KRIfYsRkasyQ0iFDZrgdkaIVj3EFs2vzE2)ff7ZIQqiZ7nC9Ocowh9A40a3CGuwHRc)jcLU7jFBF8cJtY8egWhas1Vuqa45HzEbX7JrdokcmixG3heF8OOGrEnqkZ7xbb47GQiSeVkeDmhOxXLhgXI)LW1PjsJ8Eqy5YwUCNd3fIRA36FP1K8i8EgTkwVdMTRoBGysD3o5eSZP7ydG36yityCQmaE7tqmied3PLafKLfXEhZ2HHYZ4jRzsi7lN1hpmU0wfP4)40(KNIN4jB4BnJ(d1G9J1dqVSgRkIJQDLrukPiXNvK)R2TaWjhkG54PRp900Nq65pqAz72pzPHt00tz(P10Kdx(SBfxILHILfm7068FNBMvfnUFcZHPwNeUkoAlhtiIrHVw(1LiX61RezHMNW0O7aK9ZWRULZU7C4AfHbKO)OhUJ1)AUsXwYFxkpLx2OOxVgUXbNDM151RxHXY0cQVqQ4j6UhJYaj(ADKBKoy4tNrV9ChNXtavQfiHURSD9cLQDRWV2YDlLDhtC7K51VpQt1a(Bglg4XTJpaTtxUegiOAKk7bvd4u0jwLUW0ONKggkUNsMp6CI7CI7534wocWB5SiS1FbSZs4gyjZgpzcop0caz74iVD8Kzx8E4WuS9pbNHb4krTHhb6NYoAagZM)OvmMBLPC2viATLexw9Uf)uEP12VYgpSBjSVhXAeoDqk3AyxoBkzu14o5qVxvP6o5JXLpuV6aQdvidylfrfIBrDZ9KgqoWHPkJznoKIervReVFvaE9iCikgiUND(T(WCI(R6wGbgOJz6p71qtXhvpw8DUcccWYcmvbD)dS2qDQE0HXAwNBNsM1P0hBVB9JBaHdPe7mxGc6nDObd2R0E9gzD)oi8tqnBDWRFs6oole)idfDevz)othjaOv9PP0DSMohO2B)YA2TmDsJSlB3Ke(64T8ht3Kb1ylbOfiR6Cqkv58))09Ygp1KVVF2HrMYlOQOe3lh9VJVzo07RCtV5Reb46JI1CSNbuVUQfHPfcUH3wUR9WRJbGD6b7WI3i9HL2NbUg4LrJDChFdUUh0KwYI(VI1qh(sk5taReHWkYtgFbUPipkmhTxn11D61aAWYVO2cl)I9jG2k8a7IModrHnmbknbDVa1YS7TL3xGNAB4qgDZ4XoW65Wii3MWGnLVT8PuK639M35Zx)BHQ3qWLIXXqWUGLFCGZxAB60CjEgEU6fdrngA8DJzN78UwmPaxjguZA7)scahnEyE3mfh4g0YlVHRmwYrCxZeYhp0LBu)4GxBuXaHUswJIzMpfd0c2381zWporHt2pc039ovHFFMghQTF6gk5IeXxY8ExkliXKu4A4ciid7p4L9FoLSfCuVyi(bgO))d