Chat Refactor [DRAFT]

Content.Client/Chat/Managers/ChatManager.cs

@@ -2,7 +2,10 @@
 using Content.Client.Ghost;
 using Content.Shared.Administration;
 using Content.Shared.Chat;
+using Content.Shared.Chat.Prototypes;
+using Content.Shared.Radio;
 using Robust.Client.Console;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Chat.Managers;
@@ -12,26 +15,20 @@ internal sealed class ChatManager : IChatManager
     [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
     [Dependency] private readonly IClientAdminManager _adminMgr = default!;
     [Dependency] private readonly IEntitySystemManager _systems = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
     private ISawmill _sawmill = default!;
 
+    [ValidatePrototypeId<RadioChannelPrototype>]
+    private const string DefaultRadioChannel = "Common";
+
     public void Initialize()
     {
         _sawmill = Logger.GetSawmill("chat");
         _sawmill.Level = LogLevel.Info;
     }
 
-    public void SendAdminAlert(string message)
-    {
-        // See server-side manager. This just exists for shared code.
-    }
-
-    public void SendAdminAlert(EntityUid player, string message)
-    {
-        // See server-side manager. This just exists for shared code.
-    }
-
-    public void SendMessage(string text, ChatSelectChannel channel)
+    public void SendMessage(string text, ChatSelectChannel channel, RadioChannelPrototype? radioChannel)
     {
         var str = text.ToString();
         switch (channel)
@@ -67,8 +64,18 @@ public void SendMessage(string text, ChatSelectChannel channel)
                     _sawmill.Warning("Tried to speak on deadchat without being ghost or admin.");
                 break;
 
-            // TODO sepearate radio and say into separate commands.
             case ChatSelectChannel.Radio:
+                if (radioChannel != null)
+                {
+                    SendMessage(str, "Radio" + radioChannel.ID);
+                }
+                else
+                {
+                    radioChannel = _prototypeManager.Index<RadioChannelPrototype>(DefaultRadioChannel);
+                    SendMessage(str, "Radio" + radioChannel.ID);
+                }
+                break;
+
             case ChatSelectChannel.Local:
                 _consoleHost.ExecuteCommand($"say \"{CommandParsing.Escape(str)}\"");
                 break;
@@ -81,4 +88,19 @@ public void SendMessage(string text, ChatSelectChannel channel)
                 throw new ArgumentOutOfRangeException(nameof(channel), channel, null);
         }
     }
+
+    public void SendMessage(string text, string channel)
+    {
+        if (_prototypeManager.TryIndex(channel, out CommunicationChannelPrototype? channelPrototype))
+        {
+            SendMessage(text, channelPrototype);
+        }
+    }
+
+    public void SendMessage(string text, CommunicationChannelPrototype channel)
+    {
+        var str = text.ToString();
+
+        _consoleHost.ExecuteCommand($"chat {channel.ID} \"{CommandParsing.Escape(str)}\"");
+    }
 }

Content.Client/Chat/Managers/ContentMarkupTagManager.cs

@@ -0,0 +1,17 @@
+using System.Linq;
+using Content.Client.Chat.MarkupTags;
+using Content.Shared.Chat;
+using Content.Shared.Chat.ContentMarkupTags;
+
+namespace Content.Client.Chat.Managers;
+
+public sealed class ContentMarkupTagManager : ISharedContentMarkupTagManager
+{
+    public Dictionary<string, IContentMarkupTag> ContentMarkupTagTypes => new IContentMarkupTag[]
+    {
+        new ColorValueContentTag(),
+        new EntityNameHeaderContentTag(),
+        new SessionNameHeaderContentTag(),
+        new SpeechVerbContentTag(),
+    }.ToDictionary(x => x.Name, x => x);
+}

Content.Client/Chat/Managers/IChatManager.cs

@@ -1,9 +1,15 @@
 using Content.Shared.Chat;
+using Content.Shared.Chat.Prototypes;
+using Content.Shared.Radio;
 
 namespace Content.Client.Chat.Managers
 {
     public interface IChatManager : ISharedChatManager
     {
-        public void SendMessage(string text, ChatSelectChannel channel);
+        public void SendMessage(string text, ChatSelectChannel channel, RadioChannelPrototype? radioChannel);
+
+        public void SendMessage(string text, string channel);
+
+        public void SendMessage(string text, CommunicationChannelPrototype channel);
     }
 }

