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

Change reqResultsInOrderAsFlow to reqAsFlow

Browse Source
This commit is contained in:
Vitor Pamplona
2025-11-12 08:29:05 -05:00
parent 9eee5d9e1e
commit 8554257329
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/NostrClientStaticReqAsStateFlow.kt
+7 -7
View File
@@ -42,22 +42,22 @@ import kotlinx.coroutines.flow.callbackFlow
* - They will be ignored if they are already in the list. * - They will be ignored if they are already in the list.
* - They will be added to the beginning of the list if they are new. * - They will be added to the beginning of the list if they are new.
*/ */
fun INostrClient.reqResultsInOrderAsFlow( fun INostrClient.reqAsFlow(
relay: String, relay: String,
filters: List<Filter>, filters: List<Filter>,
) = reqResultsInOrderAsFlow(RelayUrlNormalizer.normalize(relay), filters) ) = reqAsFlow(RelayUrlNormalizer.normalize(relay), filters)
fun INostrClient.reqResultsInOrderAsFlow( fun INostrClient.reqAsFlow(
relay: String, relay: String,
filter: Filter, filter: Filter,
) = reqResultsInOrderAsFlow(RelayUrlNormalizer.normalize(relay), listOf(filter)) ) = reqAsFlow(RelayUrlNormalizer.normalize(relay), listOf(filter))
fun INostrClient.reqResultsInOrderAsFlow( fun INostrClient.reqAsFlow(
relay: NormalizedRelayUrl, relay: NormalizedRelayUrl,
filter: Filter, filter: Filter,
) = reqResultsInOrderAsFlow(relay, listOf(filter)) ) = reqAsFlow(relay, listOf(filter))
fun INostrClient.reqResultsInOrderAsFlow( fun INostrClient.reqAsFlow(
relay: NormalizedRelayUrl, relay: NormalizedRelayUrl,
filters: List<Filter>, filters: List<Filter>,
): Flow<List<Event>> = ): Flow<List<Event>> =
quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionAsFlowTest.kt
+3 -3
View File
@@ -23,7 +23,7 @@ package com.vitorpamplona.quartz.nip01Core.relay
import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.Event
import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient import com.vitorpamplona.quartz.nip01Core.relay.client.NostrClient
import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.reqResultsInOrderAsFlow import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.reqAsFlow
import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
import com.vitorpamplona.quartz.utils.Log import com.vitorpamplona.quartz.utils.Log
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
@@ -50,7 +50,7 @@ class NostrClientSubscriptionAsFlowTest : BaseNostrClientTest() {
val client = NostrClient(socketBuilder, appScope) val client = NostrClient(socketBuilder, appScope)
val flow = val flow =
client.reqResultsInOrderAsFlow( client.reqAsFlow(
relay = "wss://relay.damus.io", relay = "wss://relay.damus.io",
filter = filter =
Filter( Filter(
@@ -88,7 +88,7 @@ class NostrClientSubscriptionAsFlowTest : BaseNostrClientTest() {
val client = NostrClient(socketBuilder, appScope) val client = NostrClient(socketBuilder, appScope)
val flow = val flow =
client.reqResultsInOrderAsFlow( client.reqAsFlow(
relay = "wss://relay.damus.io", relay = "wss://relay.damus.io",
filter = filter =
Filter( Filter(