From e4311ddfa30f07f21828a783381ca0907cd0b2c8 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Thu, 28 Aug 2025 18:12:55 -0400
Subject: [PATCH] Creates a bootstrap relay list for inbox that doesn't have
 nostr.wine to avoid sending posts there and getting the notify

---
 .../com/vitorpamplona/amethyst/model/Constants.kt   |  1 +
 .../model/nip65RelayList/Nip65RelayListState.kt     | 13 +------------
 .../model/serverList/TrustedRelayListsState.kt      |  8 ++++----
 .../loggedIn/search/AddInboxRelayForSearchCard.kt   |  2 +-
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Constants.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Constants.kt
index 461faca45..d312dbf80 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Constants.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Constants.kt
@@ -46,6 +46,7 @@ object Constants {
     val coracle = RelayUrlNormalizer.normalize("wss://indexer.coracle.social")
     val userkinds = RelayUrlNormalizer.normalize("wss://user.kindpag.es")
 
+    val bootstrapInbox = setOf(band, damus, primal, mom, nos, bitcoiner, oxtr, fmtwiz)
     val eventFinderRelays = setOf(band, wine, damus, primal, mom, nos, bitcoiner, oxtr, fmtwiz)
 
     val defaultSearchRelaySet = setOf(band, wine, where)
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip65RelayList/Nip65RelayListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip65RelayList/Nip65RelayListState.kt
index acd8c8479..4d70792fd 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip65RelayList/Nip65RelayListState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip65RelayList/Nip65RelayListState.kt
@@ -61,7 +61,7 @@ class Nip65RelayListState(
 
     fun normalizeNIP65WriteRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> = nip65Event(note)?.writeRelaysNorm()?.toSet() ?: Constants.eventFinderRelays
 
-    fun normalizeNIP65ReadRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> = nip65Event(note)?.readRelaysNorm()?.toSet() ?: Constants.eventFinderRelays
+    fun normalizeNIP65ReadRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> = nip65Event(note)?.readRelaysNorm()?.toSet() ?: Constants.bootstrapInbox
 
     fun normalizeNIP65AllRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> = nip65Event(note)?.relays()?.map { it.relayUrl }?.toSet() ?: Constants.eventFinderRelays
 
@@ -89,17 +89,6 @@ class Nip65RelayListState(
                 emptySet(),
             )
 
-    val allFlow =
-        getNIP65RelayListFlow()
-            .map { normalizeNIP65AllRelayListWithBackup(it.note) }
-            .onStart { emit(normalizeNIP65AllRelayListWithBackup(getNIP65RelayListNote())) }
-            .flowOn(Dispatchers.Default)
-            .stateIn(
-                scope,
-                SharingStarted.Eagerly,
-                emptySet(),
-            )
-
     val allFlowNoDefaults =
         getNIP65RelayListFlow()
             .map { normalizeNIP65AllRelayListWithBackupNoDefaults(it.note) }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/serverList/TrustedRelayListsState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/serverList/TrustedRelayListsState.kt
index 7dd7ab05b..86b492d04 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/serverList/TrustedRelayListsState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/serverList/TrustedRelayListsState.kt
@@ -65,11 +65,11 @@ class TrustedRelayListsState(
             emit(
                 mergeLists(
                     arrayOf(
-                        nip65RelayList.allFlow.value,
+                        nip65RelayList.allFlowNoDefaults.value,
                         privateOutboxRelayList.flow.value,
                         localRelayList.flow.value,
                         dmRelayList.flow.value,
-                        searchRelayListState.flow.value,
+                        searchRelayListState.flowNoDefaults.value,
                         trustedRelayList.flow.value,
                         broadcastRelayList.flow.value,
                     ),
@@ -81,11 +81,11 @@ class TrustedRelayListsState(
                 SharingStarted.Eagerly,
                 mergeLists(
                     arrayOf(
-                        nip65RelayList.allFlow.value,
+                        nip65RelayList.allFlowNoDefaults.value,
                         privateOutboxRelayList.flow.value,
                         localRelayList.flow.value,
                         dmRelayList.flow.value,
-                        searchRelayListState.flow.value,
+                        searchRelayListState.flowNoDefaults.value,
                         trustedRelayList.flow.value,
                         broadcastRelayList.flow.value,
                     ),
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/search/AddInboxRelayForSearchCard.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/search/AddInboxRelayForSearchCard.kt
index b82d461cd..377e3ab5e 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/search/AddInboxRelayForSearchCard.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/search/AddInboxRelayForSearchCard.kt
@@ -66,7 +66,7 @@ fun ObserveRelayListForSearchAndDisplayIfNotFound(
     accountViewModel: AccountViewModel,
     nav: INav,
 ) {
-    val searchRelayList by accountViewModel.account.searchRelayList.flow
+    val searchRelayList by accountViewModel.account.searchRelayList.flowNoDefaults
         .collectAsStateWithLifecycle()
 
     if (searchRelayList.isEmpty()) {