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

Fixes issue of smiling over the radio (#6148)

Browse Source
This commit is contained in:
Michael Phillips
2022-01-13 06:26:57 -08:00
committed by GitHub
parent 3596125fa9
commit e1c3fc727b
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Content.Server/Chat/Managers/ChatManager.cs
View File

@@ -1,3 +1,4 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
@@ -124,7 +125,7 @@ namespace Content.Server.Chat.Managers
_netManager.ServerSendMessage(msg, player.ConnectedClient); _netManager.ServerSendMessage(msg, player.ConnectedClient);
} }
public void TrySpeak(EntityUid source, string message, bool whisper = false, IConsoleShell? shell = null, IPlayerSession? player = null) public void TrySpeak(EntityUid source, string message, bool isWhisper = false, IConsoleShell? shell = null, IPlayerSession? player = null)
{ {
// Listen it avoids the 30 lines being copy-paste and means only 1 source needs updating if something changes. // Listen it avoids the 30 lines being copy-paste and means only 1 source needs updating if something changes.
if (_entManager.HasComponent<GhostComponent>(source)) if (_entManager.HasComponent<GhostComponent>(source))
@@ -148,17 +149,14 @@ namespace Content.Server.Chat.Managers
return; return;
} }
var emote = _sanitizer.TrySanitizeOutSmilies(message, owned, out var sanitized, out var emoteStr); var isEmote = _sanitizer.TrySanitizeOutSmilies(message, owned, out var sanitized, out var emoteStr);
if (sanitized.Length != 0) if (sanitized.Length != 0)
{ {
if (whisper) SendEntityChatType(owned, sanitized, isWhisper);
EntityWhisper(owned, sanitized);
else
EntitySay(owned, sanitized);
} }
if (emote) if (isEmote)
EntityMe(owned, emoteStr!); EntityMe(owned, emoteStr!);
} }
} }
@@ -478,6 +476,25 @@ namespace Content.Server.Chat.Managers
_chatTransformHandlers.Add(handler); _chatTransformHandlers.Add(handler);
} }
public void SendEntityChatType(EntityUid source, string message, bool isWhisper)
{
// I don't know why you're trying to smile over the radio...
// This filters out the players who just really want to try.
if (message.StartsWith(';') && message.Length <= 1)
{
return;
}
// We check to see if message is a whisper or a standard say message.
if (isWhisper)
{
EntityWhisper(source, message);
}
else
{
EntitySay(source, message);
}
}
public string SanitizeMessageCapital(EntityUid source, string message) public string SanitizeMessageCapital(EntityUid source, string message)
{ {
if (message.StartsWith(';')) if (message.StartsWith(';'))