nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Adds Eose management for the UserProfile Screen

Browse Source
This commit is contained in:
Vitor Pamplona
2025-05-06 19:42:09 -04:00
parent be0a559b7d
commit a54835e4f9
1 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/UserProfileFilterAssembler.kt
+39 -1
View File
@@ -22,6 +22,7 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.profile.datasource
import com.vitorpamplona.amethyst.model.User import com.vitorpamplona.amethyst.model.User
import com.vitorpamplona.amethyst.service.relayClient.reqCommand.QueryBasedSubscriptionOrchestrator import com.vitorpamplona.amethyst.service.relayClient.reqCommand.QueryBasedSubscriptionOrchestrator
import com.vitorpamplona.amethyst.service.relays.EOSEAccount
import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
import com.vitorpamplona.ammolite.relays.NostrClient import com.vitorpamplona.ammolite.relays.NostrClient
import com.vitorpamplona.ammolite.relays.TypedFilter import com.vitorpamplona.ammolite.relays.TypedFilter
@@ -62,6 +63,28 @@ class UserProfileQueryState(
class UserProfileFilterAssembler( class UserProfileFilterAssembler(
client: NostrClient, client: NostrClient,
) : QueryBasedSubscriptionOrchestrator<UserProfileQueryState>(client) { ) : QueryBasedSubscriptionOrchestrator<UserProfileQueryState>(client) {
val list = "A"
val latestEOSEs = EOSEAccount()
fun since(key: UserProfileQueryState) =
latestEOSEs.users[key.user]
?.followList
?.get(list)
?.relayList
fun newEose(
key: UserProfileQueryState,
relayUrl: String,
time: Long,
) {
latestEOSEs.addOrUpdate(
key.user,
list,
relayUrl,
time,
)
}
fun createUserInfoFilter(keys: List<UserProfileQueryState>) = fun createUserInfoFilter(keys: List<UserProfileQueryState>) =
keys.map { state -> keys.map { state ->
TypedFilter( TypedFilter(
@@ -71,6 +94,7 @@ class UserProfileFilterAssembler(
kinds = listOf(MetadataEvent.KIND), kinds = listOf(MetadataEvent.KIND),
authors = listOf(state.user.pubkeyHex), authors = listOf(state.user.pubkeyHex),
limit = 1, limit = 1,
since = since(state),
), ),
) )
} }
@@ -96,6 +120,7 @@ class UserProfileFilterAssembler(
), ),
authors = listOf(state.user.pubkeyHex), authors = listOf(state.user.pubkeyHex),
limit = 200, limit = 200,
since = since(state),
), ),
) )
} }
@@ -115,6 +140,7 @@ class UserProfileFilterAssembler(
), ),
authors = listOf(state.user.pubkeyHex), authors = listOf(state.user.pubkeyHex),
limit = 50, limit = 50,
since = since(state),
), ),
) )
} }
@@ -128,6 +154,7 @@ class UserProfileFilterAssembler(
kinds = listOf(LnZapEvent.KIND), kinds = listOf(LnZapEvent.KIND),
tags = mapOf("p" to listOf(state.user.pubkeyHex)), tags = mapOf("p" to listOf(state.user.pubkeyHex)),
limit = 200, limit = 200,
since = since(state),
), ),
) )
} }
@@ -141,6 +168,7 @@ class UserProfileFilterAssembler(
kinds = listOf(ContactListEvent.KIND), kinds = listOf(ContactListEvent.KIND),
authors = listOf(state.user.pubkeyHex), authors = listOf(state.user.pubkeyHex),
limit = 1, limit = 1,
since = since(state),
), ),
) )
} }
@@ -153,6 +181,7 @@ class UserProfileFilterAssembler(
SincePerRelayFilter( SincePerRelayFilter(
kinds = listOf(ContactListEvent.KIND), kinds = listOf(ContactListEvent.KIND),
tags = mapOf("p" to listOf(state.user.pubkeyHex)), tags = mapOf("p" to listOf(state.user.pubkeyHex)),
since = since(state),
), ),
) )
} }
@@ -166,6 +195,7 @@ class UserProfileFilterAssembler(
kinds = listOf(BadgeProfilesEvent.KIND), kinds = listOf(BadgeProfilesEvent.KIND),
authors = listOf(state.user.pubkeyHex), authors = listOf(state.user.pubkeyHex),
limit = 1, limit = 1,
since = since(state),
), ),
) )
} }
@@ -185,6 +215,7 @@ class UserProfileFilterAssembler(
), ),
authors = listOf(state.user.pubkeyHex), authors = listOf(state.user.pubkeyHex),
limit = 100, limit = 100,
since = since(state),
), ),
) )
} }
@@ -204,6 +235,7 @@ class UserProfileFilterAssembler(
), ),
authors = listOf(state.user.pubkeyHex), authors = listOf(state.user.pubkeyHex),
limit = 1000, limit = 1000,
since = since(state),
), ),
) )
} }
@@ -217,11 +249,17 @@ class UserProfileFilterAssembler(
kinds = listOf(BadgeAwardEvent.KIND), kinds = listOf(BadgeAwardEvent.KIND),
tags = mapOf("p" to listOf(state.user.pubkeyHex)), tags = mapOf("p" to listOf(state.user.pubkeyHex)),
limit = 20, limit = 20,
since = since(state),
), ),
) )
} }
val userInfoChannel = requestNewSubscription() val userInfoChannel =
requestNewSubscription { time, relayUrl ->
forEachSubscriber {
newEose(it, relayUrl, time)
}
}
override fun updateSubscriptions(keys1: Set<UserProfileQueryState>) { override fun updateSubscriptions(keys1: Set<UserProfileQueryState>) {
if (keys1.isEmpty()) return if (keys1.isEmpty()) return