From 9c3c81e8d8aa7aa065c4be5873f2bea36d8ae236 Mon Sep 17 00:00:00 2001
From: Vera Aguilera Puerto <gradientvera@outlook.com>
Date: Tue, 11 May 2021 12:17:47 +0200
Subject: [PATCH] Fix radio messages not being sent and messages not being
 escaped.

---
 Content.Client/Chat/ChatManager.cs                            | 2 +-
 .../GameObjects/Components/Headset/HeadsetComponent.cs        | 2 +-
 Resources/Changelog/Parts/radio.yml                           | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Changelog/Parts/radio.yml

diff --git a/Content.Client/Chat/ChatManager.cs b/Content.Client/Chat/ChatManager.cs
index 2d5b7f749a..4723bb12f8 100644
--- a/Content.Client/Chat/ChatManager.cs
+++ b/Content.Client/Chat/ChatManager.cs
@@ -355,7 +355,7 @@ namespace Content.Client.Chat
             }
 
             var color = Color.DarkGray;
-            var messageText = message.Message;
+            var messageText = FormattedMessage.EscapeText(message.Message);
             if (!string.IsNullOrEmpty(message.MessageWrap))
             {
                 messageText = string.Format(message.MessageWrap, messageText);
diff --git a/Content.Server/GameObjects/Components/Headset/HeadsetComponent.cs b/Content.Server/GameObjects/Components/Headset/HeadsetComponent.cs
index 7b4505e897..1c1c65cdc8 100644
--- a/Content.Server/GameObjects/Components/Headset/HeadsetComponent.cs
+++ b/Content.Server/GameObjects/Components/Headset/HeadsetComponent.cs
@@ -67,7 +67,7 @@ namespace Content.Server.GameObjects.Components.Headset
                 msg.Channel = ChatChannel.Radio;
                 msg.Message = message;
                 //Square brackets are added here to avoid issues with escaping
-                msg.MessageWrap = Loc.GetString("chat-radio-message-wrap", ("channel", $"[{channel}]"), ("name", source.Name));
+                msg.MessageWrap = Loc.GetString("chat-radio-message-wrap", ("channel", $"\\[{channel}\\]"), ("name", source.Name));
                 _netManager.ServerSendMessage(msg, playerChannel);
             }
         }
diff --git a/Resources/Changelog/Parts/radio.yml b/Resources/Changelog/Parts/radio.yml
new file mode 100644
index 0000000000..e005357bbc
--- /dev/null
+++ b/Resources/Changelog/Parts/radio.yml
@@ -0,0 +1,4 @@
+author: Zumorica
+changes:
+  - type: Fix
+    message: Fixes radio messages not sending.