Adds DSay command (#2901)
* DSay command * Moves getting the clients from DeadChat and AdminDeadChat to a function
This commit is contained in:
40
Content.Server/Administration/Commands/DSay.cs
Normal file
40
Content.Server/Administration/Commands/DSay.cs
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
using Content.Server.Interfaces.Chat;
|
||||||
|
using Content.Shared.Administration;
|
||||||
|
using Robust.Server.Interfaces.Console;
|
||||||
|
using Robust.Server.Interfaces.Player;
|
||||||
|
using Robust.Shared.IoC;
|
||||||
|
using Robust.Shared.Localization;
|
||||||
|
|
||||||
|
namespace Content.Server.Administration.Commands
|
||||||
|
{
|
||||||
|
[AdminCommand(AdminFlags.Admin)]
|
||||||
|
class DSay : IClientCommand
|
||||||
|
{
|
||||||
|
public string Command => "dsay";
|
||||||
|
|
||||||
|
public string Description => Loc.GetString("Sends a message to deadchat as an admin");
|
||||||
|
|
||||||
|
public string Help => Loc.GetString($"Usage: {Command} <message>");
|
||||||
|
|
||||||
|
public void Execute(IConsoleShell shell, IPlayerSession player, string[] args)
|
||||||
|
{
|
||||||
|
if (player == null)
|
||||||
|
{
|
||||||
|
shell.SendText((IPlayerSession) null, "Only players can use this command");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (args.Length < 1)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var message = string.Join(" ", args).Trim();
|
||||||
|
if (string.IsNullOrEmpty(message))
|
||||||
|
return;
|
||||||
|
|
||||||
|
var chat = IoCManager.Resolve<IChatManager>();
|
||||||
|
|
||||||
|
chat.SendAdminDeadChat(player, message);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using Content.Server.Administration;
|
using Content.Server.Administration;
|
||||||
using Content.Server.GameObjects.Components.GUI;
|
using Content.Server.GameObjects.Components.GUI;
|
||||||
@@ -212,9 +212,7 @@ namespace Content.Server.Chat
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var clients = _playerManager
|
var clients = GetDeadChatClients();
|
||||||
.GetPlayersBy(x => x.AttachedEntity != null && x.AttachedEntity.HasComponent<GhostComponent>())
|
|
||||||
.Select(p => p.ConnectedClient);
|
|
||||||
|
|
||||||
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
|
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
|
||||||
msg.Channel = ChatChannel.Dead;
|
msg.Channel = ChatChannel.Dead;
|
||||||
@@ -224,6 +222,31 @@ namespace Content.Server.Chat
|
|||||||
_netManager.ServerSendToMany(msg, clients.ToList());
|
_netManager.ServerSendToMany(msg, clients.ToList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SendAdminDeadChat(IPlayerSession player, string message)
|
||||||
|
{
|
||||||
|
// Check if message exceeds the character limit
|
||||||
|
if (message.Length > MaxMessageLength)
|
||||||
|
{
|
||||||
|
DispatchServerMessage(player, Loc.GetString(MaxLengthExceededMessage, MaxMessageLength));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var clients = GetDeadChatClients();
|
||||||
|
|
||||||
|
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
|
||||||
|
msg.Channel = ChatChannel.Dead;
|
||||||
|
msg.Message = message;
|
||||||
|
msg.MessageWrap = $"{Loc.GetString("ADMIN")}:(${player.ConnectedClient.UserName}): {{0}}";
|
||||||
|
_netManager.ServerSendToMany(msg, clients.ToList());
|
||||||
|
}
|
||||||
|
|
||||||
|
private IEnumerable<INetChannel> GetDeadChatClients()
|
||||||
|
{
|
||||||
|
return _playerManager
|
||||||
|
.GetPlayersBy(x => x.AttachedEntity != null && x.AttachedEntity.HasComponent<GhostComponent>())
|
||||||
|
.Select(p => p.ConnectedClient);
|
||||||
|
}
|
||||||
|
|
||||||
public void SendAdminChat(IPlayerSession player, string message)
|
public void SendAdminChat(IPlayerSession player, string message)
|
||||||
{
|
{
|
||||||
// Check if message exceeds the character limit
|
// Check if message exceeds the character limit
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using Robust.Server.Interfaces.Player;
|
using Robust.Server.Interfaces.Player;
|
||||||
using Robust.Shared.Interfaces.GameObjects;
|
using Robust.Shared.Interfaces.GameObjects;
|
||||||
|
|
||||||
namespace Content.Server.Interfaces.Chat
|
namespace Content.Server.Interfaces.Chat
|
||||||
@@ -27,6 +27,7 @@ namespace Content.Server.Interfaces.Chat
|
|||||||
void SendOOC(IPlayerSession player, string message);
|
void SendOOC(IPlayerSession player, string message);
|
||||||
void SendAdminChat(IPlayerSession player, string message);
|
void SendAdminChat(IPlayerSession player, string message);
|
||||||
void SendDeadChat(IPlayerSession player, string message);
|
void SendDeadChat(IPlayerSession player, string message);
|
||||||
|
void SendAdminDeadChat(IPlayerSession player, string message);
|
||||||
|
|
||||||
void SendHookOOC(string sender, string message);
|
void SendHookOOC(string sender, string message);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user