From 8849b1f5addc698ee8868bbcd41dc8cf8a7d2cf4 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 27 Apr 2020 20:39:43 -0400
Subject: [PATCH 1/6] Add TGS_EVENT_INSTANCE_RENAMED to DMAPI

---
 src/DMAPI/tgs.dm        | 7 ++++---
 src/DMAPI/tgs/v5/api.dm | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/DMAPI/tgs.dm b/src/DMAPI/tgs.dm
index 2be28883d7..ce5ce4885a 100644
--- a/src/DMAPI/tgs.dm
+++ b/src/DMAPI/tgs.dm
@@ -1,6 +1,6 @@
 //tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "5.0.0"
+#define TGS_DMAPI_VERSION "5.1.0"
 
 //All functions and datums outside this document are subject to change with any version and should not be relied on
 
@@ -52,8 +52,9 @@
 
 //EVENT CODES
 
-#define TGS_EVENT_PORT_SWAP -2	//before a port change is about to happen, extra parameter is new port
-#define TGS_EVENT_REBOOT_MODE_CHANGE -1	//before a reboot mode change, extras parameters are the current and new reboot mode enums
+#define TGS_EVENT_REBOOT_MODE_CHANGE -1	//Before a reboot mode change, extras parameters are the current and new reboot mode enums
+#define TGS_EVENT_PORT_SWAP -2	//Before a port change is about to happen, extra parameters is new port
+#define TGS_EVENT_INSTANCE_RENAMED -3	//Before the instance is renamed, extra prameter is the new name
 
 //See the descriptions for the parameters of these codes here: https://github.com/tgstation/tgstation-server/blob/master/src/Tgstation.Server.Host/Components/EventType.cs
 #define TGS_EVENT_REPO_RESET_ORIGIN 0
diff --git a/src/DMAPI/tgs/v5/api.dm b/src/DMAPI/tgs/v5/api.dm
index f1a5c2dea6..d850b6fab8 100644
--- a/src/DMAPI/tgs/v5/api.dm
+++ b/src/DMAPI/tgs/v5/api.dm
@@ -178,6 +178,9 @@
 			if(!istext(new_instance_name))
 				return TopicResponse("Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_INSTANCE_NAME]!")
 
+			if(event_handler != null)
+				event_handler.HandleEvent(TGS_EVENT_INSTANCE_RENAMED, new_instance_name)
+
 			instance_name = new_instance_name
 			return TopicResponse()
 		if(DMAPI5_TOPIC_COMMAND_CHAT_CHANNELS_UPDATE)

From 0a6022ceb4d01abd2ede0eb8a27fcad252587e1d Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 27 Apr 2020 22:14:11 -0400
Subject: [PATCH 2/6] Change how the deployment complete chat message is worded

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

diff --git a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs
index 0a7a26153a..679a42b394 100644
--- a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs
+++ b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs
@@ -444,7 +444,7 @@ namespace Tgstation.Server.Host.Components.Deployment
 
 				await Task.WhenAll(symATask, symBTask).ConfigureAwait(false);
 
-				await chatManager.SendUpdateMessage(String.Format(CultureInfo.InvariantCulture, "Deployment complete!{0}", watchdog.Running ? " Changes will be applied on next server reboot." : String.Empty), cancellationToken).ConfigureAwait(false);
+				await chatManager.SendUpdateMessage(String.Format(CultureInfo.InvariantCulture, "Deployment complete! Changes will be applied {0}.", watchdog.DeploymentApplicationTime), 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 1b8e579d40..8eacde8b8c 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/BasicWatchdog.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/BasicWatchdog.cs
@@ -25,6 +25,9 @@ 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/ExperimentalWatchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/ExperimentalWatchdog.cs
index 333582ed73..dc3e4eb1f5 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/ExperimentalWatchdog.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/ExperimentalWatchdog.cs
@@ -34,6 +34,9 @@ namespace Tgstation.Server.Host.Components.Watchdog
 		/// <inheritdoc />
 		public override RebootState? RebootState => Running ? (AlphaIsActive ? alphaServer?.RebootState : bravoServer?.RebootState) : null;
 
+		/// <inheritdoc />
+		protected override string DeploymentTimeWhileRunning => "when DreamDaemon reboots";
+
 		/// <summary>
 		/// Server designation alpha
 		/// </summary>
diff --git a/src/Tgstation.Server.Host/Components/Watchdog/IWatchdog.cs b/src/Tgstation.Server.Host/Components/Watchdog/IWatchdog.cs
index 926d5239ba..8fac965b1f 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/IWatchdog.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/IWatchdog.cs
@@ -21,6 +21,11 @@ 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>
@@ -37,7 +42,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
 		DreamDaemonLaunchParameters LastLaunchParameters { get; }
 
 		/// <summary>
-		/// The <see cref="Components.Watchdog.RebootState"/> of the active server
+		/// The <see cref="Watchdog.RebootState"/> of the active server
 		/// </summary>
 		RebootState? RebootState { get; }
 
diff --git a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
index b3877611ec..3262a914a6 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/WatchdogBase.cs
@@ -32,6 +32,9 @@ 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; }
 
