Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Сообщения в ПДА 2 (#583)

Browse Source 
* add: AdminLog

* tweak: clean up

* fix: Changeling -> Network

* add: сортировка сообщений

* fix: ТексТ
This commit is contained in:
Spatison
2024-08-08 13:20:06 +03:00
committed by GitHub
parent abf435b11d
commit cced3cc98b
19 changed files with 195 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
Content.Server/_White/CartridgeLoader/Cartridges/MessagesCartridgeSystem.cs
View File

@@ -1,19 +1,15 @@
using Content.Server._White.Radio.Components;
using System.Linq;
using Content.Server._White.Radio.Components;
using Content.Server._White.Radio.EntitySystems;
using Content.Server.Administration.Commands;
using Content.Server.CartridgeLoader;
using Content.Shared.CartridgeLoader;
using Content.Shared.PDA;
using Robust.Shared.Map;
using Content.Server.GameTicking;
using Robust.Shared.Timing;
using Content.Server.DeviceNetwork.Systems;
using Content.Shared.DeviceNetwork;
using Content.Server.Station.Systems;
using Content.Shared._White.CartridgeLoader.Cartridges;
using Content.Shared.Access.Components;
using Content.Shared.Roles;
using Robust.Shared.Prototypes;
namespace Content.Server._White.CartridgeLoader.Cartridges;
@@ -26,7 +22,6 @@ public sealed class MessagesCartridgeSystem : EntitySystem
[Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!;
[Dependency] private readonly SingletonDeviceNetServerSystem _singletonServerSystem = default!;
[Dependency] private readonly StationSystem _stationSystem = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
public override void Initialize()
{
@@ -44,13 +39,13 @@ public sealed class MessagesCartridgeSystem : EntitySystem
private void OnInit(EntityUid uid, MessagesCartridgeComponent component, ComponentInit args)
{
var stationId = _stationSystem.GetOwningStation(uid);
if (stationId.HasValue &&
_singletonServerSystem.TryGetActiveServerAddress<MessagesServerComponent>(stationId.Value,
out var address) && TryComp(uid, out CartridgeComponent? cartComponent))
{
SendName(uid, component, cartComponent, address);
component.UserUid = cartComponent.LoaderUid?.Id;
}
if (!stationId.HasValue ||
!_singletonServerSystem.TryGetActiveServerAddress<MessagesServerComponent>(stationId.Value,
out var address) || !TryComp(uid, out CartridgeComponent? cartComponent))
return;
SendName(uid, component, cartComponent, address);
component.UserUid = cartComponent.LoaderUid?.Id;
}
private void OnRemove(EntityUid uid, MessagesCartridgeComponent component, ComponentRemove args)
@@ -58,7 +53,7 @@ public sealed class MessagesCartridgeSystem : EntitySystem
if (component.LastServer == null || !TryComp<MessagesServerComponent>(component.LastServer, out var messagesServerComponent) || component.UserUid == null)
return;
messagesServerComponent.NameDict.Remove(component.UserUid.Value);
messagesServerComponent.Dictionary.Remove(component.UserUid.Value);
}
/// <summary>
@@ -69,6 +64,7 @@ public sealed class MessagesCartridgeSystem : EntitySystem
var stationId = _stationSystem.GetOwningStation(uid);
if (stationId.HasValue && _singletonServerSystem.TryGetActiveServerAddress<MessagesServerComponent>(stationId.Value, out var address) && TryComp(uid, out CartridgeComponent? cartComponent))
SendName(uid, component, cartComponent, address);
UpdateUiState(uid, component);
}
@@ -83,7 +79,7 @@ public sealed class MessagesCartridgeSystem : EntitySystem
if (args is not MessagesUiMessageEvent messageEvent)
return;
if (messageEvent.Action == MessagesUiAction.Send && TryComp(uid, out CartridgeComponent? cartComponent) && component.UserUid is { } userId && component.ChatUid != null && messageEvent.StringInput != null)
if (messageEvent.Action == MessagesUiAction.Send && HasComp<CartridgeComponent>(uid) && component.UserUid is { } userId && component.ChatUid != null && messageEvent.StringInput != null)
{
var stationId = _stationSystem.GetOwningStation(uid);
if (!stationId.HasValue)
@@ -171,7 +167,7 @@ public sealed class MessagesCartridgeSystem : EntitySystem
/// </summary>
private void SendName(EntityUid uid, MessagesCartridgeComponent component, CartridgeComponent cartComponent, string? address)
{
TryGetMessagesUser(cartComponent, out var messagesUser);
TryGetMessagesUser(component, cartComponent, out var messagesUser);
var packet = new NetworkPayload()
{
@@ -184,38 +180,38 @@ public sealed class MessagesCartridgeSystem : EntitySystem
/// <summary>
/// Retrieves the name of the given user from the last contacted server
/// </summary>
private bool TryGetName(int key, MessagesCartridgeComponent component, out string name)
private void TryGetName(int key, MessagesCartridgeComponent component, out string name)
{
if (component.LastServer != null && _messagesServerSystem.TryGetUserFromDict(component.LastServer, key, out var messagesUser))
{
name = messagesUser.Name;
return true;
return;
}
name = Loc.GetString("messages-pda-connection-error");
return false;
}
/// <summary>
/// Returns the user's name, job title and job department
/// </summary>
public bool TryGetMessagesUser(CartridgeComponent component, out MessagesUser messagesUser)
public bool TryGetMessagesUser(MessagesCartridgeComponent component, CartridgeComponent cartridgeComponent, out MessagesUserData messagesUserData)
{
var pda = component.LoaderUid;
messagesUserData = new MessagesUserData();
if (component.LastServer != null &&
TryComp<MessagesServerComponent>(component.LastServer, out var messagesServerComponent) &&
component.UserUid != null)
messagesUserData = messagesServerComponent.Dictionary[component.UserUid.Value];
var pda = cartridgeComponent.LoaderUid;
if (pda == null)
{
messagesUser = new MessagesUser(Loc.GetString("messages-pda-unknown-name"), Loc.GetString("messages-pda-unknown-job"), "Specific");
return false;
}
var pdaComponent = CompOrNull<PdaComponent>(pda);
if (pdaComponent?.OwnerName == null)
{
messagesUser = new MessagesUser(Loc.GetString("messages-pda-unknown-name"), Loc.GetString("messages-pda-unknown-job"), "Specific");
return false;
}
messagesUser = new MessagesUser(pdaComponent.OwnerName, pdaComponent.OwnerJob ?? Loc.GetString("messages-pda-unknown-job"), pdaComponent.OwnerDepartment ?? "Specific");
messagesUserData.SetMessagesUser(pdaComponent.OwnerName, pdaComponent.OwnerJob, pdaComponent.OwnerDepartment);
return true;
}
@@ -223,34 +219,39 @@ public sealed class MessagesCartridgeSystem : EntitySystem
{
if (!Resolve(uid, ref component))
return;
if (!TryComp(uid, out CartridgeComponent? cartComponent))
return;
if (cartComponent.LoaderUid == null)
return;
var loaderUid = cartComponent.LoaderUid.Value;
MessagesUiState state;
MapId mapId = Transform(uid).MapID;
int? currentUserId = component.UserUid;
var currentUserId = component.UserUid;
if (currentUserId == null || component.LastServer == null)
{
state = new MessagesUiState(MessagesUiStateMode.Error, [], null);
state = new MessagesUiState(MessagesUiStateMode.Error);
_cartridgeLoaderSystem.UpdateCartridgeUiState(loaderUid, state);
return;
}
if (component.ChatUid == null) //if no chat is loaded, list users
{
List<(MessagesUser, int?)> userList = [];
List<(MessagesUserData, int?)> userList = [];
var nameDict = _messagesServerSystem.GetNameDict(component.LastServer);
var dictionary = _messagesServerSystem.GetNameDict(component.LastServer);
foreach (var nameEntry in nameDict.Keys)
foreach (var nameEntry in dictionary.Keys)
{
if (nameEntry == currentUserId)
continue;
userList.Add((nameDict[nameEntry], nameEntry));
userList.Add((dictionary[nameEntry], nameEntry));
}
state = new MessagesUiState(MessagesUiStateMode.UserList, userList, null);
userList.Sort((a, b) => TimeSpan.Compare(b.Item1.Messages.LastOrDefault().Time, a.Item1.Messages.LastOrDefault().Time));
state = new MessagesUiState(MessagesUiStateMode.UserList, userList);
}
else
{
@@ -259,31 +260,23 @@ public sealed class MessagesCartridgeSystem : EntitySystem
foreach (var message in _messagesServerSystem.GetMessages(component.LastServer, component.ChatUid.Value, currentUserId.Value))
{
if (message.SenderId == component.ChatUid && message.ReceiverId == currentUserId || message.ReceiverId == component.ChatUid && message.SenderId == currentUserId)
{
messageList.Add(message);
}
}
messageList.Sort
(
delegate (MessagesMessageData a, MessagesMessageData b)
{
return TimeSpan.Compare(a.Time, b.Time);
}
);
messageList.Sort((a, b) => TimeSpan.Compare(a.Time, b.Time));
List<(MessagesUser, int?)> formattedMessageList = [];
List<(string, int?)> formattedMessageList = [];
foreach (var message in messageList)
{
TryGetName(message.SenderId, component, out var name);
var stationTime = message.Time.Subtract(_gameTicker.RoundStartTimeSpan);
var content = $"{stationTime.ToString("\\[hh\\:mm\\:ss\\]")} {name}: {message.Content}";
formattedMessageList.Add((new MessagesUser(content, Loc.GetString("messages-pda-unknown-job"), "Specific"), null));
var content = $"{stationTime:\\[hh\\:mm\\:ss\\]} {name}: {message.Content}";
formattedMessageList.Add((content, null));
}
TryGetName(component.ChatUid.Value, component, out var user);
state = new MessagesUiState(MessagesUiStateMode.Chat, formattedMessageList, user);
state = new MessagesUiState(MessagesUiStateMode.Chat, null, formattedMessageList, user);
}
_cartridgeLoaderSystem.UpdateCartridgeUiState(loaderUid, state);
}

10
Content.Server/_White/Radio/Components/MessagesServerComponent.cs
View File

@@ -13,14 +13,8 @@ namespace Content.Server._White.Radio.Components;
public sealed partial class MessagesServerComponent : Component
{
/// <summary>
/// The list of messages cached by the server.
/// Dictionary translating IDs to MessagesUser
/// </summary>
[DataField]
public List<MessagesMessageData> Messages = [];
/// <summary>
/// Dictionary translating uids to readable names
/// </summary>
[DataField]
public Dictionary<int, MessagesUser> NameDict = [];
public Dictionary<int, MessagesUserData> Dictionary = new();
}

52
Content.Server/_White/Radio/EntitySystems/MessagesServerSystem.cs
View File

@@ -1,9 +1,12 @@
using System.Linq;
using Content.Server._White.CartridgeLoader.Cartridges;
using Content.Server._White.Radio.Components;
using Content.Server.Administration.Logs;
using Content.Server.Chat.Systems;
using Content.Server.DeviceNetwork.Systems;
using Content.Shared._White.CartridgeLoader.Cartridges;
using Content.Shared.CartridgeLoader;
using Content.Shared.Database;
using Content.Shared.DeviceNetwork;
@@ -14,6 +17,8 @@ public sealed class MessagesServerSystem : EntitySystem
[Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!;
[Dependency] private readonly SingletonDeviceNetServerSystem _singletonServerSystem = default!;
[Dependency] private readonly MessagesCartridgeSystem _messagesSystem = default!;
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
[Dependency] private readonly ChatSystem _chat = default!;
public override void Initialize()
{
@@ -31,12 +36,12 @@ public sealed class MessagesServerSystem : EntitySystem
if (!TryComp(entityUid, out CartridgeComponent? cartComponent))
continue;
_messagesSystem.TryGetMessagesUser(cartComponent, out var messagesUser);
_messagesSystem.TryGetMessagesUser(cartridge, cartComponent, out var messagesUser);
if (cartridge.UserUid == null || messagesUser.Name == Loc.GetString("messages-pda-unknown-name"))
continue;
component.NameDict[cartridge.UserUid.Value] = messagesUser;
component.Dictionary[cartridge.UserUid.Value] = messagesUser;
cartridge.LastServer = uid;
}
}
@@ -48,13 +53,15 @@ public sealed class MessagesServerSystem : EntitySystem
{
if (!_singletonServerSystem.IsActiveServer(uid))
return;
if (args.Data.TryGetValue<MessagesUser>(MessagesNetworkKeys.NewUser, out var messagesUser) && args.Data.TryGetValue<int>(MessagesNetworkKeys.UserId, out var userId))
if (args.Data.TryGetValue<MessagesUserData>(MessagesNetworkKeys.NewUser, out var messagesUser) && args.Data.TryGetValue<int>(MessagesNetworkKeys.UserId, out var userId))
{
component.NameDict[userId] = messagesUser;
component.Dictionary[userId] = messagesUser;
var packet = new NetworkPayload();
_deviceNetworkSystem.QueuePacket(uid, args.SenderAddress, packet);
}
if (args.Data.TryGetValue<MessagesMessageData>(MessagesNetworkKeys.Message, out var message))
SendMessage(uid, component, message);
}
@@ -64,7 +71,11 @@ public sealed class MessagesServerSystem : EntitySystem
/// </summary>
private void SendMessage(EntityUid uid, MessagesServerComponent component, MessagesMessageData message)
{
component.Messages.Add(message);
component.Dictionary[message.ReceiverId].Messages.Add(message);
component.Dictionary[message.SenderId].Messages.Add(message);
_adminLogger.Add(LogType.DeviceNetwork, $"{Loc.GetString("chat-manager-send-message", ("sender", component.Dictionary[message.SenderId].Name + $" ({message.SenderId})"), ("receiver", component.Dictionary[message.ReceiverId].Name + $" ({message.ReceiverId})"), ("message", message.Content))}");
_chat.SendNetworkChat(uid, Loc.GetString("chat-manager-send-message", ("sender", component.Dictionary[message.SenderId].Name), ("receiver", component.Dictionary[message.ReceiverId].Name), ("message", message.Content)), false);
var packet = new NetworkPayload()
{
@@ -77,30 +88,23 @@ public sealed class MessagesServerSystem : EntitySystem
/// <summary>
/// Returns user
/// </summary>
public bool TryGetUserFromDict(EntityUid? uid, int key, out MessagesUser messagesUser)
public bool TryGetUserFromDict(EntityUid? uid, int key, out MessagesUserData messagesUserData)
{
if (!TryComp(uid, out MessagesServerComponent? component))
{
messagesUser = new MessagesUser(Loc.GetString("messages-pda-connection-error"), Loc.GetString("messages-pda-unknown-job"), "Specific");
messagesUserData = new MessagesUserData();
if (!TryComp(uid, out MessagesServerComponent? component) || !component.Dictionary.TryGetValue(key, out var keyValue))
return false;
}
if (component.NameDict.TryGetValue(key, out var keyValue))
{
messagesUser = keyValue;
return true;
}
messagesUser = new MessagesUser(Loc.GetString("messages-pda-user-missing"), Loc.GetString("messages-pda-unknown-job"), "Specific");
return false;
messagesUserData = keyValue;
return true;
}
/// <summary>
/// Returns the name dictionary cache
/// Returns the user dictionary cache
/// </summary>
public Dictionary<int, MessagesUser> GetNameDict(EntityUid? uid)
public Dictionary<int, MessagesUserData> GetNameDict(EntityUid? uid)
{
if (!TryComp(uid, out MessagesServerComponent? component))
return new Dictionary<int, MessagesUser>();
return component.NameDict;
return !TryComp(uid, out MessagesServerComponent? component) ? new Dictionary<int, MessagesUserData>() : component.Dictionary;
}
/// <summary>
@@ -110,9 +114,11 @@ public sealed class MessagesServerSystem : EntitySystem
{
if (!TryComp(uid, out MessagesServerComponent? component))
return [];
return
[
..component.Messages.Where(message =>
..component.Dictionary[id1]
.Messages.Where(message =>
message.SenderId == id1 && message.ReceiverId == id2 ||
message.SenderId == id2 && message.ReceiverId == id1)
];