From 14e860928b918371be591106ca91ee199ded72e3 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Thu, 31 Jul 2025 17:43:31 -0400
Subject: [PATCH] Improves names of the repost methods

---
 .../vitorpamplona/amethyst/model/LocalCache.kt    | 12 ++++++++----
 .../quartz/nip18Reposts/GenericRepostEvent.kt     | 15 ++++++++-------
 .../quartz/nip18Reposts/RepostEvent.kt            | 15 ++++++++-------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
index 80e089a29..ac7867b3c 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
@@ -800,11 +800,15 @@ object LocalCache : ILocalCache {
             is BadgeAwardEvent -> event.awardDefinition().map { getOrCreateAddressableNote(it) }
             is PrivateDmEvent -> event.taggedEvents().mapNotNull { checkGetOrCreateNote(it) }
             is RepostEvent ->
-                event.boostedEventIds().mapNotNull { checkGetOrCreateNote(it) } +
-                    event.boostedAddresses().map { getOrCreateAddressableNote(it) }
+                listOfNotNull(
+                    event.boostedEventId()?.let { checkGetOrCreateNote(it) },
+                    event.boostedAddress()?.let { getOrCreateAddressableNote(it) },
+                )
             is GenericRepostEvent ->
-                event.boostedEventIds().mapNotNull { checkGetOrCreateNote(it) } +
-                    event.boostedAddresses().map { getOrCreateAddressableNote(it) }
+                listOfNotNull(
+                    event.boostedEventId()?.let { checkGetOrCreateNote(it) },
+                    event.boostedAddress()?.let { getOrCreateAddressableNote(it) },
+                )
             is CommunityPostApprovalEvent ->
                 event.approvedEvents().mapNotNull { checkGetOrCreateNote(it) } +
                     event.approvedAddresses().map { getOrCreateAddressableNote(it) }
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip18Reposts/GenericRepostEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip18Reposts/GenericRepostEvent.kt
index 053321563..acf7e2b1b 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/nip18Reposts/GenericRepostEvent.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip18Reposts/GenericRepostEvent.kt
@@ -41,6 +41,7 @@ import com.vitorpamplona.quartz.nip01Core.tags.people.pTag
 import com.vitorpamplona.quartz.nip31Alts.AltTag
 import com.vitorpamplona.quartz.nip31Alts.alt
 import com.vitorpamplona.quartz.utils.TimeUtils
+import com.vitorpamplona.quartz.utils.lastNotNullOfOrNull
 
 @Immutable
 class GenericRepostEvent(
@@ -66,18 +67,18 @@ class GenericRepostEvent(
 
     override fun linkedAddressIds() = tags.mapNotNull(ATag::parseAddressId)
 
-    fun boostedEvents() = tags.mapNotNull(ETag::parse)
+    fun boostedEvent() = tags.lastNotNullOfOrNull(ETag::parse)
 
-    fun boostedATags() = tags.mapNotNull(ATag::parse)
+    fun boostedATag() = tags.lastNotNullOfOrNull(ATag::parse)
 
-    fun boostedAddresses() = tags.mapNotNull(ATag::parseAddress)
+    fun boostedAddress() = tags.lastNotNullOfOrNull(ATag::parseAddress)
+
+    fun boostedEventId() = tags.lastNotNullOfOrNull(ETag::parseId)
+
+    fun boostedAddressIds() = tags.lastNotNullOfOrNull(ATag::parseAddressId)
 
     fun originalAuthors() = tags.mapNotNull(PTag::parse)
 
-    fun boostedEventIds() = tags.mapNotNull(ETag::parseId)
-
-    fun boostedAddressIds() = tags.mapNotNull(ATag::parseAddressId)
-
     fun originalAuthorKeys() = tags.mapNotNull(PTag::parseKey)
 
     fun containedPost() =
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip18Reposts/RepostEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip18Reposts/RepostEvent.kt
index 922952b39..c7feb946b 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/nip18Reposts/RepostEvent.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip18Reposts/RepostEvent.kt
@@ -39,6 +39,7 @@ import com.vitorpamplona.quartz.nip01Core.tags.people.PTag
 import com.vitorpamplona.quartz.nip01Core.tags.people.pTag
 import com.vitorpamplona.quartz.nip31Alts.alt
 import com.vitorpamplona.quartz.utils.TimeUtils
+import com.vitorpamplona.quartz.utils.lastNotNullOfOrNull
 
 @Immutable
 class RepostEvent(
@@ -64,18 +65,18 @@ class RepostEvent(
 
     override fun linkedAddressIds() = tags.mapNotNull(ATag::parseAddressId)
 
-    fun boostedEvents() = tags.mapNotNull(ETag::parse)
+    fun boostedEvent() = tags.lastNotNullOfOrNull(ETag::parse)
 
-    fun boostedATags() = tags.mapNotNull(ATag::parse)
+    fun boostedATag() = tags.lastNotNullOfOrNull(ATag::parse)
 
-    fun boostedAddresses() = tags.mapNotNull(ATag::parseAddress)
+    fun boostedAddress() = tags.lastNotNullOfOrNull(ATag::parseAddress)
+
+    fun boostedEventId() = tags.lastNotNullOfOrNull(ETag::parseId)
+
+    fun boostedAddressIds() = tags.lastNotNullOfOrNull(ATag::parseAddressId)
 
     fun originalAuthors() = tags.mapNotNull(PTag::parse)
 
-    fun boostedEventIds() = tags.mapNotNull(ETag::parseId)
-
-    fun boostedAddressIds() = tags.mapNotNull(ATag::parseAddressId)
-
     fun originalAuthorKeys() = tags.mapNotNull(PTag::parseKey)
 
     fun containedPost() =