From b4682bfa8a912651f831bf934d8735c7f92af3a6 Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Mon, 6 Jan 2025 19:40:37 +0800
Subject: [PATCH 01/14] NanoChat Notification Fix

---
 .../Cartridges/NanoChatCartridgeSystem.cs     | 75 +++++++------------
 .../DeltaV/NanoChat/NanoChatSystem.cs         | 24 ++++++
 .../DeltaV/NanoChat/NanoChatCardComponent.cs  |  6 ++
 3 files changed, 55 insertions(+), 50 deletions(-)

diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
index e9e01041f15..a784e0c6410 100644
--- a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
@@ -38,25 +38,6 @@ public override void Initialize()
 
         SubscribeLocalEvent<NanoChatCartridgeComponent, CartridgeUiReadyEvent>(OnUiReady);
         SubscribeLocalEvent<NanoChatCartridgeComponent, CartridgeMessageEvent>(OnMessage);
-
-        Subs.BuiEvents<PdaComponent>(PdaUiKey.Key, subs =>
-        {
-            subs.Event<BoundUIClosedEvent>(OnPdaClosed);
-        });
-    }
-
-    // Reset current chat when PDA closes.
-    private void OnPdaClosed(EntityUid uid, PdaComponent component, BoundUIClosedEvent args)
-    {
-        var exists = GetCardEntity(uid, out var cardEntity);
-
-        if (!exists)
-            return;
-
-        _nanoChat.SetCurrentChat(
-            (cardEntity.Owner, (NanoChatCardComponent?) cardEntity.Comp),
-            null
-        );
     }
 
     public override void Update(float frameTime)
