From fe317964b8e0074806c09766790f53b0d141d9e9 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Thu, 25 May 2023 20:39:15 -0400
Subject: [PATCH] Simplifying Private message rendering scheme

---
 .../amethyst/service/model/PrivateDmEvent.kt        |  2 +-
 .../vitorpamplona/amethyst/ui/note/NoteCompose.kt   | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/model/PrivateDmEvent.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/model/PrivateDmEvent.kt
index 435e3b302..ef2b2478d 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/model/PrivateDmEvent.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/model/PrivateDmEvent.kt
@@ -39,7 +39,7 @@ class PrivateDmEvent(
 
     fun with(pubkeyHex: String): Boolean {
         return pubkeyHex == pubKey ||
-            tags.firstOrNull { it.size > 1 && it[0] == "p" }?.getOrNull(1) == pubkeyHex
+            tags.any { it.size > 1 && it[0] == "p" && it[1] == pubkeyHex }
     }
 
     fun plainContent(privKey: ByteArray, pubKey: ByteArray): String? {
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
index b662e2487..1aa8e6796 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
@@ -567,13 +567,18 @@ private fun RenderPrivateMessage(
     nav: (String) -> Unit
 ) {
     val noteEvent = note.event as? PrivateDmEvent ?: return
+
     val withMe = remember { noteEvent.with(accountViewModel.userProfile().pubkeyHex) }
+    val tags = remember(note.event?.id()) { note.event?.tags() }
+    val hashtags = remember(note.event?.id()) { note.event?.hashtags() ?: emptyList() }
+    val modifier = remember(note.event?.id()) { Modifier.fillMaxWidth() }
+    val isAuthorTheLoggedUser = remember(note.event?.id()) { accountViewModel.isLoggedUser(note.author) }
 
     if (withMe) {
         val eventContent = remember { accountViewModel.decrypt(note) }
 
         if (eventContent != null) {
-            if (makeItShort && accountViewModel.isLoggedUser(note.author)) {
+            if (makeItShort && isAuthorTheLoggedUser) {
                 Text(
                     text = eventContent,
                     color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
@@ -584,14 +589,14 @@ private fun RenderPrivateMessage(
                 TranslatableRichTextViewer(
                     content = eventContent,
                     canPreview = canPreview && !makeItShort,
-                    modifier = Modifier.fillMaxWidth(),
-                    tags = noteEvent.tags(),
+                    modifier = modifier,
+                    tags = tags,
                     backgroundColor = backgroundColor,
                     accountViewModel = accountViewModel,
                     nav = nav
                 )
 
-                DisplayUncitedHashtags(noteEvent.hashtags(), eventContent, nav)
+                DisplayUncitedHashtags(hashtags, eventContent, nav)
             }
         }
     } else {