Merge pull request #1627 from irismessage/postround-webhook

Add dividers for postround chat
impstation · Feb 9, 2025 · 62f5b41 · 62f5b41
2 parents 860ef4b + 4504b37
commit 62f5b41
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 1 deletion.
diff --git a/Content.Server/GameTicking/GameTicker.CVars.cs b/Content.Server/GameTicking/GameTicker.CVars.cs
@@ -26,6 +26,8 @@ public sealed partial class GameTicker
 
         private WebhookIdentifier? _webhookIdentifier;
 
+        private WebhookIdentifier? _webhookIdentifierPostround;
+
         [ViewVariables]
         private string? RoundEndSoundCollection { get; set; }
 
@@ -63,6 +65,13 @@ private void InitializeCVars()
                     _discord.GetWebhook(value, data => _webhookIdentifier = data.ToIdentifier());
                 }
             }, true);
+            Subs.CVar(_cfg, CCVars.DiscordPostroundChatWebhook, value =>
+            {
+                if (!string.IsNullOrWhiteSpace(value))
+                {
+                    _discord.GetWebhook(value, data => _webhookIdentifierPostround = data.ToIdentifier());
+                }
+            }, true);
             Subs.CVar(_cfg, CCVars.DiscordRoundEndRoleWebhook, value =>
             {
                 DiscordRoundEndRole = value;

diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -480,6 +480,15 @@ private async void SendRoundEndDiscordMessage()
                 payload.AllowedMentions.AllowRoleMentions();
 
                 await _discord.CreateMessage(_webhookIdentifier.Value, payload);
+
+                if (_webhookIdentifierPostround == null)
+                    return;
+
+                content = Loc.GetString("discord-round-postround-end",
+                    ("id", RoundId));
+                payload = new WebhookPayload { Content = content };
+
+                await _discord.CreateMessage(_webhookIdentifierPostround.Value, payload);
             }
             catch (Exception e)
             {
@@ -662,6 +671,15 @@ private async void SendRoundStartedDiscordMessage()
                 var payload = new WebhookPayload { Content = content };
 
                 await _discord.CreateMessage(_webhookIdentifier.Value, payload);
+
+                if (_webhookIdentifierPostround == null)
+                    return;
+
+                content = Loc.GetString("discord-round-postround-started",
+                    ("id", RoundId));
+                payload = new WebhookPayload { Content = content };
+
+                await _discord.CreateMessage(_webhookIdentifierPostround.Value, payload);
             }
             catch (Exception e)
             {

diff --git a/Content.Shared/CCVar/CCVars.Discord.cs b/Content.Shared/CCVar/CCVars.Discord.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Configuration;
+using Robust.Shared.Configuration;
 
 namespace Content.Shared.CCVar;
 
@@ -53,6 +53,12 @@ public sealed partial class CCVars
     public static readonly CVarDef<string> DiscordRoundUpdateWebhook =
         CVarDef.Create("discord.round_update_webhook", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL);
 
+    /// <summary>
+    ///     URL of the Discord webhook which will relay round restart messages.
+    /// </summary>
+    public static readonly CVarDef<string> DiscordPostroundChatWebhook =
+        CVarDef.Create("discord.postround_chat_webhook", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL);
+
     /// <summary>
     ///     Role id for the Discord webhook to ping when the round ends.
     /// </summary>

diff --git a/Resources/Locale/en-US/discord/round-notifications.ftl b/Resources/Locale/en-US/discord/round-notifications.ftl
@@ -3,3 +3,5 @@ discord-round-notifications-started = Round #{$id} on map "{$map}" started.
 discord-round-notifications-end = Round #{$id} has ended. It lasted for {$hours} hours, {$minutes} minutes, and {$seconds} seconds.
 discord-round-notifications-end-ping = <@&{$roleId}>, the server will reboot shortly!
 discord-round-notifications-unknown-map = Unknown
+discord-round-postround-started = ```ROUND START: #{$id}```
+discord-round-postround-end = ```ROUND END: #{$id}```