@@ -401,7 +382,7 @@ private void DeliverMessageToRecipient(Entity<NanoChatCardComponent> sender,
             return;
 
         _nanoChat.AddMessage((recipient, recipient.Comp), senderNumber.Value, message with { DeliveryFailed = false });
-        HandleUnreadNotification(recipient, message);
+        HandleUnreadNotification(recipient, message, (uint) senderNumber);
 
         var msgEv = new NanoChatMessageReceivedEvent(recipient);
         RaiseLocalEvent(ref msgEv);
@@ -411,42 +392,36 @@ private void DeliverMessageToRecipient(Entity<NanoChatCardComponent> sender,
     /// <summary>
     ///     Handles unread message notifications and updates unread status.
     /// </summary>
-    private void HandleUnreadNotification(Entity<NanoChatCardComponent> recipient, NanoChatMessage message)
+    private void HandleUnreadNotification(Entity<NanoChatCardComponent> recipient,
+        NanoChatMessage message,
+        uint senderNumber)
     {
         // Get sender name from contacts or fall back to number
         var recipients = _nanoChat.GetRecipients((recipient, recipient.Comp));
-        var senderName = recipients.TryGetValue(message.SenderId, out var existingRecipient)
-            ? existingRecipient.Name
+        var senderName = recipients.TryGetValue(message.SenderId, out var senderRecipient)
+            ? senderRecipient.Name
             : $"#{message.SenderId:D4}";
-
-        var shouldUnread = true;
-
-        if (!recipient.Comp.Recipients[message.SenderId].HasUnread && !recipient.Comp.NotificationsMuted)
-        {
-            var pdaQuery = EntityQueryEnumerator<PdaComponent>();
-            while (pdaQuery.MoveNext(out var pdaUid, out var pdaComp))
-            {
-                if (pdaComp.ContainedId != recipient)
-                    continue;
-
-                if (_ui.IsUiOpen((pdaUid, null), PdaUiKey.Key) && recipient.Comp.CurrentChat == message.SenderId)
-                {
-                    shouldUnread = false;
-                    break;
-                }
-
-                _cartridge.SendNotification(pdaUid,
-                    Loc.GetString("nano-chat-new-message-title", ("sender", senderName)),
-                    Loc.GetString("nano-chat-new-message-body", ("message", TruncateMessage(message.Content))));
-                break;
-            }
-        }
+        var hasSelectedCurrentChat = _nanoChat.GetCurrentChat((recipient, recipient.Comp)) == senderNumber;
 
         // Update unread status
-        _nanoChat.SetRecipient(
-            (recipient, recipient.Comp),
-            message.SenderId,
-            existingRecipient with { HasUnread = shouldUnread });
+        if (!hasSelectedCurrentChat)
+            _nanoChat.SetRecipient((recipient, recipient.Comp),
+                message.SenderId,
+                senderRecipient with { HasUnread = true });
+
+        if (recipient.Comp.NotificationsMuted ||
+            recipient.Comp.PdaUid is not {} pdaUid ||
+            !TryComp<CartridgeLoaderComponent>(pdaUid, out var loader) ||
+            // Don't notify if the recipient has the NanoChat program open with this chat selected.
+            (hasSelectedCurrentChat &&
+                _ui.IsUiOpen(pdaUid, PdaUiKey.Key) &&
+                HasComp<NanoChatCartridgeComponent>(loader.ActiveProgram)))
+            return;
+
+        _cartridge.SendNotification(pdaUid,
+            Loc.GetString("nano-chat-new-message-title", ("sender", senderName)),
+            Loc.GetString("nano-chat-new-message-body", ("message", TruncateMessage(message.Content))),
+            loader);
     }
 
     /// <summary>
diff --git a/Content.Server/DeltaV/NanoChat/NanoChatSystem.cs b/Content.Server/DeltaV/NanoChat/NanoChatSystem.cs
index fb0ca32aa66..87a174a4fce 100644
--- a/Content.Server/DeltaV/NanoChat/NanoChatSystem.cs
+++ b/Content.Server/DeltaV/NanoChat/NanoChatSystem.cs
@@ -7,6 +7,8 @@
 using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
 using Content.Shared.DeltaV.NanoChat;
 using Content.Shared.NameIdentifier;
+using Content.Shared.PDA;
+using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
@@ -26,10 +28,32 @@ public sealed class NanoChatSystem : SharedNanoChatSystem
     public override void Initialize()
     {
         base.Initialize();
+
+        SubscribeLocalEvent<NanoChatCardComponent, EntGotInsertedIntoContainerMessage>(OnInserted);
+        SubscribeLocalEvent<NanoChatCardComponent, EntGotRemovedFromContainerMessage>(OnRemoved);
+
         SubscribeLocalEvent<NanoChatCardComponent, MapInitEvent>(OnCardInit);
         SubscribeLocalEvent<NanoChatCardComponent, BeingMicrowavedEvent>(OnMicrowaved, after: [typeof(IdCardSystem)]);
     }
 
+    private void OnInserted(Entity<NanoChatCardComponent> ent, ref EntGotInsertedIntoContainerMessage args)
+    {
+        if (args.Container.ID != PdaComponent.PdaIdSlotId)
+            return;
+
+        ent.Comp.PdaUid = args.Container.Owner;
+        Dirty(ent);
+    }
+
+    private void OnRemoved(Entity<NanoChatCardComponent> ent, ref EntGotRemovedFromContainerMessage args)
+    {
+        if (args.Container.ID != PdaComponent.PdaIdSlotId)
+            return;
+
+        ent.Comp.PdaUid = null;
+        Dirty(ent);
+    }
+
     private void OnMicrowaved(Entity<NanoChatCardComponent> ent, ref BeingMicrowavedEvent args)
     {
         // Skip if the entity was deleted (e.g., by ID card system burning it)
diff --git a/Content.Shared/DeltaV/NanoChat/NanoChatCardComponent.cs b/Content.Shared/DeltaV/NanoChat/NanoChatCardComponent.cs
index 7e40be79832..03caf4a618c 100644
--- a/Content.Shared/DeltaV/NanoChat/NanoChatCardComponent.cs
+++ b/Content.Shared/DeltaV/NanoChat/NanoChatCardComponent.cs
@@ -49,4 +49,10 @@ public sealed partial class NanoChatCardComponent : Component
     /// </summary>
     [DataField]
     public bool NotificationsMuted;
+
+    /// <summary>
+    ///     The PDA that this card is currently inserted to.
+    /// </summary>
+    [DataField]
+    public EntityUid? PdaUid = null;
 }

From 96bf27a99d11bd2eb07353268a8dcf82e582566f Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Mon, 6 Jan 2025 19:44:11 +0800
Subject: [PATCH 02/14] Use correct title for editing a contact

---
 .../DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml
index 76a8513796b..11c6ed4787d 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml
@@ -1,5 +1,5 @@
 <DefaultWindow xmlns="https://spacestation14.io"
-               Title="{Loc nano-chat-new-title}"
+               Title="{Loc nano-chat-edit-title}"
                MinSize="300 200">
     <PanelContainer StyleClasses="AngleRect">
         <BoxContainer Orientation="Vertical" Margin="4">

From 7755048ed60d9b2e3557ab1853a2c5feae409709 Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Tue, 7 Jan 2025 01:56:22 +0800
Subject: [PATCH 03/14] rename Edit Chat 'Create' button to 'Confirm'

---
 .../DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml     | 4 ++--
 .../DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs  | 4 ++--
 .../Locale/en-US/deltav/cartridge-loader/cartridges.ftl      | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml
index 11c6ed4787d..3b229e824a8 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml
@@ -42,8 +42,8 @@
                         Text="{Loc nano-chat-cancel}"
                         StyleClasses="OpenRight"
                         MinSize="80 0" />
-                <Button Name="CreateButton"
-                        Text="{Loc nano-chat-create}"
+                <Button Name="ConfirmButton"
+                        Text="{Loc nano-chat-confirm}"
                         StyleClasses="OpenLeft"
                         MinSize="80 0"
                         Disabled="True" />
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs
index 5ab492bb530..de4fdb38b5a 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs
@@ -23,7 +23,7 @@ public EditChatPopup()
 
         // Button handlers
         CancelButton.OnPressed += _ => Close();
-        CreateButton.OnPressed += _ => EditChat();
+        ConfirmButton.OnPressed += _ => EditChat();
 
         // Input validation
         NameInput.OnTextChanged += _ => ValidateInputs();
@@ -61,7 +61,7 @@ private void ValidateInputs()
             !string.IsNullOrWhiteSpace(NameInput.Text) &&
             uint.TryParse(NumberInput.Text, out _);
 
-        CreateButton.Disabled = !isValid;
+        ConfirmButton.Disabled = !isValid;
     }
 
     private void EditChat()
diff --git a/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
index 5c5a5c0a418..45a53e0f214 100644
--- a/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
+++ b/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
@@ -183,7 +183,6 @@ nano-chat-delivery-failed = Failed to deliver
 
 # Create chat popup
 nano-chat-new-title = Add a new chat
-nano-chat-edit-title = Edit a contact
 nano-chat-number-label = Number
 nano-chat-name-label = Name
 nano-chat-job-label = Job title
@@ -193,6 +192,10 @@ nano-chat-job-placeholder = Enter a job title (optional)
 nano-chat-cancel = Cancel
 nano-chat-create = Create
 
+# Edit chat popup
+nano-chat-edit-title = Edit a contact
+nano-chat-confirm = Confirm
+
 # LogProbe additions
 log-probe-scan-nanochat = Scanned {$card}'s NanoChat logs
 log-probe-header-access = Access Log Scanner

From dd9b56a91f121ccc2ca868b40064d6bc6ff159ab Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Tue, 7 Jan 2025 01:58:55 +0800
Subject: [PATCH 04/14] Edit chat without deselecting chat

---
 .../Cartridges/NanoChatUiFragment.xaml.cs     |  3 +--
 .../Cartridges/NanoChatCartridgeSystem.cs     | 23 +++++++++++++++++++
 .../Cartridges/NanoChatUiMessageEvent.cs      |  1 +
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
index 3b2342e974d..31eaa58ca8e 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
@@ -50,8 +50,7 @@ private void SetupEventHandlers()
 
         _editChatPopup.OnContactEdited += (number, name, job) =>
         {
-            DeleteCurrentChat();
-            ActionSendUiMessage?.Invoke(NanoChatUiMessageType.NewChat, number, name, job);
+            ActionSendUiMessage?.Invoke(NanoChatUiMessageType.EditChat, number, name, job);
         };
 
         NewChatButton.OnPressed += _ =>
diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
index a784e0c6410..efcd76e261c 100644
--- a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
@@ -89,6 +89,9 @@ private void OnMessage(Entity<NanoChatCartridgeComponent> ent, ref CartridgeMess
             case NanoChatUiMessageType.SelectChat:
                 HandleSelectChat(card, msg);
                 break;
+            case NanoChatUiMessageType.EditChat:
+                HandleEditChat(card, msg);
+                break;
             case NanoChatUiMessageType.CloseChat:
                 HandleCloseChat(card);
                 break;
@@ -172,6 +175,26 @@ private void HandleSelectChat(Entity<NanoChatCardComponent> card, NanoChatUiMess
         }
     }
 
+    /// <summary>
+    ///     Handles editing the current chat conversation.
+    /// </summary>
+    private void HandleEditChat(Entity<NanoChatCardComponent> card, NanoChatUiMessageEvent msg)
+    {
+        if (msg.RecipientNumber == null || msg.Content == null || msg.RecipientNumber == card.Comp.Number ||
+            _nanoChat.GetRecipient((card, card.Comp), msg.RecipientNumber.Value) is not {} recipient)
+            return;
+
+        // Update recipient
+        recipient.Name = msg.Content;
+        recipient.JobTitle = msg.RecipientJob;
+
+        _nanoChat.SetRecipient((card, card.Comp), msg.RecipientNumber.Value, recipient);
+
+        var recipientEv = new NanoChatRecipientUpdatedEvent(card);
+        RaiseLocalEvent(ref recipientEv);
+        UpdateUIForCard(card);
+    }
+
     /// <summary>
     ///     Handles closing the current chat conversation.
     /// </summary>
diff --git a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs
index 8cb2efa900f..377f01004ef 100644
--- a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs
+++ b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs
@@ -50,6 +50,7 @@ public enum NanoChatUiMessageType : byte
 {
     NewChat,
     SelectChat,
+    EditChat,
     CloseChat,
     SendMessage,
     DeleteChat,

From 7d2edf0a914e548ed3d5b80c8dfd193f314432ec Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Tue, 7 Jan 2025 01:59:16 +0800
Subject: [PATCH 05/14] set PDA disk space from 5 to 8 to ensure enough space
 for NanoChat

wizden pda disk space is now 8 as of writing
---
 Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs b/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs
index c9cd710c522..f47112c7943 100644
--- a/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs
+++ b/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs
@@ -33,7 +33,7 @@ public sealed partial class CartridgeLoaderComponent : Component
     /// The maximum amount of programs that can be installed on the cartridge loader entity
     /// </summary>
     [DataField]
-    public int DiskSpace = 5;
+    public int DiskSpace = 8;
 
     /// <summary>
     /// Controls whether the cartridge loader will play notifications if it supports it at all

From 07dd16c6e355fd64dc8c0a7ac1adfb493ea22fca Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Tue, 7 Jan 2025 02:29:00 +0800
Subject: [PATCH 06/14] add icon for edit chat button

---
 .../Cartridges/NanoChatUiFragment.xaml           |   5 ++++-
 .../Textures/Interface/VerbIcons/ATTRIBUTION.txt |   5 ++++-
 .../Textures/Interface/VerbIcons/edit.svg.png    | Bin 0 -> 4909 bytes
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Textures/Interface/VerbIcons/edit.svg.png

diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
index 8fe07cee94c..3567d533eeb 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
@@ -35,12 +35,15 @@
                        VerticalAlignment="Center"
                        Margin="0 0 8 0" />
                 <Button Name="EditChatButton"
-                        Text="E"
                         MaxSize="32 32"
                         Visible="False"
                         StyleClasses="OpenBoth"
                         Margin="0 0 4 0"
                         ToolTip="{Loc nano-chat-edit}">
+                    <TextureRect StyleClasses="ButtonSquare"
+                                 TexturePath="/Textures/Interface/VerbIcons/edit.svg.png"
+                                 Stretch="KeepAspectCentered"
+                                 MinSize="18 18" />
                 </Button>
                 <Button Name="DeleteChatButton"
                         MaxSize="32 32"
diff --git a/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt b/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
index 69aa4650b32..ac76f535c48 100644
--- a/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
+++ b/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
@@ -9,4 +9,7 @@ unlock.svg by Delapouite under CC BY 3.0
 https://game-icons.net/1x1/delapouite/padlock-open.html
 
 healing_word.png by LeonardoDaBepis under CC BY 3.0
-revivify.png by LeonardoDaBepis under CC BY 3.0
\ No newline at end of file
+revivify.png by LeonardoDaBepis under CC BY 3.0
+
+edit.svg.png by H2D2 Design under MIT License
+https://www.svgrepo.com/svg/453928/edit
diff --git a/Resources/Textures/Interface/VerbIcons/edit.svg.png b/Resources/Textures/Interface/VerbIcons/edit.svg.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a59aba6afa29b604618ab2832bbf9a76b43be75
GIT binary patch
literal 4909
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

literal 0
HcmV?d00001


From 97990ea5bafa6ff12b32acdaf4418ace63aebe70 Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Tue, 7 Jan 2025 02:42:15 +0800
Subject: [PATCH 07/14] validate NanoChat message length & new chat name/job
 title length

port of commit https://github.com/Goob-Station/Goob-Station/pull/1269/commits/c063001ca97df3cd4ea69639b8f9c0cb9e51fc90
---
 .../Cartridges/NanoChatUiFragment.xaml.cs     | 16 +++++----
 .../Cartridges/NanoChatCartridgeSystem.cs     | 34 ++++++++++++++++---
 .../Cartridges/NanoChatUiMessageEvent.cs      |  2 ++
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
index 31eaa58ca8e..3e0da6c81e8 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
@@ -18,8 +18,6 @@ public sealed partial class NanoChatUiFragment : BoxContainer
 {
     [Dependency] private readonly IGameTiming _timing = default!;
 
-    private const int MaxMessageLength = 256;
-
     private readonly NewChatPopup _newChatPopup;
     private readonly EditChatPopup _editChatPopup;
     private uint? _currentChat;
@@ -70,18 +68,18 @@ private void SetupEventHandlers()
         {
             var length = args.Text.Length;
             var isValid = !string.IsNullOrWhiteSpace(args.Text) &&
-                          length <= MaxMessageLength &&
+                          length <= NanoChatMessage.MaxContentLength &&
                           (_currentChat != null || _pendingChat != null);
 
             SendButton.Disabled = !isValid;
 
             // Show character count when over limit
-            CharacterCount.Visible = length > MaxMessageLength;
-            if (length > MaxMessageLength)
+            CharacterCount.Visible = length > NanoChatMessage.MaxContentLength;
+            if (length > NanoChatMessage.MaxContentLength)
             {
                 CharacterCount.Text = Loc.GetString("nano-chat-message-too-long",
                     ("current", length),
-                    ("max", MaxMessageLength));
+                    ("max", NanoChatMessage.MaxContentLength));
                 CharacterCount.StyleClasses.Add("LabelDanger");
             }
         };
@@ -99,6 +97,12 @@ private void SendMessage()
             return;
 
         var messageContent = MessageInput.Text;
+        if (!string.IsNullOrWhiteSpace(messageContent))
+        {
+            messageContent = messageContent.Trim();
+            if (messageContent.Length > NanoChatMessage.MaxContentLength)
+                messageContent = messageContent[..NanoChatMessage.MaxContentLength];
+        }
 
         // Add predicted message
         var predictedMessage = new NanoChatMessage(
diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
index efcd76e261c..091ca24f926 100644
--- a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
@@ -139,17 +139,33 @@ private void HandleNewChat(Entity<NanoChatCardComponent> card, NanoChatUiMessage
         if (msg.RecipientNumber == null || msg.Content == null || msg.RecipientNumber == card.Comp.Number)
             return;
 
+        var name = msg.Content;
+        if (!string.IsNullOrWhiteSpace(name))
+        {
+            name = name.Trim();
+            if (name.Length > IdCardConsoleComponent.MaxFullNameLength)
+                name = name[..IdCardConsoleComponent.MaxFullNameLength];
+        }
+
+        var jobTitle = msg.RecipientJob;
+        if (!string.IsNullOrWhiteSpace(jobTitle))
+        {
+            jobTitle = jobTitle.Trim();
+            if (jobTitle.Length > IdCardConsoleComponent.MaxJobTitleLength)
+                jobTitle = jobTitle[..IdCardConsoleComponent.MaxJobTitleLength];
+        }
+
         // Add new recipient
         var recipient = new NanoChatRecipient(msg.RecipientNumber.Value,
-            msg.Content,
-            msg.RecipientJob);
+            name,
+            jobTitle);
 
         // Initialize or update recipient
         _nanoChat.SetRecipient((card, card.Comp), msg.RecipientNumber.Value, recipient);
 
         _adminLogger.Add(LogType.Action,
             LogImpact.Low,
-            $"{ToPrettyString(msg.Actor):user} created new NanoChat conversation with #{msg.RecipientNumber:D4} ({msg.Content})");
+            $"{ToPrettyString(msg.Actor):user} created new NanoChat conversation with #{msg.RecipientNumber:D4} ({name})");
 
         var recipientEv = new NanoChatRecipientUpdatedEvent(card);
         RaiseLocalEvent(ref recipientEv);
@@ -246,10 +262,18 @@ private void HandleSendMessage(Entity<NanoChatCartridgeComponent> cartridge,
         if (!EnsureRecipientExists(card, msg.RecipientNumber.Value))
             return;
 
+        var content = msg.Content;
+        if (!string.IsNullOrWhiteSpace(content))
+        {
+            content = content.Trim();
+            if (content.Length > NanoChatMessage.MaxContentLength)
+                content = content[..NanoChatMessage.MaxContentLength];
+        }
+
         // Create and store message for sender
         var message = new NanoChatMessage(
             _timing.CurTime,
-            msg.Content,
+            content,
             (uint)card.Comp.Number
         );
 
@@ -269,7 +293,7 @@ private void HandleSendMessage(Entity<NanoChatCartridgeComponent> cartridge,
 
         _adminLogger.Add(LogType.Chat,
             LogImpact.Low,
-            $"{ToPrettyString(card):user} sent NanoChat message to {recipientsText}: {msg.Content}{(deliveryFailed ? " [DELIVERY FAILED]" : "")}");
+            $"{ToPrettyString(card):user} sent NanoChat message to {recipientsText}: {content}{(deliveryFailed ? " [DELIVERY FAILED]" : "")}");
 
         var msgEv = new NanoChatMessageReceivedEvent(card);
         RaiseLocalEvent(ref msgEv);
diff --git a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs
index 377f01004ef..d6c64e074a4 100644
--- a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs
+++ b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs
@@ -100,6 +100,8 @@ public NanoChatRecipient(uint number, string name, string? jobTitle = null, bool
 [Serializable, NetSerializable, DataRecord]
 public struct NanoChatMessage
 {
+    public const int MaxContentLength = 256;
+
     /// <summary>
     ///     When the message was sent.
     /// </summary>

From 8a051e2b861aeb0aade532aef57c9039d7f6ef8b Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Tue, 7 Jan 2025 03:07:21 +0800
Subject: [PATCH 08/14] make edit chat confirm validation more robust

Will now make the Confirm button valid when any input (number, name, job title)
has changes from the original
---
 .../Cartridges/EditChatPopup.xaml.cs          | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs
index de4fdb38b5a..dbbc5e1cbe0 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs
@@ -12,6 +12,12 @@ public sealed partial class EditChatPopup : DefaultWindow
     private const int MaxInputLength = 16;
     private const int MaxNumberLength = 4;
 
+    // Used to see if the user input is different from the original data
+    // to check if the user can submit
+    private string OriginalNumber = "";
+    private string OriginalName = "";
+    private string OriginalJob = "";
+
     public event Action<uint, string, string?>? OnContactEdited;
 
     public EditChatPopup()
@@ -39,6 +45,7 @@ public EditChatPopup()
         {
             if (args.Text.Length > MaxInputLength)
                 JobInput.Text = args.Text[..MaxInputLength];
+            ValidateInputs();
         };
 
         NumberInput.OnTextChanged += args =>
@@ -59,7 +66,11 @@ private void ValidateInputs()
     {
         var isValid = !string.IsNullOrWhiteSpace(NumberInput.Text) &&
             !string.IsNullOrWhiteSpace(NameInput.Text) &&
-            uint.TryParse(NumberInput.Text, out _);
+            uint.TryParse(NumberInput.Text, out _) &&
+            // Only valid if there are any changes
+            (NumberInput.Text != OriginalNumber ||
+            NameInput.Text != OriginalName ||
+            JobInput.Text != OriginalJob);
 
         ConfirmButton.Disabled = !isValid;
     }
@@ -83,7 +94,21 @@ public void ClearInputs()
         ValidateInputs();
     }
 
-    public void SetNumberInput(string newNumber) => NumberInput.Text = newNumber;
-    public void SetNameInput(string newName) => NameInput.Text = newName;
-    public void SetJobInput(string newJob) => JobInput.Text = newJob;
+    public void SetNumberInput(string newNumber)
+    {
+        NumberInput.Text = newNumber;
+        OriginalNumber = newNumber;
+    }
+
+    public void SetNameInput(string newName)
+    {
+        NameInput.Text = newName;
+        OriginalName = newName;
+    }
+
+    public void SetJobInput(string newJob)
+    {
+        JobInput.Text = newJob;
+        OriginalJob = newJob;
+    }
 }

From 17aac9896c90fc47e957407cd7bd0e008c780033 Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Tue, 7 Jan 2025 03:44:22 +0800
Subject: [PATCH 09/14] add job title to NanoChat notification

---
 .../CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs   | 6 +++++-
 .../Locale/en-US/deltav/cartridge-loader/cartridges.ftl     | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
index 091ca24f926..f4189037239 100644
--- a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
@@ -466,7 +466,11 @@ recipient.Comp.PdaUid is not {} pdaUid ||
             return;
 
         _cartridge.SendNotification(pdaUid,
-            Loc.GetString("nano-chat-new-message-title", ("sender", senderName)),
+            !String.IsNullOrEmpty(senderRecipient.JobTitle)
+                ? Loc.GetString("nano-chat-new-message-title-job",
+                    ("sender", senderName), ("jobTitle", senderRecipient.JobTitle))
+                : Loc.GetString("nano-chat-new-message-title",
+                    ("sender", senderName)),
             Loc.GetString("nano-chat-new-message-body", ("message", TruncateMessage(message.Content))),
             loader);
     }
diff --git a/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
index 45a53e0f214..3454e8c1fe1 100644
--- a/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
+++ b/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
@@ -176,7 +176,8 @@ nano-chat-delete = Delete
 nano-chat-loading = Loading...
 nano-chat-message-too-long = Message too long ({$current}/{$max} characters)
 nano-chat-max-recipients = Maximum number of chats reached
-nano-chat-new-message-title = Message from {$sender}
+nano-chat-new-message-title = message from {$sender}
+nano-chat-new-message-title-job = message from {$sender} ({$jobTitle})
 nano-chat-new-message-body = {$message}
 nano-chat-toggle-mute = Mute notifications
 nano-chat-delivery-failed = Failed to deliver

From 3eb6a823bcd565cb05c6c39bbaadf5203fa4acdf Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Wed, 8 Jan 2025 06:15:50 +0800
Subject: [PATCH 10/14] allow inputting name/job up to real max length but
 truncate chat UI name/job

---
 .../Cartridges/EditChatPopup.xaml.cs              | 11 +++++------
 .../Cartridges/NanoChatEntry.xaml.cs              | 15 +++++++++++++--
 .../Cartridges/NewChatPopup.xaml.cs               | 10 +++++-----
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs
index dbbc5e1cbe0..47ad67b5f59 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Content.Client.DeltaV.NanoChat;
+using Content.Shared.Access.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
@@ -9,7 +9,6 @@ namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
 [GenerateTypedNameReferences]
 public sealed partial class EditChatPopup : DefaultWindow
 {
-    private const int MaxInputLength = 16;
     private const int MaxNumberLength = 4;
 
     // Used to see if the user input is different from the original data
@@ -36,15 +35,15 @@ public EditChatPopup()
 
         NameInput.OnTextChanged += args =>
         {
-            if (args.Text.Length > MaxInputLength)
-                NameInput.Text = args.Text[..MaxInputLength];
+            if (args.Text.Length > IdCardConsoleComponent.MaxFullNameLength)
+                NameInput.Text = args.Text[..IdCardConsoleComponent.MaxFullNameLength];
             ValidateInputs();
         };
 
         JobInput.OnTextChanged += args =>
         {
-            if (args.Text.Length > MaxInputLength)
-                JobInput.Text = args.Text[..MaxInputLength];
+            if (args.Text.Length > IdCardConsoleComponent.MaxJobTitleLength)
+                JobInput.Text = args.Text[..IdCardConsoleComponent.MaxJobTitleLength];
             ValidateInputs();
         };
 
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs
index ff4ea9ba9c1..5bf24f292fe 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs
@@ -8,6 +8,9 @@ namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
 [GenerateTypedNameReferences]
 public sealed partial class NanoChatEntry : BoxContainer
 {
+    private const int MaxNameLength = 16;
+    private const int MaxJobLength = 20;
+
     public event Action<uint>? OnPressed;
     private uint _number;
     private Action<EventArgs>? _pressHandler;
@@ -29,11 +32,19 @@ public void SetRecipient(NanoChatRecipient recipient, uint number, bool isSelect
         _pressHandler = _ => OnPressed?.Invoke(_number);
         ChatButton.OnPressed += _pressHandler;
 
-        NameLabel.Text = recipient.Name;
-        JobLabel.Text = recipient.JobTitle ?? "";
+        NameLabel.Text = Truncate(recipient.Name, MaxNameLength);
+        JobLabel.Text = Truncate(recipient.JobTitle ?? "", MaxJobLength);
         JobLabel.Visible = !string.IsNullOrEmpty(recipient.JobTitle);
         UnreadIndicator.Visible = recipient.HasUnread;
 
         ChatButton.ModulateSelfOverride = isSelected ? NanoChatMessageBubble.OwnMessageColor : null;
     }
+
+    /// <summary>
+    ///     Truncates a string to a maximum length.
+    /// </summary>
+    private static string Truncate(string text, int maxLength) =>
+        text.Length <= maxLength
+            ? text
+            : text[..(maxLength - 4)] + "...";
 }
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs
index 8e47e1ee5d4..a98c9ec934d 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Shared.Access.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
@@ -8,7 +9,6 @@ namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
 [GenerateTypedNameReferences]
 public sealed partial class NewChatPopup : DefaultWindow
 {
-    private const int MaxInputLength = 16;
     private const int MaxNumberLength = 4; // i hardcoded it to be 4 so suffer
 
     public event Action<uint, string, string?>? OnChatCreated;
@@ -44,15 +44,15 @@ public NewChatPopup()
 
         NameInput.OnTextChanged += args =>
         {
-            if (args.Text.Length > MaxInputLength)
-                NameInput.Text = args.Text[..MaxInputLength];
+            if (args.Text.Length > IdCardConsoleComponent.MaxFullNameLength)
+                NameInput.Text = args.Text[..IdCardConsoleComponent.MaxFullNameLength];
             ValidateInputs();
         };
 
         JobInput.OnTextChanged += args =>
         {
-            if (args.Text.Length > MaxInputLength)
-                JobInput.Text = args.Text[..MaxInputLength];
+            if (args.Text.Length > IdCardConsoleComponent.MaxJobTitleLength)
+                JobInput.Text = args.Text[..IdCardConsoleComponent.MaxJobTitleLength];
         };
     }
 

From b5d8daa1f301e599d95142ad9c8e471a2b5d4618 Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Wed, 8 Jan 2025 09:03:30 +0800
Subject: [PATCH 11/14] add validation for new chat number length (4) and left
 pad edit chat number with 0s

---
 .../Cartridges/EditChatPopup.xaml.cs          | 27 ++++++++++---------
 .../Cartridges/NewChatPopup.xaml.cs           |  1 +
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs
index 47ad67b5f59..54da9cd866c 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/EditChatPopup.xaml.cs
@@ -13,9 +13,9 @@ public sealed partial class EditChatPopup : DefaultWindow
 
     // Used to see if the user input is different from the original data
     // to check if the user can submit
-    private string OriginalNumber = "";
-    private string OriginalName = "";
-    private string OriginalJob = "";
+    private string _originalNumber = "";
+    private string _originalName = "";
+    private string _originalJob = "";
 
     public event Action<uint, string, string?>? OnContactEdited;
 
@@ -64,12 +64,13 @@ public EditChatPopup()
     private void ValidateInputs()
     {
         var isValid = !string.IsNullOrWhiteSpace(NumberInput.Text) &&
-            !string.IsNullOrWhiteSpace(NameInput.Text) &&
-            uint.TryParse(NumberInput.Text, out _) &&
-            // Only valid if there are any changes
-            (NumberInput.Text != OriginalNumber ||
-            NameInput.Text != OriginalName ||
-            JobInput.Text != OriginalJob);
+                      !string.IsNullOrWhiteSpace(NameInput.Text) &&
+                      NumberInput.Text.Length == MaxNumberLength &&
+                      uint.TryParse(NumberInput.Text, out _) &&
+                      // Only valid if there are any changes
+                      (NumberInput.Text != _originalNumber ||
+                      NameInput.Text != _originalName ||
+                      JobInput.Text != _originalJob);
 
         ConfirmButton.Disabled = !isValid;
     }
@@ -95,19 +96,19 @@ public void ClearInputs()
 
     public void SetNumberInput(string newNumber)
     {
-        NumberInput.Text = newNumber;
-        OriginalNumber = newNumber;
+        NumberInput.Text = newNumber.PadLeft(MaxNumberLength, '0');
+        _originalNumber = newNumber;
     }
 
     public void SetNameInput(string newName)
     {
         NameInput.Text = newName;
-        OriginalName = newName;
+        _originalName = newName;
     }
 
     public void SetJobInput(string newJob)
     {
         JobInput.Text = newJob;
-        OriginalJob = newJob;
+        _originalJob = newJob;
     }
 }
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs
index a98c9ec934d..16e9e1cdef8 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs
@@ -60,6 +60,7 @@ private void ValidateInputs()
     {
         var isValid = !string.IsNullOrWhiteSpace(NumberInput.Text) &&
                       !string.IsNullOrWhiteSpace(NameInput.Text) &&
+                      NumberInput.Text.Length == MaxNumberLength &&
                       uint.TryParse(NumberInput.Text, out _);
 
         CreateButton.Disabled = !isValid;

From 22bcceb0d88d127208425e2f7420ad3e90981e64 Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Wed, 8 Jan 2025 09:35:59 +0800
Subject: [PATCH 12/14] truncate title to maximum length

---
 .../Cartridges/NanoChatCartridgeSystem.cs     | 33 +++++++++++--------
 .../deltav/cartridge-loader/cartridges.ftl    |  2 +-
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
index f4189037239..369ae947fc3 100644
--- a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
@@ -32,6 +32,9 @@ public sealed class NanoChatCartridgeSystem : EntitySystem
     // no point in storing it on the comp
     private const int NotificationMaxLength = 64;
 
+    // The max length of the name and job title on the notification before being truncated.
+    private const int NotificationTitleMaxLength = 32;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -465,13 +468,19 @@ recipient.Comp.PdaUid is not {} pdaUid ||
                 HasComp<NanoChatCartridgeComponent>(loader.ActiveProgram)))
             return;
 
+        var title = "";
+        if (!String.IsNullOrEmpty(senderRecipient.JobTitle))
+        {
+            var titleRecipient = Truncate(Loc.GetString("nano-chat-new-message-title-recipient",
+                ("sender", senderName), ("jobTitle", senderRecipient.JobTitle)), NotificationTitleMaxLength, " \\[...\\]");
+            title = Loc.GetString("nano-chat-new-message-title", ("sender", titleRecipient));
+        }
+        else
+            title = Loc.GetString("nano-chat-new-message-title", ("sender", senderName));
+
         _cartridge.SendNotification(pdaUid,
-            !String.IsNullOrEmpty(senderRecipient.JobTitle)
-                ? Loc.GetString("nano-chat-new-message-title-job",
-                    ("sender", senderName), ("jobTitle", senderRecipient.JobTitle))
-                : Loc.GetString("nano-chat-new-message-title",
-                    ("sender", senderName)),
-            Loc.GetString("nano-chat-new-message-body", ("message", TruncateMessage(message.Content))),
+            title,
+            Loc.GetString("nano-chat-new-message-body", ("message", Truncate(message.Content, NotificationMaxLength, " [...]"))),
             loader);
     }
 
