Merge remote-tracking branch 'refs/remotes/sunrise_public/master'

kanopus952 · Jan 22, 2025 · a3a4e47 · a3a4e47
2 parents 2bc550c + d44fffa
commit a3a4e47
Show file tree

Hide file tree

Showing 106 changed files with 252,436 additions and 57,069 deletions.
diff --git a/Content.Client/Options/UI/Tabs/ExtraTab.xaml b/Content.Client/Options/UI/Tabs/ExtraTab.xaml
@@ -32,6 +32,7 @@
 
                 <!-- Graphics -->
                 <Label Text="{Loc 'ui-options-sunrise-general-graphics'}" StyleClasses="LabelKeyText"/>
+                <CheckBox Name="ChatIconsEnableCheckBox" Text="{Loc 'ui-options-chat-icons-enable'}" />
 
             </BoxContainer>
         </ScrollContainer>

diff --git a/Content.Client/Options/UI/Tabs/ExtraTab.xaml.cs b/Content.Client/Options/UI/Tabs/ExtraTab.xaml.cs
@@ -92,6 +92,8 @@ public ExtraTab()
         Control.AddOptionCheckBox(SunriseCCVars.DamageOverlaySelf, DamageOverlaySelfCheckBox);
         Control.AddOptionCheckBox(SunriseCCVars.DamageOverlayStructures, DamageOverlayStructuresCheckBox);
 
+        Control.AddOptionCheckBox(SunriseCCVars.ChatIconsEnable, ChatIconsEnableCheckBox);
+
         Control.Initialize();
     }
 

diff --git a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
@@ -13,6 +13,7 @@
 using Robust.Shared.Input;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
+using System.Linq;
 using static Robust.Client.UserInterface.Controls.LineEdit;
 
 namespace Content.Client.UserInterface.Systems.Chat.Widgets;
