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

Fixes sending empty msgs and trims unnecessary whitespaces (#1785)

Browse Source
This commit is contained in:
Exp
2020-08-19 14:27:51 +02:00
committed by GitHub
parent b8fef91922
commit 2448864035
2 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Client/Chat/ChatManager.cs
View File

@@ -247,13 +247,17 @@ namespace Content.Client.Chat
case OOCAlias: case OOCAlias:
{ {
var conInput = text.Substring(1); var conInput = text.Substring(1);
if (string.IsNullOrWhiteSpace(conInput))
return;
_console.ProcessCommand($"ooc \"{CommandParsing.Escape(conInput)}\""); _console.ProcessCommand($"ooc \"{CommandParsing.Escape(conInput)}\"");
break; break;
} }
case AdminChatAlias: case AdminChatAlias:
{ {
var conInput = text.Substring(1); var conInput = text.Substring(1);
if(_groupController.CanCommand("asay")){ if (string.IsNullOrWhiteSpace(conInput))
return;
if (_groupController.CanCommand("asay")){
_console.ProcessCommand($"asay \"{CommandParsing.Escape(conInput)}\""); _console.ProcessCommand($"asay \"{CommandParsing.Escape(conInput)}\"");
} }
else else
@@ -265,6 +269,8 @@ namespace Content.Client.Chat
case MeAlias: case MeAlias:
{ {
var conInput = text.Substring(1); var conInput = text.Substring(1);
if (string.IsNullOrWhiteSpace(conInput))
return;
_console.ProcessCommand($"me \"{CommandParsing.Escape(conInput)}\""); _console.ProcessCommand($"me \"{CommandParsing.Escape(conInput)}\"");
break; break;
} }

32
Content.Server/Chat/ChatCommands.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Linq; using System.Linq;
using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.GUI;
using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Items.Storage;
@@ -32,9 +32,11 @@ namespace Content.Server.Chat
if (args.Length < 1) if (args.Length < 1)
return; return;
var chat = IoCManager.Resolve<IChatManager>(); var message = string.Join(" ", args).Trim();
if (string.IsNullOrEmpty(message))
return;
var message = string.Join(" ", args); var chat = IoCManager.Resolve<IChatManager>();
if (player.AttachedEntity.HasComponent<GhostComponent>()) if (player.AttachedEntity.HasComponent<GhostComponent>())
chat.SendDeadChat(player, message); chat.SendDeadChat(player, message);
@@ -61,9 +63,11 @@ namespace Content.Server.Chat
if (args.Length < 1) if (args.Length < 1)
return; return;
var chat = IoCManager.Resolve<IChatManager>(); var action = string.Join(" ", args).Trim();
if (string.IsNullOrEmpty(action))
return;
var action = string.Join(" ", args); var chat = IoCManager.Resolve<IChatManager>();
var mindComponent = player.ContentData().Mind; var mindComponent = player.ContentData().Mind;
chat.EntityMe(mindComponent.OwnedEntity, action); chat.EntityMe(mindComponent.OwnedEntity, action);
@@ -78,8 +82,15 @@ namespace Content.Server.Chat
public void Execute(IConsoleShell shell, IPlayerSession player, string[] args) public void Execute(IConsoleShell shell, IPlayerSession player, string[] args)
{ {
if (args.Length < 1)
return;
var message = string.Join(" ", args).Trim();
if (string.IsNullOrEmpty(message))
return;
var chat = IoCManager.Resolve<IChatManager>(); var chat = IoCManager.Resolve<IChatManager>();
chat.SendOOC(player, string.Join(" ", args)); chat.SendOOC(player, message);
} }
} }
@@ -91,8 +102,15 @@ namespace Content.Server.Chat
public void Execute(IConsoleShell shell, IPlayerSession player, string[] args) public void Execute(IConsoleShell shell, IPlayerSession player, string[] args)
{ {
if (args.Length < 1)
return;
var message = string.Join(" ", args).Trim();
if (string.IsNullOrEmpty(message))
return;
var chat = IoCManager.Resolve<IChatManager>(); var chat = IoCManager.Resolve<IChatManager>();
chat.SendAdminChat(player, string.Join(" ", args)); chat.SendAdminChat(player, message);
} }
} }