From 20bc8142113da897ac9073ee7c37cda2c4066068 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Mon, 1 Jul 2024 16:40:37 -0400 Subject: [PATCH] Fixes tag. From "relay" to "server" on kind 10096 --- .../quartz/events/FileServersEvent.kt | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/FileServersEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/FileServersEvent.kt index 2bdbcab03..aff726ddc 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/events/FileServersEvent.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/FileServersEvent.kt @@ -37,34 +37,30 @@ class FileServersEvent( ) : BaseAddressableEvent(id, pubKey, createdAt, KIND, tags, content, sig) { override fun dTag() = FIXED_D_TAG - fun servers(): List { - return tags.mapNotNull { - if (it.size > 1 && it[0] == "relay") { + fun servers(): List = + tags.mapNotNull { + if (it.size > 1 && it[0] == "server") { it[1] } else { null } } - } companion object { const val KIND = 10096 const val FIXED_D_TAG = "" const val ALT = "File servers used by the author" - fun createAddressATag(pubKey: HexKey): ATag { - return ATag(KIND, pubKey, FIXED_D_TAG, null) - } + fun createAddressATag(pubKey: HexKey): ATag = ATag(KIND, pubKey, FIXED_D_TAG, null) - fun createAddressTag(pubKey: HexKey): String { - return ATag.assembleATag(KIND, pubKey, FIXED_D_TAG) - } + fun createAddressTag(pubKey: HexKey): String = ATag.assembleATag(KIND, pubKey, FIXED_D_TAG) - fun createTagArray(servers: List): Array> { - return servers.map { - arrayOf("server", it) - }.plusElement(arrayOf("alt", "Relay list to use for Search")).toTypedArray() - } + fun createTagArray(servers: List): Array> = + servers + .map { + arrayOf("server", it) + }.plusElement(arrayOf("alt", "Relay list to use for Search")) + .toTypedArray() fun updateRelayList( earlierVersion: FileServersEvent, @@ -74,11 +70,13 @@ class FileServersEvent( onReady: (FileServersEvent) -> Unit, ) { val tags = - earlierVersion.tags.filter { it[0] != "server" }.plus( - relays.map { - arrayOf("server", it) - }, - ).toTypedArray() + earlierVersion.tags + .filter { it[0] != "server" } + .plus( + relays.map { + arrayOf("server", it) + }, + ).toTypedArray() signer.sign(createdAt, KIND, tags, earlierVersion.content, onReady) }