From edf8a128653e1fee3b5e7d23e72ca50fa93df97e Mon Sep 17 00:00:00 2001
From: PhatPhuckDave <david.majdandzic@hotmail.com>
Date: Wed, 21 May 2025 01:42:41 +0200
Subject: [PATCH] Refactor message queuing to use NetworkMessenger and
 Messenger based on configuration

---
 Modules/Commander.lua        |  7 +++++--
 Modules/NetworkMessenger.lua |  2 ++
 Modules/Noter.lua            |  7 +++++--
 Modules/Whoer.lua            | 19 +++++++++++++++----
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/Modules/Commander.lua b/Modules/Commander.lua
index 202516e..b26d250 100644
--- a/Modules/Commander.lua
+++ b/Modules/Commander.lua
@@ -375,8 +375,11 @@ shared.Commander = {
 								print(string.format("[%s] Queuing message", ModuleName))
 								shared.dump(msg)
 							end
-							--table.insert(shared.messenger.queue, msg)
-							table.insert(shared.networkMessenger.queue, returnmsg)
+							if Heimdall_Data.config.networkMessenger.enabled then
+								shared.NetworkMessenger.Enqueue(returnmsg)
+							elseif Heimdall_Data.config.messenger.enabled then
+								shared.Messenger.Enqueue(returnmsg)
+							end
 						end
 					end
 				end
diff --git a/Modules/NetworkMessenger.lua b/Modules/NetworkMessenger.lua
index e58d975..7d563d3 100644
--- a/Modules/NetworkMessenger.lua
+++ b/Modules/NetworkMessenger.lua
@@ -13,6 +13,8 @@ local ModuleName = "NetworkMessenger"
 
 ---@class NetworkMessenger
 shared.NetworkMessenger = {
+	---@param message Message
+	Enqueue = function(message) table.insert(shared.networkMessenger.queue, message) end,
 	Init = function()
 		RegisterAddonMessagePrefix(Heimdall_Data.config.addonPrefix)
 
diff --git a/Modules/Noter.lua b/Modules/Noter.lua
index 2a9bde5..f9a2773 100644
--- a/Modules/Noter.lua
+++ b/Modules/Noter.lua
@@ -121,8 +121,11 @@ shared.Noter = {
 				data = channel,
 				message = string.format("[%s][%d] %s: %s", note.source, index, note.date, note.note),
 			}
-			--table.insert(shared.messenger.queue, msg)
-			table.insert(shared.networkMessenger.queue, msg)
+			if Heimdall_Data.config.networkMessenger.enabled then
+				shared.NetworkMessenger.Enqueue(msg)
+			elseif Heimdall_Data.config.messenger.enabled then
+				shared.Messenger.Enqueue(msg)
+			end
 		end
 		---@param name string
 		---@param args string[]
diff --git a/Modules/Whoer.lua b/Modules/Whoer.lua
index 91c8b38..ed27f87 100644
--- a/Modules/Whoer.lua
+++ b/Modules/Whoer.lua
@@ -323,7 +323,11 @@ shared.Whoer = {
 					print(string.format("[%s] Queuing channel notification", ModuleName))
 					shared.dump(msg)
 				end
-				table.insert(shared.networkMessenger.queue, msg)
+				if Heimdall_Data.config.networkMessenger.enabled then
+					shared.NetworkMessenger.Enqueue(msg)
+				elseif Heimdall_Data.config.messenger.enabled then
+					shared.Messenger.Enqueue(msg)
+				end
 			end
 
 			--if Heimdall_Data.config.who.doWhisper then
@@ -382,7 +386,11 @@ shared.Whoer = {
 					print(string.format("[%s] Queuing channel notification", ModuleName))
 					shared.dump(msg)
 				end
-				table.insert(shared.networkMessenger.queue, msg)
+				if Heimdall_Data.config.networkMessenger.enabled then
+					shared.NetworkMessenger.Enqueue(msg)
+				elseif Heimdall_Data.config.messenger.enabled then
+					shared.Messenger.Enqueue(msg)
+				end
 			end
 
 			--if Heimdall_Data.config.who.doWhisper then
@@ -433,8 +441,11 @@ shared.Whoer = {
 					print(string.format("[%s] Queuing channel notification", ModuleName))
 					shared.dump(msg)
 				end
-				--table.insert(shared.messenger.queue, msg)
-				table.insert(shared.networkMessenger.queue, msg)
+				if Heimdall_Data.config.networkMessenger.enabled then
+					shared.NetworkMessenger.Enqueue(msg)
+				elseif Heimdall_Data.config.messenger.enabled then
+					shared.Messenger.Enqueue(msg)
+				end
 			end
 
 			--if Heimdall_Data.config.who.doWhisper then