From 6a91b68b4b8c5a9eddf4c1d8a41d8d8d444f1076 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Wed, 14 May 2025 14:56:47 -0400
Subject: [PATCH] Migrates missing User filter to the new no EOSE cache manager

---
 .../user/loaders/FilterUserMetadataForKey.kt         |  6 +-----
 .../user/loaders/UserLoaderSubAssembler.kt           | 12 ++++--------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/loaders/FilterUserMetadataForKey.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/loaders/FilterUserMetadataForKey.kt
index 6a5cf3dc1..5e603897a 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/loaders/FilterUserMetadataForKey.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/loaders/FilterUserMetadataForKey.kt
@@ -22,16 +22,12 @@ package com.vitorpamplona.amethyst.service.relayClient.reqCommand.user.loaders
 
 import com.vitorpamplona.ammolite.relays.EVENT_FINDER_TYPES
 import com.vitorpamplona.ammolite.relays.TypedFilter
-import com.vitorpamplona.ammolite.relays.filters.EOSETime
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
 import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
 
-fun filterNewUserMetadataForKey(
-    authors: Set<HexKey>,
-    since: Map<String, EOSETime>?,
-): List<TypedFilter> =
+fun filterNewUserMetadataForKey(authors: Set<HexKey>): List<TypedFilter> =
     listOf(
         TypedFilter(
             types = EVENT_FINDER_TYPES,
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/loaders/UserLoaderSubAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/loaders/UserLoaderSubAssembler.kt
index 81d73d39b..18f612c87 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/loaders/UserLoaderSubAssembler.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/loaders/UserLoaderSubAssembler.kt
@@ -20,25 +20,21 @@
  */
 package com.vitorpamplona.amethyst.service.relayClient.reqCommand.user.loaders
 
-import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.SingleSubEoseManager
+import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.SingleSubNoEoseCacheEoseManager
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.user.UserFinderQueryState
 import com.vitorpamplona.ammolite.relays.NostrClient
 import com.vitorpamplona.ammolite.relays.TypedFilter
-import com.vitorpamplona.ammolite.relays.filters.EOSETime
 
 class UserLoaderSubAssembler(
     client: NostrClient,
     allKeys: () -> Set<UserFinderQueryState>,
-) : SingleSubEoseManager<UserFinderQueryState>(client, allKeys, invalidateAfterEose = true) {
-    override fun updateFilter(
-        keys: List<UserFinderQueryState>,
-        since: Map<String, EOSETime>?,
-    ): List<TypedFilter>? {
+) : SingleSubNoEoseCacheEoseManager<UserFinderQueryState>(client, allKeys, invalidateAfterEose = true) {
+    override fun updateFilter(keys: List<UserFinderQueryState>): List<TypedFilter>? {
         val firstTimers = keys.filter { it.user.latestMetadata == null }.mapTo(mutableSetOf()) { it.user.pubkeyHex }
 
         if (firstTimers.isEmpty()) return null
 
-        return filterNewUserMetadataForKey(firstTimers, since)
+        return filterNewUserMetadataForKey(firstTimers)
     }
 
     override fun distinct(key: UserFinderQueryState) = key.user