Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix capitalization of emotes (#7766)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Chat/ChatSystem.cs
View File

@@ -91,7 +91,9 @@ public sealed class ChatSystem : EntitySystem
if (!CanSendInGame(message, shell, player)) if (!CanSendInGame(message, shell, player))
return; 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. // Was there an emote in the message? If so, send it.
if (player != null && emoteStr != message && emoteStr != null) if (player != null && emoteStr != message && emoteStr != null)
@@ -294,10 +296,11 @@ public sealed class ChatSystem : EntitySystem
} }
// ReSharper disable once InconsistentNaming // 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(); var newMessage = message.Trim();
newMessage = SanitizeMessageCapital(source, newMessage); if (capitalize)
newMessage = SanitizeMessageCapital(source, newMessage);
newMessage = FormattedMessage.EscapeText(newMessage); newMessage = FormattedMessage.EscapeText(newMessage);
_sanitizer.TrySanitizeOutSmilies(newMessage, source, out newMessage, out emoteStr); _sanitizer.TrySanitizeOutSmilies(newMessage, source, out newMessage, out emoteStr);

1
Content.Server/Chat/Managers/ChatSanitizationManager.cs
View File

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

1
Resources/Locale/en-US/chat/sanitizer-replacements.ftl
View File

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