Merge branch 'dev' into V6

This commit is contained in:
tgstation-server
2023-10-08 01:47:58 +00:00
@@ -360,7 +360,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
var messageResponse = await channelsClient.CreateMessageAsync(
new Snowflake(channelId),
"DM: Deployment in Progress...",
"DM: Deployment in progress...",
embeds: new List<IEmbed> { embed },
ct: cancellationToken);
@@ -369,7 +369,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
return async (errorMessage, dreamMakerOutput) =>
{
var completionString = errorMessage == null ? "Succeeded" : "Failed";
var completionString = errorMessage == null ? "Pending" : "Failed";
Embed CreateUpdatedEmbed(string message, Color color) => new Embed
{
@@ -418,7 +418,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
errorMessage,
false));
var updatedMessageText = $"DM: Deployment {completionString}!";
var updatedMessageText = errorMessage == null ? $"DM: Deployment pending reboot..." : $"DM: Deployment failed!";
IMessage updatedMessage = null;
async Task CreateUpdatedMessage()
@@ -466,13 +466,20 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
return;
if (active)
{
completionString = "Succeeded";
updatedMessageText = $"DM: Deployment succeeded!";
embed = CreateUpdatedEmbed(
"The deployment completed successfully and was applied to server.",
Color.Green);
}
else
{
completionString = "Inactive";
embed = CreateUpdatedEmbed(
"This deployment has been superceeded by a new one.",
Color.Gray);
}
var editResponse = await channelsClient.EditMessageAsync(
new Snowflake(channelId),