tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make chat & examine systems use FormattedMessage.EscapeText() (#28431)

Browse Source
This commit is contained in:
Leon Friedrich
2024-06-01 08:05:34 +12:00
committed by GitHub
parent 2ddca94375
commit c4291920a6
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/Examine/ExamineSystem.cs
View File

@@ -239,9 +239,7 @@ namespace Content.Client.Examine
if (knowTarget) if (knowTarget)
{ {
// TODO: FormattedMessage.RemoveMarkupPermissive var itemName = FormattedMessage.EscapeText(Identity.Name(target, EntityManager, player));
// var itemName = FormattedMessage.RemoveMarkupPermissive(Identity.Name(target, EntityManager, player));
var itemName = FormattedMessage.FromMarkupPermissive(Identity.Name(target, EntityManager, player)).ToString();
var labelMessage = FormattedMessage.FromMarkupPermissive($"[bold]{itemName}[/bold]"); var labelMessage = FormattedMessage.FromMarkupPermissive($"[bold]{itemName}[/bold]");
var label = new RichTextLabel(); var label = new RichTextLabel();
label.SetMessage(labelMessage); label.SetMessage(labelMessage);
@@ -250,7 +248,7 @@ namespace Content.Client.Examine
else else
{ {
var label = new RichTextLabel(); var label = new RichTextLabel();
label.SetMessage(FormattedMessage.FromMarkup("[bold]???[/bold]")); label.SetMessage(FormattedMessage.FromMarkupOrThrow("[bold]???[/bold]"));
hBox.AddChild(label); hBox.AddChild(label);
} }

4
Content.Server/Chat/Systems/ChatSystem.cs
View File

@@ -378,7 +378,7 @@ public sealed partial class ChatSystem : SharedChatSystem
if (!_actionBlocker.CanSpeak(source) && !ignoreActionBlocker) if (!_actionBlocker.CanSpeak(source) && !ignoreActionBlocker)
return; return;
var message = TransformSpeech(source, FormattedMessage.RemoveMarkup(originalMessage)); var message = TransformSpeech(source, originalMessage);
if (message.Length == 0) if (message.Length == 0)
return; return;
@@ -417,7 +417,7 @@ public sealed partial class ChatSystem : SharedChatSystem
// To avoid logging any messages sent by entities that are not players, like vendors, cloning, etc. // To avoid logging any messages sent by entities that are not players, like vendors, cloning, etc.
// Also doesn't log if hideLog is true. // Also doesn't log if hideLog is true.
if (!HasComp<ActorComponent>(source) || hideLog == true) if (!HasComp<ActorComponent>(source) || hideLog)
return; return;
if (originalMessage == message) if (originalMessage == message)

11
Content.Shared/Chat/MsgChatMessage.cs
View File

@@ -11,8 +11,19 @@ namespace Content.Shared.Chat
public sealed class ChatMessage public sealed class ChatMessage
{ {
public ChatChannel Channel; public ChatChannel Channel;
/// <summary>
/// This is the text spoken by the entity, after accents and such were applied.
/// This should have <see cref="FormattedMessage.EscapeText"/> applied before using it in any rich text box.
/// </summary>
public string Message; public string Message;
/// <summary>
/// This is the <see cref="Message"/> but with special characters escaped and wrapped in some rich text
/// formatting tags.
/// </summary>
public string WrappedMessage; public string WrappedMessage;
public NetEntity SenderEntity; public NetEntity SenderEntity;
/// <summary> /// <summary>