Merge pull request #728 from fospas/fix_pda_message

NanoChatUpdate
fospas · Jan 1, 2025 · a3e919c · a3e919c
2 parents 84b0740 + 71ed523
commit a3e919c
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/Content.Server/_Cats/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs b/Content.Server/_Cats/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
@@ -24,6 +24,7 @@ public sealed class NanoChatCartridgeSystem : EntitySystem
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly SharedNanoChatSystem _nanoChat = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
     [Dependency] private readonly StationSystem _station = default!;
 
     // Messages in notifications get cut off after this point
@@ -38,6 +39,20 @@ public override void Initialize()
         SubscribeLocalEvent<NanoChatCartridgeComponent, CartridgeMessageEvent>(OnMessage);
     }
 
+    private void UpdateClosed(Entity<NanoChatCartridgeComponent> ent)
+    {
+        if (!TryComp<CartridgeComponent>(ent, out var cartridge) ||
+            cartridge.LoaderUid is not {} pda ||
+            !TryComp<CartridgeLoaderComponent>(pda, out var loader) ||
+            !GetCardEntity(pda, out var card))
+        {
+            return;
+        }
+
+        // if you switch to another program or close the pda UI, allow notifications for the selected chat
+        _nanoChat.SetClosed((card, card.Comp), loader.ActiveProgram != ent.Owner || !_ui.IsUiOpen(pda, PdaUiKey.Key));
+    }
+
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -49,6 +64,9 @@ public override void Update(float frameTime)
             if (cartridge.LoaderUid == null)
                 continue;
 
+            // keep it up to date without handling ui open/close events on the pda or adding code when changing active program
+            UpdateClosed((uid, nanoChat));
+
             // Check if we need to update our card reference
             if (!TryComp<PdaComponent>(cartridge.LoaderUid, out var pda))
                 continue;
@@ -381,8 +399,7 @@ private void DeliverMessageToRecipient(Entity<NanoChatCardComponent> sender,
 
         _nanoChat.AddMessage((recipient, recipient.Comp), senderNumber.Value, message with { DeliveryFailed = false });
 
-
-        if (_nanoChat.GetCurrentChat((recipient, recipient.Comp)) != senderNumber)
+        if (recipient.Comp.IsClosed || _nanoChat.GetCurrentChat((recipient, recipient.Comp)) != senderNumber)
             HandleUnreadNotification(recipient, message);
 
         var msgEv = new NanoChatMessageReceivedEvent(recipient);

diff --git a/Content.Shared/_Cats/NanoChat/NanoChatCardComponent.cs b/Content.Shared/_Cats/NanoChat/NanoChatCardComponent.cs
@@ -14,6 +14,13 @@ public sealed partial class NanoChatCardComponent : Component
     [DataField, AutoNetworkedField]
     public uint? Number;
 
+    /// <summary>
+    ///     Whether a PDA has this card's UI closed.
+    ///     Used for notifications.
+    /// </summary>
+    [DataField]
+    public bool IsClosed;
+
     /// <summary>
     ///     All chat recipients stored on this card.
     /// </summary>

diff --git a/Content.Shared/_Cats/NanoChat/SharedNanoChatSystem.cs b/Content.Shared/_Cats/NanoChat/SharedNanoChatSystem.cs
@@ -49,13 +49,24 @@ private void OnExamined(Entity<NanoChatCardComponent> ent, ref ExaminedEvent arg
     /// </summary>
     public void SetNumber(Entity<NanoChatCardComponent?> card, uint number)
     {
-        if (!Resolve(card, ref card.Comp))
+        if (!Resolve(card, ref card.Comp) || card.Comp.Number == number)
             return;
 
         card.Comp.Number = number;
         Dirty(card);
     }
 
+    /// <summary>
+    ///     Sets IsClosed for a card.
+    /// </summary>
+    public void SetClosed(Entity<NanoChatCardComponent?> card, bool closed)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return;
+
+        card.Comp.IsClosed = closed;
+    }
+
     /// <summary>
     ///     Gets the recipients dictionary from a card.
     /// </summary>
@@ -170,7 +181,7 @@ public bool GetNotificationsMuted(Entity<NanoChatCardComponent?> card)
     /// </summary>
     public void SetNotificationsMuted(Entity<NanoChatCardComponent?> card, bool muted)
     {
-        if (!Resolve(card, ref card.Comp))
+        if (!Resolve(card, ref card.Comp) || card.Comp.NotificationsMuted == muted)
             return;
 
         card.Comp.NotificationsMuted = muted;