If chat message begins with "/" it gets blocked.

danbudworthmead · Oct 29, 2020 · e032c0d · e032c0d
1 parent 454f486
commit e032c0d
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 27 deletions.
diff --git a/src/Impostor.Server/Net/Inner/InnerNetObject.cs b/src/Impostor.Server/Net/Inner/InnerNetObject.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Inner;
 using Impostor.Api.Net.Messages;
@@ -16,7 +16,7 @@ internal abstract class InnerNetObject : GameObject, IInnerNetObject
 
         public SpawnFlags SpawnFlags { get; internal set; }
 
-        public abstract ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, IMessageReader reader);
+        public abstract ValueTask<bool> HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, IMessageReader reader);
 
         public abstract bool Serialize(IMessageWriter writer, bool initialState);
 
@@ -28,4 +28,4 @@ public bool IsOwnedBy(IClientPlayer player)
                    (OwnerId == HostInheritId && player.IsHost);
         }
     }
-}
+}
diff --git a/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.cs b/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using System.Threading.Tasks;
 using Impostor.Api;
 using Impostor.Api.Innersloth;
@@ -52,7 +52,7 @@ private static Vector2 ReadVector2(IMessageReader reader)
             return new Vector2(XRange.Lerp(v1), YRange.Lerp(v2));
         }
 
-        public override ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, IMessageReader reader)
+        public override ValueTask<bool> HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, IMessageReader reader)
         {
             if (call == RpcCalls.SnapTo)
             {
@@ -145,4 +145,4 @@ private void SnapTo(Vector2 position, ushort minSid)
             _targetSyncVelocity = Vector2.Zero;
         }
     }
-}
+}
diff --git a/src/Impostor.Server/Net/Inner/Objects/Components/InnerPlayerPhysics.cs b/src/Impostor.Server/Net/Inner/Objects/Components/InnerPlayerPhysics.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Impostor.Api;
 using Impostor.Api.Net;
@@ -19,7 +19,7 @@ public InnerPlayerPhysics(ILogger<InnerPlayerPhysics> logger, InnerPlayerControl
             _playerControl = playerControl;
         }
 
-        public override ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, IMessageReader reader)
+        public override ValueTask<bool> HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, IMessageReader reader)
         {
             if (call != RpcCalls.EnterVent && call != RpcCalls.ExitVent)
             {
@@ -60,4 +60,4 @@ public override void Deserialize(IClientPlayer sender, IClientPlayer? target, IM
             throw new NotImplementedException();
         }
     }
-}
+}
diff --git a/src/Impostor.Server/Net/Inner/Objects/Components/InnerVoteBanSystem.cs b/src/Impostor.Server/Net/Inner/Objects/Components/InnerVoteBanSystem.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Impostor.Api;
@@ -21,7 +21,7 @@ public InnerVoteBanSystem(ILogger<InnerVoteBanSystem> logger)
             _votes = new Dictionary<int, int[]>();
         }
 
-        public override ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, IMessageReader reader)
+        public override ValueTask<bool> HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, IMessageReader reader)
         {
             if (call != RpcCalls.AddVote)
             {
@@ -85,4 +85,4 @@ public override void Deserialize(IClientPlayer sender, IClientPlayer? target, IM
             }
         }
     }
-}
+}
diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs b/src/Impostor.Server/Net/Inner/Objects/InnerGameData.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -43,7 +43,7 @@ public InnerGameData(ILogger<InnerGameData> logger, Game game, IServiceProvider
             return _allPlayers.TryGetValue(id, out var player) ? player : null;
         }
 
-        public override ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call,
+        public override ValueTask<bool> HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call,
             IMessageReader reader)
         {
             switch (call)
@@ -182,4 +182,4 @@ private void SetTasks(byte playerId, ReadOnlyMemory<byte> taskTypeIds)
             }
         }
     }
-}
+}
diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerLobbyBehaviour.cs b/src/Impostor.Server/Net/Inner/Objects/InnerLobbyBehaviour.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Impostor.Api.Games;
 using Impostor.Api.Net;
 using Impostor.Api.Net.Inner.Objects;
@@ -18,7 +18,7 @@ public InnerLobbyBehaviour(IGame game)
             Components.Add(this);
         }
 
-        public override ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, IMessageReader reader)
+        public override ValueTask<bool> HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, IMessageReader reader)
         {
             throw new System.NotImplementedException();
         }
@@ -33,4 +33,4 @@ public override void Deserialize(IClientPlayer sender, IClientPlayer? target, IM
             throw new System.NotImplementedException();
         }
     }
-}
+}
diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.cs b/src/Impostor.Server/Net/Inner/Objects/InnerMeetingHud.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Impostor.Api;
@@ -44,7 +44,7 @@ private void PopulateButtons(byte reporter)
                 .ToArray();
         }
 
-        public override async ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, IMessageReader reader)
+        public override async ValueTask<bool> HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, IMessageReader reader)
         {
             switch (call)
             {
@@ -114,6 +114,7 @@ public override async ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? tar
                     break;
                 }
             }
+            return default;
         }
 
         public override bool Serialize(IMessageWriter writer, bool initialState)
@@ -161,4 +162,4 @@ public override void Deserialize(IClientPlayer sender, IClientPlayer? target, IM
             }
         }
     }
-}
+}
diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.cs
@@ -45,7 +45,7 @@ public InnerPlayerControl(ILogger<InnerPlayerControl> logger, IServiceProvider s
 
         public InnerPlayerInfo PlayerInfo { get; internal set; }
 
-        public override async ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, IMessageReader reader)
+        public override async ValueTask<bool> HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call, IMessageReader reader)
         {
             switch (call)
             {
@@ -294,6 +294,12 @@ public override async ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? tar
                     var chat = reader.ReadString();
 
                     await _eventManager.CallAsync(new PlayerChatEvent(_game, sender, this, chat));
+
+                    if (chat.StartsWith("/"))
+                    {
+                        return true;
+                    }
+
                     break;
                 }
 
@@ -393,6 +399,7 @@ public override async ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? tar
                     break;
                 }
             }
+            return default;
         }
 
         public override bool Serialize(IMessageWriter writer, bool initialState)

diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerShipStatus.cs b/src/Impostor.Server/Net/Inner/Objects/InnerShipStatus.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Impostor.Api;
@@ -46,7 +46,7 @@ public InnerShipStatus(ILogger<InnerShipStatus> logger, Game game)
             Components.Add(this);
         }
 
-        public override ValueTask HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call,
+        public override ValueTask<bool> HandleRpc(ClientPlayer sender, ClientPlayer? target, RpcCalls call,
             IMessageReader reader)
         {
             switch (call)
@@ -144,4 +144,4 @@ public override void Deserialize(IClientPlayer sender, IClientPlayer? target, IM
             }
         }
     }
-}
+}
diff --git a/src/Impostor.Server/Net/State/Game.Data.cs b/src/Impostor.Server/Net/State/Game.Data.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -246,7 +246,11 @@ public async ValueTask<bool> HandleGameDataAsync(IMessageReader parent, ClientPl
                         var netId = reader.ReadPackedUInt32();
                         if (_allObjectsFast.TryGetValue(netId, out var obj))
                         {
-                            await obj.HandleRpc(sender, target, (RpcCalls) reader.ReadByte(), reader);
+                            bool isBlocked = await obj.HandleRpc(sender, target, (RpcCalls) reader.ReadByte(), reader);
+                            if (isBlocked)
+                            {
+                                return false;
+                            }
                         }
                         else
                         {