highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-11-10 12:07:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

use url tag, add relay hint

Browse Source
This commit is contained in:
Believethehype
2024-07-05 08:29:49 +02:00
parent c81324843c
commit ad6dcfc030
5 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
quartz/src/main/java/com/vitorpamplona/quartz/events/Event.kt
View File

@@ -119,7 +119,10 @@ open class Event(
override fun taggedEvents() = tags.filter { it.size > 1 && it[0] == "e" }.map { it[1] }
override fun taggedGalleryEntries() = tags.filter { it.size > 2 && it[0] == GalleryListEvent.GALLERYTAGNAME }.map { GalleryListEvent.GalleryUrl(it[1], it[2]) }
override fun taggedGalleryEntries() =
tags.filter { it.size > 2 && it[0] == GalleryListEvent.GALLERYTAGNAME }.map {
GalleryListEvent.GalleryUrl(it[1], it[2], it.getOrNull(3))
}
override fun taggedUrls() = tags.filter { it.size > 1 && it[0] == "r" }.map { it[1] }

32
quartz/src/main/java/com/vitorpamplona/quartz/events/GalleryListEvent.kt
View File

@@ -38,29 +38,36 @@ class GalleryListEvent(
companion object {
const val KIND = 10011
const val ALT = "Profile Gallery"
const val GALLERYTAGNAME = "G"
const val GALLERYTAGNAME = "url"
fun addEvent(
earlierVersion: GalleryListEvent?,
eventId: HexKey,
url: String,
relay: String?,
signer: NostrSigner,
createdAt: Long = TimeUtils.now(),
onReady: (GalleryListEvent) -> Unit,
) = addTag(earlierVersion, GALLERYTAGNAME, eventId, url, signer, createdAt, onReady)
) = addTag(earlierVersion, GALLERYTAGNAME, eventId, url, relay, signer, createdAt, onReady)
fun addTag(
earlierVersion: GalleryListEvent?,
tagName: String,
tagValue: HexKey,
eventid: HexKey,
url: String,
relay: String?,
signer: NostrSigner,
createdAt: Long = TimeUtils.now(),
onReady: (GalleryListEvent) -> Unit,
) {
var tags = arrayOf(tagName, url, eventid)
if (relay != null) {
tags + relay
}
add(
earlierVersion,
arrayOf(arrayOf(tagName, tagValue, url)),
arrayOf(tags),
signer,
createdAt,
onReady,
@@ -104,7 +111,7 @@ class GalleryListEvent(
private fun removeTag(
earlierVersion: GalleryListEvent,
tagName: String,
tagValue: HexKey,
eventid: HexKey,
url: String,
signer: NostrSigner,
createdAt: Long = TimeUtils.now(),
@@ -114,7 +121,7 @@ class GalleryListEvent(
content = earlierVersion.content,
tags =
earlierVersion.tags
.filter { it.size <= 1 || !(it[0] == tagName && it[1] == tagValue && it[2] == url) }
.filter { it.size <= 1 || !(it[0] == tagName && it[1] == url && it[2] == eventid) }
.toTypedArray(),
signer = signer,
createdAt = createdAt,
@@ -142,16 +149,17 @@ class GalleryListEvent(
@Immutable
data class GalleryUrl(
val id: String,
val url: String,
val id: String,
val relay: String?,
) {
fun encode(): String = ":$id:$url"
fun encode(): String = ":$url:$id:$relay"
companion object {
fun decode(encodedGallerySetup: String): EmojiUrl? {
val emojiParts = encodedGallerySetup.split(":", limit = 3)
return if (emojiParts.size > 2) {
EmojiUrl(emojiParts[1], emojiParts[2])
fun decode(encodedGallerySetup: String): GalleryUrl? {
val galleryParts = encodedGallerySetup.split(":", limit = 3)
return if (galleryParts.size > 3) {
GalleryUrl(galleryParts[1], galleryParts[2], galleryParts[3])
} else {
null
}