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

Send messages on admin/deadmin.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-11-01 23:56:35 +01:00
parent 637581bf3b
commit 6f78851647
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/Administration/AdminManager.cs
View File

@@ -5,6 +5,7 @@ using System.Linq;
using System.Net; using System.Net;
using System.Reflection; using System.Reflection;
using Content.Server.Database; using Content.Server.Database;
using Content.Server.Interfaces.Chat;
using Content.Server.Players; using Content.Server.Players;
using Content.Shared; using Content.Shared;
using Content.Shared.Administration; using Content.Shared.Administration;
@@ -35,6 +36,7 @@ namespace Content.Server.Administration
[Dependency] private readonly IConGroupController _conGroup = default!; [Dependency] private readonly IConGroupController _conGroup = default!;
[Dependency] private readonly IResourceManager _res = default!; [Dependency] private readonly IResourceManager _res = default!;
[Dependency] private readonly IConsoleShell _consoleShell = default!; [Dependency] private readonly IConsoleShell _consoleShell = default!;
[Dependency] private readonly IChatManager _chat = default!;
private readonly Dictionary<IPlayerSession, AdminReg> _admins = new Dictionary<IPlayerSession, AdminReg>(); private readonly Dictionary<IPlayerSession, AdminReg> _admins = new Dictionary<IPlayerSession, AdminReg>();
@@ -69,12 +71,13 @@ namespace Content.Server.Administration
return; return;
} }
_chat.SendAdminAnnouncement(Loc.GetString("{0} de-adminned themselves.", session.Name));
_chat.DispatchServerMessage(session, Loc.GetString("You are now a normal player."));
var plyData = session.ContentData()!; var plyData = session.ContentData()!;
plyData.ExplicitlyDeadminned = true; plyData.ExplicitlyDeadminned = true;
reg.Data.Active = false; reg.Data.Active = false;
// TODO: Send messages to all admins.
UpdateAdminStatus(session); UpdateAdminStatus(session);
} }
@@ -85,11 +88,13 @@ namespace Content.Server.Administration
throw new ArgumentException($"Player {session} is not an admin"); throw new ArgumentException($"Player {session} is not an admin");
} }
_chat.DispatchServerMessage(session, Loc.GetString("You are now an admin."));
var plyData = session.ContentData()!; var plyData = session.ContentData()!;
plyData.ExplicitlyDeadminned = true; plyData.ExplicitlyDeadminned = true;
reg.Data.Active = true; reg.Data.Active = true;
// TODO: Send messages to all admins. _chat.SendAdminAnnouncement(Loc.GetString("{0} re-adminned themselves.", session.Name));
UpdateAdminStatus(session); UpdateAdminStatus(session);
} }

22
Content.Server/Chat/ChatManager.cs
View File

@@ -124,7 +124,7 @@ namespace Content.Server.Chat
// Capitalize first letter // Capitalize first letter
message = message[0].ToString().ToUpper() + message = message[0].ToString().ToUpper() +
message.Remove(0,1); message.Remove(0, 1);
if (source.TryGetComponent(out InventoryComponent inventory) && if (source.TryGetComponent(out InventoryComponent inventory) &&
inventory.TryGetSlotItem(EquipmentSlotDefines.Slots.EARS, out ItemComponent item) && inventory.TryGetSlotItem(EquipmentSlotDefines.Slots.EARS, out ItemComponent item) &&
@@ -141,7 +141,7 @@ namespace Content.Server.Chat
{ {
// Capitalize first letter // Capitalize first letter
message = message[0].ToString().ToUpper() + message = message[0].ToString().ToUpper() +
message.Remove(0,1); message.Remove(0, 1);
} }
var listeners = EntitySystem.Get<ListeningSystem>(); var listeners = EntitySystem.Get<ListeningSystem>();
@@ -211,7 +211,10 @@ namespace Content.Server.Chat
return; return;
} }
var clients = _playerManager.GetPlayersBy(x => x.AttachedEntity != null && x.AttachedEntity.HasComponent<GhostComponent>()).Select(p => p.ConnectedClient);; var clients = _playerManager
.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;
@@ -240,6 +243,19 @@ namespace Content.Server.Chat
_netManager.ServerSendToMany(msg, clients.ToList()); _netManager.ServerSendToMany(msg, clients.ToList());
} }
public void SendAdminAnnouncement(string message)
{
var clients = _adminManager.ActiveAdmins.Select(p => p.ConnectedClient);
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
msg.Channel = ChatChannel.AdminChat;
msg.Message = message;
msg.MessageWrap = $"{Loc.GetString("ADMIN")}: {{0}}";
_netManager.ServerSendToMany(msg, clients.ToList());
}
public void SendHookOOC(string sender, string message) public void SendHookOOC(string sender, string message)
{ {
var msg = _netManager.CreateNetMessage<MsgChatMessage>(); var msg = _netManager.CreateNetMessage<MsgChatMessage>();

1
Content.Server/Interfaces/Chat/IChatManager.cs
View File

@@ -31,5 +31,6 @@ namespace Content.Server.Interfaces.Chat
delegate string TransformChat(IEntity speaker, string message); delegate string TransformChat(IEntity speaker, string message);
void RegisterChatTransform(TransformChat handler); void RegisterChatTransform(TransformChat handler);
void SendAdminAnnouncement(string message);
} }
} }