Fix capitalization of emotes (#7766)

This commit is contained in:
Rane
2022-04-24 20:15:40 -04:00
committed by GitHub
parent a16cc22dc6
commit 955e7af2ad
3 changed files with 8 additions and 3 deletions

View File

@@ -91,7 +91,9 @@ public sealed class ChatSystem : EntitySystem
if (!CanSendInGame(message, shell, player))
return;
message = SanitizeInGameICMessage(source, message, out var emoteStr);
bool shouldCapitalize = (desiredType != InGameICChatType.Emote);
message = SanitizeInGameICMessage(source, message, out var emoteStr, shouldCapitalize);
// Was there an emote in the message? If so, send it.
if (player != null && emoteStr != message && emoteStr != null)
@@ -294,10 +296,11 @@ public sealed class ChatSystem : EntitySystem
}
// ReSharper disable once InconsistentNaming
private string SanitizeInGameICMessage(EntityUid source, string message, out string? emoteStr)
private string SanitizeInGameICMessage(EntityUid source, string message, out string? emoteStr, bool capitalize = true)
{
var newMessage = message.Trim();
newMessage = SanitizeMessageCapital(source, newMessage);
if (capitalize)
newMessage = SanitizeMessageCapital(source, newMessage);
newMessage = FormattedMessage.EscapeText(newMessage);
_sanitizer.TrySanitizeOutSmilies(newMessage, source, out newMessage, out emoteStr);

View File

@@ -65,6 +65,7 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
{ "lel", "chatsan-laughs" },
{ "kek", "chatsan-laughs" },
{ "o7", "chatsan-salutes" },
{ ";_;7", "chatsan-tearfully-salutes"},
{ "idk", "chatsan-shrugs" }
};

View File

@@ -18,4 +18,5 @@ chatsan-confused = looks confused
chatsan-unimpressed = seems unimpressed
chatsan-waves = waves
chatsan-salutes = salutes
chatsan-tearfully-salutes = tearfully salutes
chatsan-shrugs = shrugs