Sanitize shorthand emotes throughought the whole message (#28645)
* Rename ChatSanitizationManager to ChatEmoteSanitizationManager The prior name was kind of confusing as there's a emote one and then now there's also chat expansion happening in the accent system, so knowing which I actually need to edit is useful. So, I just need to keep myself not confused. * Rename smileyToEmote and remove punctuation duplicates The name SmileyToEmote is just... Bad. Plus, I needed to remove the punctuation duplicates as that would break any kind of regex parsing that I tried. * Switch to regex from checking end of string I also changed from System.Globalization to ILocalizationManager. Writing that regex was definitely an experience. * Document regex and the manager * Rename it back * Simplify regex
This commit is contained in:
@@ -1,17 +1,19 @@
|
|||||||
using System.Diagnostics.CodeAnalysis;
|
using System.Diagnostics.CodeAnalysis;
|
||||||
using System.Globalization;
|
using System.Text.RegularExpressions;
|
||||||
using Content.Shared.CCVar;
|
using Content.Shared.CCVar;
|
||||||
using Robust.Shared.Configuration;
|
using Robust.Shared.Configuration;
|
||||||
|
|
||||||
namespace Content.Server.Chat.Managers;
|
namespace Content.Server.Chat.Managers;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sanitizes messages!
|
||||||
|
/// It currently ony removes the shorthands for emotes (like "lol" or "^-^") from a chat message and returns the last
|
||||||
|
/// emote in their message
|
||||||
|
/// </summary>
|
||||||
public sealed class ChatSanitizationManager : IChatSanitizationManager
|
public sealed class ChatSanitizationManager : IChatSanitizationManager
|
||||||
{
|
{
|
||||||
[Dependency] private readonly IConfigurationManager _configurationManager = default!;
|
private static readonly Dictionary<string, string> ShorthandToEmote = new()
|
||||||
|
|
||||||
private static readonly Dictionary<string, string> SmileyToEmote = new()
|
|
||||||
{
|
{
|
||||||
// I could've done this with regex, but felt it wasn't the right idea.
|
|
||||||
{ ":)", "chatsan-smiles" },
|
{ ":)", "chatsan-smiles" },
|
||||||
{ ":]", "chatsan-smiles" },
|
{ ":]", "chatsan-smiles" },
|
||||||
{ "=)", "chatsan-smiles" },
|
{ "=)", "chatsan-smiles" },
|
||||||
@@ -75,7 +77,7 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
|
|||||||
{ "kek", "chatsan-laughs" },
|
{ "kek", "chatsan-laughs" },
|
||||||
{ "rofl", "chatsan-laughs" },
|
{ "rofl", "chatsan-laughs" },
|
||||||
{ "o7", "chatsan-salutes" },
|
{ "o7", "chatsan-salutes" },
|
||||||
{ ";_;7", "chatsan-tearfully-salutes"},
|
{ ";_;7", "chatsan-tearfully-salutes" },
|
||||||
{ "idk", "chatsan-shrugs" },
|
{ "idk", "chatsan-shrugs" },
|
||||||
{ ";)", "chatsan-winks" },
|
{ ";)", "chatsan-winks" },
|
||||||
{ ";]", "chatsan-winks" },
|
{ ";]", "chatsan-winks" },
|
||||||
@@ -88,9 +90,12 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
|
|||||||
{ "(':", "chatsan-tearfully-smiles" },
|
{ "(':", "chatsan-tearfully-smiles" },
|
||||||
{ "[':", "chatsan-tearfully-smiles" },
|
{ "[':", "chatsan-tearfully-smiles" },
|
||||||
{ "('=", "chatsan-tearfully-smiles" },
|
{ "('=", "chatsan-tearfully-smiles" },
|
||||||
{ "['=", "chatsan-tearfully-smiles" },
|
{ "['=", "chatsan-tearfully-smiles" }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
[Dependency] private readonly IConfigurationManager _configurationManager = default!;
|
||||||
|
[Dependency] private readonly ILocalizationManager _loc = default!;
|
||||||
|
|
||||||
private bool _doSanitize;
|
private bool _doSanitize;
|
||||||
|
|
||||||
public void Initialize()
|
public void Initialize()
|
||||||
@@ -98,29 +103,60 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
|
|||||||
_configurationManager.OnValueChanged(CCVars.ChatSanitizerEnabled, x => _doSanitize = x, true);
|
_configurationManager.OnValueChanged(CCVars.ChatSanitizerEnabled, x => _doSanitize = x, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool TrySanitizeOutSmilies(string input, EntityUid speaker, out string sanitized, [NotNullWhen(true)] out string? emote)
|
/// <summary>
|
||||||
|
/// Remove the shorthands from the message, returning the last one found as the emote
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="message">The pre-sanitized message</param>
|
||||||
|
/// <param name="speaker">The speaker</param>
|
||||||
|
/// <param name="sanitized">The sanitized message with shorthands removed</param>
|
||||||
|
/// <param name="emote">The localized emote</param>
|
||||||
|
/// <returns>True if emote has been sanitized out</returns>
|
||||||
|
public bool TrySanitizeEmoteShorthands(string message,
|
||||||
|
EntityUid speaker,
|
||||||
|
out string sanitized,
|
||||||
|
[NotNullWhen(true)] out string? emote)
|
||||||
{
|
{
|
||||||
if (!_doSanitize)
|
|
||||||
{
|
|
||||||
sanitized = input;
|
|
||||||
emote = null;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
input = input.TrimEnd();
|
|
||||||
|
|
||||||
foreach (var (smiley, replacement) in SmileyToEmote)
|
|
||||||
{
|
|
||||||
if (input.EndsWith(smiley, true, CultureInfo.InvariantCulture))
|
|
||||||
{
|
|
||||||
sanitized = input.Remove(input.Length - smiley.Length).TrimEnd();
|
|
||||||
emote = Loc.GetString(replacement, ("ent", speaker));
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
sanitized = input;
|
|
||||||
emote = null;
|
emote = null;
|
||||||
return false;
|
sanitized = message;
|
||||||
|
|
||||||
|
if (!_doSanitize)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// -1 is just a canary for nothing found yet
|
||||||
|
var lastEmoteIndex = -1;
|
||||||
|
|
||||||
|
foreach (var (shorthand, emoteKey) in ShorthandToEmote)
|
||||||
|
{
|
||||||
|
// We have to escape it because shorthands like ":)" or "-_-" would break the regex otherwise.
|
||||||
|
var escaped = Regex.Escape(shorthand);
|
||||||
|
|
||||||
|
// So there are 2 cases:
|
||||||
|
// - If there is whitespace before it and after it is either punctuation, whitespace, or the end of the line
|
||||||
|
// Delete the word and the whitespace before
|
||||||
|
// - If it is at the start of the string and is followed by punctuation, whitespace, or the end of the line
|
||||||
|
// Delete the word and the punctuation if it exists.
|
||||||
|
var pattern =
|
||||||
|
$@"\s{escaped}(?=\p{{P}}|\s|$)|^{escaped}(?:\p{{P}}|(?=\s|$))";
|
||||||
|
|
||||||
|
var r = new Regex(pattern, RegexOptions.RightToLeft | RegexOptions.IgnoreCase);
|
||||||
|
|
||||||
|
// We're using sanitized as the original message until the end so that we can make sure the indices of
|
||||||
|
// the emotes are accurate.
|
||||||
|
var lastMatch = r.Match(sanitized);
|
||||||
|
|
||||||
|
if (!lastMatch.Success)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (lastMatch.Index > lastEmoteIndex)
|
||||||
|
{
|
||||||
|
lastEmoteIndex = lastMatch.Index;
|
||||||
|
emote = _loc.GetString(emoteKey, ("ent", speaker));
|
||||||
|
}
|
||||||
|
|
||||||
|
message = r.Replace(message, string.Empty);
|
||||||
|
}
|
||||||
|
|
||||||
|
sanitized = message.Trim();
|
||||||
|
return emote is not null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,5 +6,8 @@ public interface IChatSanitizationManager
|
|||||||
{
|
{
|
||||||
public void Initialize();
|
public void Initialize();
|
||||||
|
|
||||||
public bool TrySanitizeOutSmilies(string input, EntityUid speaker, out string sanitized, [NotNullWhen(true)] out string? emote);
|
public bool TrySanitizeEmoteShorthands(string input,
|
||||||
|
EntityUid speaker,
|
||||||
|
out string sanitized,
|
||||||
|
[NotNullWhen(true)] out string? emote);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -749,6 +749,9 @@ public sealed partial class ChatSystem : SharedChatSystem
|
|||||||
var newMessage = message.Trim();
|
var newMessage = message.Trim();
|
||||||
newMessage = SanitizeMessageReplaceWords(newMessage);
|
newMessage = SanitizeMessageReplaceWords(newMessage);
|
||||||
|
|
||||||
|
// Sanitize it first as it might change the word order
|
||||||
|
_sanitizer.TrySanitizeEmoteShorthands(newMessage, source, out newMessage, out emoteStr);
|
||||||
|
|
||||||
if (capitalize)
|
if (capitalize)
|
||||||
newMessage = SanitizeMessageCapital(newMessage);
|
newMessage = SanitizeMessageCapital(newMessage);
|
||||||
if (capitalizeTheWordI)
|
if (capitalizeTheWordI)
|
||||||
@@ -756,8 +759,6 @@ public sealed partial class ChatSystem : SharedChatSystem
|
|||||||
if (punctuate)
|
if (punctuate)
|
||||||
newMessage = SanitizeMessagePeriod(newMessage);
|
newMessage = SanitizeMessagePeriod(newMessage);
|
||||||
|
|
||||||
_sanitizer.TrySanitizeOutSmilies(newMessage, source, out newMessage, out emoteStr);
|
|
||||||
|
|
||||||
return newMessage;
|
return newMessage;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user