@@ -44,6 +47,11 @@ 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 74b6b25dac..a1d56b5e59 100644
--- a/src/Tgstation.Server.Host/Components/Watchdog/WindowsWatchdog.cs
+++ b/src/Tgstation.Server.Host/Components/Watchdog/WindowsWatchdog.cs
@@ -19,6 +19,9 @@ 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>

From 74f276668baef3dcef0eeff6495444f3a6fc2183 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 27 Apr 2020 22:21:56 -0400
Subject: [PATCH 3/6] Adds deployment complete event

---
 src/DMAPI/tgs.dm                              |  4 +--
 .../Components/EventType.cs                   | 33 +++++++++++--------
 .../Components/Instance.cs                    |  6 +++-
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/DMAPI/tgs.dm b/src/DMAPI/tgs.dm
index ce5ce4885a..5dfb6230ee 100644
--- a/src/DMAPI/tgs.dm
+++ b/src/DMAPI/tgs.dm
@@ -68,9 +68,9 @@
 #define TGS_EVENT_COMPILE_START 8
 #define TGS_EVENT_COMPILE_CANCELLED 9
 #define TGS_EVENT_COMPILE_FAILURE 10
-#define TGS_EVENT_COMPILE_COMPLETE 11
+#define TGS_EVENT_COMPILE_COMPLETE 11 // Note, this event fires before the new .dmb is loaded into the watchdog. Consider using the TGS_EVENT_DEPLOYMENT_COMPLETE instead
 #define TGS_EVENT_INSTANCE_AUTO_UPDATE_START 12
-#define TGS_EVENT_REPO_MERGE_CONFLICT 13
+#define TGS_EVENT_DEPLOYMENT_COMPLETE 13
 
 //OTHER ENUMS
 
diff --git a/src/Tgstation.Server.Host/Components/EventType.cs b/src/Tgstation.Server.Host/Components/EventType.cs
index f711742dbe..e501403ebf 100644
--- a/src/Tgstation.Server.Host/Components/EventType.cs
+++ b/src/Tgstation.Server.Host/Components/EventType.cs
@@ -8,71 +8,76 @@
 		/// <summary>
 		/// Parameters: Reference name, commit sha
 		/// </summary>
-		RepoResetOrigin = 0,
+		RepoResetOrigin,
 
 		/// <summary>
 		/// Parameters: Checkout target
 		/// </summary>
-		RepoCheckout = 1,
+		RepoCheckout,
 
 		/// <summary>
 		/// No parameters
 		/// </summary>
-		RepoFetch = 2,
+		RepoFetch,
 
 		/// <summary>
 		/// Parameters: Pull request number, pull request sha, merger message
 		/// </summary>
-		RepoMergePullRequest = 3,
+		RepoMergePullRequest,
 
 		/// <summary>
 		/// Parameters: Absolute path to repository root
 		/// </summary>
-		RepoPreSynchronize = 4,
+		RepoPreSynchronize,
 
 		/// <summary>
 		/// Parameters: Version being installed
 		/// </summary>
-		ByondInstallStart = 5,
+		ByondInstallStart,
 
 		/// <summary>
 		/// Parameters: Error string
 		/// </summary>
-		ByondInstallFail = 6,
+		ByondInstallFail,
 
 		/// <summary>
 		/// Parameters: Old active version, new active version
 		/// </summary>
-		ByondActiveVersionChange = 7,
+		ByondActiveVersionChange,
 
 		/// <summary>
 		/// Parameters: Game directory path, origin commit sha
 		/// </summary>
-		CompileStart = 8,
+		CompileStart,
 
 		/// <summary>
 		/// No parameters
 		/// </summary>
-		CompileCancelled = 9,
+		CompileCancelled,
 
 		/// <summary>
 		/// Parameters: Game directory path, "1" if compile succeeded and api validation failed, "0" otherwise
 		/// </summary>
-		CompileFailure = 10,
+		CompileFailure,
 
 		/// <summary>
 		/// Parameters: Game directory path
 		/// </summary>
-		CompileComplete = 11,
+		CompileComplete,
 
 		/// <summary>
 		/// No parameters
 		/// </summary>
-		InstanceAutoUpdateStart = 12,
+		InstanceAutoUpdateStart,
 
 		/// <summary>
 		/// Parameters: Base sha, target sha, base reference, target reference
 		/// </summary>
