Removes unused since param for missing events in thread assemblers
This commit is contained in:
+3
-7
@@ -25,13 +25,9 @@ import com.vitorpamplona.amethyst.model.ThreadAssembler
|
|||||||
import com.vitorpamplona.amethyst.service.relayClient.reqCommand.event.loaders.filterMissingAddressables
|
import com.vitorpamplona.amethyst.service.relayClient.reqCommand.event.loaders.filterMissingAddressables
|
||||||
import com.vitorpamplona.amethyst.service.relayClient.reqCommand.event.loaders.filterMissingEvents
|
import com.vitorpamplona.amethyst.service.relayClient.reqCommand.event.loaders.filterMissingEvents
|
||||||
import com.vitorpamplona.ammolite.relays.TypedFilter
|
import com.vitorpamplona.ammolite.relays.TypedFilter
|
||||||
import com.vitorpamplona.ammolite.relays.filters.EOSETime
|
|
||||||
import com.vitorpamplona.quartz.nip01Core.tags.addressables.Address
|
import com.vitorpamplona.quartz.nip01Core.tags.addressables.Address
|
||||||
|
|
||||||
fun filterMissingEventsForThread(
|
fun filterMissingEventsForThread(threadInfo: ThreadAssembler.ThreadInfo): List<TypedFilter> {
|
||||||
threadInfo: ThreadAssembler.ThreadInfo,
|
|
||||||
since: Map<String, EOSETime>?,
|
|
||||||
): List<TypedFilter> {
|
|
||||||
val missingEvents = mutableSetOf<String>()
|
val missingEvents = mutableSetOf<String>()
|
||||||
val missingAddresses = mutableSetOf<Address>()
|
val missingAddresses = mutableSetOf<Address>()
|
||||||
|
|
||||||
@@ -53,8 +49,8 @@ fun filterMissingEventsForThread(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val missingEventsFilter = filterMissingEvents(missingEvents, since) ?: emptyList()
|
val missingEventsFilter = filterMissingEvents(missingEvents) ?: emptyList()
|
||||||
val missingAddressFilter = filterMissingAddressables(missingAddresses, since) ?: emptyList()
|
val missingAddressFilter = filterMissingAddressables(missingAddresses) ?: emptyList()
|
||||||
|
|
||||||
return missingEventsFilter + missingAddressFilter
|
return missingEventsFilter + missingAddressFilter
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -45,7 +45,7 @@ class ThreadEventLoaderSubAssembler(
|
|||||||
since: Map<String, EOSETime>?,
|
since: Map<String, EOSETime>?,
|
||||||
): List<TypedFilter>? {
|
): List<TypedFilter>? {
|
||||||
val branches = ThreadAssembler().findThreadFor(key.eventId) ?: return null
|
val branches = ThreadAssembler().findThreadFor(key.eventId) ?: return null
|
||||||
return filterMissingEventsForThread(branches, since)
|
return filterMissingEventsForThread(branches)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun id(key: ThreadQueryState) = key.eventId
|
override fun id(key: ThreadQueryState) = key.eventId
|
||||||
|
|||||||
Reference in New Issue
Block a user