From a67155ac255b7d71ef1dba7839d3867a855dee1f Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Thu, 14 Aug 2025 16:03:19 -0400
Subject: [PATCH] Only loads notifications from random relays after the
 notification feed is done

---
 ...otificationsEoseFromRandomRelaysManager.kt | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/AccountNotificationsEoseFromRandomRelaysManager.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/AccountNotificationsEoseFromRandomRelaysManager.kt
index 9f59c18bc9..dc21ec4835 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/AccountNotificationsEoseFromRandomRelaysManager.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/AccountNotificationsEoseFromRandomRelaysManager.kt
@@ -27,12 +27,12 @@ import com.vitorpamplona.amethyst.service.relays.SincePerRelayMap
 import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
 import com.vitorpamplona.quartz.nip01Core.relay.client.subscriptions.Subscription
-import com.vitorpamplona.quartz.utils.TimeUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch
 
 class AccountNotificationsEoseFromRandomRelaysManager(
@@ -49,11 +49,18 @@ class AccountNotificationsEoseFromRandomRelaysManager(
     override fun updateFilter(
         key: AccountQueryState,
         since: SincePerRelayMap?,
-    ): List<RelayBasedFilter>? =
-        (key.account.followsPerRelay.value.keys - key.account.notificationRelays.flow.value).flatMap {
-            val since = since?.get(it)?.time ?: TimeUtils.oneWeekAgo()
-            filterJustTheLatestNotificationsToPubkeyFromRandomRelays(it, user(key).pubkeyHex, since)
+    ): List<RelayBasedFilter>? {
+        // only loads this after the feed is built
+        val defaultSince = key.feedContentStates.notifications.lastNoteCreatedAtIfFilled()
+        return if (defaultSince != null) {
+            (key.account.followsPerRelay.value.keys - key.account.notificationRelays.flow.value).flatMap {
+                val since = since?.get(it)?.time ?: defaultSince
+                filterJustTheLatestNotificationsToPubkeyFromRandomRelays(it, user(key).pubkeyHex, since)
+            }
+        } else {
+            emptyList()
         }
+    }
 
     val userJobMap = mutableMapOf<User, List<Job>>()
 
@@ -69,6 +76,11 @@ class AccountNotificationsEoseFromRandomRelaysManager(
                         invalidateFilters()
                     }
                 },
+                key.account.scope.launch(Dispatchers.Default) {
+                    key.feedContentStates.notifications.lastNoteCreatedAtWhenFullyLoaded.sample(5000).collectLatest {
+                        invalidateFilters()
+                    }
+                },
             )
 
         return super.newSub(key)