From 9fb89056b60f3e53735505bb227ee84ac2cc8460 Mon Sep 17 00:00:00 2001 From: PhatPhuckDave Date: Fri, 29 Nov 2024 19:13:34 +0100 Subject: [PATCH] Update spotter to send channel names as args --- FreshShit/Spotter/export | 2 +- FreshShit/Spotter/init.lua | 36 +----------------------------------- 2 files changed, 2 insertions(+), 36 deletions(-) diff --git a/FreshShit/Spotter/export b/FreshShit/Spotter/export index b17aa6c..359ca02 100644 --- a/FreshShit/Spotter/export +++ b/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 \ No newline at end of file +!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 \ No newline at end of file diff --git a/FreshShit/Spotter/init.lua b/FreshShit/Spotter/init.lua index 658c714..2251373 100644 --- a/FreshShit/Spotter/init.lua +++ b/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)