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

Fix typing indicator input validation. (#10818)

Browse Source
This commit is contained in:
Leon Friedrich
2022-08-26 01:44:43 +12:00
committed by GitHub
parent 6237b784c2
commit 1e9e93a33c
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs
View File

@@ -1,4 +1,4 @@
using Content.Shared.CCVar; using Content.Shared.CCVar;
using Content.Shared.Chat.TypingIndicator; using Content.Shared.Chat.TypingIndicator;
using Robust.Client.Player; using Robust.Client.Player;
using Robust.Shared.Configuration; using Robust.Shared.Configuration;
@@ -67,12 +67,11 @@ public sealed class TypingIndicatorSystem : SharedTypingIndicatorSystem
_isClientTyping = isClientTyping; _isClientTyping = isClientTyping;
// check if player controls any pawn // check if player controls any pawn
var playerPawn = _playerManager.LocalPlayer?.ControlledEntity; if (_playerManager.LocalPlayer?.ControlledEntity == null)
if (playerPawn == null)
return; return;
// send a networked event to server // send a networked event to server
RaiseNetworkEvent(new TypingChangedEvent(playerPawn.Value, isClientTyping)); RaiseNetworkEvent(new TypingChangedEvent(isClientTyping));
} }
private void OnShowTypingChanged(bool showTyping) private void OnShowTypingChanged(bool showTyping)

15
Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
View File

@@ -1,6 +1,7 @@
using Content.Shared.ActionBlocker; using Content.Shared.ActionBlocker;
using Content.Shared.Chat.TypingIndicator; using Content.Shared.Chat.TypingIndicator;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Shared.Players;
namespace Content.Server.Chat.TypingIndicator; namespace Content.Server.Chat.TypingIndicator;
@@ -33,24 +34,24 @@ public sealed class TypingIndicatorSystem : SharedTypingIndicatorSystem
SetTypingIndicatorEnabled(uid, false); SetTypingIndicatorEnabled(uid, false);
} }
private void OnClientTypingChanged(TypingChangedEvent ev) private void OnClientTypingChanged(TypingChangedEvent ev, EntitySessionEventArgs args)
{ {
// make sure that this entity still exist var uid = args.SenderSession.AttachedEntity;
if (!Exists(ev.Uid)) if (!Exists(uid))
{ {
Logger.Warning($"Client attached entity {ev.Uid} from TypingChangedEvent doesn't exist on server."); Logger.Warning($"Client {args.SenderSession} sent TypingChangedEvent without an attached entity.");
return; return;
} }
// check if this entity can speak or emote // check if this entity can speak or emote
if (!_actionBlocker.CanEmote(ev.Uid) && !_actionBlocker.CanSpeak(ev.Uid)) if (!_actionBlocker.CanEmote(uid.Value) && !_actionBlocker.CanSpeak(uid.Value))
{ {
// nah, make sure that typing indicator is disabled // nah, make sure that typing indicator is disabled
SetTypingIndicatorEnabled(ev.Uid, false); SetTypingIndicatorEnabled(uid.Value, false);
return; return;
} }
SetTypingIndicatorEnabled(ev.Uid, ev.IsTyping); SetTypingIndicatorEnabled(uid.Value, ev.IsTyping);
} }
private void SetTypingIndicatorEnabled(EntityUid uid, bool isEnabled, AppearanceComponent? appearance = null) private void SetTypingIndicatorEnabled(EntityUid uid, bool isEnabled, AppearanceComponent? appearance = null)

6
Content.Shared/Chat/TypingIndicator/TypingChangedEvent.cs
View File

@@ -1,4 +1,4 @@
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
namespace Content.Shared.Chat.TypingIndicator; namespace Content.Shared.Chat.TypingIndicator;
@@ -9,12 +9,10 @@ namespace Content.Shared.Chat.TypingIndicator;
[Serializable, NetSerializable] [Serializable, NetSerializable]
public sealed class TypingChangedEvent : EntityEventArgs public sealed class TypingChangedEvent : EntityEventArgs
{ {
public readonly EntityUid Uid;
public readonly bool IsTyping; public readonly bool IsTyping;
public TypingChangedEvent(EntityUid uid, bool isTyping) public TypingChangedEvent(bool isTyping)
{ {
Uid = uid;
IsTyping = isTyping; IsTyping = isTyping;
} }
} }