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

Fixes incorrectly marking EOSEs for addressables

Browse Source
This commit is contained in:
Vitor Pamplona
2024-07-17 19:26:46 -04:00
parent d30e613b17
commit a32f907d6c
1 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleEventDataSource.kt
+34 -28
View File
@@ -44,21 +44,24 @@ import com.vitorpamplona.quartz.events.TextNoteEvent
import com.vitorpamplona.quartz.events.TextNoteModificationEvent import com.vitorpamplona.quartz.events.TextNoteModificationEvent
object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") { object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") {
private var eventsToWatch = setOf<Note>() private var nextEventsToWatch = setOf<Note>()
private var addressesToWatch = setOf<Note>() private var nextAddressesToWatch = setOf<Note>()
private var eventsToWatchInProd = setOf<Note>()
private var addressesToWatchInProd = setOf<Note>()
private fun createReactionsToWatchInAddressFilter(): List<TypedFilter>? { private fun createReactionsToWatchInAddressFilter(): List<TypedFilter>? {
val addressesToWatch = val myAddressesToWatch =
( (
eventsToWatch.filter { it.address() != null } + eventsToWatchInProd.filter { it.address() != null } +
addressesToWatch.filter { it.address() != null } addressesToWatchInProd.filter { it.address() != null }
).toSet() ).toSet()
if (addressesToWatch.isEmpty()) { if (myAddressesToWatch.isEmpty()) {
return null return null
} }
return groupByEOSEPresence(addressesToWatch) return groupByEOSEPresence(myAddressesToWatch)
.map { .map {
listOf( listOf(
TypedFilter( TypedFilter(
@@ -102,13 +105,13 @@ object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") {
} }
private fun createAddressFilter(): List<TypedFilter>? { private fun createAddressFilter(): List<TypedFilter>? {
val addressesToWatch = addressesToWatch.filter { it.event == null } val myAddressesToWatch = addressesToWatchInProd.filter { it.event == null }
if (addressesToWatch.isEmpty()) { if (myAddressesToWatch.isEmpty()) {
return null return null
} }
return addressesToWatch.mapNotNull { return myAddressesToWatch.mapNotNull {
it.address()?.let { aTag -> it.address()?.let { aTag ->
if (aTag.kind < 25000 && aTag.dTag.isBlank()) { if (aTag.kind < 25000 && aTag.dTag.isBlank()) {
TypedFilter( TypedFilter(
@@ -137,11 +140,11 @@ object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") {
} }
private fun createRepliesAndReactionsFilter(): List<TypedFilter>? { private fun createRepliesAndReactionsFilter(): List<TypedFilter>? {
if (eventsToWatch.isEmpty()) { if (eventsToWatchInProd.isEmpty()) {
return null return null
} }
return groupByEOSEPresence(eventsToWatch) return groupByEOSEPresence(eventsToWatchInProd)
.map { .map {
listOf( listOf(
TypedFilter( TypedFilter(
@@ -187,11 +190,11 @@ object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") {
} }
private fun createQuotesFilter(): List<TypedFilter>? { private fun createQuotesFilter(): List<TypedFilter>? {
if (eventsToWatch.isEmpty()) { if (eventsToWatchInProd.isEmpty()) {
return null return null
} }
return groupByEOSEPresence(eventsToWatch) return groupByEOSEPresence(eventsToWatchInProd)
.map { .map {
listOf( listOf(
TypedFilter( TypedFilter(
@@ -210,10 +213,10 @@ object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") {
} }
fun createLoadEventsIfNotLoadedFilter(): List<TypedFilter>? { fun createLoadEventsIfNotLoadedFilter(): List<TypedFilter>? {
val directEventsToLoad = eventsToWatch.filter { it.event == null } val directEventsToLoad = eventsToWatchInProd.filter { it.event == null }
val threadingEventsToLoad = val threadingEventsToLoad =
eventsToWatch eventsToWatchInProd
.mapNotNull { it.replyTo } .mapNotNull { it.replyTo }
.flatten() .flatten()
.filter { it !is AddressableNote && it.event == null } .filter { it !is AddressableNote && it.event == null }
@@ -243,7 +246,7 @@ object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") {
checkNotInMainThread() checkNotInMainThread()
eventsToWatch.forEach { eventsToWatchInProd.forEach {
val eose = it.lastReactionsDownloadTime[relayUrl] val eose = it.lastReactionsDownloadTime[relayUrl]
if (eose == null) { if (eose == null) {
it.lastReactionsDownloadTime += Pair(relayUrl, EOSETime(time)) it.lastReactionsDownloadTime += Pair(relayUrl, EOSETime(time))
@@ -252,7 +255,7 @@ object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") {
} }
} }
addressesToWatch.forEach { addressesToWatchInProd.forEach {
val eose = it.lastReactionsDownloadTime[relayUrl] val eose = it.lastReactionsDownloadTime[relayUrl]
if (eose == null) { if (eose == null) {
it.lastReactionsDownloadTime += Pair(relayUrl, EOSETime(time)) it.lastReactionsDownloadTime += Pair(relayUrl, EOSETime(time))
@@ -267,6 +270,9 @@ object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") {
} }
override fun updateChannelFilters() { override fun updateChannelFilters() {
addressesToWatchInProd = nextAddressesToWatch
eventsToWatchInProd = nextEventsToWatch
val reactions = createRepliesAndReactionsFilter() val reactions = createRepliesAndReactionsFilter()
val missing = createLoadEventsIfNotLoadedFilter() val missing = createLoadEventsIfNotLoadedFilter()
val addresses = createAddressFilter() val addresses = createAddressFilter()
@@ -278,29 +284,29 @@ object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") {
} }
fun add(eventId: Note) { fun add(eventId: Note) {
if (!eventsToWatch.contains(eventId)) { if (!nextEventsToWatch.contains(eventId)) {
eventsToWatch = eventsToWatch.plus(eventId) nextEventsToWatch = nextEventsToWatch.plus(eventId)
invalidateFilters() invalidateFilters()
} }
} }
fun remove(eventId: Note) { fun remove(eventId: Note) {
if (eventsToWatch.contains(eventId)) { if (nextEventsToWatch.contains(eventId)) {
eventsToWatch = eventsToWatch.minus(eventId) nextEventsToWatch = nextEventsToWatch.minus(eventId)
invalidateFilters() invalidateFilters()
} }
} }
fun addAddress(addressableNote: Note) { fun addAddress(addressableNote: Note) {
if (!addressesToWatch.contains(addressableNote)) { if (!nextAddressesToWatch.contains(addressableNote)) {
addressesToWatch = addressesToWatch.plus(addressableNote) nextAddressesToWatch = nextAddressesToWatch.plus(addressableNote)
invalidateFilters() invalidateFilters()
} }
} }
fun removeAddress(addressableNote: Note) { fun removeAddress(addressableNote: Note) {
if (addressesToWatch.contains(addressableNote)) { if (nextAddressesToWatch.contains(addressableNote)) {
addressesToWatch = addressesToWatch.minus(addressableNote) nextAddressesToWatch = nextAddressesToWatch.minus(addressableNote)
invalidateFilters() invalidateFilters()
} }
} }
@@ -325,8 +331,8 @@ fun groupByEOSEPresence(users: Iterable<User>): Collection<List<User>> =
fun findMinimumEOSEs(notes: List<Note>): Map<String, EOSETime> { fun findMinimumEOSEs(notes: List<Note>): Map<String, EOSETime> {
val minLatestEOSEs = mutableMapOf<String, EOSETime>() val minLatestEOSEs = mutableMapOf<String, EOSETime>()
notes.forEach { notes.forEach { note ->
it.lastReactionsDownloadTime.forEach { note.lastReactionsDownloadTime.forEach {
val minEose = minLatestEOSEs[it.key] val minEose = minLatestEOSEs[it.key]
if (minEose == null) { if (minEose == null) {
minLatestEOSEs.put(it.key, EOSETime(it.value.time)) minLatestEOSEs.put(it.key, EOSETime(it.value.time))