From 11dabd46ba69156e2b38b3eaac20a64b955361df Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Tue, 24 Mar 2026 09:33:37 -0400 Subject: [PATCH] Checks if p tags are user pubkeys when loading drafts. --- .../screen/loggedIn/home/ShortNotePostViewModel.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostViewModel.kt index 2bbded69b..4f6b0b73e 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostViewModel.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostViewModel.kt @@ -336,6 +336,7 @@ open class ShortNotePostViewModel : val currentMentions = (replyNote.event as? TextNoteEvent) ?.mentions() + ?.toSet() ?.map { LocalCache.getOrCreateUser(it.pubKey) } ?: emptyList() @@ -490,8 +491,8 @@ open class ShortNotePostViewModel : } pTags = - draftEvent.tags.filter { it.size > 1 && it[0] == "p" }.map { - LocalCache.getOrCreateUser(it[1]) + draftEvent.tags.filter { it.size > 1 && it[0] == "p" }.mapNotNull { + LocalCache.checkGetOrCreateUser(it[1]) } draftEvent.tags.filter { it.size > 3 && (it[0] == "e" || it[0] == "a") && it[3] == "fork" }.forEach { @@ -576,8 +577,8 @@ open class ShortNotePostViewModel : } pTags = - draftEvent.tags.filter { it.size > 1 && it[0] == "p" }.map { - LocalCache.getOrCreateUser(it[1]) + draftEvent.tags.filter { it.size > 1 && it[0] == "p" }.mapNotNull { + LocalCache.checkGetOrCreateUser(it[1]) } canUsePoll = originalNote == null @@ -647,8 +648,8 @@ open class ShortNotePostViewModel : } pTags = - draftEvent.tags.filter { it.size > 1 && it[0] == "p" }.map { - LocalCache.getOrCreateUser(it[1]) + draftEvent.tags.filter { it.size > 1 && it[0] == "p" }.mapNotNull { + LocalCache.checkGetOrCreateUser(it[1]) } canUsePoll = originalNote == null