From 19722eeec7427dfab0e1f8faf60e457b547647da Mon Sep 17 00:00:00 2001 From: Evaisa Date: Tue, 4 Nov 2025 00:13:44 +0100 Subject: [PATCH] Fallback for listing sender names. Sender names now show up if they are in your contacts, even if they do not have List Number enabled. If their name can not be obtained then it will show "Unknown#0000" rather than just the nanochat number. (cherry picked from commit 90775680d8b7b2d95636dd1027e56d48118e55e1) --- .../Cartridges/NanoChatUiFragment.xaml.cs | 20 +++++++++---------- .../en-US/_Funkystation/nanochat/nanochat.ftl | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Content.Client/_DV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs b/Content.Client/_DV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs index ff2a193af8..6acd1cfc9d 100644 --- a/Content.Client/_DV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs +++ b/Content.Client/_DV/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs @@ -563,24 +563,24 @@ public sealed partial class NanoChatUiFragment : BoxContainer string? senderName = null; if (isGroupChat && !isOwnMessage) { - // Try to get sender name from contacts first, then recipients - if (_contacts != null) + // Funky Station - Try to get sender name from contacts first, then recipients + if (_recipients.TryGetValue(message.SenderId, out var senderRecipient)) + { + senderName = senderRecipient.Name; + } + + // If not in recipients, try contacts list (station-wide directory) + if (senderName == null && _contacts != null) { var contact = _contacts.FirstOrDefault(c => c.Number == message.SenderId); if (contact.Number != 0) senderName = contact.Name; } - // If not found in contacts, try recipients - if (senderName == null && _recipients.TryGetValue(message.SenderId, out var senderRecipient)) - { - senderName = senderRecipient.Name; - } - - // Fallback to number if name not found + // Fallback to "Unknown" with number if name not found if (senderName == null) { - senderName = $"#{message.SenderId:D4}"; + senderName = $"{Loc.GetString("nano-chat-unknown-sender")}#{message.SenderId:D4}"; // Funky Station } } diff --git a/Resources/Locale/en-US/_Funkystation/nanochat/nanochat.ftl b/Resources/Locale/en-US/_Funkystation/nanochat/nanochat.ftl index 6542916a3c..66b914174e 100644 --- a/Resources/Locale/en-US/_Funkystation/nanochat/nanochat.ftl +++ b/Resources/Locale/en-US/_Funkystation/nanochat/nanochat.ftl @@ -36,3 +36,4 @@ nano-chat-emoji-search = Search emojis... # Department sorting nano-chat-other-department = Other +nano-chat-unknown-sender = Unknown