Serverside Webhook update on external sent ahelp messages

Content.Server/Administration/ServerApi.cs

@@ -424,7 +424,8 @@ await RespondError(
         }
 
         // Message is parsed by the bot itself, we only need to make it a right component
-        var message = new SharedBwoinkSystem.BwoinkTextMessage(player.UserId, SharedBwoinkSystem.SystemUserId, body.Text);
+        var message = new SharedBwoinkSystem.BwoinkTextMessage(player.UserId, SharedBwoinkSystem.SystemUserId, body.TextFormatted);
+
 
         // If we want to only send the message to the player
         if (!body.UserOnly)
@@ -443,9 +444,32 @@ await RespondError(
         }
         // Send the message to the player
         _entityManager.EntityNetManager?.SendSystemNetworkMessage(message, player.Channel);
+
+
+        // This saves me a headache of making the bot remembering every message it send and adding it to the embed.
+        // So i just let the existing system handle it
+        if (body.webhookupdate)
+        {
+            var ticker = _entitySystemManager.GetEntitySystem<GameTicker>();
+            var serverBwoinkSystem = _entitySystemManager.GetEntitySystem<BwoinkSystem>();
+            var queue = serverBwoinkSystem._messageQueues.GetOrNew(player.UserId);
+
+            var formattedMessage = new AHelpMessageParams(
+                player.Name,
+                body.TextRaw,
+                true,
+                ticker.RoundDuration().ToString("hh\\:mm\\:ss"),
+                ticker.RunLevel,
+                true,
+                isDiscord: true
+                );
+
+            var finalMessage = BwoinkSystem.GenerateAHelpMessage(formattedMessage);
+            queue.Enqueue(finalMessage);
+
+        }
         // Respond with OK
         await RespondOk(context);
-
     });
 
 
@@ -689,9 +713,11 @@ private sealed class MotdActionBody
 
     private sealed class BwoinkActionBody
     {
-        public required string Text { get; init; }
+        public required string TextRaw { get; init; }
+        public required string TextFormatted { get; init; }
         public required Guid Guid { get; init; }
         public bool UserOnly { get; init; }
+        public required bool webhookupdate { get; init; }
     }
 
     #endregion

Content.Server/Administration/Systems/BwoinkSystem.cs

@@ -59,7 +59,7 @@ private readonly
                 lastRunLevel)> _relayMessages = new();
 
         private Dictionary<NetUserId, string> _oldMessageIds = new();
-        private readonly Dictionary<NetUserId, Queue<string>> _messageQueues = new();
+        public readonly Dictionary<NetUserId, Queue<string>> _messageQueues = new(); // Frontier - Changed to Public
         private readonly HashSet<NetUserId> _processingChannels = new();
         private readonly Dictionary<NetUserId, (TimeSpan Timestamp, bool Typing)> _typingUpdateTimestamps = new();
         private string _overrideClientName = string.Empty;
@@ -704,7 +704,7 @@ private IList<INetChannel> GetTargetAdmins()
                 .ToList();
         }
 
-        private static string GenerateAHelpMessage(AHelpMessageParams parameters)
+        public static string GenerateAHelpMessage(AHelpMessageParams parameters) // Frontier - Changed to Public
         {
             var stringbuilder = new StringBuilder();
 
@@ -722,6 +722,9 @@ private static string GenerateAHelpMessage(AHelpMessageParams parameters)
             if (!parameters.PlayedSound)
                 stringbuilder.Append(" **(S)**");
 
+            if (parameters.IsDiscord ?? false) // Frontier - Discord Indicator
+                stringbuilder.Append(" **(DC)**");
+
             if (parameters.Icon == null)
                 stringbuilder.Append($" **{parameters.Username}:** ");
             else
@@ -740,6 +743,7 @@ public sealed class AHelpMessageParams
         public GameRunLevel RoundState { get; set; }
         public bool PlayedSound { get; set; }
         public bool NoReceivers { get; set; }
+        public bool? IsDiscord { get; set; } // Frontier
         public string? Icon { get; set; }
 
         public AHelpMessageParams(
@@ -749,6 +753,7 @@ public AHelpMessageParams(
             string roundTime,
             GameRunLevel roundState,
             bool playedSound,
+            bool isDiscord = false, // Frontier
             bool noReceivers = false,
             string? icon = null)
         {
@@ -757,6 +762,7 @@ public AHelpMessageParams(
             IsAdmin = isAdmin;
             RoundTime = roundTime;
             RoundState = roundState;
+            IsDiscord = isDiscord; // Frontier
             PlayedSound = playedSound;
             NoReceivers = noReceivers;
             Icon = icon;