From 721beaff68673573a387d66b4a0e4573e29fc352 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Fri, 9 May 2025 21:32:26 -0400
Subject: [PATCH] Fix conflicting name error

---
 src/Tgstation.Server.Host/Components/Chat/ChatManager.cs  | 2 +-
 src/Tgstation.Server.Host/Components/Chat/IChatManager.cs | 2 +-
 src/Tgstation.Server.Host/Components/Instance.cs          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs b/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs
index abd5ef90c3..2aeca4f8f3 100644
--- a/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs
+++ b/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs
@@ -354,7 +354,7 @@ namespace Tgstation.Server.Host.Components.Chat
 			=> QueueMessageGeneric(mapping => mapping.IsWatchdogChannel, message, "WD");
 
 		/// <inheritdoc />
-		public void QueueDeploymentMessage(string message)
+		public void QueueRawDeploymentMessage(string message)
 			=> QueueMessageGeneric(mapping => mapping.IsUpdatesChannel, message, null);
 
 		/// <inheritdoc />
diff --git a/src/Tgstation.Server.Host/Components/Chat/IChatManager.cs b/src/Tgstation.Server.Host/Components/Chat/IChatManager.cs
index 2b2faf9496..4f112afb69 100644
--- a/src/Tgstation.Server.Host/Components/Chat/IChatManager.cs
+++ b/src/Tgstation.Server.Host/Components/Chat/IChatManager.cs
@@ -61,7 +61,7 @@ namespace Tgstation.Server.Host.Components.Chat
 		/// Queue a chat <paramref name="message"/> to configured deployment channels.
 		/// </summary>
 		/// <param name="message">The message being sent.</param>
-		void QueueDeploymentMessage(string message);
+		void QueueRawDeploymentMessage(string message);
 
 		/// <summary>
 		/// Send the message for a deployment to configured deployment channels.
diff --git a/src/Tgstation.Server.Host/Components/Instance.cs b/src/Tgstation.Server.Host/Components/Instance.cs
index 8957678a3e..37454b7dbc 100644
--- a/src/Tgstation.Server.Host/Components/Instance.cs
+++ b/src/Tgstation.Server.Host/Components/Instance.cs
@@ -532,7 +532,7 @@ namespace Tgstation.Server.Host.Components
 					}
 					else if (preserveTestMerges)
 					{
-						Chat.QueueDeploymentMessage("Automatic update has failed due to a conflicting testmerge!");
+						Chat.QueueRawDeploymentMessage("Automatic update has failed due to a conflicting testmerge!");
 						throw new JobException(Api.Models.ErrorCode.InstanceUpdateTestMergeConflict);
 					}