Content.Client/Chat/MarkupTags/ColorValueContentTag.cs

@@ -0,0 +1,62 @@
+using System.Diagnostics;
+using Content.Shared.Chat.ContentMarkupTags;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Chat.MarkupTags;
+
+public sealed class ColorValueContentTag : IContentMarkupTag
+{
+    public string Name => "ColorValue";
+
+    // TODO: These values should probably be retrieved via yaml, and be customizable in options! This solution works for now!
+    private Dictionary<string, Color> _colors = new Dictionary<string, Color>()
+    {
+        ["Base"] = Color.White,
+        ["Speech"] = Color.LightGray,
+        ["Emote"] = Color.LightGray,
+        ["Whisper"] = Color.DarkGray,
+        ["LOOC"] = Color.MediumTurquoise,
+        ["OOC"] = Color.LightSkyBlue,
+        ["Dead"] = Color.MediumPurple,
+        ["IngameAnnouncement"] = Color.Yellow,
+        ["IngameAlert"] = Color.Red,
+        ["Server"] = Color.Orange,
+        ["AdminChat"] = Color.HotPink,
+        ["AdminAlert"] = Color.Red,
+        ["Radio.Common"] = Color.FromHex("#2cdb2c"),
+        ["Radio.Security"] = Color.FromHex("#ff4242"),
+        ["Radio.Supply"] = Color.FromHex("#b48b57"),
+        ["Radio.Command"] = Color.FromHex("#fcdf03"),
+        ["Radio.Service"] = Color.FromHex("#539c00"),
+        ["Radio.Science"] = Color.FromHex("#cd7ccd"),
+        ["Radio.Engineering"] = Color.FromHex("#ff733c"),
+        ["Radio.Medical"] = Color.FromHex("#57b8f0"),
+        ["Radio.Syndicate"] = Color.FromHex("#8f4a4b"),
+        ["Radio.Freelance"] = Color.FromHex("#f6ce64"),
+        ["Radio.Service"] = Color.FromHex("#539c00"),
+        ["Radio.Binary"] = Color.FromHex("#2ed2fd"),
+        ["Radio.CentCom"] = Color.FromHex("#2681a5"),
+        ["Radio.Handheld"] = Color.FromHex("#967101"),
+    };
+
+    public List<MarkupNode>? OpenerProcessing(MarkupNode node)
+    {
+        return new List<MarkupNode>() { new MarkupNode("color", new MarkupParameter(ColorValueLookup(node)), null) };
+    }
+
+    public List<MarkupNode>? CloserProcessing(MarkupNode node)
+    {
+        return new List<MarkupNode>() { new MarkupNode("color", null, null, true) };
+    }
+
+    public Color ColorValueLookup(MarkupNode node)
+    {
+        var markupColor = node.Value.StringValue;
+        if (markupColor != null && _colors.TryGetValue(markupColor, out var color))
+            return color;
+
+        // CHAT-TODO: Log erroneous color attempt.
+        Logger.Debug("This should not run!");
+        return Color.White;
+    }
+}

Content.Client/Chat/MarkupTags/EntityNameHeaderContentTag.cs

@@ -0,0 +1,31 @@
+using System.Diagnostics;
+using System.Linq;
+using Content.Shared.CCVar;
+using Content.Shared.Chat.ContentMarkupTags;
+using Content.Shared.Decals;
+using FastAccessors;
+using Robust.Shared.Configuration;
+using Robust.Shared.GameObjects.Components.Localization;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Chat.MarkupTags;
+
+public sealed class EntityNameHeaderContentTag : IContentMarkupTag
+{
+    public string Name => "EntityNameHeader";
+
+    public List<MarkupNode>? OpenerProcessing(MarkupNode node)
+    {
+
+        var list = new List<MarkupNode>();
+        var name = node.Value.StringValue;
+
+        if (name == null)
+            return null;
+
+        list.Add(new MarkupNode(name));
+
+        return list;
+    }
+}