-		RepoMergeConflict = 13,
+		RepoMergeConflict,
+
+		/// <summary>
+		/// No parameters
+		/// </summary>
+		DeploymentComplete
 	}
 }
diff --git a/src/Tgstation.Server.Host/Components/Instance.cs b/src/Tgstation.Server.Host/Components/Instance.cs
index 34d582a381..687eb2c246 100644
--- a/src/Tgstation.Server.Host/Components/Instance.cs
+++ b/src/Tgstation.Server.Host/Components/Instance.cs
@@ -256,7 +256,11 @@ namespace Tgstation.Server.Host.Components
 
 			databaseContext.CompileJobs.Add(compileJob); // will be saved by job context
 
-			job.PostComplete = ct => compileJobConsumer.LoadCompileJob(compileJob, ct);
+			job.PostComplete = async postCompleteCancellationToken =>
+			{
+				await compileJobConsumer.LoadCompileJob(compileJob, postCompleteCancellationToken).ConfigureAwait(false);
+				await eventConsumer.HandleEvent(EventType.DeploymentComplete, null, postCompleteCancellationToken).ConfigureAwait(false);
+			};
 
 			if (repositorySettings?.AccessToken != null)
 			{

From c9f990ccceedca47228d882bb07b85b71bec60c4 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 27 Apr 2020 22:26:02 -0400
Subject: [PATCH 4/6] No more prerelease

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index ace9d4cd11..f157c98a3d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -100,7 +100,7 @@ deploy:
       secure: lJNGAXwiB5HlWdthz3K4PetqpTG5IEAyRgKaiKxFMQ8HW8CcOjRtB97B05op7BsK
     artifact: ServerConsole,ServerService,ServerUpdatePackage,DMAPI,SwaggerSpec
     draft: $(TGSDraftNotes)
-    prerelease: true
+    prerelease: false
     on:
       TGSDeploy: "Do it."
   - provider: GitHub

From b070566c1e4eadf126e6fa02fd30e6c28e63dcd9 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 27 Apr 2020 23:05:36 -0400
Subject: [PATCH 5/6] Bump DMAPI version in Version.props

---
 build/Version.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/Version.props b/build/Version.props
index 7878a900d9..dd2c9a844e 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -5,7 +5,7 @@
     <TgsCoreVersion>4.1.0</TgsCoreVersion>
     <TgsApiVersion>6.0.0</TgsApiVersion>
     <TgsClientVersion>6.0.0</TgsClientVersion>
-    <TgsDmapiVersion>5.0.0</TgsDmapiVersion>
+    <TgsDmapiVersion>5.1.0</TgsDmapiVersion>
     <TgsControlPanelVersion>0.4.0</TgsControlPanelVersion>
     <TgsHostWatchdogVersion>1.1.0</TgsHostWatchdogVersion>
   </PropertyGroup>

From ba0fc29678c647fffd8380832b15351d344aa5f2 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 27 Apr 2020 23:20:04 -0400
Subject: [PATCH 6/6] Fix some DMAPI constants

---
 src/DMAPI/tgs/v5/api.dm                                        | 2 +-
 src/Tgstation.Server.Host/Components/Interop/DMApiConstants.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/DMAPI/tgs/v5/api.dm b/src/DMAPI/tgs/v5/api.dm
index d850b6fab8..ef071f3b70 100644
--- a/src/DMAPI/tgs/v5/api.dm
+++ b/src/DMAPI/tgs/v5/api.dm
@@ -18,7 +18,7 @@
 	var/datum/tgs_event_handler/event_handler
 
 /datum/tgs_api/v5/ApiVersion()
-	return "5.0.0"
+	return "5.1.0"
 
 /datum/tgs_api/v5/OnWorldNew(datum/tgs_event_handler/event_handler, minimum_required_security_level)
 	src.event_handler = event_handler
diff --git a/src/Tgstation.Server.Host/Components/Interop/DMApiConstants.cs b/src/Tgstation.Server.Host/Components/Interop/DMApiConstants.cs
index b0b95efbae..f14967cf94 100644
--- a/src/Tgstation.Server.Host/Components/Interop/DMApiConstants.cs
+++ b/src/Tgstation.Server.Host/Components/Interop/DMApiConstants.cs
@@ -33,7 +33,7 @@ namespace Tgstation.Server.Host.Components.Interop
 		/// <summary>
 		/// The DMAPI <see cref="Version"/> being used.
 		/// </summary>
-		public static readonly Version Version = new Version(5, 0, 0);
+		public static readonly Version Version = new Version(5, 1, 0);
 
 		/// <summary>
 		/// <see cref="JsonSerializerSettings"/> for use when communicating with the DMAPI.