[Fix] TTS 3: Враг в отражении

Content.Client/Chat/Managers/ChatManager.cs

@@ -5,81 +5,91 @@
 using Robust.Client.Console;
 using Robust.Shared.Utility;
 
-namespace Content.Client.Chat.Managers
+namespace Content.Client.Chat.Managers;
+
+internal sealed class ChatManager : IChatManager
 {
-    internal sealed class ChatManager : IChatManager
+    [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
+    [Dependency] private readonly IClientAdminManager _adminMgr = default!;
+    [Dependency] private readonly IEntitySystemManager _systems = default!;
+
+    private ISawmill _sawmill = default!;
+    public event Action? PermissionsUpdated; //Nyano - Summary: need to be able to update perms for new psionics.
+    public void Initialize()
     {
-        [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
-        [Dependency] private readonly IClientAdminManager _adminMgr = default!;
-        [Dependency] private readonly IEntitySystemManager _systems = default!;
+        _sawmill = Logger.GetSawmill("chat");
+        _sawmill.Level = LogLevel.Info;
+    }
 
-        private ISawmill _sawmill = default!;
-        public event Action? PermissionsUpdated; //Nyano - Summary: need to be able to update perms for new psionics.
-        public void Initialize()
-        {
-            _sawmill = Logger.GetSawmill("chat");
-            _sawmill.Level = LogLevel.Info;
-        }
+    public void SendAdminAlert(string message)
+    {
+        // See server-side manager. This just exists for shared code.
+    }
 
-        public void SendMessage(string text, ChatSelectChannel channel)
-        {
-            var str = text.ToString();
-            switch (channel)
-            {
-                case ChatSelectChannel.Console:
-                    // run locally
-                    _consoleHost.ExecuteCommand(text);
-                    break;
-
-                case ChatSelectChannel.LOOC:
-                    _consoleHost.ExecuteCommand($"looc \"{CommandParsing.Escape(str)}\"");
-                    break;
-
-                case ChatSelectChannel.OOC:
-                    _consoleHost.ExecuteCommand($"ooc \"{CommandParsing.Escape(str)}\"");
-                    break;
-
-                case ChatSelectChannel.Admin:
-                    _consoleHost.ExecuteCommand($"asay \"{CommandParsing.Escape(str)}\"");
-                    break;
-
-                case ChatSelectChannel.Emotes:
-                    _consoleHost.ExecuteCommand($"me \"{CommandParsing.Escape(str)}\"");
-                    break;
-
-                case ChatSelectChannel.Dead:
-                    if (_systems.GetEntitySystemOrNull<GhostSystem>() is {IsGhost: true})
-                        goto case ChatSelectChannel.Local;
-
-                    if (_adminMgr.HasFlag(AdminFlags.Admin))
-                        _consoleHost.ExecuteCommand($"dsay \"{CommandParsing.Escape(str)}\"");
-                    else
-                        _sawmill.Warning("Tried to speak on deadchat without being ghost or admin.");
-                    break;
-
-                // TODO sepearate radio and say into separate commands.
-                case ChatSelectChannel.Radio:
-                case ChatSelectChannel.Local:
-                    _consoleHost.ExecuteCommand($"say \"{CommandParsing.Escape(str)}\"");
-                    break;
-
-                case ChatSelectChannel.Whisper:
-                    _consoleHost.ExecuteCommand($"whisper \"{CommandParsing.Escape(str)}\"");
-                    break;
-
-                //Nyano - Summary: sends the command for telepath communication.
-                case ChatSelectChannel.Telepathic:
-                    _consoleHost.ExecuteCommand($"tsay \"{CommandParsing.Escape(str)}\"");
-                    break;
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(channel), channel, null);
-            }
-        }
-        //Nyano - Summary: fires off the update permissions script. 
-        public void UpdatePermissions()
+    public void SendAdminAlert(EntityUid player, string message)
+    {
+        // See server-side manager. This just exists for shared code.
+    }
+
+    public void SendMessage(string text, ChatSelectChannel channel)
+    {
+        var str = text.ToString();
+        switch (channel)
         {
-            PermissionsUpdated?.Invoke();
+            case ChatSelectChannel.Console:
+                // run locally
+                _consoleHost.ExecuteCommand(text);
+                break;
+
+            case ChatSelectChannel.LOOC:
+                _consoleHost.ExecuteCommand($"looc \"{CommandParsing.Escape(str)}\"");
+                break;
+
+            case ChatSelectChannel.OOC:
+                _consoleHost.ExecuteCommand($"ooc \"{CommandParsing.Escape(str)}\"");
+                break;
+
+            case ChatSelectChannel.Admin:
+                _consoleHost.ExecuteCommand($"asay \"{CommandParsing.Escape(str)}\"");
+                break;
+
+            case ChatSelectChannel.Emotes:
+                _consoleHost.ExecuteCommand($"me \"{CommandParsing.Escape(str)}\"");
+                break;
+
+            case ChatSelectChannel.Dead:
+                if (_systems.GetEntitySystemOrNull<GhostSystem>() is {IsGhost: true})
+                    goto case ChatSelectChannel.Local;
+
+                if (_adminMgr.HasFlag(AdminFlags.Admin))
+                    _consoleHost.ExecuteCommand($"dsay \"{CommandParsing.Escape(str)}\"");
+                else
+                    _sawmill.Warning("Tried to speak on deadchat without being ghost or admin.");
+                break;
+
+            // TODO sepearate radio and say into separate commands.
+            case ChatSelectChannel.Radio:
+            case ChatSelectChannel.Local:
+                _consoleHost.ExecuteCommand($"say \"{CommandParsing.Escape(str)}\"");
+                break;
+
+            case ChatSelectChannel.Whisper:
+                _consoleHost.ExecuteCommand($"whisper \"{CommandParsing.Escape(str)}\"");
+                break;
+
+            //Nyano - Summary: sends the command for telepath communication.
+            case ChatSelectChannel.Telepathic:
+                _consoleHost.ExecuteCommand($"tsay \"{CommandParsing.Escape(str)}\"");
+                break;
+
+            default:
+                throw new ArgumentOutOfRangeException(nameof(channel), channel, null);
         }
     }
+
+    //Nyano - Summary: fires off the update permissions script.
+    public void UpdatePermissions()
+    {
+        PermissionsUpdated?.Invoke();
+    }
 }

Content.Client/Chat/Managers/IChatManager.cs

@@ -2,10 +2,8 @@
 
 namespace Content.Client.Chat.Managers
 {
-    public interface IChatManager
+    public interface IChatManager : ISharedChatManager
     {
-        void Initialize();
-
         public void SendMessage(string text, ChatSelectChannel channel);
 
         /// <summary>

Content.Client/Entry/EntryPoint.cs

@@ -1,4 +1,3 @@
-using Content.Client._White.TTS;
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
@@ -73,7 +72,6 @@ public sealed class EntryPoint : GameClient
         [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly JoinQueueManager _joinQueue = default!;
         [Dependency] private readonly DiscordAuthManager _discordAuth = default!;
-        [Dependency] private readonly TTSManager _ttsManager = default!; // WD EDIT
 
         public override void Init()
         {
@@ -168,7 +166,6 @@ public override void PostInit()
             _documentParsingManager.Initialize();
             _joinQueue.Initialize();
             _discordAuth.Initialize();
-            _ttsManager.Initialize(); // WD EDIT
 
             _baseClient.RunLevelChanged += (_, args) =>
             {

Content.Client/IoC/ClientContentIoC.cs

@@ -1,4 +1,3 @@
-using Content.Client._White.TTS;
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
@@ -18,10 +17,12 @@
 using Content.Shared.Administration.Logs;
 using Content.Client.Guidebook;
 using Content.Client.Lobby;
+using Content.Client.Players.RateLimiting;
 using Content.Client.Replay;
 using Content.Shared.Administration.Managers;
+using Content.Shared.Chat;
 using Content.Shared.Players.PlayTimeTracking;
-
+using Content.Shared.Players.RateLimiting;
 
 namespace Content.Client.IoC
 {
@@ -33,6 +34,7 @@ public static void Register()
 
             collection.Register<IParallaxManager, ParallaxManager>();
             collection.Register<IChatManager, ChatManager>();
+            collection.Register<ISharedChatManager, ChatManager>();
             collection.Register<IClientPreferencesManager, ClientPreferencesManager>();
             collection.Register<IStylesheetManager, StylesheetManager>();
             collection.Register<IScreenshotHook, ScreenshotHook>();
@@ -51,9 +53,10 @@ public static void Register()
             collection.Register<DocumentParsingManager>();
             collection.Register<ContentReplayPlaybackManager, ContentReplayPlaybackManager>();
             collection.Register<ISharedPlaytimeManager, JobRequirementsManager>();
+            collection.Register<PlayerRateLimitManager>();
+            collection.Register<SharedPlayerRateLimitManager, PlayerRateLimitManager>();
             IoCManager.Register<JoinQueueManager>();
             IoCManager.Register<DiscordAuthManager>();
-            IoCManager.Register<TTSManager>(); // WD EDIT
         }
     }
 }

Content.Client/Players/RateLimiting/PlayerRateLimitManager.cs

@@ -0,0 +1,23 @@
+using Content.Shared.Players.RateLimiting;
+using Robust.Shared.Player;
+
+namespace Content.Client.Players.RateLimiting;
+
+public sealed class PlayerRateLimitManager : SharedPlayerRateLimitManager
+{
+    public override RateLimitStatus CountAction(ICommonSession player, string key)
+    {
+        // TODO Rate-Limit
+        // Add support for rate limit prediction
+        // I.e., dont mis-predict just because somebody is clicking too quickly.
+        return RateLimitStatus.Allowed;
+    }
+
+    public override void Register(string key, RateLimitRegistration registration)
+    {
+    }
+
+    public override void Initialize()
+    {
+    }
+}