From b89efb547e3faf668104396155ad38b2d7e2fce6 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Fri, 7 Apr 2023 17:38:25 -0400 Subject: [PATCH] Correctly points Users to the right DM when clicking in the notification. --- .../vitorpamplona/amethyst/ui/note/NoteCompose.kt | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 91021b376e..dc13ec0ab9 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 @@ -207,7 +207,20 @@ fun NoteComposeInner( navController.navigate("Channel/${it.idHex}") } } else if (noteEvent is PrivateDmEvent) { - navController.navigate("Room/${note.author?.pubkeyHex}") + val replyAuthorBase = + (note.event as? PrivateDmEvent) + ?.recipientPubKey() + ?.let { LocalCache.getOrCreateUser(it) } + + var userToComposeOn = note.author!! + + if (replyAuthorBase != null) { + if (note.author == accountViewModel.userProfile()) { + userToComposeOn = replyAuthorBase + } + } + + navController.navigate("Room/${userToComposeOn.pubkeyHex}") } else { navController.navigate("Note/${note.idHex}") }