highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-10-10 23:14:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

updates the EOSE of users even if no user is found in the relay.

Browse Source
This commit is contained in:
Vitor Pamplona
2024-07-22 14:27:10 -04:00
parent 3c1f57fac0
commit 4def80c914
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleEventDataSource.kt
View File

@@ -320,7 +320,7 @@ fun groupByEOSEPresence(notes: Set<Note>): Collection<List<Note>> =
.joinToString(",") .joinToString(",")
}.values }.values
.map { .map {
it.sortedBy { it.idHex } it.sortedBy { it.idHex } // important to keep in order otherwise the Relay thinks the filter has changed and we REQ again
} }
fun groupByEOSEPresence(users: Iterable<User>): Collection<List<User>> = fun groupByEOSEPresence(users: Iterable<User>): Collection<List<User>> =
@@ -331,7 +331,7 @@ fun groupByEOSEPresence(users: Iterable<User>): Collection<List<User>> =
.joinToString(",") .joinToString(",")
}.values }.values
.map { .map {
it.sortedBy { it.pubkeyHex } it.sortedBy { it.pubkeyHex } // important to keep in order otherwise the Relay thinks the filter has changed and we REQ again
} }
fun findMinimumEOSEs(notes: List<Note>): Map<String, EOSETime> { fun findMinimumEOSEs(notes: List<Note>): Map<String, EOSETime> {

3
amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleUserDataSource.kt
View File

@@ -64,6 +64,7 @@ object NostrSingleUserDataSource : AmethystNostrDataSource("SingleUserFeed") {
.map { group -> .map { group ->
val groupIds = group.map { it.pubkeyHex } val groupIds = group.map { it.pubkeyHex }
val minEOSEs = findMinimumEOSEsForUsers(group) val minEOSEs = findMinimumEOSEsForUsers(group)
listOf( listOf(
TypedFilter( TypedFilter(
types = EVENT_FINDER_TYPES, types = EVENT_FINDER_TYPES,
@@ -92,7 +93,6 @@ object NostrSingleUserDataSource : AmethystNostrDataSource("SingleUserFeed") {
checkNotInMainThread() checkNotInMainThread()
usersToWatch.forEach { usersToWatch.forEach {
if (it.latestMetadata != null) {
val eose = it.latestEOSEs[relayUrl] val eose = it.latestEOSEs[relayUrl]
if (eose == null) { if (eose == null) {
it.latestEOSEs = it.latestEOSEs + Pair(relayUrl, EOSETime(time)) it.latestEOSEs = it.latestEOSEs + Pair(relayUrl, EOSETime(time))
@@ -101,7 +101,6 @@ object NostrSingleUserDataSource : AmethystNostrDataSource("SingleUserFeed") {
} }
} }
} }
}
override fun updateChannelFilters() { override fun updateChannelFilters() {
checkNotInMainThread() checkNotInMainThread()