From f708bb5dc8e508c3480323dadd79640d705da7ad Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Fri, 8 May 2020 22:18:54 -0400
Subject: [PATCH] Remove unecessary abstraction

---
 .../Components/Deployment/DreamMaker.cs                   | 8 +++++++-
 .../Components/Watchdog/BasicWatchdog.cs                  | 3 ---
 .../Components/Watchdog/IWatchdog.cs                      | 5 -----
 .../Components/Watchdog/WatchdogBase.cs                   | 8 --------
 .../Components/Watchdog/WindowsWatchdog.cs                | 3 ---
 5 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs
index 0a35672cf7..6dc7a2805a 100644
--- a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs
+++ b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs
@@ -455,7 +455,13 @@ namespace Tgstation.Server.Host.Components.Deployment
 
 				await Task.WhenAll(symATask, symBTask).ConfigureAwait(false);
 
-				await chatManager.SendUpdateMessage(String.Format(CultureInfo.InvariantCulture, "Deployment complete! Changes will be applied {0}.", watchdog.DeploymentApplicationTime), cancellationToken).ConfigureAwait(false);
+				await chatManager.SendUpdateMessage(
+					String.Format(
+						CultureInfo.InvariantCulture,
+						"Deployment complete! Changes will be applied when DreamDaemon {0}.",
+						watchdog.Running ? "reboots" : "is launched"),
+					cancellationToken)
+					.ConfigureAwait(false);
 
 				logger.LogDebug("Compile complete!");
 			}
diff --git a/src/Tgstation.Server.Host/Components/Watchdog/BasicWatchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/BasicWatchdog.cs
index 61050c4146..36f1b5e3a7 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/BasicWatchdog.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/BasicWatchdog.cs
@@ -23,9 +23,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
 		/// <inheritdoc />
 		public sealed override Models.CompileJob ActiveCompileJob => Server?.Dmb.CompileJob;
 
-		/// <inheritdoc />
-		protected override string DeploymentTimeWhileRunning => "immediately";
-
 		/// <inheritdoc />
 		public sealed override RebootState? RebootState => Server?.RebootState;
 
diff --git a/src/Tgstation.Server.Host/Components/Watchdog/IWatchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/IWatchdog.cs
index 8fac965b1f..bd9c175e95 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/IWatchdog.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/IWatchdog.cs
@@ -21,11 +21,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
 		/// </summary>
 		bool AlphaIsActive { get; }
 
-		/// <summary>
-		/// When new <see cref="Models.CompileJob"/>s will be made active.
-		/// </summary>
-		string DeploymentApplicationTime { get; }
-
 		/// <summary>
 		/// The <see cref="CompileJob"/> currently running on the server
 		/// </summary>
diff --git a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
index 0de52d5f00..25113ccfcf 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
@@ -30,9 +30,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
 		/// <inheritdoc />
 		public abstract bool AlphaIsActive { get; }
 
-		/// <inheritdoc />
-		public string DeploymentApplicationTime => Running ? DeploymentTimeWhileRunning : "when DreamDaemon is launched";
-
 		/// <inheritdoc />
 		public abstract Models.CompileJob ActiveCompileJob { get; }
 
@@ -45,11 +42,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
 		/// <inheritdoc />
 		public abstract RebootState? RebootState { get; }
 
-		/// <summary>
-		/// When deployments happen if the <see cref="IWatchdog"/> is <see cref="Running"/>.
-		/// </summary>
-		protected abstract string DeploymentTimeWhileRunning { get; }
-
 		/// <summary>
 		/// <see cref="TaskCompletionSource{TResult}"/> that completes when <see cref="ActiveLaunchParameters"/> are changed and we are <see cref="Running"/>.
 		/// </summary>
diff --git a/src/Tgstation.Server.Host/Components/Watchdog/WindowsWatchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/WindowsWatchdog.cs
index 7f1b83ae94..b191159c20 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/WindowsWatchdog.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/WindowsWatchdog.cs
@@ -17,9 +17,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
 	/// </summary>
 	sealed class WindowsWatchdog : BasicWatchdog
 	{
-		/// <inheritdoc />
-		protected override string DeploymentTimeWhileRunning => "when DreamDaemon reboots";
-
 		/// <summary>
 		/// The <see cref="IIOManager"/> for the <see cref="WindowsWatchdog"/>.
 		/// </summary>