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

Fixes tag. From "relay" to "server" on kind 10096

Browse Source
This commit is contained in:
Vitor Pamplona
2024-07-01 16:40:37 -04:00
parent e61404146b
commit 20bc814211
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quartz/src/main/java/com/vitorpamplona/quartz/events/FileServersEvent.kt
+18 -20
View File
@@ -37,34 +37,30 @@ class FileServersEvent(
) : BaseAddressableEvent(id, pubKey, createdAt, KIND, tags, content, sig) { ) : BaseAddressableEvent(id, pubKey, createdAt, KIND, tags, content, sig) {
override fun dTag() = FIXED_D_TAG override fun dTag() = FIXED_D_TAG
fun servers(): List<String> { fun servers(): List<String> =
return tags.mapNotNull { tags.mapNotNull {
if (it.size > 1 && it[0] == "relay") { if (it.size > 1 && it[0] == "server") {
it[1] it[1]
} else { } else {
null null
} }
} }
}
companion object { companion object {
const val KIND = 10096 const val KIND = 10096
const val FIXED_D_TAG = "" const val FIXED_D_TAG = ""
const val ALT = "File servers used by the author" const val ALT = "File servers used by the author"
fun createAddressATag(pubKey: HexKey): ATag { fun createAddressATag(pubKey: HexKey): ATag = ATag(KIND, pubKey, FIXED_D_TAG, null)
return ATag(KIND, pubKey, FIXED_D_TAG, null)
}
fun createAddressTag(pubKey: HexKey): String { fun createAddressTag(pubKey: HexKey): String = ATag.assembleATag(KIND, pubKey, FIXED_D_TAG)
return ATag.assembleATag(KIND, pubKey, FIXED_D_TAG)
}
fun createTagArray(servers: List<String>): Array<Array<String>> { fun createTagArray(servers: List<String>): Array<Array<String>> =
return servers.map { servers
arrayOf("server", it) .map {
}.plusElement(arrayOf("alt", "Relay list to use for Search")).toTypedArray() arrayOf("server", it)
} }.plusElement(arrayOf("alt", "Relay list to use for Search"))
.toTypedArray()
fun updateRelayList( fun updateRelayList(
earlierVersion: FileServersEvent, earlierVersion: FileServersEvent,
@@ -74,11 +70,13 @@ class FileServersEvent(
onReady: (FileServersEvent) -> Unit, onReady: (FileServersEvent) -> Unit,
) { ) {
val tags = val tags =
earlierVersion.tags.filter { it[0] != "server" }.plus( earlierVersion.tags
relays.map { .filter { it[0] != "server" }
arrayOf("server", it) .plus(
}, relays.map {
).toTypedArray() arrayOf("server", it)
},
).toTypedArray()
signer.sign(createdAt, KIND, tags, earlierVersion.content, onReady) signer.sign(createdAt, KIND, tags, earlierVersion.content, onReady)
} }