From d0f3630abbd8b65fd6a49649417a72be6591b859 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Wed, 6 Aug 2025 18:26:11 -0400
Subject: [PATCH] Changes to show the user name before the text on public
 messages.

---
 .../vitorpamplona/amethyst/ui/note/types/PublicMessage.kt  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/PublicMessage.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/PublicMessage.kt
index 3f7e0d219..a8bb45c9d 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/PublicMessage.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/PublicMessage.kt
@@ -59,10 +59,11 @@ fun RenderPublicMessage(
     nav: INav,
 ) {
     val noteEvent = note.event as? PublicMessageEvent ?: return
+    val content = remember(noteEvent) { noteEvent.peopleAndContent() }
 
     if (makeItShort && accountViewModel.isLoggedUser(note.author)) {
         Text(
-            text = noteEvent.content,
+            text = content,
             color = MaterialTheme.colorScheme.placeholderText,
             maxLines = 2,
             overflow = TextOverflow.Ellipsis,
@@ -75,7 +76,7 @@ fun RenderPublicMessage(
             accountViewModel = accountViewModel,
         ) {
             TranslatableRichTextViewer(
-                content = noteEvent.content,
+                content = content,
                 canPreview = canPreview && !makeItShort,
                 quotesLeft = quotesLeft,
                 modifier = Modifier.fillMaxWidth(),
@@ -91,8 +92,6 @@ fun RenderPublicMessage(
         if (noteEvent.hasHashtags()) {
             DisplayUncitedHashtags(noteEvent, noteEvent.content, callbackUri, accountViewModel, nav)
         }
-
-        DisplayUncitedUsers(noteEvent, accountViewModel, nav)
     }
 }