Content.Client/Chat/MarkupTags/SessionNameHeaderContentTag.cs

@@ -0,0 +1,31 @@
+using System.Diagnostics;
+using System.Linq;
+using Content.Shared.CCVar;
+using Content.Shared.Chat.ContentMarkupTags;
+using Content.Shared.Decals;
+using FastAccessors;
+using Robust.Shared.Configuration;
+using Robust.Shared.GameObjects.Components.Localization;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Chat.MarkupTags;
+
+public sealed class SessionNameHeaderContentTag : IContentMarkupTag
+{
+    public string Name => "SessionNameHeader";
+
+    public List<MarkupNode>? OpenerProcessing(MarkupNode node)
+    {
+
+        var list = new List<MarkupNode>();
+        var name = node.Value.StringValue;
+
+        if (name == null)
+            return null;
+
+        list.Add(new MarkupNode(name));
+
+        return list;
+    }
+}

Content.Client/Chat/UI/SpeechBubble.cs

@@ -15,6 +15,7 @@ public abstract class SpeechBubble : Control
     {
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
+        [Dependency] protected readonly ISharedChatManager _chatManager = default!;
         [Dependency] protected readonly IConfigurationManager ConfigManager = default!;
         private readonly SharedTransformSystem _transformSystem;
 
@@ -73,14 +74,14 @@ public static SpeechBubble CreateSpeechBubble(SpeechType type, ChatMessage messa
                     return new FancyTextSpeechBubble(message, senderEntity, "whisperBox");
 
                 case SpeechType.Looc:
-                    return new TextSpeechBubble(message, senderEntity, "emoteBox", Color.FromHex("#48d1cc"));
+                    return new TextSpeechBubble(message, senderEntity, "emoteBox");
 
                 default:
                     throw new ArgumentOutOfRangeException();
             }
         }
 
