Merge pull request #607 from TorchAPI/ChatFix

Added new chat options from a few updates ago....

Author: Casimir255

Torch.API/Managers/IChatManagerClient.cs

@@ -1,13 +1,14 @@
-using System;
+using Sandbox.Engine.Multiplayer;
+using Sandbox.Game.Gui;
+using Sandbox.Game.Multiplayer;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Sandbox.Engine.Multiplayer;
-using Sandbox.Game.Gui;
-using Sandbox.Game.Multiplayer;
 using Torch.Utils;
 using VRage.Game;
+using VRage.GameServices;
 using VRage.Network;
 using VRage.Replication;
 using VRageMath;
@@ -54,6 +55,7 @@ public TorchChatMessage(string author, string message, Color color, string font
             Target = 0;
             Font = font;
             Color = color == default ? ColorUtils.TranslateColor(font) : color;
+            CustomData = null;
         }
 
         /// <summary>
@@ -73,6 +75,7 @@ public TorchChatMessage(string author, ulong authorSteamId, string message, Chat
             Target = target;
             Font = font;
             Color = color == default ? ColorUtils.TranslateColor(font) : color;
+            CustomData = null;
         }
 
         /// <summary>
@@ -91,6 +94,20 @@ public TorchChatMessage(ulong authorSteamId, string message, ChatChannel channel
             Target = target;
             Font = font;
             Color = color == default ? ColorUtils.TranslateColor(font) : color;
+            CustomData = null;
+        }
+
+        public TorchChatMessage(ChatMsg msg)
+        {
+            Timestamp = DateTime.Now;
+            AuthorSteamId = msg.Author;
+            Author = MyMultiplayer.Static?.GetMemberName(msg.Author) ?? "Player";
+            Message = msg.Text;
+            Channel = (ChatChannel)msg.Channel;
+            Target = msg.TargetId;
+            Font = DEFAULT_FONT;
+            Color = default;
+            CustomData = msg.CustomData;
         }
 
         /// <summary>
@@ -125,6 +142,11 @@ public TorchChatMessage(ulong authorSteamId, string message, ChatChannel channel
         /// The chat message color.
         /// </summary>
         public readonly Color Color;
+
+        /// <summary>
+        /// Chat message custom data, if any.
+        /// </summary>
+        public readonly ChatMessageCustomData? CustomData;
     }
 
     /// <summary>

Torch/Managers/ChatManager/ChatManagerServer.cs

@@ -41,6 +41,8 @@ internal static void Patch(PatchContext context)
 
         private static bool PrefixMessageProcessing(ref ChatMsg msg)
         {
+          
+
             var consumed = false;
             OnChatRecvAccess?.Invoke(ref msg);
             ChatManager.RaiseMessageRecieved(msg, ref consumed);
@@ -158,7 +160,7 @@ protected override bool OfflineMessageProcessor(TorchChatMessage msg)
 
         internal void RaiseMessageRecieved(ChatMsg message, ref bool consumed)
         {
-            var torchMsg = new TorchChatMessage(GetMemberName(message.Author), message.Author, message.Text, (ChatChannel)message.Channel, message.TargetId);
+            var torchMsg = new TorchChatMessage(message);
             if (_muted.Contains(message.Author))
             {
                 consumed = true;