From d148644799d33560af66d89760ede26c48469ded Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Thu, 9 Mar 2023 08:49:29 -0500
Subject: [PATCH] Allows Rendering of PrivateMessages as Notes (for
 notifications) with correct redirection to the private room when clicked

---
 .../amethyst/ui/note/NoteCompose.kt             | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

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 045887019..b92727e0c 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
@@ -44,6 +44,7 @@ import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
@@ -140,16 +141,18 @@ fun NoteCompose(
             modifier = modifier
                 .combinedClickable(
                     onClick = {
-                        if (noteEvent !is ChannelMessageEvent) {
-                            navController.navigate("Note/${note.idHex}") {
+                        if (noteEvent is ChannelMessageEvent) {
+                            baseChannel?.let {
+                                navController.navigate("Channel/${it.idHex}")
+                            }
+                        } else if (noteEvent is PrivateDmEvent) {
+                            navController.navigate("Room/${note.author?.pubkeyHex}") {
                                 launchSingleTop = true
                             }
                         } else {
-                            note
-                                .channel()
-                                ?.let {
-                                    navController.navigate("Channel/${it.idHex}")
-                                }
+                            navController.navigate("Note/${note.idHex}") {
+                                launchSingleTop = true
+                            }
                         }
                     },
                     onLongClick = { popupExpanded = true }