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

Revert "Update submodule to 172.0.0 (#21222)" (#21225)

Browse Source
This commit is contained in:
metalgearsloth
2023-10-24 21:55:20 +11:00
committed by GitHub
parent 517aea8bc3
commit a2bbda43cc
249 changed files with 1049 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/Chat/Managers/ChatManager.cs
View File

@@ -10,9 +10,11 @@ using Content.Shared.CCVar;
using Content.Shared.Chat;
using Content.Shared.Database;
using Content.Shared.Mind;
using Robust.Server.Player;
using Robust.Shared.Configuration;
using Robust.Shared.Network;
using Robust.Shared.Player;
using Robust.Shared.Players;
using Robust.Shared.Replays;
using Robust.Shared.Utility;
@@ -49,8 +51,8 @@ namespace Content.Server.Chat.Managers
private bool _oocEnabled = true;
private bool _adminOocEnabled = true;
public Dictionary<ICommonSession, int> SenderKeys { get; } = new();
public Dictionary<ICommonSession, HashSet<NetEntity>> SenderEntities { get; } = new();
public Dictionary<IPlayerSession, int> SenderKeys { get; } = new();
public Dictionary<IPlayerSession, HashSet<NetEntity>> SenderEntities { get; } = new();
public void Initialize()
{
@@ -77,7 +79,7 @@ namespace Content.Server.Chat.Managers
DispatchServerAnnouncement(Loc.GetString(val ? "chat-manager-admin-ooc-chat-enabled-message" : "chat-manager-admin-ooc-chat-disabled-message"));
}
public void DeleteMessagesBy(ICommonSession player)
public void DeleteMessagesBy(IPlayerSession player)
{
var key = SenderKeys.GetValueOrDefault(player);
var entities = SenderEntities.GetValueOrDefault(player) ?? new HashSet<NetEntity>();
@@ -163,7 +165,7 @@ namespace Content.Server.Chat.Managers
/// <param name="player">The player sending the message.</param>
/// <param name="message">The message.</param>
/// <param name="type">The type of message.</param>
public void TrySendOOCMessage(ICommonSession player, string message, OOCChatType type)
public void TrySendOOCMessage(IPlayerSession player, string message, OOCChatType type)
{
// Check if message exceeds the character limit
if (message.Length > MaxMessageLength)
@@ -187,7 +189,7 @@ namespace Content.Server.Chat.Managers
#region Private API
private void SendOOC(ICommonSession player, string message)
private void SendOOC(IPlayerSession player, string message)
{
if (_adminManager.IsAdmin(player))
{
@@ -224,7 +226,7 @@ namespace Content.Server.Chat.Managers
_adminLogger.Add(LogType.Chat, LogImpact.Low, $"OOC from {player:Player}: {message}");
}
private void SendAdminChat(ICommonSession player, string message)
private void SendAdminChat(IPlayerSession player, string message)
{
if (!_adminManager.IsAdmin(player))
{
@@ -324,7 +326,7 @@ namespace Content.Server.Chat.Managers
}
}
public bool MessageCharacterLimit(ICommonSession? player, string message)
public bool MessageCharacterLimit(IPlayerSession? player, string message)
{
var isOverLength = false;

12
Content.Server/Chat/Managers/IChatManager.cs
View File

@@ -1,6 +1,8 @@
using Content.Shared.Chat;
using Robust.Server.Player;
using Robust.Shared.Network;
using Robust.Shared.Player;
using Robust.Shared.Players;
namespace Content.Server.Chat.Managers
{
@@ -10,12 +12,12 @@ namespace Content.Server.Chat.Managers
/// Keys identifying messages sent by a specific player, used when sending
/// <see cref="MsgChatMessage"/>
/// </summary>
Dictionary<ICommonSession, int> SenderKeys { get; }
Dictionary<IPlayerSession, int> SenderKeys { get; }
/// <summary>
/// Tracks which entities a player was attached to while sending messages.
/// </summary>
Dictionary<ICommonSession, HashSet<NetEntity>> SenderEntities { get; }
Dictionary<IPlayerSession, HashSet<NetEntity>> SenderEntities { get; }
void Initialize();
@@ -28,7 +30,7 @@ namespace Content.Server.Chat.Managers
void DispatchServerMessage(ICommonSession player, string message, bool suppressLog = false);
void TrySendOOCMessage(ICommonSession player, string message, OOCChatType type);
void TrySendOOCMessage(IPlayerSession player, string message, OOCChatType type);
void SendHookOOC(string sender, string message);
void SendAdminAnnouncement(string message);
@@ -45,8 +47,8 @@ namespace Content.Server.Chat.Managers
void ChatMessageToAll(ChatChannel channel, string message, string wrappedMessage, EntityUid source, bool hideChat, bool recordReplay, Color? colorOverride = null, string? audioPath = null, float audioVolume = 0, int? senderKey = null);
bool MessageCharacterLimit(ICommonSession player, string message);
bool MessageCharacterLimit(IPlayerSession player, string message);
void DeleteMessagesBy(ICommonSession player);
void DeleteMessagesBy(IPlayerSession player);
}
}