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

Update GalleryListEvent.kt

Browse Source
This commit is contained in:
Believethehype
2024-06-28 16:51:09 +02:00
parent 91caacd36d
commit e073e58241
1 changed files with 15 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quartz/src/main/java/com/vitorpamplona/quartz/events/GalleryListEvent.kt
+5 -31
View File
@@ -86,52 +86,27 @@ class GalleryListEvent(
fun removeEvent( fun removeEvent(
earlierVersion: GalleryListEvent, earlierVersion: GalleryListEvent,
eventId: HexKey, eventId: HexKey,
isPrivate: Boolean,
signer: NostrSigner, signer: NostrSigner,
createdAt: Long = TimeUtils.now(), createdAt: Long = TimeUtils.now(),
onReady: (GalleryListEvent) -> Unit, onReady: (GalleryListEvent) -> Unit,
) = removeTag(earlierVersion, "e", eventId, isPrivate, signer, createdAt, onReady) ) = removeTag(earlierVersion, "e", eventId, signer, createdAt, onReady)
fun removeReplaceable( fun removeReplaceable(
earlierVersion: GalleryListEvent, earlierVersion: GalleryListEvent,
aTag: ATag, aTag: ATag,
isPrivate: Boolean,
signer: NostrSigner, signer: NostrSigner,
createdAt: Long = TimeUtils.now(), createdAt: Long = TimeUtils.now(),
onReady: (GalleryListEvent) -> Unit, onReady: (GalleryListEvent) -> Unit,
) = removeTag(earlierVersion, "a", aTag.toTag(), isPrivate, signer, createdAt, onReady) ) = removeTag(earlierVersion, "a", aTag.toTag(), signer, createdAt, onReady)
private fun removeTag( private fun removeTag(
earlierVersion: GalleryListEvent, earlierVersion: GalleryListEvent,
tagName: String, tagName: String,
tagValue: HexKey, tagValue: HexKey,
isPrivate: Boolean,
signer: NostrSigner, signer: NostrSigner,
createdAt: Long = TimeUtils.now(), createdAt: Long = TimeUtils.now(),
onReady: (GalleryListEvent) -> Unit, onReady: (GalleryListEvent) -> Unit,
) { ) {
if (isPrivate) {
earlierVersion.privateTagsOrEmpty(signer) { privateTags ->
encryptTags(
privateTags =
privateTags
.filter { it.size <= 1 || !(it[0] == tagName && it[1] == tagValue) }
.toTypedArray(),
signer = signer,
) { encryptedTags ->
create(
content = encryptedTags,
tags =
earlierVersion.tags
.filter { it.size <= 1 || !(it[0] == tagName && it[1] == tagValue) }
.toTypedArray(),
signer = signer,
createdAt = createdAt,
onReady = onReady,
)
}
}
} else {
create( create(
content = earlierVersion.content, content = earlierVersion.content,
tags = tags =
@@ -143,7 +118,6 @@ class GalleryListEvent(
onReady = onReady, onReady = onReady,
) )
} }
}
fun create( fun create(
content: String, content: String,
@@ -177,9 +151,9 @@ class GalleryListEvent(
val tags = mutableListOf<Array<String>>() val tags = mutableListOf<Array<String>>()
tags.add(arrayOf("d", name)) tags.add(arrayOf("d", name))
images?.forEach { tags.add(arrayOf("image", it)) } images?.forEach { tags.add(arrayOf("g", it)) }
videos?.forEach { tags.add(arrayOf("video", it)) } videos?.forEach { tags.add(arrayOf("g", it)) }
audios?.forEach { tags.add(arrayOf("audio", it)) } audios?.forEach { tags.add(arrayOf("g", it)) }
tags.add(arrayOf("alt", ALT)) tags.add(arrayOf("alt", ALT))
createPrivateTags(privEvents, privUsers, privAddresses, signer) { content -> createPrivateTags(privEvents, privUsers, privAddresses, signer) { content ->