From ccf5e4a8d4afd8bcc9f07fb76370a345a481a354 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 12 Jun 2020 15:02:09 -0400 Subject: [PATCH 1/3] Add a message for users who have embeds disabled. --- .../Components/Chat/Providers/DiscordProvider.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs index b2b5c7c86c..48e3c2ebba 100644 --- a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs +++ b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs @@ -350,7 +350,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers } var message = await channel.SendMessageAsync( - String.Empty, + "DM: Deployment in Progress...", false, builder.Build(), new RequestOptions @@ -361,7 +361,8 @@ namespace Tgstation.Server.Host.Components.Chat.Providers return async (errorMessage, dreamMakerOutput) => { - builder.Footer.Text = errorMessage == null ? "Succeeded" : "Failed"; + var completionString = errorMessage == null ? "Succeeded" : "Failed"; + builder.Footer.Text = completionString; builder.Color = errorMessage == null ? Color.Green : Color.Red; builder.Timestamp = DateTimeOffset.Now; builder.Description = errorMessage == null @@ -394,7 +395,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers try { await channel.SendMessageAsync( - String.Empty, + $"DM: Deployment {completionString}!", false, builder.Build()) .ConfigureAwait(false); From 01826087e67cfc4342ff764d252185fc7e1b7aab Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 12 Jun 2020 15:02:56 -0400 Subject: [PATCH 2/3] Don't show ETA in deploy embeds if there isn't one --- .../Components/Chat/Providers/DiscordProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs index 48e3c2ebba..2a82485356 100644 --- a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs +++ b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs @@ -337,7 +337,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers Title = "Code Deployment", Footer = new EmbedFooterBuilder { - Text = "In progress... ETA" + Text = $"In progress...{(estimatedCompletionTime.HasValue ? " ETA" : String.Empty)}" }, Timestamp = estimatedCompletionTime }; From 541c0effb0a563b944bbbc7c8d2d1afd714bd3a1 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 12 Jun 2020 15:04:36 -0400 Subject: [PATCH 3/3] Version bump to 4.3.4 --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index 4ed6782372..2101f58ad7 100644 --- a/build/Version.props +++ b/build/Version.props @@ -2,7 +2,7 @@ - 4.3.3 + 4.3.4 6.6.0 7.2.0 5.2.2