From bcb9ba26ab884970ada261e3e9b66f8703e28d13 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Thu, 5 Dec 2024 17:14:16 -0500
Subject: [PATCH] Improves search by npubs to use all relays.

---
 .../service/NostrSearchEventOrUserDataSource.kt      | 12 ++++++------
 .../java/com/vitorpamplona/ammolite/relays/Relay.kt  |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt
index 1d74f5fa8..d1091f03a 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt
@@ -20,7 +20,7 @@
  */
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
+import com.vitorpamplona.ammolite.relays.ALL_FEED_TYPES
 import com.vitorpamplona.ammolite.relays.FeedType
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
@@ -96,7 +96,7 @@ object NostrSearchEventOrUserDataSource : AmethystNostrDataSource("SearchEventFe
                     listOfNotNull(
                         ATag.parse(it, null)?.let { aTag ->
                             TypedFilter(
-                                types = COMMON_FEED_TYPES,
+                                types = ALL_FEED_TYPES,
                                 filter =
                                     SincePerRelayFilter(
                                         kinds = listOf(MetadataEvent.KIND, aTag.kind),
@@ -111,19 +111,19 @@ object NostrSearchEventOrUserDataSource : AmethystNostrDataSource("SearchEventFe
                     // event ids
                     listOf(
                         TypedFilter(
-                            types = COMMON_FEED_TYPES,
+                            types = ALL_FEED_TYPES,
                             filter =
                                 SincePerRelayFilter(
-                                    ids = listOfNotNull(hexToWatch),
+                                    ids = listOfNotNull(it),
                                 ),
                         ),
                         // authors
                         TypedFilter(
-                            types = COMMON_FEED_TYPES,
+                            types = ALL_FEED_TYPES,
                             filter =
                                 SincePerRelayFilter(
                                     kinds = listOf(MetadataEvent.KIND),
-                                    authors = listOfNotNull(hexToWatch),
+                                    authors = listOfNotNull(it),
                                     // just to be sure
                                     limit = 5,
                                 ),
diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/Relay.kt b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/Relay.kt
index aa73eac31..da537d4e3 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/Relay.kt
+++ b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/Relay.kt
@@ -46,6 +46,9 @@ enum class FeedType {
     WALLET_CONNECT,
 }
 
+val ALL_FEED_TYPES =
+    setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.PRIVATE_DMS, FeedType.GLOBAL, FeedType.SEARCH)
+
 val COMMON_FEED_TYPES =
     setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.PRIVATE_DMS, FeedType.GLOBAL)