highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-04-05 02:20:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixing the use of filters that didn't discriminate the relay type setup

Browse Source
This commit is contained in:
Vitor Pamplona 2024-04-04 15:24:04 -04:00
parent 7fd37367fc
commit 719b950272
2 changed files with 11 additions and 9 deletions
app/src/main/java/com/vitorpamplona/amethyst/service/relays
Relay.ktRelayPool.kt

16
app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt

@ -353,9 +353,14 @@ class Relay(
if (read) {
if (isConnected()) {
if (isReady) {
if (filters.isNotEmpty()) {
val relayFilters =
filters.filter { filter ->
activeTypes.any { it in filter.types }
}
if (relayFilters.isNotEmpty()) {
val request =
filters.joinToStringLimited(
relayFilters.joinToStringLimited(
separator = ",",
limit = 20,
prefix = """["REQ","$requestId",""",
@ -423,12 +428,7 @@ class Relay(
fun renewFilters() {
// Force update all filters after AUTH.
Client.allSubscriptions().forEach {
val filters =
it.value.filter { filter ->
activeTypes.any { it in filter.types }
}
sendFilter(requestId = it.key, filters)
sendFilter(requestId = it.key, it.value)
}
}

4
app/src/main/java/com/vitorpamplona/amethyst/service/relays/RelayPool.kt

@ -81,7 +81,9 @@ object RelayPool : Relay.Listener {
subscriptionId: String,
filters: List<TypedFilter>,
) {
relays.forEach { it.sendFilter(subscriptionId, filters) }
relays.forEach { relay ->
relay.sendFilter(subscriptionId, filters)
}
}
fun connectAndSendFiltersIfDisconnected() {