From f9f7cdf12fe4ea9669d20bb332d5a666160c355f Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Wed, 29 Oct 2025 18:29:23 -0400
Subject: [PATCH] Renames internal Req objects

---
 ...FilterRequest.kt => NostrClientDynamicReq.kt} |  6 +++---
 ...cFilterRequest.kt => NostrClientStaticReq.kt} | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)
 rename quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/{NostrClientDynamicFilterRequest.kt => NostrClientDynamicReq.kt} (92%)
 rename quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/{NostrClientStaticFilterRequest.kt => NostrClientStaticReq.kt} (80%)

diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/NostrClientDynamicFilterRequest.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/NostrClientDynamicReq.kt
similarity index 92%
rename from quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/NostrClientDynamicFilterRequest.kt
rename to quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/NostrClientDynamicReq.kt
index c6b386afb..9a4ab58d5 100644
--- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/NostrClientDynamicFilterRequest.kt
+++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/NostrClientDynamicReq.kt
@@ -26,13 +26,13 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
 import com.vitorpamplona.quartz.utils.RandomInstance
 
-class NostrClientDynamicFilterRequest(
+class NostrClientDynamicReq(
     val client: INostrClient,
     val filter: () -> Map<NormalizedRelayUrl, List<Filter>>,
     val onEvent: (event: Event) -> Unit = {},
 ) : IRequestListener,
     IOpenNostrRequest {
-    private val subId = RandomInstance.randomChars(10)
+    val subId = RandomInstance.randomChars(10)
 
     override fun onEvent(
         event: Event,
@@ -59,4 +59,4 @@ class NostrClientDynamicFilterRequest(
 fun INostrClient.req(
     filters: () -> Map<NormalizedRelayUrl, List<Filter>>,
     onEvent: (event: Event) -> Unit = {},
-): IOpenNostrRequest = NostrClientDynamicFilterRequest(this, filters, onEvent)
+): IOpenNostrRequest = NostrClientDynamicReq(this, filters, onEvent)
diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/NostrClientStaticFilterRequest.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/NostrClientStaticReq.kt
similarity index 80%
rename from quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/NostrClientStaticFilterRequest.kt
rename to quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/NostrClientStaticReq.kt
index 7c42d4d9e..4f4b737ae 100644
--- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/NostrClientStaticFilterRequest.kt
+++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/NostrClientStaticReq.kt
@@ -27,13 +27,13 @@ import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
 import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer
 import com.vitorpamplona.quartz.utils.RandomInstance
 
-class NostrClientStaticFilterRequest(
+class NostrClientStaticReq(
     val client: INostrClient,
     val filter: Map<NormalizedRelayUrl, List<Filter>>,
     val onEvent: (event: Event) -> Unit = {},
 ) : IRequestListener,
     IOpenNostrRequest {
-    private val subId = RandomInstance.randomChars(10)
+    val subId = RandomInstance.randomChars(10)
 
     override fun onEvent(
         event: Event,
@@ -61,25 +61,25 @@ fun INostrClient.req(
     relay: NormalizedRelayUrl,
     filters: List<Filter>,
     onEvent: (event: Event) -> Unit = {},
-): IOpenNostrRequest = NostrClientStaticFilterRequest(this, mapOf(relay to filters), onEvent)
+): IOpenNostrRequest = NostrClientStaticReq(this, mapOf(relay to filters), onEvent)
 
 fun INostrClient.req(
     relay: NormalizedRelayUrl,
     filter: Filter,
     onEvent: (event: Event) -> Unit = {},
-): IOpenNostrRequest = NostrClientStaticFilterRequest(this, mapOf(relay to listOf(filter)), onEvent)
+): IOpenNostrRequest = NostrClientStaticReq(this, mapOf(relay to listOf(filter)), onEvent)
 
 fun INostrClient.req(
     relays: List<NormalizedRelayUrl>,
     filters: List<Filter>,
     onEvent: (event: Event) -> Unit = {},
-): IOpenNostrRequest = NostrClientStaticFilterRequest(this, relays.associateWith { filters }, onEvent)
+): IOpenNostrRequest = NostrClientStaticReq(this, relays.associateWith { filters }, onEvent)
 
 fun INostrClient.req(
     relays: List<NormalizedRelayUrl>,
     filter: Filter,
     onEvent: (event: Event) -> Unit = {},
-): IOpenNostrRequest = NostrClientStaticFilterRequest(this, relays.associateWith { listOf(filter) }, onEvent)
+): IOpenNostrRequest = NostrClientStaticReq(this, relays.associateWith { listOf(filter) }, onEvent)
 
 // -----------------------------------
 // Helper methods with relay as string
@@ -88,10 +88,10 @@ fun INostrClient.req(
     relay: String,
     filters: List<Filter>,
     onEvent: (event: Event) -> Unit = {},
-): IOpenNostrRequest = NostrClientStaticFilterRequest(this, mapOf(RelayUrlNormalizer.normalize(relay) to filters), onEvent)
+): IOpenNostrRequest = NostrClientStaticReq(this, mapOf(RelayUrlNormalizer.normalize(relay) to filters), onEvent)
 
 fun INostrClient.req(
     relay: String,
     filter: Filter,
     onEvent: (event: Event) -> Unit = {},
-): IOpenNostrRequest = NostrClientStaticFilterRequest(this, mapOf(RelayUrlNormalizer.normalize(relay) to listOf(filter)), onEvent)
+): IOpenNostrRequest = NostrClientStaticReq(this, mapOf(RelayUrlNormalizer.normalize(relay) to listOf(filter)), onEvent)