From 5693363d2ce4289baae92891b248ce08bc5528fb Mon Sep 17 00:00:00 2001
From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date: Thu, 5 Jan 2023 19:42:10 +0000
Subject: [PATCH] Cybbtweaks

---
 .../Components/Deployment/DmbFactory.cs                | 10 ++++++----
 .../Components/Deployment/DreamMaker.cs                |  1 +
 .../Components/Events/EventType.cs                     |  4 ++--
 .../Components/InstanceFactory.cs                      |  2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Tgstation.Server.Host/Components/Deployment/DmbFactory.cs b/src/Tgstation.Server.Host/Components/Deployment/DmbFactory.cs
index d8d584a803..775c8ce270 100644
--- a/src/Tgstation.Server.Host/Components/Deployment/DmbFactory.cs
+++ b/src/Tgstation.Server.Host/Components/Deployment/DmbFactory.cs
@@ -100,22 +100,22 @@ namespace Tgstation.Server.Host.Components.Deployment
 		/// <param name="databaseContextFactory">The value of <see cref="databaseContextFactory"/>.</param>
 		/// <param name="ioManager">The value of <see cref="ioManager"/>.</param>
 		/// <param name="remoteDeploymentManagerFactory">The value of <see cref="remoteDeploymentManagerFactory"/>.</param>
-		/// <param name="logger">The value of <see cref="logger"/>.</param>
 		/// <param name="eventConsumer">The value of <see cref="eventConsumer"/>.</param>
+		/// <param name="logger">The value of <see cref="logger"/>.</param>
 		/// <param name="metadata">The value of <see cref="metadata"/>.</param>
 		public DmbFactory(
 			IDatabaseContextFactory databaseContextFactory,
 			IIOManager ioManager,
 			IRemoteDeploymentManagerFactory remoteDeploymentManagerFactory,
-			ILogger<DmbFactory> logger,
 			IEventConsumer eventConsumer,
+			ILogger<DmbFactory> logger,
 			Api.Models.Instance metadata)
 		{
 			this.databaseContextFactory = databaseContextFactory ?? throw new ArgumentNullException(nameof(databaseContextFactory));
 			this.ioManager = ioManager ?? throw new ArgumentNullException(nameof(ioManager));
 			this.remoteDeploymentManagerFactory = remoteDeploymentManagerFactory ?? throw new ArgumentNullException(nameof(remoteDeploymentManagerFactory));
-			this.logger = logger ?? throw new ArgumentNullException(nameof(logger));
 			this.eventConsumer = eventConsumer ?? throw new ArgumentNullException(nameof(eventConsumer));
+			this.logger = logger ?? throw new ArgumentNullException(nameof(logger));
 			this.metadata = metadata ?? throw new ArgumentNullException(nameof(metadata));
 
 			cleanupTask = Task.CompletedTask;
@@ -367,7 +367,7 @@ namespace Tgstation.Server.Host.Components.Deployment
 				try
 				{
 					++deleting;
-					await eventConsumer.HandleEvent(EventType.DeploymentCleanedUp, new List<string> { x }, cancellationToken);
+					await eventConsumer.HandleEvent(EventType.DeploymentCleanup, new List<string> { x }, cancellationToken);
 					await ioManager.DeleteDirectory(x, cancellationToken);
 				}
 				catch (OperationCanceledException)
@@ -400,6 +400,8 @@ namespace Tgstation.Server.Host.Components.Deployment
 		{
 			async Task HandleCleanup()
 			{
+				// This needs to happen first
+				await eventConsumer.HandleEvent(EventType.DeploymentCleanup, new List<string> { job.DirectoryName.ToString() }, cleanupCts.Token);
 				var deleteJob = ioManager.DeleteDirectory(job.DirectoryName.ToString(), cleanupCts.Token);
 				var remoteDeploymentManager = remoteDeploymentManagerFactory.CreateRemoteDeploymentManager(
 					metadata,
diff --git a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs
index ffb2935ac9..e8464b0d89 100644
--- a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs
+++ b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs
@@ -929,6 +929,7 @@ namespace Tgstation.Server.Host.Components.Deployment
 				try
 				{
 					// DCT: None available
+					await eventConsumer.HandleEvent(EventType.DeploymentCleanup, new List<string> { jobPath }, default);
 					await ioManager.DeleteDirectory(jobPath, default);
 				}
 				catch (Exception e)
diff --git a/src/Tgstation.Server.Host/Components/Events/EventType.cs b/src/Tgstation.Server.Host/Components/Events/EventType.cs
index dc5fea1cec..f67a4bea87 100644
--- a/src/Tgstation.Server.Host/Components/Events/EventType.cs
+++ b/src/Tgstation.Server.Host/Components/Events/EventType.cs
@@ -159,7 +159,7 @@
 		/// <summary>
 		/// Whenever a deployment folder is deleted from disk. Parameters: Game directory path
 		/// </summary>
-		[EventScript("DeploymentCleanedUp")]
-		DeploymentCleanedUp,
+		[EventScript("DeploymentCleanup")]
+		DeploymentCleanup,
 	}
 }
diff --git a/src/Tgstation.Server.Host/Components/InstanceFactory.cs b/src/Tgstation.Server.Host/Components/InstanceFactory.cs
index 75fb2f0695..1bb8121c9d 100644
--- a/src/Tgstation.Server.Host/Components/InstanceFactory.cs
+++ b/src/Tgstation.Server.Host/Components/InstanceFactory.cs
@@ -286,8 +286,8 @@ namespace Tgstation.Server.Host.Components
 						databaseContextFactory,
 						gameIoManager,
 						remoteDeploymentManagerFactory,
-						loggerFactory.CreateLogger<DmbFactory>(),
 						eventConsumer,
+						loggerFactory.CreateLogger<DmbFactory>(),
 						metadata);
 					try
 					{