-        public SpeechBubble(ChatMessage message, EntityUid senderEntity, string speechStyleClass, Color? fontColor = null)
+        public SpeechBubble(ChatMessage message, EntityUid senderEntity, string speechStyleClass)
         {
             IoCManager.InjectDependencies(this);
             _senderEntity = senderEntity;
@@ -89,7 +90,7 @@ public SpeechBubble(ChatMessage message, EntityUid senderEntity, string speechSt
             // Use text clipping so new messages don't overlap old ones being pushed up.
             RectClipContent = true;
 
-            var bubble = BuildBubble(message, speechStyleClass, fontColor);
+            var bubble = BuildBubble(message, speechStyleClass);
 
             AddChild(bubble);
 
@@ -100,7 +101,7 @@ public SpeechBubble(ChatMessage message, EntityUid senderEntity, string speechSt
             _verticalOffsetAchieved = -ContentSize.Y;
         }
 
-        protected abstract Control BuildBubble(ChatMessage message, string speechStyleClass, Color? fontColor = null);
+        protected abstract Control BuildBubble(ChatMessage message, string speechStyleClass);
 
         protected override void FrameUpdate(FrameEventArgs args)
         {
@@ -184,28 +185,28 @@ protected FormattedMessage FormatSpeech(string message, Color? fontColor = null)
             return msg;
         }
 
-        protected FormattedMessage ExtractAndFormatSpeechSubstring(ChatMessage message, string tag, Color? fontColor = null)
+        /*protected FormattedMessage ExtractAndFormatSpeechSubstring(ChatMessage message, string tag, Color? fontColor = null)
         {
             return FormatSpeech(SharedChatSystem.GetStringInsideTag(message, tag), fontColor);
-        }
+        }*/
 
     }
 
     public sealed class TextSpeechBubble : SpeechBubble
     {
-        public TextSpeechBubble(ChatMessage message, EntityUid senderEntity, string speechStyleClass, Color? fontColor = null)
-            : base(message, senderEntity, speechStyleClass, fontColor)
+        public TextSpeechBubble(ChatMessage message, EntityUid senderEntity, string speechStyleClass)
+            : base(message, senderEntity, speechStyleClass)
         {
         }
 
-        protected override Control BuildBubble(ChatMessage message, string speechStyleClass, Color? fontColor = null)
+        protected override Control BuildBubble(ChatMessage message, string speechStyleClass)
         {
             var label = new RichTextLabel
             {
                 MaxWidth = SpeechMaxWidth,
             };
 
-            label.SetMessage(FormatSpeech(message.WrappedMessage, fontColor));
+            label.SetMessage(message.Message);
 
             var panel = new PanelContainer
             {
@@ -221,12 +222,12 @@ protected override Control BuildBubble(ChatMessage message, string speechStyleCl
     public sealed class FancyTextSpeechBubble : SpeechBubble
     {
 
-        public FancyTextSpeechBubble(ChatMessage message, EntityUid senderEntity, string speechStyleClass, Color? fontColor = null)
-            : base(message, senderEntity, speechStyleClass, fontColor)
+        public FancyTextSpeechBubble(ChatMessage message, EntityUid senderEntity, string speechStyleClass)
+            : base(message, senderEntity, speechStyleClass)
         {
         }
 
-        protected override Control BuildBubble(ChatMessage message, string speechStyleClass, Color? fontColor = null)
+        protected override Control BuildBubble(ChatMessage message, string speechStyleClass)
         {
             if (!ConfigManager.GetCVar(CCVars.ChatEnableFancyBubbles))
             {
@@ -235,8 +236,6 @@ protected override Control BuildBubble(ChatMessage message, string speechStyleCl
                     MaxWidth = SpeechMaxWidth
                 };
 
-                label.SetMessage(ExtractAndFormatSpeechSubstring(message, "BubbleContent", fontColor));
-
                 var unfanciedPanel = new PanelContainer
                 {
                     StyleClasses = { "speechBox", speechStyleClass },
@@ -258,9 +257,15 @@ protected override Control BuildBubble(ChatMessage message, string speechStyleCl
                 StyleClasses = { "bubbleContent" }
             };
 
-            //We'll be honest. *Yes* this is hacky. Doing this in a cleaner way would require a bottom-up refactor of how saycode handles sending chat messages. -Myr
-            bubbleHeader.SetMessage(ExtractAndFormatSpeechSubstring(message, "BubbleHeader", fontColor));
-            bubbleContent.SetMessage(ExtractAndFormatSpeechSubstring(message, "BubbleContent", fontColor));
+
+            if (_chatManager.TryGetMessageInsideTag(message.Message, out var bubbleHeaderMsg, "BubbleHeader") &&
+                _chatManager.TryGetMessageInsideTag(message.Message, out var bubbleMessageMsg, "BubbleMessage"))
+            {
+                bubbleHeader.SetMessage(bubbleHeaderMsg);
+                bubbleContent.SetMessage(bubbleMessageMsg);
+            }
+            //bubbleHeader.SetMessage(ExtractAndFormatSpeechSubstring(message, "BubbleHeader", fontColor));
+            //bubbleContent.SetMessage(ExtractAndFormatSpeechSubstring(message, "BubbleContent", fontColor));
 
             //As for below: Some day this could probably be converted to xaml. But that is not today. -Myr
             var mainPanel = new PanelContainer

Content.Client/Entry/EntryPoint.cs

@@ -22,6 +22,7 @@
 using Content.Client.Viewport;
 using Content.Client.Voting;
 using Content.Shared.Ame.Components;
+using Content.Shared.Chat;
 using Content.Shared.Gravity;
 using Content.Shared.Localizations;
 using Robust.Client;
@@ -72,6 +73,7 @@ public sealed class EntryPoint : GameClient
         [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly DebugMonitorManager _debugMonitorManager = default!;
         [Dependency] private readonly TitleWindowManager _titleWindowManager = default!;
+        [Dependency] private readonly ISharedContentMarkupTagManager _contentMarkupTagManager = default!;
 
         public override void Init()
         {

Content.Client/IoC/ClientContentIoC.cs

@@ -59,6 +59,7 @@ public static void Register()
             collection.Register<PlayerRateLimitManager>();
             collection.Register<SharedPlayerRateLimitManager, PlayerRateLimitManager>();
             collection.Register<TitleWindowManager>();
+            collection.Register<ISharedContentMarkupTagManager, ContentMarkupTagManager>();
         }
     }
 }