From 5fbaf869f84d22a468941d9423eae9f15c390bdd Mon Sep 17 00:00:00 2001
From: PhatPhuckDave <david.majdandzic@hotmail.com>
Date: Thu, 28 Nov 2024 19:45:09 +0100
Subject: [PATCH] Make whosniffer use messenger

---
 FreshShit/WhoSniffer/event4.lua | 24 ++++++++++++++++--------
 FreshShit/WhoSniffer/event5.lua | 17 +++++++++++------
 FreshShit/WhoSniffer/event6.lua | 22 ----------------------
 FreshShit/WhoSniffer/init.lua   |  9 +++++----
 4 files changed, 32 insertions(+), 40 deletions(-)
 delete mode 100644 FreshShit/WhoSniffer/event6.lua

diff --git a/FreshShit/WhoSniffer/event4.lua b/FreshShit/WhoSniffer/event4.lua
index dc199c7..e955648 100644
--- a/FreshShit/WhoSniffer/event4.lua
+++ b/FreshShit/WhoSniffer/event4.lua
@@ -1,9 +1,17 @@
--- TICKER_200
-function()
-	---@type Message
-	local message = aura_env.messageQueue[1]
-	if message == nil then return end
-
-	table.remove(aura_env.messageQueue, 1)
-	SendChatMessage(message.message, message.channel, nil, message.data)
+-- CHAT_MSG_WHISPER
+---@type event string
+---@type msg string
+---@type sender string
+function(event, msg, sender)
+	if msg == "who" then
+		for _, player in pairs(aura_env.stinkies) do
+			local msg = aura_env.MakeNotifyMessage(player)
+			local message = {
+				channel = "WHISPER",
+				data = sender,
+				message = msg
+			}
+			table.insert(WeakAurasSaved.Cyka.MessageQueue, message)
+		end
+	end
 end
\ No newline at end of file
diff --git a/FreshShit/WhoSniffer/event5.lua b/FreshShit/WhoSniffer/event5.lua
index dc1a53e..d6e491a 100644
--- a/FreshShit/WhoSniffer/event5.lua
+++ b/FreshShit/WhoSniffer/event5.lua
@@ -1,17 +1,22 @@
--- CHAT_MSG_WHISPER
+-- CHAT_MSG_CHANNEL
 ---@type event string
 ---@type msg string
 ---@type sender string
-function(event, msg, sender)
+function(event, msg, sender, ...)
+	local channelId = select(6, ...)
+	if channelId ~= aura_env.channelId then
+		return
+	end
+
 	if msg == "who" then
 		for _, player in pairs(aura_env.stinkies) do
 			local msg = aura_env.MakeNotifyMessage(player)
 			local message = {
-				channel = "WHISPER",
-				data = sender,
+				channel = "CHANNEL",
+				data = channelId,
 				message = msg
 			}
-			table.insert(aura_env.messageQueue, message)
+			table.insert(WeakAurasSaved.Cyka.MessageQueue, message)
 		end
 	end
-end
\ No newline at end of file
+end
diff --git a/FreshShit/WhoSniffer/event6.lua b/FreshShit/WhoSniffer/event6.lua
deleted file mode 100644
index 4507d1f..0000000
--- a/FreshShit/WhoSniffer/event6.lua
+++ /dev/null
@@ -1,22 +0,0 @@
--- CHAT_MSG_CHANNEL
----@type event string
----@type msg string
----@type sender string
-function(event, msg, sender, ...)
-	local channelId = select(6, ...)
-	if channelId ~= aura_env.channelId then
-		return
-	end
-
-	if msg == "who" then
-		for _, player in pairs(aura_env.stinkies) do
-			local msg = aura_env.MakeNotifyMessage(player)
-			local message = {
-				channel = "CHANNEL",
-				data = channelId,
-				message = msg
-			}
-			table.insert(aura_env.messageQueue, message)
-		end
-	end
-end
diff --git a/FreshShit/WhoSniffer/init.lua b/FreshShit/WhoSniffer/init.lua
index 9143287..d9cec0e 100644
--- a/FreshShit/WhoSniffer/init.lua
+++ b/FreshShit/WhoSniffer/init.lua
@@ -106,8 +106,9 @@ end
 ---@field channel string
 ---@field data string
 
----@type Message[]
-aura_env.messageQueue = {}
+if not WeakAurasSaved.Cyka.MessageQueue then
+    WeakAurasSaved.Cyka.MessageQueue = {}
+end
 aura_env.whoQueryIdx = 1
 ---@type table<number, WHOQuery>
 aura_env.whoQueries = {}
@@ -255,7 +256,7 @@ local NotifyAll = function(msg)
             data = rec,
             message = msg
         }
-        table.insert(aura_env.messageQueue, message)
+        table.insert(WeakAurasSaved.Cyka.MessageQueue, message)
     end
 end
 ---@param msg string
@@ -269,7 +270,7 @@ local NotifyChannel = function(msg)
         data = channelId,
         message = msg
     }
-    table.insert(aura_env.messageQueue, message)
+    table.insert(WeakAurasSaved.Cyka.MessageQueue, message)
 end
 
 ---@param player Player