@@ -519,14 +528,12 @@ private void UpdateUIForCard(EntityUid cardUid)
     }
 
     /// <summary>
-    ///     Truncates a message to the notification maximum length.
+    ///     Truncates a string to a maximum length.
     /// </summary>
-    private static string TruncateMessage(string message)
-    {
-        return message.Length <= NotificationMaxLength
-            ? message
-            : message[..(NotificationMaxLength - 4)] + " [...]";
-    }
+    private static string Truncate(string text, int maxLength, string overflowText = "...") =>
+        text.Length <= maxLength
+            ? text
+            : text[..(maxLength - overflowText.Length)] + overflowText;
 
     private void OnUiReady(Entity<NanoChatCartridgeComponent> ent, ref CartridgeUiReadyEvent args)
     {
diff --git a/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
index 3454e8c1fe1..08ecf33aaf0 100644
--- a/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
+++ b/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl
@@ -177,7 +177,7 @@ nano-chat-loading = Loading...
 nano-chat-message-too-long = Message too long ({$current}/{$max} characters)
 nano-chat-max-recipients = Maximum number of chats reached
 nano-chat-new-message-title = message from {$sender}
-nano-chat-new-message-title-job = message from {$sender} ({$jobTitle})
+nano-chat-new-message-title-recipient = {$sender} ({$jobTitle})
 nano-chat-new-message-body = {$message}
 nano-chat-toggle-mute = Mute notifications
 nano-chat-delivery-failed = Failed to deliver

From b24a21013c4589481516a39ab6e1f07c7aa7942b Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Wed, 8 Jan 2025 10:13:14 +0800
Subject: [PATCH 13/14] decrease chat list entry name max length from 16 to 14

---
 .../DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs
index 5bf24f292fe..49a23b708f4 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs
@@ -8,7 +8,7 @@ namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
 [GenerateTypedNameReferences]
 public sealed partial class NanoChatEntry : BoxContainer
 {
-    private const int MaxNameLength = 16;
+    private const int MaxNameLength = 14;
     private const int MaxJobLength = 20;
 
     public event Action<uint>? OnPressed;
@@ -46,5 +46,5 @@ public void SetRecipient(NanoChatRecipient recipient, uint number, bool isSelect
     private static string Truncate(string text, int maxLength) =>
         text.Length <= maxLength
             ? text
-            : text[..(maxLength - 4)] + "...";
+            : text[..(maxLength - 3)] + "...";
 }

From f6aebd9033c2f033215bac1283acbdb53733d45f Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Wed, 8 Jan 2025 10:38:27 +0800
Subject: [PATCH 14/14] add input validation to HandleEditChat, same as
 HandleNewChat

---
 .../Cartridges/NanoChatCartridgeSystem.cs     | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
index 369ae947fc3..9d1723d62bd 100644
--- a/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
@@ -203,9 +203,25 @@ private void HandleEditChat(Entity<NanoChatCardComponent> card, NanoChatUiMessag
             _nanoChat.GetRecipient((card, card.Comp), msg.RecipientNumber.Value) is not {} recipient)
             return;
 
+        var name = msg.Content;
+        if (!string.IsNullOrWhiteSpace(name))
+        {
+            name = name.Trim();
+            if (name.Length > IdCardConsoleComponent.MaxFullNameLength)
+                name = name[..IdCardConsoleComponent.MaxFullNameLength];
+        }
+
+        var jobTitle = msg.RecipientJob;
+        if (!string.IsNullOrWhiteSpace(jobTitle))
+        {
+            jobTitle = jobTitle.Trim();
+            if (jobTitle.Length > IdCardConsoleComponent.MaxJobTitleLength)
+                jobTitle = jobTitle[..IdCardConsoleComponent.MaxJobTitleLength];
+        }
+
         // Update recipient
-        recipient.Name = msg.Content;
-        recipient.JobTitle = msg.RecipientJob;
+        recipient.Name = name;
+        recipient.JobTitle = jobTitle;
 
         _nanoChat.SetRecipient((card, card.Comp), msg.RecipientNumber.Value, recipient);