From 8c854c43bef710bf1b030d91097646982790e3a1 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Wed, 6 Aug 2025 17:58:51 -0400
Subject: [PATCH] Adds p-tags to the display of public messages so that users
 know they are being cited

---
 .../amethyst/ui/note/types/PublicMessage.kt   | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

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 69dd2052c..3f7e0d219 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
@@ -20,22 +20,29 @@
  */
 package com.vitorpamplona.amethyst.ui.note.types
 
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextOverflow
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.ui.components.RenderUserAsClickableText
 import com.vitorpamplona.amethyst.ui.components.SensitivityWarning
 import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
+import com.vitorpamplona.amethyst.ui.navigation.navs.EmptyNav.nav
 import com.vitorpamplona.amethyst.ui.navigation.navs.INav
 import com.vitorpamplona.amethyst.ui.note.elements.DisplayUncitedHashtags
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.HalfHalfTopPadding
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.quartz.experimental.publicMessages.PublicMessageEvent
 import com.vitorpamplona.quartz.nip01Core.tags.hashtags.hasHashtags
@@ -84,5 +91,35 @@ fun RenderPublicMessage(
         if (noteEvent.hasHashtags()) {
             DisplayUncitedHashtags(noteEvent, noteEvent.content, callbackUri, accountViewModel, nav)
         }
+
+        DisplayUncitedUsers(noteEvent, accountViewModel, nav)
+    }
+}
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun DisplayUncitedUsers(
+    event: PublicMessageEvent,
+    accountViewModel: AccountViewModel,
+    nav: INav,
+) {
+    @Suppress("ProduceStateDoesNotAssignValue")
+    val uncitedUsers by produceState(initialValue = emptyList<User>()) {
+        val users = event.groupKeySetWithoutOwner() - event.citedUsers()
+        if (users.isNotEmpty()) {
+            val newUsers = accountViewModel.loadUsersSync(users.toList())
+
+            if (newUsers.isNotEmpty()) {
+                value = newUsers
+            }
+        }
+    }
+
+    if (uncitedUsers.isNotEmpty()) {
+        FlowRow(HalfHalfTopPadding) {
+            uncitedUsers.forEach { user ->
+                RenderUserAsClickableText(user, "", accountViewModel, nav)
+            }
+        }
     }
 }