@@ -81,7 +82,7 @@ private void OnChannelSelect(ChatSelectChannel channel)
 
     public void Repopulate()
     {
-        Contents.Clear();
+        ClearChatContents(); // Sunrise
 
         foreach (var message in _controller.History)
         {
@@ -91,7 +92,7 @@ public void Repopulate()
 
     private void OnChannelFilter(ChatChannel channel, bool active)
     {
-        Contents.Clear();
+        ClearChatContents(); // Sunrise
 
         foreach (var message in _controller.History)
         {
@@ -104,6 +105,21 @@ private void OnChannelFilter(ChatChannel channel, bool active)
         }
     }
 
+    // Sunrise start
+    private void ClearChatContents()
+    {
+        Contents.Clear();
+
+        foreach (var child in Contents.Children.ToArray())
+        {
+            if (child.Name != "_v_scroll")
+            {
+                Contents.RemoveChild(child);
+            }
+        }
+    }
+    // Sunrise end
+
     public void AddLine(string message, Color color)
     {
         var formatted = new FormattedMessage(3);

diff --git a/Content.Client/_Sunrise/ChatIcons/RadioIconsSystem.cs b/Content.Client/_Sunrise/ChatIcons/RadioIconsSystem.cs
@@ -0,0 +1,31 @@
+using Content.Client.UserInterface.Systems.Chat;
+using Content.Shared._Sunrise.SunriseCCVars;
+using Robust.Client.UserInterface;
+using Robust.Shared.Configuration;
+
+namespace Content.Client._Sunrise.ChatIcons;
+
+public sealed class ChatIconsSystem : EntitySystem
+{
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IUserInterfaceManager _uiMan = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _cfg.OnValueChanged(SunriseCCVars.ChatIconsEnable, OnRadioIconsChanged, true);
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+
+        _cfg.UnsubValueChanged(SunriseCCVars.ChatIconsEnable, OnRadioIconsChanged);
+    }
+
+    private void OnRadioIconsChanged(bool enable)
+    {
+        _uiMan.GetUIController<ChatUIController>().Repopulate();
+    }
+}
diff --git a/Content.Client/_Sunrise/UserInterface/RichText/RadioIconTag.cs b/Content.Client/_Sunrise/UserInterface/RichText/RadioIconTag.cs
@@ -0,0 +1,100 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Numerics;
+using Content.Shared._Sunrise.SunriseCCVars;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.RichText;
+using Robust.Shared.Configuration;
+using Robust.Shared.Utility;
+
+namespace Content.Client._Sunrise.UserInterface.RichText;
+
+public sealed class RadioIconTag : IMarkupTag
+{
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IResourceCache _cache = default!;
+
+    public string Name => "radicon";
+
+    /// <inheritdoc/>
+    public bool TryGetControl(MarkupNode node, [NotNullWhen(true)] out Control? control)
+    {
+        if (_cfg.GetCVar(SunriseCCVars.ChatIconsEnable))
+        {
+            if (!node.Attributes.TryGetValue("path", out var rawPath))
+            {
+                control = null;
+                return false;
+            }
+
+            if (!node.Attributes.TryGetValue("scale", out var scale) || !scale.TryGetLong(out var scaleValue))
+            {
+                scaleValue = 1;
+            }
+
+            control = DrawIcon(rawPath.ToString(), scaleValue.Value);
+        }
+        else
+        {
+            if (!node.Attributes.TryGetValue("text", out var text))
+            {
+                control = null;
+                return false;
+            }
+
+            if (!node.Attributes.TryGetValue("color", out var color))
+            {
+                control = null;
+                return false;
+            }
+
+            control = DrawText(text.ToString(), color.ToString());
+        }
+
+        return true;
+    }
+
+    private Control DrawIcon(string path, long scaleValue)
+    {
+        var texture = new TextureRect();
+
+        path = ClearString(path);
+
+        texture.TexturePath = path;
+        texture.TextureScale = new Vector2(scaleValue, scaleValue);
+
+        return texture;
+    }
+
+    private Control DrawText(string text, string color)
+    {
+        var label = new Label();
+
+        color = ClearString(color);
+        text = ClearString(text);
+
+        label.Text = text;
+        label.FontColorOverride = Color.FromHex(color);
+        label.FontOverride = new VectorFont(_cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Bold.ttf"), 13);
+
+        return label;
+    }
+
+    /// <summary>
+    /// Очищает строку от мусора, который приходит вместе с ней
+    /// </summary>
+    /// <remarks>
+    /// Почему мне приходят строки в говне
+    /// </remarks>
+    private static string ClearString(string str)
+    {
+        str = str.Replace("=", "");
+        str = str.Replace(" ", "");
+        str = str.Replace("\"", "");
+
+        return str;
+    }
+
+}
diff --git a/Content.Client/_Sunrise/UserInterface/RichText/TextureTag.cs b/Content.Client/_Sunrise/UserInterface/RichText/TextureTag.cs
@@ -0,0 +1,42 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Numerics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.RichText;
+
+using Robust.Shared.Utility;
+
+namespace Content.Client._Sunrise.UserInterface.RichText;
+
+public sealed class TextureTag : IMarkupTag
+{
+    public string Name => "tex";
+
+    /// <inheritdoc/>
+    public bool TryGetControl(MarkupNode node, [NotNullWhen(true)] out Control? control)
+    {
+        if (!node.Attributes.TryGetValue("path", out var rawPath))
+        {
+            control = null;
+            return false;
+        }
+
+        if (!node.Attributes.TryGetValue("scale", out var scale) || !scale.TryGetLong(out var scaleValue))
+        {
+            scaleValue = 1;
+        }
+
+        var texture = new TextureRect();
+
+        var path = rawPath.ToString();
+        path = path.Replace("=", "");
+        path = path.Replace(" ", "");
+        path = path.Replace("\"", "");
+
+        texture.TexturePath = path;
+        texture.TextureScale = new Vector2(scaleValue.Value, scaleValue.Value);
+
+        control = texture;
+        return true;
+    }
+}
diff --git a/Content.Server/Administration/Managers/BanManager.Notification.cs b/Content.Server/Administration/Managers/BanManager.Notification.cs
@@ -1,6 +1,4 @@
-using System.Text.Json;
 using System.Text.Json.Serialization;
-using Content.Server.Database;
 
 namespace Content.Server.Administration.Managers;
 
@@ -30,36 +28,15 @@ public sealed partial class BanManager
     private TimeSpan _banNotificationRateLimitStart;
     private int _banNotificationRateLimitCount;
 
-    private void OnDatabaseNotification(DatabaseNotification notification)
+    private bool OnDatabaseNotificationEarlyFilter()
     {
-        if (notification.Channel != BanNotificationChannel)
-            return;
-
-        if (notification.Payload == null)
-        {
-            _sawmill.Error("Got ban notification with null payload!");
-            return;
-        }
-
-        BanNotificationData data;
-        try
-        {
-            data = JsonSerializer.Deserialize<BanNotificationData>(notification.Payload)
-                   ?? throw new JsonException("Content is null");
-        }
-        catch (JsonException e)
-        {
-            _sawmill.Error($"Got invalid JSON in ban notification: {e}");
-            return;
-        }
-
         if (!CheckBanRateLimit())
         {
             _sawmill.Verbose("Not processing ban notification due to rate limit");
-            return;
+            return false;
         }
 
-        _taskManager.RunOnMainThread(() => ProcessBanNotification(data));
+        return true;
     }
 
     private async void ProcessBanNotification(BanNotificationData data)

diff --git a/Content.Server/Administration/Managers/BanManager.cs b/Content.Server/Administration/Managers/BanManager.cs
@@ -75,7 +75,12 @@ public void Initialize()
     {
         _netManager.RegisterNetMessage<MsgRoleBans>();
 
-        _db.SubscribeToNotifications(OnDatabaseNotification);
+        _db.SubscribeToJsonNotification<BanNotificationData>(
+            _taskManager,
+            _sawmill,
+            BanNotificationChannel,
+            ProcessBanNotification,
+            OnDatabaseNotificationEarlyFilter);
 
         _userDbData.AddOnLoadPlayer(CachePlayerData);
         _userDbData.AddOnPlayerDisconnect(ClearPlayerData);