diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapPollNote.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapPollNote.kt index a16430e086..31e85dfb4c 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapPollNote.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapPollNote.kt @@ -104,7 +104,6 @@ import com.vitorpamplona.amethyst.ui.theme.placeholderText import com.vitorpamplona.amethyst.ui.theme.ripple24dp import com.vitorpamplona.amethyst.ui.theme.subtleBorder import com.vitorpamplona.quartz.experimental.zapPolls.ZapPollEvent -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.nip57Zaps.LnZapEvent import kotlinx.collections.immutable.ImmutableList import kotlinx.coroutines.Dispatchers @@ -204,7 +203,6 @@ fun ZapZapPollNotePreview2() { arrayOf("poll_option", "1", "Pesquisa em ingles"), arrayOf("value_maximum", "2"), arrayOf("value_minimum", "2"), - AltTag.assemble("Poll event"), ), ) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt index 48f95e1461..43c295b649 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt @@ -137,7 +137,6 @@ import com.vitorpamplona.quartz.nip19Bech32.entities.NPub import com.vitorpamplona.quartz.nip19Bech32.entities.NRelay import com.vitorpamplona.quartz.nip19Bech32.entities.NSec import com.vitorpamplona.quartz.nip28PublicChat.base.IsInPublicChatChannel -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip37Drafts.DraftWrapEvent import com.vitorpamplona.quartz.nip47WalletConnect.Nip47WalletConnect import com.vitorpamplona.quartz.nip47WalletConnect.rpc.Response @@ -1761,7 +1760,6 @@ class AccountViewModel( nostrGroupId: String, url: String, imeta: com.vitorpamplona.quartz.nip92IMeta.IMetaTag, - caption: String? = null, ) { val template = eventTemplate( @@ -1769,9 +1767,6 @@ class AccountViewModel( description = url, ) { imeta(imeta) - if (!caption.isNullOrEmpty()) { - alt(caption) - } } // MIP-03: inner events MUST remain unsigned (no `sig`) so a leaked // plaintext can't be replayed as a valid public kind:9. Authorship diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/marmotGroup/send/MarmotFileSender.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/marmotGroup/send/MarmotFileSender.kt index b16d142265..bf512b716d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/marmotGroup/send/MarmotFileSender.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/marmotGroup/send/MarmotFileSender.kt @@ -44,13 +44,13 @@ class MarmotFileSender( dimensions = upload.dimensions, blurhash = upload.blurhash, thumbhash = upload.thumbhash, + alt = upload.caption, ) accountViewModel.sendMarmotGroupMediaMessage( nostrGroupId = nostrGroupId, url = upload.url, imeta = imeta, - caption = upload.caption, ) } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/upload/ChatFileSender.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/upload/ChatFileSender.kt index b621b520fa..531dec2695 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/upload/ChatFileSender.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/upload/ChatFileSender.kt @@ -66,10 +66,11 @@ class ChatFileSender( blurhash = result.fileHeader.blurHash?.blurhash, thumbhash = result.fileHeader.thumbHash?.thumbhash, ) { + // NIP-94 accessibility description of the file (kept; the deprecated + // generic NIP-31 boilerplate alt is not written). if (!caption.isNullOrEmpty()) { alt(caption) } - contentWarningReason?.let { contentWarning(it) } }, ) @@ -89,9 +90,6 @@ class ChatFileSender( ChatMessageEvent.build(result.url, toUsers) { references(listOf(result.url)) - if (!caption.isNullOrEmpty()) { - alt(caption) - } contentWarningReason?.let { contentWarning(it) } imetas(iMetaAttachments.filterIsIn(setOf(result.url))) diff --git a/amethyst/src/test/java/com/vitorpamplona/amethyst/service/uploads/hls/HlsVideoEventBuilderTest.kt b/amethyst/src/test/java/com/vitorpamplona/amethyst/service/uploads/hls/HlsVideoEventBuilderTest.kt index 84e6c042a7..1d7223b49c 100644 --- a/amethyst/src/test/java/com/vitorpamplona/amethyst/service/uploads/hls/HlsVideoEventBuilderTest.kt +++ b/amethyst/src/test/java/com/vitorpamplona/amethyst/service/uploads/hls/HlsVideoEventBuilderTest.kt @@ -216,21 +216,17 @@ class HlsVideoEventBuilderTest { } @Test - fun horizontalTemplateCarriesAutoGeneratedAltTag() { + fun horizontalTemplateOmitsDeprecatedAltTag() { val result = HlsVideoEventBuilder.build(input(landscapeRenditions)) val tags = (result.template as HlsVideoEventTemplate.Horizontal).template.tags - val alt = tags.findTag("alt") - assertNotNull(alt) - assertEquals(VideoHorizontalEvent.ALT_DESCRIPTION, alt!![1]) + assertNull(tags.findTag("alt")) } @Test - fun verticalTemplateCarriesVerticalAltTag() { + fun verticalTemplateOmitsDeprecatedAltTag() { val result = HlsVideoEventBuilder.build(input(portraitRenditions)) val tags = (result.template as HlsVideoEventTemplate.Vertical).template.tags - val alt = tags.findTag("alt") - assertNotNull(alt) - assertEquals(VideoVerticalEvent.ALT_DESCRIPTION, alt!![1]) + assertNull(tags.findTag("alt")) } @Test diff --git a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/highlights/HighlightPublishAction.kt b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/highlights/HighlightPublishAction.kt index 992640b028..764f7e521d 100644 --- a/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/highlights/HighlightPublishAction.kt +++ b/desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/ui/highlights/HighlightPublishAction.kt @@ -23,7 +23,6 @@ package com.vitorpamplona.amethyst.desktop.ui.highlights import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag import com.vitorpamplona.quartz.nip01Core.tags.people.PTag -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.nip84Highlights.HighlightEvent import com.vitorpamplona.quartz.nip84Highlights.tags.CommentTag import com.vitorpamplona.quartz.nip84Highlights.tags.ContextTag @@ -39,7 +38,6 @@ object HighlightPublishAction { ): HighlightEvent { val tags = mutableListOf>() - tags.add(AltTag.assemble(HighlightEvent.ALT)) tags.add(ATag.assemble(articleAddressTag, null)) // Tag the article author diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/attestations/attestation/AttestationEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/attestations/attestation/AttestationEvent.kt index 8202989305..a4ee13f6f6 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/attestations/attestation/AttestationEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/attestations/attestation/AttestationEvent.kt @@ -37,7 +37,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip01Core.tags.events.ETag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -85,7 +84,6 @@ class AttestationEvent( companion object { const val KIND = 31871 - const val ALT_DESCRIPTION = "Attestation" fun buildEvent( dTagId: String, @@ -98,7 +96,6 @@ class AttestationEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, content, createdAt) { - alt(ALT_DESCRIPTION) dTag(dTagId) about(about) status?.let { status(it) } @@ -119,7 +116,6 @@ class AttestationEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, content, createdAt) { - alt(ALT_DESCRIPTION) dTag(dTagId) aboutReplaceable(about) status?.let { status(it) } @@ -140,7 +136,6 @@ class AttestationEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, content, createdAt) { - alt(ALT_DESCRIPTION) dTag(dTagId) aboutAddressable(about) status?.let { status(it) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/attestations/proficiency/AttestorProficiencyEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/attestations/proficiency/AttestorProficiencyEvent.kt index 74dcd32098..ea8fff30ed 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/attestations/proficiency/AttestorProficiencyEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/attestations/proficiency/AttestorProficiencyEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.Kind import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -48,7 +47,6 @@ class AttestorProficiencyEvent( companion object { const val KIND = 11871 - const val ALT_DESCRIPTION = "Attestor Proficiency Declaration" fun build( kinds: List, @@ -56,7 +54,6 @@ class AttestorProficiencyEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, description ?: "", createdAt) { - alt(ALT_DESCRIPTION) kinds(kinds) initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/attestations/recommendation/AttestorRecommendationEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/attestations/recommendation/AttestorRecommendationEvent.kt index 373146bce6..e679dc2b10 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/attestations/recommendation/AttestorRecommendationEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/attestations/recommendation/AttestorRecommendationEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Kind import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -49,7 +48,6 @@ class AttestorRecommendationEvent( companion object { const val KIND = 31873 - const val ALT_DESCRIPTION = "Attestor Recommendation" fun build( attestorPubKey: HexKey, @@ -58,7 +56,6 @@ class AttestorRecommendationEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, description ?: "", createdAt) { - alt(ALT_DESCRIPTION) dTag(attestorPubKey) kinds(kinds) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/attestations/request/AttestationRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/attestations/request/AttestationRequestEvent.kt index 0a1328c15a..c7b452a39e 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/attestations/request/AttestationRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/attestations/request/AttestationRequestEvent.kt @@ -37,7 +37,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip01Core.tags.events.ETag import com.vitorpamplona.quartz.nip01Core.tags.people.PTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -82,7 +81,6 @@ class AttestationRequestEvent( companion object { const val KIND = 31872 - const val ALT_DESCRIPTION = "Attestation Request" fun buildEvent( dTagId: String, @@ -93,7 +91,6 @@ class AttestationRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, content, createdAt) { - alt(ALT_DESCRIPTION) dTag(dTagId) about(about) attestorPubKeys(attestorPubKeys) @@ -110,7 +107,6 @@ class AttestationRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, content, createdAt) { - alt(ALT_DESCRIPTION) dTag(dTagId) aboutReplaceable(about) attestorPubKeys(attestorPubKeys) @@ -127,7 +123,6 @@ class AttestationRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, content, createdAt) { - alt(ALT_DESCRIPTION) dTag(dTagId) aboutAddressable(about) attestorPubKeys(attestorPubKeys) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/audio/header/AudioHeaderEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/audio/header/AudioHeaderEvent.kt index acc168f39d..f9abe052c9 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/audio/header/AudioHeaderEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/audio/header/AudioHeaderEvent.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -52,7 +51,6 @@ class AudioHeaderEvent( companion object { const val KIND = 1808 - const val ALT = "Audio header" fun build( description: String, @@ -62,7 +60,6 @@ class AudioHeaderEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, description, createdAt) { - alt(ALT) downloadUrl.let { downloadUrl(it) } streamUrl?.let { streamUrl(it) } wavefront?.let { wavefront(it) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/audio/track/AudioTrackEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/audio/track/AudioTrackEvent.kt index 56c45a3920..4806cec67a 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/audio/track/AudioTrackEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/audio/track/AudioTrackEvent.kt @@ -32,7 +32,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip14Subject.SubjectTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.uuid.ExperimentalUuidApi @@ -65,7 +64,6 @@ class AudioTrackEvent( companion object { const val KIND = 31337 - const val ALT_DESCRIPTION = "Audio track" @OptIn(ExperimentalUuidApi::class) fun build( @@ -79,7 +77,6 @@ class AudioTrackEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { dTag(dTag) - alt(ALT_DESCRIPTION) type(type) media(media) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/bounties/BountyAddValueEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/bounties/BountyAddValueEvent.kt index 25b4ad29cd..39921e4602 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/bounties/BountyAddValueEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/bounties/BountyAddValueEvent.kt @@ -30,7 +30,6 @@ import com.vitorpamplona.quartz.nip10Notes.TextNoteEvent import com.vitorpamplona.quartz.nip10Notes.tags.MarkedETag import com.vitorpamplona.quartz.nip10Notes.tags.markedETag import com.vitorpamplona.quartz.nip10Notes.tags.toMarkedETag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.BigDecimal import com.vitorpamplona.quartz.utils.TimeUtils @@ -40,7 +39,6 @@ import com.vitorpamplona.quartz.utils.TimeUtils class BountyAddValueEvent { companion object { const val KIND = 1 - const val ALT_DESCRIPTION = "Add Value to Bounty" const val BOUNTY_HASH_TAG = "bounty-added-reward" @@ -54,7 +52,6 @@ class BountyAddValueEvent { tags.markedETag(bountyRoot.toMarkedETag(MarkedETag.MARKER.ROOT)) tags.hashtag(BOUNTY_HASH_TAG) tags.pTag(bountyRootAuthor) - tags.alt(ALT_DESCRIPTION) return EventTemplate(createdAt, KIND, tags.build(), amount.toString()) } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/clink/debits/DebitEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/clink/debits/DebitEvent.kt index d5dc713ef3..fb5162f52c 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/clink/debits/DebitEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/clink/debits/DebitEvent.kt @@ -32,7 +32,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.events.ETag import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils /** @@ -87,7 +86,6 @@ class DebitEvent( companion object { const val KIND = 21002 - const val ALT = "CLINK debit" /** Builds a request event (requestor side) addressed to the debit service. */ suspend fun createRequest( @@ -101,7 +99,6 @@ class DebitEvent( eventTemplate(KIND, encrypted, createdAt) { pTag(servicePubKey, null) clinkVersion() - alt(ALT) }, ) } @@ -120,7 +117,6 @@ class DebitEvent( pTag(requestorPubKey, null) add(ETag.assemble(requestEvent.id, null, null)) clinkVersion() - alt(ALT) }, ) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/clink/manage/ManageEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/clink/manage/ManageEvent.kt index c2901a8669..e2cfced7c8 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/clink/manage/ManageEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/clink/manage/ManageEvent.kt @@ -32,7 +32,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.events.ETag import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils /** @@ -87,7 +86,6 @@ class ManageEvent( companion object { const val KIND = 21003 - const val ALT = "CLINK manage" /** Builds a request event (app side) addressed to the wallet server. */ suspend fun createRequest( @@ -101,7 +99,6 @@ class ManageEvent( eventTemplate(KIND, encrypted, createdAt) { pTag(serverPubKey, null) clinkVersion() - alt(ALT) }, ) } @@ -120,7 +117,6 @@ class ManageEvent( pTag(appPubKey, null) add(ETag.assemble(requestEvent.id, null, null)) clinkVersion() - alt(ALT) }, ) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/clink/offers/OfferEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/clink/offers/OfferEvent.kt index fb35b0b57f..4041843a9b 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/clink/offers/OfferEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/clink/offers/OfferEvent.kt @@ -32,7 +32,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.events.ETag import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils /** @@ -91,7 +90,6 @@ class OfferEvent( companion object { const val KIND = 21001 - const val ALT = "CLINK offer" /** Builds a request event (payer side) addressed to the offer service. */ suspend fun createRequest( @@ -105,7 +103,6 @@ class OfferEvent( eventTemplate(KIND, encrypted, createdAt) { pTag(servicePubKey, null) clinkVersion() - alt(ALT) }, ) } @@ -124,7 +121,6 @@ class OfferEvent( pTag(payerPubKey, null) add(ETag.assemble(requestEvent.id, null, null)) clinkVersion() - alt(ALT) }, ) } @@ -147,7 +143,6 @@ class OfferEvent( pTag(payerPubKey, null) add(ETag.assemble(requestEvent.id, null, null)) clinkVersion() - alt(ALT) }, ) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/decoupling/setup/EncryptionKeyListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/decoupling/setup/EncryptionKeyListEvent.kt index ff3b6dc8d2..2a5d6f6a73 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/decoupling/setup/EncryptionKeyListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/decoupling/setup/EncryptionKeyListEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.signers.eventUpdate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -43,7 +42,6 @@ class EncryptionKeyListEvent( companion object { const val KIND = 10044 - const val ALT = "Encryption keys" fun add( key: KeyTag, @@ -51,7 +49,6 @@ class EncryptionKeyListEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventUpdate(currentEvent, createdAt) { - alt(ALT) key(key) initializer() } @@ -62,7 +59,6 @@ class EncryptionKeyListEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventUpdate(currentEvent, createdAt) { - alt(ALT) removeIf(KeyTag::isSameKey, key.toTagArray()) initializer() } @@ -72,7 +68,6 @@ class EncryptionKeyListEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) keys(keys) initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/edits/TextNoteModificationEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/edits/TextNoteModificationEvent.kt index 47a06d6f7e..1545a8789a 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/edits/TextNoteModificationEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/edits/TextNoteModificationEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.tags.events.firstTaggedEvent -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -43,7 +42,6 @@ class TextNoteModificationEvent( companion object { const val KIND = 1010 - const val ALT = "Content Change Event" suspend fun create( content: String, @@ -63,8 +61,6 @@ class TextNoteModificationEvent( tags.add(arrayOf("summary", it)) } - tags.add(AltTag.assemble(ALT)) - return signer.sign(createdAt, KIND, tags.toTypedArray(), content) } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/ephemChat/chat/EphemeralChatEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/ephemChat/chat/EphemeralChatEvent.kt index 135e716b11..b073d67792 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/ephemChat/chat/EphemeralChatEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/ephemChat/chat/EphemeralChatEvent.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -50,7 +49,6 @@ class EphemeralChatEvent( companion object { const val KIND = 23333 - const val ALT_DESCRIPTION = "Ephemeral Chat" const val DEFAULT_ROOM = "_" @@ -63,7 +61,6 @@ class EphemeralChatEvent( ) = eventTemplate(KIND, message, createdAt) { room(room) relay(relay) - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/ephemChat/list/EphemeralChatListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/ephemChat/list/EphemeralChatListEvent.kt index 1ba12ec2b1..02e98a628b 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/ephemChat/list/EphemeralChatListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/ephemChat/list/EphemeralChatListEvent.kt @@ -27,12 +27,9 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.removeParsing @@ -53,7 +50,6 @@ class EphemeralChatListEvent( companion object { const val KIND = 10023 - const val ALT = "Ephemeral Chat List" const val FIXED_D_TAG = "" fun createAddress(pubKey: HexKey) = Address(KIND, pubKey, FIXED_D_TAG) @@ -136,16 +132,7 @@ class EphemeralChatListEvent( tags: TagArray, signer: NostrSigner, createdAt: Long = TimeUtils.now(), - ): EphemeralChatListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } - - return signer.sign(createdAt, KIND, newTags, content) - } + ): EphemeralChatListEvent = signer.sign(createdAt, KIND, tags, content) suspend fun create( publicRooms: List = emptyList(), @@ -168,7 +155,6 @@ class EphemeralChatListEvent( description = PrivateTagsInContent.encryptNip44(privateRooms.map { it.toTagArray() }.toTypedArray(), signer), createdAt = createdAt, ) { - alt(ALT) rooms(publicRooms) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/fitness/workout/WorkoutRecordEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/fitness/workout/WorkoutRecordEvent.kt index 028304279d..f70454a2b5 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/fitness/workout/WorkoutRecordEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/fitness/workout/WorkoutRecordEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip22Comments.RootScope -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.uuid.ExperimentalUuidApi @@ -89,7 +88,6 @@ class WorkoutRecordEvent( companion object { const val KIND = 1301 - const val ALT_DESCRIPTION = "Workout record" @OptIn(ExperimentalUuidApi::class) fun build( @@ -101,7 +99,6 @@ class WorkoutRecordEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, notes, createdAt) { - alt(ALT_DESCRIPTION) dTag(workoutId) exercise(exercise) hashtag(exercise.hashtag) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/interactiveStories/InteractiveStoryReadingStateEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/interactiveStories/InteractiveStoryReadingStateEvent.kt index 51d45eb745..32a71a23c3 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/interactiveStories/InteractiveStoryReadingStateEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/interactiveStories/InteractiveStoryReadingStateEvent.kt @@ -35,7 +35,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip23LongContent.tags.ImageTag import com.vitorpamplona.quartz.nip23LongContent.tags.TitleTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip94FileMetadata.tags.SummaryTag import com.vitorpamplona.quartz.nip99Classifieds.tags.StatusTag import com.vitorpamplona.quartz.utils.TimeUtils @@ -63,8 +62,6 @@ class InteractiveStoryReadingStateEvent( companion object { const val KIND = 30298 - const val ALT1 = "Interactive Story Reading state" - const val ALT2 = "The reading state of " fun createAddress( pubKey: HexKey, @@ -125,7 +122,6 @@ class InteractiveStoryReadingStateEvent( } dTag(rootTag.toTag()) - alt(root.event.title()?.let { ALT2 + it } ?: ALT1) rootScene(rootTag) currentScene(sceneTag) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/medical/FhirResourceEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/medical/FhirResourceEvent.kt index 721aa0234b..b95823d72b 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/medical/FhirResourceEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/medical/FhirResourceEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -39,14 +38,12 @@ class FhirResourceEvent( ) : Event(id, pubKey, createdAt, KIND, tags, content, sig) { companion object { const val KIND = 82 - const val ALT_DESCRIPTION = "Medical data" fun build( fhirPayload: String, createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, fhirPayload, createdAt) { - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/music/playlist/MusicPlaylistEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/music/playlist/MusicPlaylistEvent.kt index 3484ef974c..d264b1c53a 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/music/playlist/MusicPlaylistEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/music/playlist/MusicPlaylistEvent.kt @@ -39,7 +39,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip01Core.tags.hashtags.hashtag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.uuid.ExperimentalUuidApi @@ -92,7 +91,6 @@ class MusicPlaylistEvent( companion object { const val KIND = 34139 - const val ALT_DESCRIPTION_PREFIX = "Playlist" const val CATEGORY_TAG = "playlist" @OptIn(ExperimentalUuidApi::class) @@ -111,7 +109,6 @@ class MusicPlaylistEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, content, createdAt) { dTag(dTag) - alt("$ALT_DESCRIPTION_PREFIX: $title") title(title) hashtag(CATEGORY_TAG) @@ -172,7 +169,6 @@ class MusicPlaylistEvent( val newTags = earlierVersion.tags.builder { title(title) - alt("$ALT_DESCRIPTION_PREFIX: $title") setOrRemove(image, ImageTag.TAG_NAME, ::image) setOrRemove(description, DescriptionTag.TAG_NAME, ::description) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/music/track/MusicTrackEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/music/track/MusicTrackEvent.kt index 5256ee2c1b..1b29032bc8 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/music/track/MusicTrackEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/music/track/MusicTrackEvent.kt @@ -43,7 +43,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip01Core.tags.hashtags.hashtag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.uuid.ExperimentalUuidApi @@ -91,7 +90,6 @@ class MusicTrackEvent( companion object { const val KIND = 36787 - const val ALT_DESCRIPTION_PREFIX = "Music track" const val GENRE_TAG = "music" @OptIn(ExperimentalUuidApi::class) @@ -116,7 +114,6 @@ class MusicTrackEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, description, createdAt) { dTag(dTag) - alt("$ALT_DESCRIPTION_PREFIX: $title by $artist") title(title) artist(artist) @@ -166,7 +163,6 @@ class MusicTrackEvent( title(title) artist(artist) url(url) - alt("$ALT_DESCRIPTION_PREFIX: $title by $artist") setOrRemove(image, ImageTag.TAG_NAME, ::image) setOrRemove(album, AlbumTag.TAG_NAME, ::album) if (duration != null) duration(duration) else remove(DurationTag.TAG_NAME) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip82SoftwareApps/application/SoftwareApplicationEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip82SoftwareApps/application/SoftwareApplicationEvent.kt index 2110f878ea..4b34461d2e 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip82SoftwareApps/application/SoftwareApplicationEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip82SoftwareApps/application/SoftwareApplicationEvent.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip01Core.tags.hashtags.HashtagTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -75,7 +74,6 @@ class SoftwareApplicationEvent( companion object { const val KIND = 32267 - const val ALT_DESCRIPTION = "Software application" fun build( appId: String, @@ -85,7 +83,6 @@ class SoftwareApplicationEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, description, createdAt) { dTag(appId) - alt(ALT_DESCRIPTION) name(name) initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip82SoftwareApps/asset/SoftwareAssetEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip82SoftwareApps/asset/SoftwareAssetEvent.kt index a58e4ddf5e..5d04e7606a 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip82SoftwareApps/asset/SoftwareAssetEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip82SoftwareApps/asset/SoftwareAssetEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils /** @@ -81,7 +80,6 @@ class SoftwareAssetEvent( companion object { const val KIND = 3063 - const val ALT_DESCRIPTION = "Software asset" fun build( appId: String, @@ -93,7 +91,6 @@ class SoftwareAssetEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) appId(appId) mimeType(mimeType) hash(hash) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip82SoftwareApps/release/SoftwareReleaseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip82SoftwareApps/release/SoftwareReleaseEvent.kt index 1927c70c97..36d9a99d36 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip82SoftwareApps/release/SoftwareReleaseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip82SoftwareApps/release/SoftwareReleaseEvent.kt @@ -30,7 +30,6 @@ import com.vitorpamplona.quartz.nip01Core.hints.EventHintBundle import com.vitorpamplona.quartz.nip01Core.hints.EventHintProvider import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -77,7 +76,6 @@ class SoftwareReleaseEvent( companion object { const val KIND = 30063 - const val ALT_DESCRIPTION = "Software release" /** NIP-82 requires `d = @`. */ fun buildDTag( @@ -95,7 +93,6 @@ class SoftwareReleaseEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, releaseNotes, createdAt) { dTag(buildDTag(appId, version)) - alt(ALT_DESCRIPTION) appId(appId) version(version) channel(channel) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip95/data/FileStorageEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip95/data/FileStorageEvent.kt index 46b7385a13..ef2b7636d7 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip95/data/FileStorageEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip95/data/FileStorageEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.io.encoding.Base64 @@ -45,7 +44,6 @@ class FileStorageEvent( companion object { const val KIND = 1064 - const val ALT = "Binary data" fun decode(content: String): ByteArray? = runCatching { Base64.decode(content) }.getOrNull() @@ -58,7 +56,6 @@ class FileStorageEvent( initializer: TagArrayBuilder.() -> Unit = {}, ): EventTemplate = eventTemplate(KIND, encode(data), createdAt) { - alt(ALT) mimeType?.let { mimeType(it) } initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip95/header/FileStorageHeaderEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip95/header/FileStorageHeaderEvent.kt index 02c0625425..ad121b8bd0 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip95/header/FileStorageHeaderEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nip95/header/FileStorageHeaderEvent.kt @@ -31,7 +31,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.events.ETag import com.vitorpamplona.quartz.nip01Core.tags.events.eTag import com.vitorpamplona.quartz.nip01Core.tags.events.toETag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip94FileMetadata.tags.BlurhashTag import com.vitorpamplona.quartz.nip94FileMetadata.tags.DimensionTag @@ -98,7 +97,6 @@ class FileStorageHeaderEvent( companion object { const val KIND = 1065 - const val ALT_DESCRIPTION = "Descriptors for a binary file" fun build( storageEvent: EventHintBundle, @@ -107,7 +105,6 @@ class FileStorageHeaderEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, caption ?: "", createdAt) { eTag(storageEvent.toETag()) - caption?.ifBlank { null }?.let { alt(caption) } ?: alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nipA3/PaymentTargetsEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nipA3/PaymentTargetsEvent.kt index fe38dcd24b..7ee3be366f 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nipA3/PaymentTargetsEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nipA3/PaymentTargetsEvent.kt @@ -24,7 +24,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.BaseReplaceableEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.utils.TimeUtils class PaymentTargetsEvent( @@ -39,7 +38,6 @@ class PaymentTargetsEvent( companion object { const val KIND = 10133 - const val ALT = "Payment targets" const val FIXED_D_TAG = "" fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, FIXED_D_TAG) @@ -54,13 +52,12 @@ class PaymentTargetsEvent( earlierVersion.tags .filter(PaymentTargetTag::notMatch) .plus(targets.map { PaymentTargetTag.assemble(it) }) - .plusElement(AltTag.assemble(ALT)) .toTypedArray() return signer.sign(createdAt, KIND, tags, earlierVersion.content) } - fun createPaymentTargets(targets: List) = (targets.map { PaymentTargetTag.assemble(it) } + listOf(AltTag.assemble(ALT))).toTypedArray() + fun createPaymentTargets(targets: List) = targets.map { PaymentTargetTag.assemble(it) }.toTypedArray() suspend fun create( targets: List, diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nipsOnNostr/NipTextEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nipsOnNostr/NipTextEvent.kt index f25763b1b2..a754a6f817 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nipsOnNostr/NipTextEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nipsOnNostr/NipTextEvent.kt @@ -45,7 +45,6 @@ import com.vitorpamplona.quartz.nip19Bech32.eventHints import com.vitorpamplona.quartz.nip19Bech32.eventIds import com.vitorpamplona.quartz.nip22Comments.RootScope import com.vitorpamplona.quartz.nip23LongContent.tags.TitleTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.uuid.ExperimentalUuidApi @@ -139,7 +138,6 @@ class NipTextEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, description, createdAt) { dTag(dTag) - alt("NIP: $title") title(title) kinds(kinds) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nns/NNSEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nns/NNSEvent.kt index a5d5d2a402..5bd6403a58 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nns/NNSEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/nns/NNSEvent.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.core.BaseAddressableEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -48,13 +47,11 @@ class NNSEvent( companion object { const val KIND = 30053 - const val ALT = "DNS records" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } @@ -63,7 +60,6 @@ class NNSEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) ipv4(ipv4) initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/notifications/wake/WakeUpEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/notifications/wake/WakeUpEvent.kt index 33b567a8dd..0bd33866fb 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/notifications/wake/WakeUpEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/notifications/wake/WakeUpEvent.kt @@ -33,7 +33,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.events.ETag import com.vitorpamplona.quartz.nip01Core.tags.kinds.kind import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip01Core.tags.people.toPTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils import kotlinx.serialization.json.JsonNull.content @@ -80,7 +79,6 @@ class WakeUpEvent( companion object { const val KIND = 23903 - const val ALT_DESCRIPTION = "WakeUp" // p-tags on a WakeUp identify the AUTHORS of the referenced events — // the people whose events are the subject of the wake-up and who should @@ -91,7 +89,6 @@ class WakeUpEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, content, createdAt) { - alt(ALT_DESCRIPTION) about(about) notify(about.toPTag()) kind(about.event.kind) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/profileGallery/GalleryListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/profileGallery/GalleryListEvent.kt index 64ef180927..f30941c49c 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/profileGallery/GalleryListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/profileGallery/GalleryListEvent.kt @@ -24,7 +24,6 @@ import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -41,7 +40,6 @@ class GalleryListEvent( @Suppress("DEPRECATION") companion object { const val KIND = 10011 - const val ALT = "Profile Gallery" const val GALLERY_TAG_NAME = "url" suspend fun addEvent( @@ -127,16 +125,7 @@ class GalleryListEvent( tags: Array>, signer: NostrSigner, createdAt: Long = TimeUtils.now(), - ): GalleryListEvent { - val newTags = - if (tags.any { it.size > 1 && it[0] == "alt" }) { - tags - } else { - tags + AltTag.assemble(ALT) - } - - return signer.sign(createdAt, KIND, newTags, content) - } + ): GalleryListEvent = signer.sign(createdAt, KIND, tags, content) } @Immutable diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/profileGallery/ProfileGalleryEntryEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/profileGallery/ProfileGalleryEntryEvent.kt index 29cf7f16d0..b27bac9906 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/profileGallery/ProfileGalleryEntryEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/profileGallery/ProfileGalleryEntryEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.core.any import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.events.ETag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip94FileMetadata.tags.BlurhashTag import com.vitorpamplona.quartz.nip94FileMetadata.tags.DimensionTag @@ -99,7 +98,6 @@ class ProfileGalleryEntryEvent( companion object { const val KIND = 1163 - const val ALT_DESCRIPTION = "Profile Gallery Entry" fun build( url: String, @@ -107,7 +105,6 @@ class ProfileGalleryEntryEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { url(url) - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/roadstr/confirmation/RoadEventConfirmationEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/roadstr/confirmation/RoadEventConfirmationEvent.kt index 746fe9200b..1674a7fd97 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/roadstr/confirmation/RoadEventConfirmationEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/roadstr/confirmation/RoadEventConfirmationEvent.kt @@ -36,7 +36,6 @@ import com.vitorpamplona.quartz.nip01Core.hints.EventHintProvider import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.geohash.geohashes import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip40Expiration.expiration import com.vitorpamplona.quartz.utils.TimeUtils @@ -90,14 +89,6 @@ class RoadEventConfirmationEvent( companion object { const val KIND = 1316 - /** NIP-31 fallback for a confirmation (`still_there`), per the roadstr spec. */ - const val ALT_CONFIRMED = "Roadstr: event confirmed" - - /** NIP-31 fallback for a denial (`no_longer_there`), per the roadstr spec. */ - const val ALT_DENIED = "Roadstr: event denied" - - fun altDescription(status: RoadEventStatus) = if (status == RoadEventStatus.NO_LONGER_THERE) ALT_DENIED else ALT_CONFIRMED - fun build( reportId: HexKey, status: RoadEventStatus, @@ -113,7 +104,6 @@ class RoadEventConfirmationEvent( coordinates(latitude, longitude) } expiration(createdAt + RoadEventReportEvent.RELAY_TTL_SECONDS) - alt(altDescription(status)) initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/roadstr/report/RoadEventReportEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/roadstr/report/RoadEventReportEvent.kt index 1d7eb8747c..319b8d22ee 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/roadstr/report/RoadEventReportEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/roadstr/report/RoadEventReportEvent.kt @@ -32,7 +32,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.geohash.geohashes import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip40Expiration.expiration import com.vitorpamplona.quartz.utils.TimeUtils @@ -87,13 +86,10 @@ class RoadEventReportEvent( companion object { const val KIND = 1315 - const val ALT_PREFIX = "Roadstr: " /** Fixed relay-side NIP-40 window (14 days) for both report and confirmation events. */ const val RELAY_TTL_SECONDS = 1_209_600L - fun altDescription(type: RoadEventType) = "$ALT_PREFIX${type.code} report" - fun build( type: RoadEventType, latitude: Double, @@ -106,7 +102,6 @@ class RoadEventReportEvent( roadGeohashes(latitude, longitude) coordinates(latitude, longitude) expiration(createdAt + RELAY_TTL_SECONDS) - alt(altDescription(type)) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/zapPolls/ZapPollEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/zapPolls/ZapPollEvent.kt index 2b1ff294a1..385e58d3ad 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/zapPolls/ZapPollEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/zapPolls/ZapPollEvent.kt @@ -46,7 +46,6 @@ import com.vitorpamplona.quartz.nip19Bech32.eventHints import com.vitorpamplona.quartz.nip19Bech32.eventIds import com.vitorpamplona.quartz.nip19Bech32.pubKeyHints import com.vitorpamplona.quartz.nip19Bech32.pubKeys -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -129,7 +128,6 @@ class ZapPollEvent( companion object { const val KIND = 6969 - const val ALT_DESCRIPTION = "Poll event" fun build( post: String, @@ -139,7 +137,6 @@ class ZapPollEvent( ): EventTemplate { val tags = TagArrayBuilder() tags.pollOptions(options) - tags.alt(ALT_DESCRIPTION) tags.apply(initializer) return EventTemplate(createdAt, KIND, tags.build(), post) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/mip00KeyPackages/KeyPackageEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/mip00KeyPackages/KeyPackageEvent.kt index c8d01ddc6e..c00378e80f 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/mip00KeyPackages/KeyPackageEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/mip00KeyPackages/KeyPackageEvent.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils /** @@ -85,7 +84,6 @@ class KeyPackageEvent( companion object { const val KIND = 30443 - const val ALT_DESCRIPTION = "MLS KeyPackage" fun build( keyPackageBase64: String, @@ -97,7 +95,6 @@ class KeyPackageEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, keyPackageBase64, createdAt) { - alt(ALT_DESCRIPTION) dTag(dTagSlot) mlsProtocolVersion() mlsCiphersuite(ciphersuite) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/mip00KeyPackages/KeyPackageRelayListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/mip00KeyPackages/KeyPackageRelayListEvent.kt index dbbfff6198..137afb2c55 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/mip00KeyPackages/KeyPackageRelayListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/mip00KeyPackages/KeyPackageRelayListEvent.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.relay.normalizer.isLocalHost import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.utils.TimeUtils /** @@ -53,7 +52,6 @@ class KeyPackageRelayListEvent( companion object { const val KIND = 10051 - const val ALT_DESCRIPTION = "MLS KeyPackage relay list" fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, FIXED_D_TAG) @@ -62,7 +60,6 @@ class KeyPackageRelayListEvent( private fun createTagArray(relays: List): Array> = relays .map { RelayTag.assemble(it) } - .plusElement(AltTag.assemble(ALT_DESCRIPTION)) .toTypedArray() suspend fun create( diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/mip04EncryptedMedia/Mip04IMetaTag.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/mip04EncryptedMedia/Mip04IMetaTag.kt index 7f78d36dd1..c07fffca78 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/mip04EncryptedMedia/Mip04IMetaTag.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/mip04EncryptedMedia/Mip04IMetaTag.kt @@ -22,6 +22,7 @@ package com.vitorpamplona.quartz.marmot.mip04EncryptedMedia import com.vitorpamplona.quartz.nip01Core.core.hexToByteArray import com.vitorpamplona.quartz.nip01Core.core.toHexKey +import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.nip92IMeta.IMetaTag import com.vitorpamplona.quartz.nip92IMeta.IMetaTagBuilder import com.vitorpamplona.quartz.utils.Log @@ -167,6 +168,7 @@ fun buildMip04IMetaTag( dimensions: String? = null, blurhash: String? = null, thumbhash: String? = null, + alt: String? = null, ): IMetaTag = IMetaTagBuilder(url) .apply { @@ -178,4 +180,6 @@ fun buildMip04IMetaTag( dimensions?.let { add(Mip04Fields.DIMENSIONS, it) } blurhash?.let { add(Mip04Fields.BLURHASH, it) } thumbhash?.let { add(Mip04Fields.THUMBHASH, it) } + // imeta accessibility description (NIP-92/94 "alt"); only when provided. + alt?.ifBlank { null }?.let { add(AltTag.TAG_NAME, it) } }.build() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/metadata/MetadataEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/metadata/MetadataEvent.kt index 2a3d427b70..8a2f1eb445 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/metadata/MetadataEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/metadata/MetadataEvent.kt @@ -41,7 +41,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag import com.vitorpamplona.quartz.nip21UriScheme.toNostrUri -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip39ExtIdentities.IdentityClaimTag import com.vitorpamplona.quartz.nip39ExtIdentities.claims import com.vitorpamplona.quartz.nip39ExtIdentities.githubClaim @@ -127,8 +126,6 @@ class MetadataEvent( val content = Json.encodeToString(JsonObject.serializer(), newJsonObject) return eventTemplate(KIND, content, createdAt) { - alt("User profile for $name") - updateOrDeleteTagNames(metadata) initializer() @@ -175,8 +172,6 @@ class MetadataEvent( val content = Json.encodeToString(JsonObject.serializer(), newJsonObject) return eventTemplate(KIND, content, createdAt) { - alt("User profile for ${currentMetadata["name"]?.text ?: "Anonymous"}") - // For https://github.com/nostr-protocol/nips/pull/1770 updateOrDeleteTagNames(currentMetadata) @@ -233,8 +228,6 @@ class MetadataEvent( val tags = latest.tags.builder { - alt("User profile for ${currentMetadata["name"]?.text ?: "Anonymous"}") - updateOrDeleteTagNames(currentMetadata) val newClaims = latest.replaceClaims(twitter, mastodon, github) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip02FollowList/ContactListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip02FollowList/ContactListEvent.kt index 69fce5ddd0..293fc606d1 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip02FollowList/ContactListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip02FollowList/ContactListEvent.kt @@ -33,7 +33,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag import com.vitorpamplona.quartz.nip01Core.tags.people.isTaggedUser import com.vitorpamplona.quartz.nip02FollowList.tags.ContactTag -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.utils.TimeUtils @Stable @@ -80,7 +79,6 @@ class ContactListEvent( companion object { const val KIND = 3 - const val ALT = "Follow List" fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey) @@ -177,16 +175,7 @@ class ContactListEvent( tags: Array>, signer: NostrSigner, createdAt: Long = TimeUtils.now(), - ): ContactListEvent { - val newTags = - if (tags.any { it.size > 1 && it[0] == "alt" }) { - tags - } else { - tags + AltTag.assemble(ALT) - } - - return signer.sign(createdAt, KIND, newTags, content) - } + ): ContactListEvent = signer.sign(createdAt, KIND, tags, content) fun createFromScratch( followUsers: List = emptyList(), @@ -196,9 +185,7 @@ class ContactListEvent( ): ContactListEvent { val content = relayUse?.let { RelaySet.assemble(it) } ?: "" - val tags = - listOf(AltTag.assemble(ALT)) + - followUsers.map { it.toTagArray() } + val tags = followUsers.map { it.toTagArray() } return signer.sign(createdAt, KIND, tags.toTypedArray(), content) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip03Timestamp/OtsEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip03Timestamp/OtsEvent.kt index 0147ed3dbd..8661fb787e 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip03Timestamp/OtsEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip03Timestamp/OtsEvent.kt @@ -30,7 +30,6 @@ import com.vitorpamplona.quartz.nip01Core.hints.EventHintProvider import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.events.toETag import com.vitorpamplona.quartz.nip03Timestamp.tags.TargetEventTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.io.encoding.Base64 @@ -60,7 +59,6 @@ class OtsEvent( companion object { const val KIND = 1040 - const val ALT = "Opentimestamps Attestation" /** * Stamp is used to save OTS requests locally while we want for the bitcoin @@ -102,7 +100,6 @@ class OtsEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, encodeOtsState(otsState), createdAt) { - alt(ALT) targetEvent(TargetEventTag(eventId)) initializer() @@ -114,8 +111,6 @@ class OtsEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, encodeOtsState(otsState), createdAt) { - alt(ALT) - targetEvent(event.toETag()) targetKind(event.event.kind) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip04Dm/messages/PrivateDmEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip04Dm/messages/PrivateDmEvent.kt index f3ccce358c..9b774e3c49 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip04Dm/messages/PrivateDmEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip04Dm/messages/PrivateDmEvent.kt @@ -36,7 +36,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.people.pTag import com.vitorpamplona.quartz.nip10Notes.tags.MarkedETag import com.vitorpamplona.quartz.nip17Dm.base.ChatroomKey import com.vitorpamplona.quartz.nip17Dm.base.ChatroomKeyable -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip92IMeta.IMetaTag import com.vitorpamplona.quartz.utils.Hex import com.vitorpamplona.quartz.utils.TimeUtils @@ -102,7 +101,6 @@ class PrivateDmEvent( companion object { const val KIND = 4 - const val ALT = "Private Message" const val NIP_18_ADVERTISEMENT = "[//]: # (nip18)\n" fun prepareMessageToEncrypt( @@ -139,7 +137,6 @@ class PrivateDmEvent( ), createdAt = createdAt, ) { - alt(ALT) pTag(toUser) replyingTo?.let { reply(it) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip09Deletions/DeletionEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip09Deletions/DeletionEvent.kt index 2bd3265953..ec2f1de70a 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip09Deletions/DeletionEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip09Deletions/DeletionEvent.kt @@ -41,7 +41,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.kinds.kinds import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTagIds -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -77,15 +76,12 @@ class DeletionEvent( companion object { const val KIND = 5 - const val ALT = "Deletion event" fun build( deleteEvents: List, createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) - deleteEvents.forEach { eTag(ETag(it.id)) if (it is AddressableEvent) { @@ -104,8 +100,6 @@ class DeletionEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) - deleteEvents.forEach { if (it is AddressableEvent) { aTag(it.address()) @@ -123,8 +117,6 @@ class DeletionEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) - deleteEvents.forEach { pTag(PTag(it.pubKey)) eTag(ETag(it.id)) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip10Notes/TextNoteEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip10Notes/TextNoteEvent.kt index e2ab5a1f94..dd3deb8c2e 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip10Notes/TextNoteEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip10Notes/TextNoteEvent.kt @@ -47,10 +47,8 @@ import com.vitorpamplona.quartz.nip19Bech32.eventHints import com.vitorpamplona.quartz.nip19Bech32.eventIds import com.vitorpamplona.quartz.nip19Bech32.pubKeyHints import com.vitorpamplona.quartz.nip19Bech32.pubKeys -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils -import com.vitorpamplona.quartz.utils.takeKeepingSurrogatePairs @Immutable class TextNoteEvent( @@ -124,22 +122,12 @@ class TextNoteEvent( companion object { const val KIND = 1 - const val ALT = "A short note: " - - private fun shortedMessageForAlt(msg: String): String { - if (msg.length < 50) return ALT + msg - // takeKeepingSurrogatePairs avoids leaving a lone surrogate (e.g. half - // of an emoji) in the alt tag, which would be unencodable as UTF-8 and - // corrupt the event id on the wire. - return ALT + msg.takeKeepingSurrogatePairs(50) + "..." - } fun build( note: String, createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, note, createdAt) { - alt(shortedMessageForAlt(note)) initializer() } @@ -150,8 +138,6 @@ class TextNoteEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, note, createdAt) { - alt(shortedMessageForAlt(note)) - if (replyingTo != null || forkingFrom != null) { markedETags(prepareETagsAsReplyTo(replyingTo, forkingFrom)) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/auction/AuctionEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/auction/AuctionEvent.kt index 01487fcf5e..7cdce539c5 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/auction/AuctionEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/auction/AuctionEvent.kt @@ -29,7 +29,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip01Core.tags.hashtags.hashtags import com.vitorpamplona.quartz.nip21UriScheme.toNostrUri -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.Log import com.vitorpamplona.quartz.utils.TimeUtils import kotlinx.coroutines.CancellationException @@ -56,7 +55,6 @@ class AuctionEvent( companion object { const val KIND = 30020 - const val ALT_DESCRIPTION = "Marketplace auction" fun build( auction: AuctionData, @@ -65,7 +63,6 @@ class AuctionEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, JsonMapper.toJson(auction), createdAt) { dTag(auction.id) - alt(ALT_DESCRIPTION) categories?.let { hashtags(it) } initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/bid/BidEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/bid/BidEvent.kt index d07f841acc..202a13f1ae 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/bid/BidEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/bid/BidEvent.kt @@ -31,7 +31,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.events.ETag import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip15Marketplace.auction.AuctionEvent -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -59,7 +58,6 @@ class BidEvent( companion object { const val KIND = 1021 - const val ALT_DESCRIPTION = "Auction bid" fun build( auction: EventHintBundle, @@ -67,7 +65,6 @@ class BidEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, amount.toLong().toString(), createdAt) { - alt(ALT_DESCRIPTION) auction(auction) notifyAuthor(auction) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/bidConfirmation/BidConfirmationEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/bidConfirmation/BidConfirmationEvent.kt index 55bc78d798..bac6333f7c 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/bidConfirmation/BidConfirmationEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/bidConfirmation/BidConfirmationEvent.kt @@ -34,7 +34,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip15Marketplace.auction.AuctionEvent import com.vitorpamplona.quartz.nip15Marketplace.bid.BidEvent import com.vitorpamplona.quartz.nip21UriScheme.toNostrUri -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.Log import com.vitorpamplona.quartz.utils.TimeUtils import kotlinx.coroutines.CancellationException @@ -71,7 +70,6 @@ class BidConfirmationEvent( companion object { const val KIND = 1022 - const val ALT_DESCRIPTION = "Bid confirmation" const val STATUS_ACCEPTED = "accepted" const val STATUS_REJECTED = "rejected" @@ -85,7 +83,6 @@ class BidConfirmationEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, JsonMapper.toJson(confirmation), createdAt) { - alt(ALT_DESCRIPTION) bid(bid) auction(auction) notifyBidder(bid) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/marketplace/MarketplaceEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/marketplace/MarketplaceEvent.kt index 11d31790fd..b6e277c379 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/marketplace/MarketplaceEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/marketplace/MarketplaceEvent.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip21UriScheme.toNostrUri -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.Log import com.vitorpamplona.quartz.utils.TimeUtils import kotlinx.coroutines.CancellationException @@ -55,7 +54,6 @@ class MarketplaceEvent( companion object { const val KIND = 30019 - const val ALT_DESCRIPTION = "Marketplace UI" fun build( marketplace: MarketplaceData, @@ -64,7 +62,6 @@ class MarketplaceEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, JsonMapper.toJson(marketplace), createdAt) { dTag(dTag) - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/product/ProductEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/product/ProductEvent.kt index e2a7dba304..90de4c2e71 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/product/ProductEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/product/ProductEvent.kt @@ -29,7 +29,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip01Core.tags.hashtags.hashtags import com.vitorpamplona.quartz.nip21UriScheme.toNostrUri -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.Log import com.vitorpamplona.quartz.utils.TimeUtils import kotlinx.coroutines.CancellationException @@ -58,7 +57,6 @@ class ProductEvent( companion object { const val KIND = 30018 - const val ALT_DESCRIPTION = "Marketplace product" fun build( product: ProductData, @@ -67,7 +65,6 @@ class ProductEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, JsonMapper.toJson(product), createdAt) { dTag(product.id) - alt(ALT_DESCRIPTION) categories?.let { hashtags(it) } initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/stall/StallEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/stall/StallEvent.kt index c20e61dea8..92998a1583 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/stall/StallEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip15Marketplace/stall/StallEvent.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip21UriScheme.toNostrUri -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.Log import com.vitorpamplona.quartz.utils.TimeUtils import kotlinx.coroutines.CancellationException @@ -55,7 +54,6 @@ class StallEvent( companion object { const val KIND = 30017 - const val ALT_DESCRIPTION = "Marketplace stall" fun build( stall: StallData, @@ -63,7 +61,6 @@ class StallEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, JsonMapper.toJson(stall), createdAt) { dTag(stall.id) - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip17Dm/files/ChatMessageEncryptedFileHeaderEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip17Dm/files/ChatMessageEncryptedFileHeaderEvent.kt index b1742a042d..902016f868 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip17Dm/files/ChatMessageEncryptedFileHeaderEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip17Dm/files/ChatMessageEncryptedFileHeaderEvent.kt @@ -33,7 +33,6 @@ import com.vitorpamplona.quartz.nip17Dm.files.tags.EncryptionKey import com.vitorpamplona.quartz.nip17Dm.files.tags.EncryptionNonce import com.vitorpamplona.quartz.nip17Dm.files.tags.FileTypeTag import com.vitorpamplona.quartz.nip17Dm.messages.ChatMessageEvent -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip94FileMetadata.tags.BlurhashTag import com.vitorpamplona.quartz.nip94FileMetadata.tags.DimensionTag import com.vitorpamplona.quartz.nip94FileMetadata.tags.HashSha256Tag @@ -78,7 +77,6 @@ class ChatMessageEncryptedFileHeaderEvent( companion object { const val KIND = 15 - const val ALT_DESCRIPTION = "Encrypted file in chat" fun build( to: List, @@ -97,8 +95,6 @@ class ChatMessageEncryptedFileHeaderEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, url, createdAt) { - alt(ALT_DESCRIPTION) - group(to) encryptionAlgo(cipher.name()) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip17Dm/messages/ChatMessageEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip17Dm/messages/ChatMessageEvent.kt index 5ab47f319b..1dbbc919a2 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip17Dm/messages/ChatMessageEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip17Dm/messages/ChatMessageEvent.kt @@ -29,7 +29,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.events.ETag import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip01Core.tags.people.toPTag import com.vitorpamplona.quartz.nip17Dm.base.BaseDMGroupEvent -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -50,7 +49,6 @@ class ChatMessageEvent( companion object { const val KIND = 14 - const val ALT_DESCRIPTION = "Direct message" fun build( msg: String, @@ -58,7 +56,6 @@ class ChatMessageEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, msg, createdAt) { - alt(ALT_DESCRIPTION) group(to) initializer() } @@ -69,7 +66,6 @@ class ChatMessageEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, msg, createdAt) { - alt(ALT_DESCRIPTION) reply(reply) group((reply.event.recipients() + reply.toPTag()).distinctBy { it.pubKey }) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip17Dm/settings/ChatMessageRelayListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip17Dm/settings/ChatMessageRelayListEvent.kt index bc77c4979e..80ed9a356f 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip17Dm/settings/ChatMessageRelayListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip17Dm/settings/ChatMessageRelayListEvent.kt @@ -29,7 +29,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag import com.vitorpamplona.quartz.nip17Dm.settings.tags.RelayTag -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -55,9 +54,7 @@ class ChatMessageRelayListEvent( fun createTagArray(relays: List): Array> = relays .map { RelayTag.assemble(it) } - .plusElement( - AltTag.assemble("Relay list to receive private messages"), - ).toTypedArray() + .toTypedArray() suspend fun updateRelayList( earlierVersion: ChatMessageRelayListEvent, diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip18Reposts/GenericRepostEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip18Reposts/GenericRepostEvent.kt index 59ca0bec29..624ceba069 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip18Reposts/GenericRepostEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip18Reposts/GenericRepostEvent.kt @@ -39,7 +39,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.kinds.KindTag import com.vitorpamplona.quartz.nip01Core.tags.kinds.kind import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils import com.vitorpamplona.quartz.utils.lastNotNullOfOrNull @@ -93,7 +92,6 @@ class GenericRepostEvent( companion object { const val KIND = 16 - const val ALT = "Generic repost" fun build( eventHint: EventHintBundle, @@ -102,8 +100,6 @@ class GenericRepostEvent( ) = eventTemplate(KIND, eventHint.event.toJson(), createdAt) { val boostedPost = eventHint.event - alt(ALT) - kind(boostedPost.kind) pTag(PTag(boostedPost.pubKey, eventHint.authorHomeRelay)) eTag(ETag(boostedPost.id, eventHint.relay, boostedPost.pubKey)) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip18Reposts/RepostEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip18Reposts/RepostEvent.kt index 74e8146502..525b12cec9 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip18Reposts/RepostEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip18Reposts/RepostEvent.kt @@ -39,7 +39,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.kinds.KindTag import com.vitorpamplona.quartz.nip01Core.tags.kinds.kind import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils import com.vitorpamplona.quartz.utils.lastNotNullOfOrNull @@ -93,7 +92,6 @@ class RepostEvent( companion object { const val KIND = 6 - const val ALT = "Repost event" fun build( eventHint: EventHintBundle, @@ -102,8 +100,6 @@ class RepostEvent( ) = eventTemplate(KIND, eventHint.event.toJson(), createdAt) { val boostedPost = eventHint.event - alt(ALT) - pTag(PTag(boostedPost.pubKey, eventHint.authorHomeRelay)) eTag(ETag(boostedPost.id, eventHint.relay, boostedPost.pubKey)) if (boostedPost is AddressableEvent) { diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip22Comments/CommentEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip22Comments/CommentEvent.kt index 8bd085449d..07761c3b98 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip22Comments/CommentEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip22Comments/CommentEvent.kt @@ -44,7 +44,6 @@ import com.vitorpamplona.quartz.nip19Bech32.eventHints import com.vitorpamplona.quartz.nip19Bech32.eventIds import com.vitorpamplona.quartz.nip19Bech32.pubKeyHints import com.vitorpamplona.quartz.nip19Bech32.pubKeys -import com.vitorpamplona.quartz.nip21UriScheme.toNostrUri import com.vitorpamplona.quartz.nip22Comments.tags.ReplyAddressTag import com.vitorpamplona.quartz.nip22Comments.tags.ReplyAuthorTag import com.vitorpamplona.quartz.nip22Comments.tags.ReplyEventTag @@ -55,7 +54,6 @@ import com.vitorpamplona.quartz.nip22Comments.tags.RootAuthorTag import com.vitorpamplona.quartz.nip22Comments.tags.RootEventTag import com.vitorpamplona.quartz.nip22Comments.tags.RootIdentifierTag import com.vitorpamplona.quartz.nip22Comments.tags.RootKindTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip72ModCommunities.definition.CommunityDefinitionEvent import com.vitorpamplona.quartz.nip73ExternalIds.ExternalId @@ -240,7 +238,6 @@ class CommentEvent( companion object { const val KIND = 1111 - const val ALT = "Reply to " fun replyBuilder( msg: String, @@ -248,8 +245,6 @@ class CommentEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, msg, createdAt) { - alt(ALT + replyingTo.toNostrUri()) - if (replyingTo.event is CommentEvent) { addAll(replyingTo.event.rootScopes()) addAll(replyingTo.event.rootKinds()) @@ -278,8 +273,6 @@ class CommentEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, msg, createdAt) { - alt(ALT + extId.toScope()) - if (extId is GeohashId) { GeoHashTag.geoMipMap(extId.geohash).forEach { rootExternalIdentity(GeohashId(it, extId.hint)) } } else { diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip23LongContent/LongTextNoteEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip23LongContent/LongTextNoteEvent.kt index 43d8c4c13c..93f4826b9f 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip23LongContent/LongTextNoteEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip23LongContent/LongTextNoteEvent.kt @@ -49,7 +49,6 @@ import com.vitorpamplona.quartz.nip23LongContent.tags.ImageTag import com.vitorpamplona.quartz.nip23LongContent.tags.PublishedAtTag import com.vitorpamplona.quartz.nip23LongContent.tags.SummaryTag import com.vitorpamplona.quartz.nip23LongContent.tags.TitleTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.uuid.ExperimentalUuidApi @@ -157,7 +156,6 @@ class LongTextNoteEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, description, createdAt) { dTag(dTag) - alt("Blog post: $title") title(title) summary?.let { summary(it) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/admin/ChannelCreateEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/admin/ChannelCreateEvent.kt index be1db07883..ed61fa5d9e 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/admin/ChannelCreateEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/admin/ChannelCreateEvent.kt @@ -31,7 +31,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip28PublicChat.base.ChannelData import com.vitorpamplona.quartz.nip28PublicChat.base.ChannelDataNorm -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.Log import com.vitorpamplona.quartz.utils.TimeUtils @@ -97,7 +96,6 @@ class ChannelCreateEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, data.toContent(), createdAt) { - alt("Public chat creation event ${data.name?.let { "about $it" }}") initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/admin/ChannelHideMessageEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/admin/ChannelHideMessageEvent.kt index b62fc271c9..3c261b869f 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/admin/ChannelHideMessageEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/admin/ChannelHideMessageEvent.kt @@ -31,7 +31,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.events.eTags import com.vitorpamplona.quartz.nip01Core.tags.events.taggedEventIds import com.vitorpamplona.quartz.nip28PublicChat.base.BasePublicChatEvent import com.vitorpamplona.quartz.nip28PublicChat.base.channel -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -52,7 +51,6 @@ class ChannelHideMessageEvent( companion object { const val KIND = 43 - const val ALT = "Hide message instruction for public chats" fun build( reason: String, @@ -61,7 +59,6 @@ class ChannelHideMessageEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, reason, createdAt) { - alt(ALT) channel(channel) eTags(messagesToHide) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/admin/ChannelMetadataEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/admin/ChannelMetadataEvent.kt index 6395940cf2..59725804aa 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/admin/ChannelMetadataEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/admin/ChannelMetadataEvent.kt @@ -34,7 +34,6 @@ import com.vitorpamplona.quartz.nip28PublicChat.base.BasePublicChatEvent import com.vitorpamplona.quartz.nip28PublicChat.base.ChannelData import com.vitorpamplona.quartz.nip28PublicChat.base.ChannelDataNorm import com.vitorpamplona.quartz.nip28PublicChat.base.channel -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.Log import com.vitorpamplona.quartz.utils.TimeUtils @@ -116,7 +115,6 @@ class ChannelMetadataEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, data.toContent(), createdAt) { - alt("Public chat update to ${data.name}") channel(channel) initializer() } @@ -127,7 +125,6 @@ class ChannelMetadataEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, data.toContent(), createdAt) { - alt("Public chat update to ${data.name}") channel(channel) initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/admin/ChannelMuteUserEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/admin/ChannelMuteUserEvent.kt index 51df858239..8d197750c8 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/admin/ChannelMuteUserEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/admin/ChannelMuteUserEvent.kt @@ -31,7 +31,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.people.pTags import com.vitorpamplona.quartz.nip01Core.tags.people.taggedUserIds import com.vitorpamplona.quartz.nip28PublicChat.base.BasePublicChatEvent import com.vitorpamplona.quartz.nip28PublicChat.base.channel -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -52,7 +51,6 @@ class ChannelMuteUserEvent( companion object { const val KIND = 44 - const val ALT = "Mute user instruction for public chats" fun build( reason: String, @@ -61,7 +59,6 @@ class ChannelMuteUserEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, reason, createdAt) { - alt(ALT) channel(channel) pTags(usersToMute) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/list/ChannelListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/list/ChannelListEvent.kt index a0576e5804..5f97ccde41 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/list/ChannelListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip28PublicChat/list/ChannelListEvent.kt @@ -25,15 +25,12 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.EventHintProvider import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip28PublicChat.list.tags.ChannelTag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.encryption.signNip51List @@ -57,7 +54,6 @@ class ChannelListEvent( companion object { const val KIND = 10005 - const val ALT = "Public Chat List" const val FIXED_D_TAG = "" fun createAddress(pubKey: HexKey) = Address(KIND, pubKey, FIXED_D_TAG) @@ -166,16 +162,7 @@ class ChannelListEvent( tags: TagArray, signer: NostrSigner, createdAt: Long = TimeUtils.now(), - ): ChannelListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } - - return signer.sign(createdAt, KIND, newTags, content) - } + ): ChannelListEvent = signer.sign(createdAt, KIND, tags, content) suspend fun create( publicChannels: List = emptyList(), @@ -194,7 +181,7 @@ class ChannelListEvent( createdAt: Long = TimeUtils.now(), ): ChannelListEvent { val privateTagArray = privateChannels.map { it.toTagArray() }.toTypedArray() - val publicTagArray = publicChannels.map { it.toTagArray() }.toTypedArray() + AltTag.assemble(ALT) + val publicTagArray = publicChannels.map { it.toTagArray() }.toTypedArray() return signer.signNip51List(createdAt, KIND, publicTagArray, privateTagArray) } @@ -209,7 +196,6 @@ class ChannelListEvent( description = PrivateTagsInContent.encryptNip44(privateChannels.map { it.toTagArray() }.toTypedArray(), signer), createdAt = createdAt, ) { - alt(ALT) channels(publicChannels) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/metadata/GroupAdminsEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/metadata/GroupAdminsEvent.kt index af68af2f4f..c58b4d44e8 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/metadata/GroupAdminsEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/metadata/GroupAdminsEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip29RelayGroups.tags.GroupAdminTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -45,7 +44,6 @@ class GroupAdminsEvent( companion object { const val KIND = 39001 - const val ALT_DESCRIPTION = "Group admins" fun build( groupId: String, @@ -53,7 +51,6 @@ class GroupAdminsEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) dTag(groupId) addAll(GroupAdminTag.assemble(admins)) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/metadata/GroupMembersEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/metadata/GroupMembersEvent.kt index 56e6e3cb7b..243f008cec 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/metadata/GroupMembersEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/metadata/GroupMembersEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip01Core.tags.people.PTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -45,7 +44,6 @@ class GroupMembersEvent( companion object { const val KIND = 39002 - const val ALT_DESCRIPTION = "Group members" fun build( groupId: String, @@ -53,7 +51,6 @@ class GroupMembersEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) dTag(groupId) memberPubKeys.forEach { add(arrayOf("p", it)) } initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/metadata/GroupMetadataEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/metadata/GroupMetadataEvent.kt index 1f5223a232..b15718f7c6 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/metadata/GroupMetadataEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/metadata/GroupMetadataEvent.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.core.firstTagValue import com.vitorpamplona.quartz.nip01Core.core.hasTagWithContent import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -81,7 +80,6 @@ class GroupMetadataEvent( companion object { const val KIND = 39000 - const val ALT_DESCRIPTION = "Group metadata" fun build( groupId: String, @@ -92,7 +90,6 @@ class GroupMetadataEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) dTag(groupId) name?.let { add(arrayOf("name", it)) } about?.let { add(arrayOf("about", it)) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/metadata/SupportedRolesEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/metadata/SupportedRolesEvent.kt index 9dbf7eacb4..5efe39736b 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/metadata/SupportedRolesEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/metadata/SupportedRolesEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip29RelayGroups.tags.RoleTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -45,7 +44,6 @@ class SupportedRolesEvent( companion object { const val KIND = 39003 - const val ALT_DESCRIPTION = "Group supported roles" fun build( groupId: String, @@ -53,7 +51,6 @@ class SupportedRolesEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) dTag(groupId) addAll(RoleTag.assemble(roles)) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/CreateGroupEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/CreateGroupEvent.kt index 0554e2c4ca..0dbed7662e 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/CreateGroupEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/CreateGroupEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -41,14 +40,12 @@ class CreateGroupEvent( companion object { const val KIND = 9007 - const val ALT_DESCRIPTION = "Group create" fun build( groupId: String, createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) groupId(groupId) initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/CreateInviteEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/CreateInviteEvent.kt index 44861e1acf..6b5ce7f322 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/CreateInviteEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/CreateInviteEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -43,7 +42,6 @@ class CreateInviteEvent( companion object { const val KIND = 9009 - const val ALT_DESCRIPTION = "Group create invite" fun build( groupId: String, @@ -51,7 +49,6 @@ class CreateInviteEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) groupId(groupId) inviteCode(code) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/DeleteEventEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/DeleteEventEvent.kt index 91674eb624..25ebd16183 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/DeleteEventEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/DeleteEventEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -45,7 +44,6 @@ class DeleteEventEvent( companion object { const val KIND = 9005 - const val ALT_DESCRIPTION = "Group delete event" fun build( groupId: String, @@ -54,7 +52,6 @@ class DeleteEventEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) groupId(groupId) eventIds.forEach { add(arrayOf("e", it)) } previous(previousEvents) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/DeleteGroupEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/DeleteGroupEvent.kt index 6f71cfdbbf..fb1bc7df0c 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/DeleteGroupEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/DeleteGroupEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -41,14 +40,12 @@ class DeleteGroupEvent( companion object { const val KIND = 9008 - const val ALT_DESCRIPTION = "Group delete" fun build( groupId: String, createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) groupId(groupId) initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/EditMetadataEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/EditMetadataEvent.kt index f05b72d963..500c82e776 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/EditMetadataEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/EditMetadataEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip29RelayGroups.metadata.GroupMetadataEvent -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -44,7 +43,6 @@ class EditMetadataEvent( companion object { const val KIND = 9002 - const val ALT_DESCRIPTION = "Group edit metadata" fun build( groupId: String, @@ -56,7 +54,6 @@ class EditMetadataEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) groupId(groupId) name?.let { add(arrayOf("name", it)) } about?.let { add(arrayOf("about", it)) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/PutUserEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/PutUserEvent.kt index 0fbf979181..b6b9e48b9f 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/PutUserEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/PutUserEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -45,7 +44,6 @@ class PutUserEvent( companion object { const val KIND = 9000 - const val ALT_DESCRIPTION = "Group add user" fun build( groupId: String, @@ -54,7 +52,6 @@ class PutUserEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) groupId(groupId) pubKeysWithRoles.forEach { (pubKey, roles) -> userPubKeyWithRoles(pubKey, roles) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/RemoveUserEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/RemoveUserEvent.kt index 162e63252d..09d7ea35fb 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/RemoveUserEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/moderation/RemoveUserEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -45,7 +44,6 @@ class RemoveUserEvent( companion object { const val KIND = 9001 - const val ALT_DESCRIPTION = "Group remove user" fun build( groupId: String, @@ -54,7 +52,6 @@ class RemoveUserEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) groupId(groupId) pubKeys.forEach { userPubKey(it) } previous(previousEvents) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/request/JoinRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/request/JoinRequestEvent.kt index c75f3021b7..2db9b25108 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/request/JoinRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/request/JoinRequestEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip29RelayGroups.moderation.groupId import com.vitorpamplona.quartz.nip29RelayGroups.moderation.inviteCode -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -45,7 +44,6 @@ class JoinRequestEvent( companion object { const val KIND = 9021 - const val ALT_DESCRIPTION = "Group join request" fun build( groupId: String, @@ -54,7 +52,6 @@ class JoinRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, reason, createdAt) { - alt(ALT_DESCRIPTION) groupId(groupId) inviteCode?.let { inviteCode(it) } initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/request/LeaveRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/request/LeaveRequestEvent.kt index 74999557d1..429750cc61 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/request/LeaveRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip29RelayGroups/request/LeaveRequestEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip29RelayGroups.moderation.groupId -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -42,7 +41,6 @@ class LeaveRequestEvent( companion object { const val KIND = 9022 - const val ALT_DESCRIPTION = "Group leave request" fun build( groupId: String, @@ -50,7 +48,6 @@ class LeaveRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, reason, createdAt) { - alt(ALT_DESCRIPTION) groupId(groupId) initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip30CustomEmoji/pack/EmojiPackEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip30CustomEmoji/pack/EmojiPackEvent.kt index 46f9507929..92fd6e5bb1 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip30CustomEmoji/pack/EmojiPackEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip30CustomEmoji/pack/EmojiPackEvent.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip30CustomEmoji.EmojiUrlTag import com.vitorpamplona.quartz.nip30CustomEmoji.emojis -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.tags.DescriptionTag @@ -84,7 +83,6 @@ class EmojiPackEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) dTag(dTag) title(name) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip30CustomEmoji/selection/EmojiPackSelectionEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip30CustomEmoji/selection/EmojiPackSelectionEvent.kt index a2174bf871..774f834730 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip30CustomEmoji/selection/EmojiPackSelectionEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip30CustomEmoji/selection/EmojiPackSelectionEvent.kt @@ -32,7 +32,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventUpdate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag import com.vitorpamplona.quartz.nip01Core.tags.aTag.toATag import com.vitorpamplona.quartz.nip30CustomEmoji.pack.EmojiPackEvent -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -55,7 +54,6 @@ class EmojiPackSelectionEvent( companion object { const val KIND = 10030 - const val ALT_DESCRIPTION = "Emoji selection" const val FIXED_D_TAG = "" fun createAddress(pubKey: HexKey) = Address(KIND, pubKey, FIXED_D_TAG) @@ -87,7 +85,6 @@ class EmojiPackSelectionEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) packs(listOfEmojiPacks.map { it.toATag() }) initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip31Alts/TagArrayBuilderExt.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip31Alts/TagArrayBuilderExt.kt index f53e5f41e8..10287e42bc 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip31Alts/TagArrayBuilderExt.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip31Alts/TagArrayBuilderExt.kt @@ -23,4 +23,11 @@ package com.vitorpamplona.quartz.nip31Alts import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder +/** + * Writes an `alt` tag. The generic NIP-31 "alt" client-hint is deprecated, so do + * NOT use this to add a boilerplate description of the event kind. It remains only + * for file-metadata events (e.g. NIP-94 kind 1063, NIP-17 encrypted file headers) + * where the `alt` tag is the accessibility description of the file itself, and only + * when the user actually provided one. + */ fun TagArrayBuilder.alt(altDescriptor: String) = addUnique(AltTag.assemble(altDescriptor)) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip32Labeling/LabelEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip32Labeling/LabelEvent.kt index 974bfec5a0..8ca3bd4f92 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip32Labeling/LabelEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip32Labeling/LabelEvent.kt @@ -39,7 +39,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.events.toETag import com.vitorpamplona.quartz.nip01Core.tags.hashtags.HashtagTag import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip32Labeling.tags.LabelNamespaceTag import com.vitorpamplona.quartz.nip32Labeling.tags.LabelTag import com.vitorpamplona.quartz.utils.TimeUtils @@ -114,7 +113,6 @@ class LabelEvent( companion object { const val KIND = 1985 - const val ALT = "Label event" /** * NIP-32 tag-association namespace for hashtags. A label of the form @@ -133,7 +131,6 @@ class LabelEvent( hashtag: String, createdAt: Long = TimeUtils.now(), ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) eTag(labeledEvent.toETag()) val tag = LabelTag(hashtag.removePrefix("#").lowercase(), HASHTAG_NAMESPACE) labelNamespace(tag.namespace) @@ -151,7 +148,6 @@ class LabelEvent( content: String = "", createdAt: Long = TimeUtils.now(), ) = eventTemplate(KIND, content, createdAt) { - alt(ALT) eTag(ETag(labeledEventId, labeledEventRelay?.let { RelayUrlNormalizer.normalizeOrNull(it) }, labeledEventAuthor)) labels.map { it.namespace }.distinct().forEach { labelNamespace(it) } labels.forEach { label(it) } @@ -167,7 +163,6 @@ class LabelEvent( content: String = "", createdAt: Long = TimeUtils.now(), ) = eventTemplate(KIND, content, createdAt) { - alt(ALT) pTag(labeledPubKey, labeledPubKeyRelay?.let { RelayUrlNormalizer.normalizeOrNull(it) }) labels.map { it.namespace }.distinct().forEach { labelNamespace(it) } labels.forEach { label(it) } @@ -181,7 +176,6 @@ class LabelEvent( content: String = "", createdAt: Long = TimeUtils.now(), ) = eventTemplate(KIND, content, createdAt) { - alt(ALT) labels.map { it.namespace }.distinct().forEach { labelNamespace(it) } labels.forEach { label(it) } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/grasp/UserGraspListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/grasp/UserGraspListEvent.kt index 11ebd05b03..4ab519fa3b 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/grasp/UserGraspListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/grasp/UserGraspListEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip34Git.grasp.tags.GraspTag import com.vitorpamplona.quartz.utils.TimeUtils @@ -55,7 +54,6 @@ class UserGraspListEvent( companion object { const val KIND = 10317 - const val ALT = "Preferred grasp servers for Git over Nostr" fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, FIXED_D_TAG) @@ -64,7 +62,6 @@ class UserGraspListEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) grasps.forEach { add(GraspTag.assemble(it)) } initializer() } @@ -74,7 +71,6 @@ class UserGraspListEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) grasps.forEach { add(GraspTag.assemble(it)) } initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/issue/GitIssueEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/issue/GitIssueEvent.kt index 900a195233..8a693019dc 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/issue/GitIssueEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/issue/GitIssueEvent.kt @@ -43,7 +43,6 @@ import com.vitorpamplona.quartz.nip19Bech32.eventHints import com.vitorpamplona.quartz.nip19Bech32.eventIds import com.vitorpamplona.quartz.nip19Bech32.pubKeyHints import com.vitorpamplona.quartz.nip19Bech32.pubKeys -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip34Git.repository.GitRepositoryEvent import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -119,7 +118,6 @@ class GitIssueEvent( companion object { const val KIND = 1621 - const val ALT_DESCRIPTION = "A Git Issue" fun build( subject: String, @@ -130,7 +128,6 @@ class GitIssueEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, content, createdAt) { - alt(ALT_DESCRIPTION) subject(subject) repository(repository) notify(notify) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/patch/GitPatchEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/patch/GitPatchEvent.kt index 9547446908..fe22921a31 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/patch/GitPatchEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/patch/GitPatchEvent.kt @@ -37,7 +37,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTags import com.vitorpamplona.quartz.nip10Notes.tags.MarkedETag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip34Git.patch.tags.CommitPgpSigTag import com.vitorpamplona.quartz.nip34Git.patch.tags.CommitTag import com.vitorpamplona.quartz.nip34Git.patch.tags.Committer @@ -118,7 +117,6 @@ class GitPatchEvent( companion object { const val KIND = 1617 - const val ALT = "A Git Patch" const val ROOT = "root" const val ROOT_REVISION = "root-revision" @@ -150,7 +148,6 @@ class GitPatchEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, patch, createdAt) { - alt(ALT) repository(repository) euc(earliestUniqueCommit) pTag(repository.event.pubKey, repository.authorHomeRelay) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/pr/GitPullRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/pr/GitPullRequestEvent.kt index 16cc045e87..c9d67b6398 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/pr/GitPullRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/pr/GitPullRequestEvent.kt @@ -36,7 +36,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTags import com.vitorpamplona.quartz.nip14Subject.SubjectTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip34Git.pr.tags.BranchNameTag import com.vitorpamplona.quartz.nip34Git.pr.tags.CurrentCommitTag import com.vitorpamplona.quartz.nip34Git.pr.tags.MergeBaseTag @@ -103,7 +102,6 @@ class GitPullRequestEvent( companion object { const val KIND = 1618 - const val ALT = "A Git Pull Request" /** * Build a NIP-34 kind-1618 pull request event. @@ -135,7 +133,6 @@ class GitPullRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, description, createdAt) { - alt(ALT) repository(repository) euc(earliestUniqueCommit) pTag(repository.event.pubKey, repository.authorHomeRelay) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/pr/GitPullRequestUpdateEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/pr/GitPullRequestUpdateEvent.kt index 81d2e19270..898187ae25 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/pr/GitPullRequestUpdateEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/pr/GitPullRequestUpdateEvent.kt @@ -35,7 +35,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.people.pTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTags import com.vitorpamplona.quartz.nip22Comments.tags.RootAuthorTag import com.vitorpamplona.quartz.nip22Comments.tags.RootEventTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip34Git.pr.tags.CurrentCommitTag import com.vitorpamplona.quartz.nip34Git.pr.tags.MergeBaseTag import com.vitorpamplona.quartz.nip34Git.repository.GitRepositoryEvent @@ -90,7 +89,6 @@ class GitPullRequestUpdateEvent( companion object { const val KIND = 1619 - const val ALT = "A Git Pull Request Update" /** * Build a NIP-34 kind-1619 pull-request update event. @@ -114,7 +112,6 @@ class GitPullRequestUpdateEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) parentPullRequest(parentPullRequest) parentPullRequestAuthor(parentPullRequest) repository(repository) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/repository/GitRepositoryEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/repository/GitRepositoryEvent.kt index 3cce25f932..cf3451008a 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/repository/GitRepositoryEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/repository/GitRepositoryEvent.kt @@ -29,7 +29,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip01Core.tags.hashtags.HashtagTag import com.vitorpamplona.quartz.nip01Core.tags.hashtags.hashtag import com.vitorpamplona.quartz.nip01Core.tags.hashtags.hashtags -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip34Git.repository.tags.CloneTag import com.vitorpamplona.quartz.nip34Git.repository.tags.DescriptionTag import com.vitorpamplona.quartz.nip34Git.repository.tags.EucTag @@ -94,7 +93,6 @@ class GitRepositoryEvent( companion object { const val KIND = 30617 - const val ALT_DESCRIPTION = "Git Repository" const val PERSONAL_FORK = "personal-fork" @OptIn(ExperimentalUuidApi::class) @@ -107,7 +105,6 @@ class GitRepositoryEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) dTag(dTag) name(name) description?.let { description(it) } @@ -131,7 +128,6 @@ class GitRepositoryEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) dTag(dTag) name(name) description?.let { description(it) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/state/GitRepositoryStateEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/state/GitRepositoryStateEvent.kt index 2c0f66f971..dd1c7a11b5 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/state/GitRepositoryStateEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/state/GitRepositoryStateEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip34Git.state.tags.HeadTag import com.vitorpamplona.quartz.nip34Git.state.tags.RefTag import com.vitorpamplona.quartz.utils.TimeUtils @@ -61,7 +60,6 @@ class GitRepositoryStateEvent( companion object { const val KIND = 30618 - const val ALT_DESCRIPTION = "Git Repository State" fun build( dTag: String, @@ -70,7 +68,6 @@ class GitRepositoryStateEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) dTag(dTag) refs.forEach { ref(it) } head?.let { head(it) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusAppliedEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusAppliedEvent.kt index 32501ed204..7273666b3e 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusAppliedEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusAppliedEvent.kt @@ -60,7 +60,6 @@ class GitStatusAppliedEvent( companion object { const val KIND = KIND_APPLIED - const val ALT = "A Git Applied Status" fun build( content: String, @@ -73,7 +72,6 @@ class GitStatusAppliedEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = GitStatusBuilders.buildStatus( kind = KIND, - altDescriptor = ALT, content = content, target = target, notify = notify, diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusBuilders.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusBuilders.kt index b50a254449..7d16e3087d 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusBuilders.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusBuilders.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTags import com.vitorpamplona.quartz.nip10Notes.tags.MarkedETag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils /** @@ -40,14 +39,12 @@ import com.vitorpamplona.quartz.utils.TimeUtils object GitStatusBuilders { fun buildStatus( kind: Int, - altDescriptor: String, content: String, target: EventHintBundle, notify: List = emptyList(), createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(kind, content, createdAt) { - alt(altDescriptor) add( MarkedETag.assemble( target.event.id, diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusClosedEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusClosedEvent.kt index d2b15c35db..5a9f4baaf7 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusClosedEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusClosedEvent.kt @@ -39,7 +39,6 @@ class GitStatusClosedEvent( ) : GitStatusEvent(id, pubKey, createdAt, KIND, tags, content, sig) { companion object { const val KIND = KIND_CLOSED - const val ALT = "A Git Closed Status" fun build( content: String, @@ -49,7 +48,6 @@ class GitStatusClosedEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = GitStatusBuilders.buildStatus( kind = KIND, - altDescriptor = ALT, content = content, target = target, notify = notify, diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusDraftEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusDraftEvent.kt index 627f442f33..2f4fa4295b 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusDraftEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusDraftEvent.kt @@ -39,7 +39,6 @@ class GitStatusDraftEvent( ) : GitStatusEvent(id, pubKey, createdAt, KIND, tags, content, sig) { companion object { const val KIND = KIND_DRAFT - const val ALT = "A Git Draft Status" fun build( content: String, @@ -49,7 +48,6 @@ class GitStatusDraftEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = GitStatusBuilders.buildStatus( kind = KIND, - altDescriptor = ALT, content = content, target = target, notify = notify, diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusOpenEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusOpenEvent.kt index 67b2afe71e..649f9af5ec 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusOpenEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/status/GitStatusOpenEvent.kt @@ -39,7 +39,6 @@ class GitStatusOpenEvent( ) : GitStatusEvent(id, pubKey, createdAt, KIND, tags, content, sig) { companion object { const val KIND = KIND_OPEN - const val ALT = "A Git Open Status" fun build( content: String, @@ -49,7 +48,6 @@ class GitStatusOpenEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = GitStatusBuilders.buildStatus( kind = KIND, - altDescriptor = ALT, content = content, target = target, notify = notify, diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip35Torrents/TorrentCommentEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip35Torrents/TorrentCommentEvent.kt index 699e64911d..e381d01d0d 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip35Torrents/TorrentCommentEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip35Torrents/TorrentCommentEvent.kt @@ -47,7 +47,6 @@ import com.vitorpamplona.quartz.nip19Bech32.eventHints import com.vitorpamplona.quartz.nip19Bech32.eventIds import com.vitorpamplona.quartz.nip19Bech32.pubKeyHints import com.vitorpamplona.quartz.nip19Bech32.pubKeys -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -118,7 +117,6 @@ class TorrentCommentEvent( @Suppress("DEPRECATION") companion object { const val KIND = 2004 - const val ALT_DESCRIPTION = "Comment for a Torrent file" fun build( message: String, @@ -152,7 +150,6 @@ class TorrentCommentEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, post, createdAt) { - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip35Torrents/TorrentEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip35Torrents/TorrentEvent.kt index 4648feaa5d..8475c527e2 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip35Torrents/TorrentEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip35Torrents/TorrentEvent.kt @@ -32,7 +32,6 @@ import com.vitorpamplona.quartz.nip10Notes.content.findNostrUris import com.vitorpamplona.quartz.nip10Notes.content.findURLs import com.vitorpamplona.quartz.nip18Reposts.quotes.quotes import com.vitorpamplona.quartz.nip23LongContent.tags.TitleTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip35Torrents.tags.BtihTag import com.vitorpamplona.quartz.nip35Torrents.tags.FileTag import com.vitorpamplona.quartz.nip35Torrents.tags.InfoHashTag @@ -98,7 +97,6 @@ class TorrentEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, description ?: "", createdAt) { - alt(ALT_DESCRIPTION) initializer() } @@ -109,11 +107,9 @@ class TorrentEvent( description: String? = null, x: String? = null, trackers: List? = null, - alt: String? = null, contentWarningReason: String? = null, createdAt: Long = TimeUtils.now(), ) = eventTemplate(KIND, description ?: "", createdAt) { - alt(alt ?: ALT_DESCRIPTION) title(title) btih(btih) files(files) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip37Drafts/DraftWrapEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip37Drafts/DraftWrapEvent.kt index 31d818e45a..b5d4954865 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip37Drafts/DraftWrapEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip37Drafts/DraftWrapEvent.kt @@ -31,7 +31,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip01Core.tags.kinds.kind -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip40Expiration.expiration import com.vitorpamplona.quartz.utils.Log import com.vitorpamplona.quartz.utils.TimeUtils @@ -67,7 +66,6 @@ class DraftWrapEvent( companion object { const val KIND = 31234 - const val ALT_DESCRIPTION = "Draft Event" fun createAddress( pubKey: HexKey, @@ -90,7 +88,6 @@ class DraftWrapEvent( description = signer.nip44Encrypt(draft.toJson(), signer.pubKey), createdAt = createdAt, ) { - alt(ALT_DESCRIPTION) dTag(dTag) kind(draft.kind) expiration(TimeUtils.ninetyDaysFromNow()) @@ -111,7 +108,6 @@ class DraftWrapEvent( description = "", createdAt = createdAt, ) { - alt(ALT_DESCRIPTION) expiration(TimeUtils.oneMinuteFromNow()) dTag(dTag) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip37Drafts/privateOutbox/PrivateOutboxRelayListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip37Drafts/privateOutbox/PrivateOutboxRelayListEvent.kt index da1f158441..ef1d066acf 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip37Drafts/privateOutbox/PrivateOutboxRelayListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip37Drafts/privateOutbox/PrivateOutboxRelayListEvent.kt @@ -30,8 +30,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.encryption.signNip51List @@ -59,9 +57,6 @@ class PrivateOutboxRelayListEvent( const val KIND = 10013 const val FIXED_D_TAG = "" - val ALT = "Relay list to store private content from this author" - val TAGS = arrayOf(AltTag.assemble(ALT)) - fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, FIXED_D_TAG) fun createAddressATag(pubKey: HexKey): ATag = ATag(KIND, pubKey, FIXED_D_TAG, null) @@ -89,7 +84,7 @@ class PrivateOutboxRelayListEvent( createdAt: Long = TimeUtils.now(), ): PrivateOutboxRelayListEvent { val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray() - return signer.signNip51List(createdAt, KIND, TAGS, privateTagArray) + return signer.signNip51List(createdAt, KIND, emptyArray(), privateTagArray) } suspend fun create( @@ -98,7 +93,7 @@ class PrivateOutboxRelayListEvent( createdAt: Long = TimeUtils.now(), ): PrivateOutboxRelayListEvent { val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray() - return signer.signNip51List(createdAt, KIND, TAGS, privateTagArray) + return signer.signNip51List(createdAt, KIND, emptyArray(), privateTagArray) } suspend fun build( @@ -112,7 +107,6 @@ class PrivateOutboxRelayListEvent( description = PrivateTagsInContent.encryptNip44(privateRelays.map { RelayTag.assemble(it) }.toTypedArray(), signer), createdAt = createdAt, ) { - alt(ALT) privateRelays(publicRelays) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip39ExtIdentities/ExternalIdentitiesEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip39ExtIdentities/ExternalIdentitiesEvent.kt index fb3fc40a7b..d191cb17c3 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip39ExtIdentities/ExternalIdentitiesEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip39ExtIdentities/ExternalIdentitiesEvent.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.core.builder import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -42,7 +41,6 @@ class ExternalIdentitiesEvent( ) : BaseReplaceableEvent(id, pubKey, createdAt, KIND, tags, content, sig) { companion object { const val KIND = 10011 - const val ALT_DESCRIPTION = "External Identities" const val FIXED_D_TAG = "" fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, FIXED_D_TAG) @@ -57,7 +55,6 @@ class ExternalIdentitiesEvent( initializer: TagArrayBuilder.() -> Unit = {}, ): EventTemplate = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) twitter?.let { twitterClaim(it) } mastodon?.let { mastodonClaim(it) } github?.let { githubClaim(it) } @@ -74,7 +71,6 @@ class ExternalIdentitiesEvent( ): EventTemplate { val tags = latest.tags.builder { - alt(ALT_DESCRIPTION) val newClaims = latest.replaceClaims(twitter, mastodon, github) remove(IdentityClaimTag.TAG_NAME) claims(newClaims) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/addMember/RelayAddMemberEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/addMember/RelayAddMemberEvent.kt index 8c387a6a9f..2acd2de6da 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/addMember/RelayAddMemberEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/addMember/RelayAddMemberEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.people.PTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip70ProtectedEvts.protect import com.vitorpamplona.quartz.utils.TimeUtils @@ -43,14 +42,12 @@ class RelayAddMemberEvent( companion object { const val KIND = 8000 - const val ALT_DESCRIPTION = "Relay member added" fun build( memberPubKeys: List, createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) protect() memberPubKeys.forEach { add(PTag.assemble(it, null)) } initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/inviteRequest/RelayInviteRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/inviteRequest/RelayInviteRequestEvent.kt index e5ad571670..fde64991fd 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/inviteRequest/RelayInviteRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/inviteRequest/RelayInviteRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -39,13 +38,11 @@ class RelayInviteRequestEvent( ) : Event(id, pubKey, createdAt, KIND, tags, content, sig) { companion object { const val KIND = 28935 - const val ALT_DESCRIPTION = "Relay invite request" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/joinRequest/RelayJoinRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/joinRequest/RelayJoinRequestEvent.kt index 57c8667d28..3c64941867 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/joinRequest/RelayJoinRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/joinRequest/RelayJoinRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -41,14 +40,12 @@ class RelayJoinRequestEvent( companion object { const val KIND = 28934 - const val ALT_DESCRIPTION = "Relay join request" fun build( claim: String? = null, createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) claim?.let { claim(it) } initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/leaveRequest/RelayLeaveRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/leaveRequest/RelayLeaveRequestEvent.kt index 07824cbb31..e28d410a7d 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/leaveRequest/RelayLeaveRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/leaveRequest/RelayLeaveRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip70ProtectedEvts.protect import com.vitorpamplona.quartz.utils.TimeUtils @@ -40,13 +39,11 @@ class RelayLeaveRequestEvent( ) : Event(id, pubKey, createdAt, KIND, tags, content, sig) { companion object { const val KIND = 28936 - const val ALT_DESCRIPTION = "Relay leave request" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) protect() initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/list/RelayMembershipListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/list/RelayMembershipListEvent.kt index 0b22cd6758..9993cb05b7 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/list/RelayMembershipListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/list/RelayMembershipListEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip70ProtectedEvts.protect import com.vitorpamplona.quartz.utils.TimeUtils @@ -42,14 +41,12 @@ class RelayMembershipListEvent( companion object { const val KIND = 13534 - const val ALT_DESCRIPTION = "Relay membership list" fun build( members: List, createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) protect() members(members) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/removeMember/RelayRemoveMemberEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/removeMember/RelayRemoveMemberEvent.kt index 83b82c41c6..91f4ce7530 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/removeMember/RelayRemoveMemberEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip43RelayMembers/removeMember/RelayRemoveMemberEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.people.PTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip70ProtectedEvts.protect import com.vitorpamplona.quartz.utils.TimeUtils @@ -43,14 +42,12 @@ class RelayRemoveMemberEvent( companion object { const val KIND = 8001 - const val ALT_DESCRIPTION = "Relay member removed" fun build( memberPubKeys: List, createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) protect() memberPubKeys.forEach { add(PTag.assemble(it, null)) } initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip47WalletConnect/events/LnZapPaymentRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip47WalletConnect/events/LnZapPaymentRequestEvent.kt index d98476399c..e9de87634e 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip47WalletConnect/events/LnZapPaymentRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip47WalletConnect/events/LnZapPaymentRequestEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.OptimizedJsonMapper import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.nip47WalletConnect.rpc.PayInvoiceMethod import com.vitorpamplona.quartz.nip47WalletConnect.rpc.Request import com.vitorpamplona.quartz.utils.TimeUtils @@ -58,7 +57,6 @@ class LnZapPaymentRequestEvent( companion object { const val KIND = 23194 - const val ALT = "NWC request" suspend fun create( lnInvoice: String, @@ -84,9 +82,9 @@ class LnZapPaymentRequestEvent( val tags = if (useNip44) { - arrayOf(arrayOf("p", walletServicePubkey), AltTag.assemble(ALT), arrayOf("encryption", "nip44_v2")) + arrayOf(arrayOf("p", walletServicePubkey), arrayOf("encryption", "nip44_v2")) } else { - arrayOf(arrayOf("p", walletServicePubkey), AltTag.assemble(ALT)) + arrayOf(arrayOf("p", walletServicePubkey)) } val encrypted = diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip47WalletConnect/events/LnZapPaymentResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip47WalletConnect/events/LnZapPaymentResponseEvent.kt index ebabe68a79..88b6519e95 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip47WalletConnect/events/LnZapPaymentResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip47WalletConnect/events/LnZapPaymentResponseEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.OptimizedJsonMapper import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.nip47WalletConnect.rpc.Response import com.vitorpamplona.quartz.utils.TimeUtils @@ -58,7 +57,6 @@ class LnZapPaymentResponseEvent( companion object { const val KIND = 23195 - const val ALT = "NWC response" /** * Creates an NWC response event (server-side). @@ -84,7 +82,6 @@ class LnZapPaymentResponseEvent( arrayOf( arrayOf("p", clientPubkey), arrayOf("e", requestEvent.id), - AltTag.assemble(ALT), ) val encrypted = diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip47WalletConnect/events/NwcInfoEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip47WalletConnect/events/NwcInfoEvent.kt index 3691d3dc10..8c48c2e6e4 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip47WalletConnect/events/NwcInfoEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip47WalletConnect/events/NwcInfoEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip47WalletConnect.tags.EncryptionTag import com.vitorpamplona.quartz.nip47WalletConnect.tags.NotificationsTag import com.vitorpamplona.quartz.utils.TimeUtils @@ -51,7 +50,6 @@ class NwcInfoEvent( companion object { const val KIND = 13194 - const val ALT_DESCRIPTION = "Wallet service info" fun build( capabilities: List, @@ -60,7 +58,6 @@ class NwcInfoEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, capabilities.joinToString(" "), createdAt) { - alt(ALT_DESCRIPTION) encryptionSchemes?.let { addUnique(EncryptionTag.assemble(it)) } notificationTypes?.let { addUnique(NotificationsTag.assemble(it)) } initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip47WalletConnect/events/NwcNotificationEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip47WalletConnect/events/NwcNotificationEvent.kt index 825b4c8942..e734941faa 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip47WalletConnect/events/NwcNotificationEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip47WalletConnect/events/NwcNotificationEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.OptimizedJsonMapper import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.nip47WalletConnect.rpc.Notification import com.vitorpamplona.quartz.utils.TimeUtils @@ -56,7 +55,6 @@ class NwcNotificationEvent( companion object { const val KIND = 23197 const val LEGACY_KIND = 23196 - const val ALT = "Wallet notification" /** * Creates an NWC notification event (server-side). @@ -78,7 +76,6 @@ class NwcNotificationEvent( val tags = arrayOf( arrayOf("p", clientPubkey), - AltTag.assemble(ALT), ) val encrypted = signer.nip44Encrypt(serialized, clientPubkey) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip50Search/SearchRelayListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip50Search/SearchRelayListEvent.kt index 3e36f2063f..dc23dc6e23 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip50Search/SearchRelayListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip50Search/SearchRelayListEvent.kt @@ -30,8 +30,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.encryption.signNip51List @@ -58,8 +56,6 @@ class SearchRelayListEvent( companion object { const val KIND = 10007 - val ALT = "Relay list to use for Search" - val ALT_TAG = arrayOf(AltTag.assemble(ALT)) fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey) @@ -87,7 +83,7 @@ class SearchRelayListEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): SearchRelayListEvent { - val publicTagArray = relays.map { RelayTag.assemble(it) }.plus(ALT_TAG).toTypedArray() + val publicTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray() return signer.signNip51List(createdAt, KIND, publicTagArray, emptyArray()) } @@ -96,7 +92,7 @@ class SearchRelayListEvent( signer: NostrSignerSync, createdAt: Long = TimeUtils.now(), ): SearchRelayListEvent { - val publicTagArray = relays.map { RelayTag.assemble(it) }.plus(ALT_TAG).toTypedArray() + val publicTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray() return signer.signNip51List(createdAt, KIND, publicTagArray, emptyArray()) } @@ -111,7 +107,6 @@ class SearchRelayListEvent( description = PrivateTagsInContent.encryptNip44(privateRelays.map { RelayTag.assemble(it) }.toTypedArray(), signer), createdAt = createdAt, ) { - alt(ALT) searchRelays(publicRelays) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/PinListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/PinListEvent.kt index 13ac854473..1674ca6164 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/PinListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/PinListEvent.kt @@ -25,10 +25,8 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.BaseReplaceableEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.EventHintProvider import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.nip51Lists.bookmarkList.tags.EventBookmark import com.vitorpamplona.quartz.utils.TimeUtils @@ -54,7 +52,6 @@ class PinListEvent( companion object { const val KIND = 10001 - const val ALT = "Pinned Notes" fun createPinAddress(pubKey: HexKey) = Address(KIND, pubKey, "") @@ -63,7 +60,7 @@ class PinListEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): PinListEvent { - val tags = arrayOf(pin.toTagArray(), AltTag.assemble(ALT)) + val tags = arrayOf(pin.toTagArray()) return signer.sign(createdAt, KIND, tags, "") } @@ -96,12 +93,7 @@ class PinListEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): PinListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, "") } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/appCurationSet/AppCurationSetEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/appCurationSet/AppCurationSetEvent.kt index 2be5f3968d..2320bbd1b0 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/appCurationSet/AppCurationSetEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/appCurationSet/AppCurationSetEvent.kt @@ -26,13 +26,10 @@ import com.vitorpamplona.quartz.nip01Core.core.BaseAddressableEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.AddressHintProvider import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip51Lists.bookmarkList.tags.AddressBookmark import com.vitorpamplona.quartz.nip51Lists.remove @@ -70,7 +67,6 @@ class AppCurationSetEvent( companion object { const val KIND = 30267 - const val ALT = "App Curation Set" fun createAddress( pubKey: HexKey, @@ -109,12 +105,7 @@ class AppCurationSetEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): AppCurationSetEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } @@ -150,7 +141,6 @@ class AppCurationSetEvent( createdAt = createdAt, ) { dTag(dTag) - alt(ALT) title(title) apps(apps) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/articleCurationSet/ArticleCurationSetEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/articleCurationSet/ArticleCurationSetEvent.kt index c98dd4fd15..1535c66d8e 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/articleCurationSet/ArticleCurationSetEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/articleCurationSet/ArticleCurationSetEvent.kt @@ -25,15 +25,12 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.AddressHintProvider import com.vitorpamplona.quartz.nip01Core.hints.EventHintProvider import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.bookmarkList.tags.AddressBookmark @@ -82,7 +79,6 @@ class ArticleCurationSetEvent( companion object { const val KIND = 30004 - const val ALT = "Article Curation Set" fun createAddress( pubKey: HexKey, @@ -155,12 +151,7 @@ class ArticleCurationSetEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): ArticleCurationSetEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } @@ -199,7 +190,6 @@ class ArticleCurationSetEvent( createdAt = createdAt, ) { dTag(dTag) - alt(ALT) title(title) bookmarks(publicItems) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/bookmarkList/BookmarkListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/bookmarkList/BookmarkListEvent.kt index 0438551672..0a2a9c95a1 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/bookmarkList/BookmarkListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/bookmarkList/BookmarkListEvent.kt @@ -25,14 +25,11 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.AddressHintProvider import com.vitorpamplona.quartz.nip01Core.hints.EventHintProvider import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip51Lists.PrivateReplaceableTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.bookmarkList.tags.AddressBookmark @@ -77,7 +74,6 @@ class BookmarkListEvent( companion object { const val KIND = 10003 - const val ALT = "List of bookmarks" fun createBookmarkAddress(pubKey: HexKey) = Address(KIND, pubKey, "") @@ -185,12 +181,7 @@ class BookmarkListEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): BookmarkListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } @@ -218,7 +209,6 @@ class BookmarkListEvent( description = PrivateTagsInContent.encryptNip44(privateBookmarks.map { it.toTagArray() }.toTypedArray(), signer), createdAt = createdAt, ) { - alt(ALT) title(title) bookmarks(publicBookmarks) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/bookmarkList/OldBookmarkListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/bookmarkList/OldBookmarkListEvent.kt index 32d9b050f2..ba49e6f75c 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/bookmarkList/OldBookmarkListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/bookmarkList/OldBookmarkListEvent.kt @@ -25,15 +25,12 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.AddressHintProvider import com.vitorpamplona.quartz.nip01Core.hints.EventHintProvider import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.bookmarkList.tags.AddressBookmark @@ -78,7 +75,6 @@ class OldBookmarkListEvent( companion object { const val KIND = 30001 - const val ALT = "List of bookmarks" const val DEFAULT_D_TAG_BOOKMARKS = "bookmark" fun createBookmarkAddress(pubKey: HexKey) = Address(KIND, pubKey, DEFAULT_D_TAG_BOOKMARKS) @@ -187,12 +183,7 @@ class OldBookmarkListEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): OldBookmarkListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } @@ -223,7 +214,6 @@ class OldBookmarkListEvent( createdAt = createdAt, ) { dTag(dTag) - alt(ALT) addUnique(TitleTag.assemble(title)) addAll(publicBookmarks.map { it.toTagArray() }) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/favoriteAlgoFeedsList/FavoriteAlgoFeedsListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/favoriteAlgoFeedsList/FavoriteAlgoFeedsListEvent.kt index d4b673582b..e7a00838fe 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/favoriteAlgoFeedsList/FavoriteAlgoFeedsListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/favoriteAlgoFeedsList/FavoriteAlgoFeedsListEvent.kt @@ -25,12 +25,9 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.bookmarkList.tags.AddressBookmark import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent @@ -52,7 +49,6 @@ class FavoriteAlgoFeedsListEvent( companion object { const val KIND = 10090 - const val ALT = "Favorite algo-feeds list" const val FIXED_D_TAG = "" fun createAddress(pubKey: HexKey) = Address(KIND, pubKey, FIXED_D_TAG) @@ -148,12 +144,7 @@ class FavoriteAlgoFeedsListEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): FavoriteAlgoFeedsListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } @@ -183,7 +174,6 @@ class FavoriteAlgoFeedsListEvent( ), createdAt = createdAt, ) { - alt(ALT) favoriteAlgoFeeds(publicFeeds) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/followList/FollowListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/followList/FollowListEvent.kt index 6edd0c861b..d1341702eb 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/followList/FollowListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/followList/FollowListEvent.kt @@ -25,13 +25,10 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.BaseAddressableEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.PubKeyHintProvider import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip51Lists.muteList.tags.UserTag import com.vitorpamplona.quartz.nip51Lists.remove @@ -73,7 +70,6 @@ class FollowListEvent( companion object { const val KIND = 39089 - const val ALT = "List of people to follow" fun createAddress( pubKey: HexKey, @@ -140,12 +136,7 @@ class FollowListEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): FollowListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } @@ -175,7 +166,6 @@ class FollowListEvent( createdAt = createdAt, ) { dTag(dTag) - alt(ALT) title(name) people(people) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/geohashList/GeohashListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/geohashList/GeohashListEvent.kt index 15624bea87..4822e39119 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/geohashList/GeohashListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/geohashList/GeohashListEvent.kt @@ -25,14 +25,11 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.geohash.GeoHashTag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.encryption.signNip51List @@ -57,7 +54,6 @@ class GeohashListEvent( companion object { const val KIND = 10081 - const val ALT = "Geohash List" const val FIXED_D_TAG = "" fun createAddress(pubKey: HexKey) = Address(KIND, pubKey, FIXED_D_TAG) @@ -169,12 +165,7 @@ class GeohashListEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): GeohashListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } @@ -196,7 +187,7 @@ class GeohashListEvent( createdAt: Long = TimeUtils.now(), ): GeohashListEvent { val privateTagArray = publicGeohashes.map { GeoHashTag.assembleSingle(it) }.toTypedArray() - val publicTagArray = privateGeohashes.map { GeoHashTag.assembleSingle(it) }.toTypedArray() + AltTag.assemble(ALT) + val publicTagArray = privateGeohashes.map { GeoHashTag.assembleSingle(it) }.toTypedArray() return signer.signNip51List(createdAt, KIND, publicTagArray, privateTagArray) } @@ -211,7 +202,6 @@ class GeohashListEvent( description = PrivateTagsInContent.encryptNip44(privateGeohashes.map { GeoHashTag.assembleSingle(it) }.toTypedArray(), signer), createdAt = createdAt, ) { - alt(ALT) geohashes(publicGeohashes) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/gitAuthorList/GitAuthorListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/gitAuthorList/GitAuthorListEvent.kt index 64dced6684..84d5999307 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/gitAuthorList/GitAuthorListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/gitAuthorList/GitAuthorListEvent.kt @@ -24,11 +24,9 @@ import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.PubKeyHintProvider import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.gitAuthorList.tags.GitAuthorTag @@ -55,7 +53,6 @@ class GitAuthorListEvent( companion object { const val KIND = 10017 - const val ALT = "Git Authors List" fun createAddress(pubKey: HexKey) = Address(KIND, pubKey, "") @@ -129,12 +126,7 @@ class GitAuthorListEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): GitAuthorListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/gitRepositoryList/GitRepositoryListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/gitRepositoryList/GitRepositoryListEvent.kt index 0cb4ee6223..a80e4f396e 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/gitRepositoryList/GitRepositoryListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/gitRepositoryList/GitRepositoryListEvent.kt @@ -24,11 +24,9 @@ import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.AddressHintProvider import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.bookmarkList.tags.AddressBookmark import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent @@ -55,7 +53,6 @@ class GitRepositoryListEvent( companion object { const val KIND = 10018 - const val ALT = "Git Repositories List" fun createAddress(pubKey: HexKey) = Address(KIND, pubKey, "") @@ -129,12 +126,7 @@ class GitRepositoryListEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): GitRepositoryListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/goodWikiAuthorList/GoodWikiAuthorListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/goodWikiAuthorList/GoodWikiAuthorListEvent.kt index 9146d22ad9..8885ca44ab 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/goodWikiAuthorList/GoodWikiAuthorListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/goodWikiAuthorList/GoodWikiAuthorListEvent.kt @@ -24,11 +24,9 @@ import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.PubKeyHintProvider import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.muteList.tags.UserTag @@ -55,7 +53,6 @@ class GoodWikiAuthorListEvent( companion object { const val KIND = 10101 - const val ALT = "Good Wiki Authors List" fun createAddress(pubKey: HexKey) = Address(KIND, pubKey, "") @@ -129,12 +126,7 @@ class GoodWikiAuthorListEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): GoodWikiAuthorListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/goodWikiRelayList/GoodWikiRelayListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/goodWikiRelayList/GoodWikiRelayListEvent.kt index 536937ff46..c70b4cb373 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/goodWikiRelayList/GoodWikiRelayListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/goodWikiRelayList/GoodWikiRelayListEvent.kt @@ -24,11 +24,9 @@ import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.relayLists.tags.RelayTag @@ -53,7 +51,6 @@ class GoodWikiRelayListEvent( companion object { const val KIND = 10102 - const val ALT = "Good Wiki Relays List" fun createAddress(pubKey: HexKey) = Address(KIND, pubKey, "") @@ -128,12 +125,7 @@ class GoodWikiRelayListEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): GoodWikiRelayListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/hashtagList/HashtagListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/hashtagList/HashtagListEvent.kt index a095271cc6..8d862ce132 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/hashtagList/HashtagListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/hashtagList/HashtagListEvent.kt @@ -25,14 +25,11 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.hashtags.HashtagTag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.encryption.signNip51List @@ -53,7 +50,6 @@ class HashtagListEvent( companion object { const val KIND = 10015 - const val ALT = "Hashtag List" const val FIXED_D_TAG = "" fun createAddress(pubKey: HexKey) = Address(KIND, pubKey, FIXED_D_TAG) @@ -165,12 +161,7 @@ class HashtagListEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): HashtagListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } @@ -192,7 +183,7 @@ class HashtagListEvent( createdAt: Long = TimeUtils.now(), ): HashtagListEvent { val privateTagArray = publicHashtags.map { HashtagTag.assemble(it) }.toTypedArray() - val publicTagArray = privateHashtags.map { HashtagTag.assemble(it) }.toTypedArray() + AltTag.assemble(ALT) + val publicTagArray = privateHashtags.map { HashtagTag.assemble(it) }.toTypedArray() return signer.signNip51List(createdAt, KIND, publicTagArray, privateTagArray) } @@ -207,7 +198,6 @@ class HashtagListEvent( description = PrivateTagsInContent.encryptNip44(privateHashtags.map { HashtagTag.assemble(it) }.toTypedArray(), signer), createdAt = createdAt, ) { - alt(ALT) hashtags(publicHashtags) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/interestSet/InterestSetEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/interestSet/InterestSetEvent.kt index 12072ab335..6c1cc5e124 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/interestSet/InterestSetEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/interestSet/InterestSetEvent.kt @@ -25,14 +25,11 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip01Core.tags.hashtags.HashtagTag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent @@ -68,7 +65,6 @@ class InterestSetEvent( companion object { const val KIND = 30015 - const val ALT = "Interest Set" fun createAddress( pubKey: HexKey, @@ -134,12 +130,7 @@ class InterestSetEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): InterestSetEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } @@ -172,7 +163,6 @@ class InterestSetEvent( createdAt = createdAt, ) { dTag(dTag) - alt(ALT) title(title) hashtags(publicHashtags) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/kindMuteSet/KindMuteSetEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/kindMuteSet/KindMuteSetEvent.kt index 6d231bb8ad..2dd938ae95 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/kindMuteSet/KindMuteSetEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/kindMuteSet/KindMuteSetEvent.kt @@ -25,14 +25,11 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.PubKeyHintProvider import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.muteList.tags.UserTag @@ -59,7 +56,6 @@ class KindMuteSetEvent( companion object { const val KIND = 30007 - const val ALT = "Kind Mute Set" fun createAddress( pubKey: HexKey, @@ -123,12 +119,7 @@ class KindMuteSetEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): KindMuteSetEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } @@ -157,7 +148,6 @@ class KindMuteSetEvent( createdAt = createdAt, ) { dTag(kindNumber.toString()) - alt(ALT) peoples(publicMutedUsers) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/labeledBookmarkList/LabeledBookmarkListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/labeledBookmarkList/LabeledBookmarkListEvent.kt index cc20f2135c..4f3272d23a 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/labeledBookmarkList/LabeledBookmarkListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/labeledBookmarkList/LabeledBookmarkListEvent.kt @@ -25,15 +25,12 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.AddressHintProvider import com.vitorpamplona.quartz.nip01Core.hints.EventHintProvider import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.bookmarkList.tags.AddressBookmark @@ -95,8 +92,6 @@ class LabeledBookmarkListEvent( companion object { const val KIND = 30003 - const val ALT = "A labeled list of bookmarks" - @OptIn(ExperimentalUuidApi::class) fun createAddress( pubKey: HexKey, @@ -286,12 +281,7 @@ class LabeledBookmarkListEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): LabeledBookmarkListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } @@ -330,7 +320,6 @@ class LabeledBookmarkListEvent( createdAt = createdAt, ) { dTag(dTag) - alt(ALT) title(title) bookmarks(publicBookmarks) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/mediaFollowList/MediaFollowListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/mediaFollowList/MediaFollowListEvent.kt index 60c0d6eade..b5e5f35a25 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/mediaFollowList/MediaFollowListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/mediaFollowList/MediaFollowListEvent.kt @@ -24,11 +24,9 @@ import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.PubKeyHintProvider import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.muteList.tags.UserTag @@ -55,7 +53,6 @@ class MediaFollowListEvent( companion object { const val KIND = 10020 - const val ALT = "Media Follow List" fun createAddress(pubKey: HexKey) = Address(KIND, pubKey, "") @@ -129,12 +126,7 @@ class MediaFollowListEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): MediaFollowListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/mediaStarterPack/MediaStarterPackEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/mediaStarterPack/MediaStarterPackEvent.kt index 9eeb887854..0082a17d05 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/mediaStarterPack/MediaStarterPackEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/mediaStarterPack/MediaStarterPackEvent.kt @@ -25,13 +25,10 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.BaseAddressableEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.PubKeyHintProvider import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip51Lists.followList.followIdSet import com.vitorpamplona.quartz.nip51Lists.followList.followIds @@ -76,7 +73,6 @@ class MediaStarterPackEvent( companion object { const val KIND = 39092 - const val ALT = "Media Starter Pack" fun createAddress( pubKey: HexKey, @@ -134,12 +130,7 @@ class MediaStarterPackEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): MediaStarterPackEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } @@ -157,7 +148,6 @@ class MediaStarterPackEvent( createdAt = createdAt, ) { dTag(dTag) - alt(ALT) title(name) people(people) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/muteList/MuteListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/muteList/MuteListEvent.kt index ebfecf2ad3..1230fe16b4 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/muteList/MuteListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/muteList/MuteListEvent.kt @@ -25,13 +25,10 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.PubKeyHintProvider import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.muteList.tags.MuteTag @@ -65,7 +62,6 @@ class MuteListEvent( companion object { const val KIND = 10000 const val FIXED_D_TAG = "" - const val ALT = "Mute List" fun createAddress(pubKey: HexKey) = Address(KIND, pubKey, FIXED_D_TAG) @@ -168,12 +164,7 @@ class MuteListEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): MuteListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } @@ -199,7 +190,6 @@ class MuteListEvent( description = PrivateTagsInContent.encryptNip44(privateMutes.map { it.toTagArray() }.toTypedArray(), signer), createdAt = createdAt, ) { - alt(ALT) mutes(publicMutes) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/peopleList/PeopleListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/peopleList/PeopleListEvent.kt index 0705d75ec7..3a30f9548f 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/peopleList/PeopleListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/peopleList/PeopleListEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.PubKeyHintProvider import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner @@ -33,8 +32,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip23LongContent.tags.TitleTag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent @@ -93,7 +90,6 @@ class PeopleListEvent( companion object { const val KIND = 30000 const val BLOCK_LIST_D_TAG = "mute" - const val ALT = "List of people" fun createBlockAddress(pubKey: HexKey) = Address(KIND, pubKey, BLOCK_LIST_D_TAG) @@ -262,12 +258,7 @@ class PeopleListEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): PeopleListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } @@ -300,7 +291,6 @@ class PeopleListEvent( createdAt = createdAt, ) { dTag(dTag) - alt(ALT) title(title) peoples(publicMembers) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/pictureCurationSet/PictureCurationSetEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/pictureCurationSet/PictureCurationSetEvent.kt index f8546d4a24..b8ed6a0025 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/pictureCurationSet/PictureCurationSetEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/pictureCurationSet/PictureCurationSetEvent.kt @@ -25,14 +25,11 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.EventHintProvider import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.bookmarkList.tags.BookmarkIdTag @@ -75,7 +72,6 @@ class PictureCurationSetEvent( companion object { const val KIND = 30006 - const val ALT = "Picture Curation Set" fun createAddress( pubKey: HexKey, @@ -148,12 +144,7 @@ class PictureCurationSetEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): PictureCurationSetEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } @@ -192,7 +183,6 @@ class PictureCurationSetEvent( createdAt = createdAt, ) { dTag(dTag) - alt(ALT) title(title) bookmarks(publicItems) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/BlockedRelayListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/BlockedRelayListEvent.kt index 3c8a843bce..5676f4da24 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/BlockedRelayListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/BlockedRelayListEvent.kt @@ -30,8 +30,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.encryption.signNip51List @@ -58,8 +56,6 @@ class BlockedRelayListEvent( companion object { const val KIND = 10006 - const val ALT = "Blocked relays from this author" - val ALT_TAG = arrayOf(AltTag.Companion.assemble(ALT)) fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, "") @@ -88,7 +84,7 @@ class BlockedRelayListEvent( createdAt: Long = TimeUtils.now(), ): BlockedRelayListEvent { val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray() - return signer.signNip51List(createdAt, KIND, ALT_TAG, privateTagArray) + return signer.signNip51List(createdAt, KIND, emptyArray(), privateTagArray) } fun create( @@ -97,7 +93,7 @@ class BlockedRelayListEvent( createdAt: Long = TimeUtils.now(), ): BlockedRelayListEvent { val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray() - return signer.signNip51List(createdAt, KIND, ALT_TAG, privateTagArray) + return signer.signNip51List(createdAt, KIND, emptyArray(), privateTagArray) } suspend fun build( @@ -111,7 +107,6 @@ class BlockedRelayListEvent( description = PrivateTagsInContent.encryptNip44(privateRelays.map { RelayTag.assemble(it) }.toTypedArray(), signer), createdAt = createdAt, ) { - alt(ALT) blockedRelays(publicRelays) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/BroadcastRelayListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/BroadcastRelayListEvent.kt index a201da7f28..6cf4503639 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/BroadcastRelayListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/BroadcastRelayListEvent.kt @@ -30,8 +30,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.encryption.signNip51List @@ -58,8 +56,6 @@ class BroadcastRelayListEvent( companion object { const val KIND = 10088 - const val ALT = "Broadcast relays from this author" - val TAGS = arrayOf(AltTag.assemble(ALT)) fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, "") @@ -87,7 +83,7 @@ class BroadcastRelayListEvent( createdAt: Long = TimeUtils.now(), ): BroadcastRelayListEvent { val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray() - return signer.signNip51List(createdAt, KIND, TAGS, privateTagArray) + return signer.signNip51List(createdAt, KIND, emptyArray(), privateTagArray) } suspend fun create( @@ -96,7 +92,7 @@ class BroadcastRelayListEvent( createdAt: Long = TimeUtils.now(), ): BroadcastRelayListEvent { val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray() - return signer.signNip51List(createdAt, KIND, TAGS, privateTagArray) + return signer.signNip51List(createdAt, KIND, emptyArray(), privateTagArray) } suspend fun build( @@ -110,7 +106,6 @@ class BroadcastRelayListEvent( description = PrivateTagsInContent.encryptNip44(privateRelays.map { RelayTag.assemble(it) }.toTypedArray(), signer), createdAt = createdAt, ) { - alt(ALT) broadcastRelays(publicRelays) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/IndexerRelayListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/IndexerRelayListEvent.kt index 6a44448d64..e73816c900 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/IndexerRelayListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/IndexerRelayListEvent.kt @@ -30,8 +30,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.encryption.signNip51List @@ -58,8 +56,6 @@ class IndexerRelayListEvent( companion object { const val KIND = 10086 - const val ALT = "Indexer relays from this author" - val TAGS = arrayOf(AltTag.assemble(ALT)) fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, "") @@ -88,7 +84,7 @@ class IndexerRelayListEvent( createdAt: Long = TimeUtils.now(), ): IndexerRelayListEvent { val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray() - return signer.signNip51List(createdAt, KIND, TAGS, privateTagArray) + return signer.signNip51List(createdAt, KIND, emptyArray(), privateTagArray) } fun create( @@ -97,7 +93,7 @@ class IndexerRelayListEvent( createdAt: Long = TimeUtils.now(), ): IndexerRelayListEvent { val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray() - return signer.signNip51List(createdAt, KIND, TAGS, privateTagArray) + return signer.signNip51List(createdAt, KIND, emptyArray(), privateTagArray) } suspend fun build( @@ -111,7 +107,6 @@ class IndexerRelayListEvent( description = PrivateTagsInContent.encryptNip44(privateRelays.map { RelayTag.assemble(it) }.toTypedArray(), signer), createdAt = createdAt, ) { - alt(ALT) indexerRelays(publicRelays) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/ProxyRelayListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/ProxyRelayListEvent.kt index 8523db3ab9..834f324692 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/ProxyRelayListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/ProxyRelayListEvent.kt @@ -30,8 +30,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.encryption.signNip51List @@ -58,8 +56,6 @@ class ProxyRelayListEvent( companion object { const val KIND = 10087 - const val ALT = "Proxy relays from this author" - val TAGS = arrayOf(AltTag.assemble(ALT)) fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, "") @@ -88,7 +84,7 @@ class ProxyRelayListEvent( createdAt: Long = TimeUtils.now(), ): ProxyRelayListEvent { val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray() - return signer.signNip51List(createdAt, KIND, TAGS, privateTagArray) + return signer.signNip51List(createdAt, KIND, emptyArray(), privateTagArray) } suspend fun create( @@ -97,7 +93,7 @@ class ProxyRelayListEvent( createdAt: Long = TimeUtils.now(), ): ProxyRelayListEvent { val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray() - return signer.signNip51List(createdAt, KIND, TAGS, privateTagArray) + return signer.signNip51List(createdAt, KIND, emptyArray(), privateTagArray) } suspend fun build( @@ -111,7 +107,6 @@ class ProxyRelayListEvent( description = PrivateTagsInContent.encryptNip44(privateRelays.map { RelayTag.assemble(it) }.toTypedArray(), signer), createdAt = createdAt, ) { - alt(ALT) proxyRelays(publicRelays) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/RelayFeedsListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/RelayFeedsListEvent.kt index c802c0055d..ed36d3f423 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/RelayFeedsListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/RelayFeedsListEvent.kt @@ -30,8 +30,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.encryption.signNip51List @@ -58,8 +56,6 @@ class RelayFeedsListEvent( companion object { const val KIND = 10012 - const val ALT = "Relay Feeds" - val TAGS = arrayOf(AltTag.assemble(ALT)) fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, "") @@ -88,7 +84,7 @@ class RelayFeedsListEvent( createdAt: Long = TimeUtils.now(), ): RelayFeedsListEvent { val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray() - return signer.signNip51List(createdAt, KIND, TAGS, privateTagArray) + return signer.signNip51List(createdAt, KIND, emptyArray(), privateTagArray) } fun create( @@ -97,7 +93,7 @@ class RelayFeedsListEvent( createdAt: Long = TimeUtils.now(), ): RelayFeedsListEvent { val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray() - return signer.signNip51List(createdAt, KIND, TAGS, privateTagArray) + return signer.signNip51List(createdAt, KIND, emptyArray(), privateTagArray) } suspend fun build( @@ -111,7 +107,6 @@ class RelayFeedsListEvent( description = PrivateTagsInContent.encryptNip44(privateRelays.map { RelayTag.assemble(it) }.toTypedArray(), signer), createdAt = createdAt, ) { - alt(ALT) relayFeeds(publicRelays) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/TrustedRelayListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/TrustedRelayListEvent.kt index 3661ed939d..d47a5de7c3 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/TrustedRelayListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relayLists/TrustedRelayListEvent.kt @@ -30,8 +30,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.encryption.signNip51List @@ -58,8 +56,6 @@ class TrustedRelayListEvent( companion object { const val KIND = 10089 - val ALT = "Trusted relays from this author" - val TAGS = arrayOf(AltTag.assemble(ALT)) fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, "") @@ -88,7 +84,7 @@ class TrustedRelayListEvent( createdAt: Long = TimeUtils.now(), ): TrustedRelayListEvent { val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray() - return signer.signNip51List(createdAt, KIND, TAGS, privateTagArray) + return signer.signNip51List(createdAt, KIND, emptyArray(), privateTagArray) } suspend fun create( @@ -97,7 +93,7 @@ class TrustedRelayListEvent( createdAt: Long = TimeUtils.now(), ): TrustedRelayListEvent { val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray() - return signer.signNip51List(createdAt, KIND, TAGS, privateTagArray) + return signer.signNip51List(createdAt, KIND, emptyArray(), privateTagArray) } suspend fun build( @@ -111,7 +107,6 @@ class TrustedRelayListEvent( description = PrivateTagsInContent.encryptNip44(privateRelays.map { RelayTag.assemble(it) }.toTypedArray(), signer), createdAt = createdAt, ) { - alt(ALT) trustedRelays(publicRelays) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relaySets/RelaySetEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relaySets/RelaySetEvent.kt index 9780bdb630..89f004c4e5 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relaySets/RelaySetEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/relaySets/RelaySetEvent.kt @@ -28,8 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent @@ -66,8 +64,6 @@ class RelaySetEvent( companion object { const val KIND = 30002 - const val ALT = "Relay list" - val ALT_TAG = arrayOf(AltTag.assemble(ALT)) suspend fun updateRelayList( earlierVersion: RelaySetEvent, @@ -90,7 +86,7 @@ class RelaySetEvent( createdAt: Long = TimeUtils.now(), ): RelaySetEvent { val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray() - return signer.signNip51List(createdAt, KIND, ALT_TAG, privateTagArray) + return signer.signNip51List(createdAt, KIND, emptyArray(), privateTagArray) } suspend fun create( @@ -99,7 +95,7 @@ class RelaySetEvent( createdAt: Long = TimeUtils.now(), ): RelaySetEvent { val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray() - return signer.signNip51List(createdAt, KIND, ALT_TAG, privateTagArray) + return signer.signNip51List(createdAt, KIND, emptyArray(), privateTagArray) } suspend fun build( @@ -113,7 +109,6 @@ class RelaySetEvent( description = PrivateTagsInContent.encryptNip44(privateRelays.map { RelayTag.assemble(it) }.toTypedArray(), signer), createdAt = createdAt, ) { - alt(ALT) relaySet(publicRelays) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/releaseArtifactSet/ReleaseArtifactSetEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/releaseArtifactSet/ReleaseArtifactSetEvent.kt index 1c13812bae..f634bc4341 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/releaseArtifactSet/ReleaseArtifactSetEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/releaseArtifactSet/ReleaseArtifactSetEvent.kt @@ -25,14 +25,11 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.AddressHintProvider import com.vitorpamplona.quartz.nip01Core.hints.EventHintProvider import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip51Lists.bookmarkList.tags.AddressBookmark import com.vitorpamplona.quartz.nip51Lists.bookmarkList.tags.BookmarkIdTag @@ -74,7 +71,6 @@ class ReleaseArtifactSetEvent( companion object { const val KIND = 30063 - const val ALT = "Release Artifact Set" fun createAddress( pubKey: HexKey, @@ -113,12 +109,7 @@ class ReleaseArtifactSetEvent( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): ReleaseArtifactSetEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } + val newTags = tags return signer.sign(createdAt, KIND, newTags, content) } @@ -152,7 +143,6 @@ class ReleaseArtifactSetEvent( createdAt = createdAt, ) { dTag(dTag) - alt(ALT) title(title) artifacts(items) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/simpleGroupList/SimpleGroupListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/simpleGroupList/SimpleGroupListEvent.kt index 404720d281..bc7620a372 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/simpleGroupList/SimpleGroupListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/simpleGroupList/SimpleGroupListEvent.kt @@ -24,10 +24,8 @@ import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.remove @@ -48,7 +46,6 @@ class SimpleGroupListEvent( companion object { const val KIND = 10009 - const val ALT = "Simple Groups List" fun createAddress(pubKey: HexKey) = Address(KIND, pubKey, "") @@ -121,15 +118,6 @@ class SimpleGroupListEvent( tags: TagArray, signer: NostrSigner, createdAt: Long = TimeUtils.now(), - ): SimpleGroupListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } - - return signer.sign(createdAt, KIND, newTags, content) - } + ): SimpleGroupListEvent = signer.sign(createdAt, KIND, tags, content) } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/videoCurationSet/VideoCurationSetEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/videoCurationSet/VideoCurationSetEvent.kt index 881f8c4c21..65d0720dca 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/videoCurationSet/VideoCurationSetEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/videoCurationSet/VideoCurationSetEvent.kt @@ -25,15 +25,12 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.AddressHintProvider import com.vitorpamplona.quartz.nip01Core.hints.EventHintProvider import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.bookmarkList.tags.AddressBookmark @@ -82,7 +79,6 @@ class VideoCurationSetEvent( companion object { const val KIND = 30005 - const val ALT = "Video Curation Set" fun createAddress( pubKey: HexKey, @@ -154,16 +150,7 @@ class VideoCurationSetEvent( tags: TagArray, signer: NostrSigner, createdAt: Long = TimeUtils.now(), - ): VideoCurationSetEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } - - return signer.sign(createdAt, KIND, newTags, content) - } + ): VideoCurationSetEvent = signer.sign(createdAt, KIND, tags, content) @OptIn(ExperimentalUuidApi::class) suspend fun create( @@ -199,7 +186,6 @@ class VideoCurationSetEvent( createdAt = createdAt, ) { dTag(dTag) - alt(ALT) title(title) bookmarks(publicItems) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip52Calendar/appt/day/CalendarDateSlotEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip52Calendar/appt/day/CalendarDateSlotEvent.kt index 251404c1c8..8c5e521bab 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip52Calendar/appt/day/CalendarDateSlotEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip52Calendar/appt/day/CalendarDateSlotEvent.kt @@ -34,7 +34,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.references.references import com.vitorpamplona.quartz.nip23LongContent.tags.ImageTag import com.vitorpamplona.quartz.nip23LongContent.tags.SummaryTag import com.vitorpamplona.quartz.nip23LongContent.tags.TitleTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip52Calendar.appt.tags.LocationTag import com.vitorpamplona.quartz.utils.TimeUtils @@ -77,7 +76,6 @@ class CalendarDateSlotEvent( companion object { const val KIND = 31922 - const val ALT = "Full-day calendar event" @OptIn(ExperimentalUuidApi::class) fun build( @@ -93,7 +91,6 @@ class CalendarDateSlotEvent( titleDay(title) startDate(start) end?.let { endDate(it) } - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip52Calendar/appt/time/CalendarTimeSlotEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip52Calendar/appt/time/CalendarTimeSlotEvent.kt index b036c88979..a616b8c523 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip52Calendar/appt/time/CalendarTimeSlotEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip52Calendar/appt/time/CalendarTimeSlotEvent.kt @@ -35,7 +35,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.references.references import com.vitorpamplona.quartz.nip23LongContent.tags.ImageTag import com.vitorpamplona.quartz.nip23LongContent.tags.SummaryTag import com.vitorpamplona.quartz.nip23LongContent.tags.TitleTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip52Calendar.appt.tags.LocationTag import com.vitorpamplona.quartz.utils.TimeUtils @@ -82,7 +81,6 @@ class CalendarTimeSlotEvent( companion object { const val KIND = 31923 - const val ALT = "Calendar time-slot event" @OptIn(ExperimentalUuidApi::class) fun build( @@ -102,7 +100,6 @@ class CalendarTimeSlotEvent( end?.let { endTimestamp(it) } startTzId?.let { startTzId(it) } endTzId?.let { endTzId(it) } - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip52Calendar/calendar/CalendarEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip52Calendar/calendar/CalendarEvent.kt index e11e4af522..311f24152d 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip52Calendar/calendar/CalendarEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip52Calendar/calendar/CalendarEvent.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.taggedAddresses import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip23LongContent.tags.TitleTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.uuid.ExperimentalUuidApi @@ -52,7 +51,6 @@ class CalendarEvent( companion object { const val KIND = 31924 - const val ALT = "Calendar" @OptIn(ExperimentalUuidApi::class) fun build( @@ -64,7 +62,6 @@ class CalendarEvent( ) = eventTemplate(KIND, content, createdAt) { dTag(dTag) title(title) - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip52Calendar/rsvp/CalendarRSVPEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip52Calendar/rsvp/CalendarRSVPEvent.kt index a96ca7fd38..c58588e9ac 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip52Calendar/rsvp/CalendarRSVPEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip52Calendar/rsvp/CalendarRSVPEvent.kt @@ -33,7 +33,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip01Core.tags.events.ETag import com.vitorpamplona.quartz.nip01Core.tags.events.firstTaggedEvent import com.vitorpamplona.quartz.nip01Core.tags.people.PTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip52Calendar.appt.tags.RSVPStatusTag import com.vitorpamplona.quartz.nip52Calendar.rsvp.tags.FreeBusyTag import com.vitorpamplona.quartz.utils.TimeUtils @@ -68,7 +67,6 @@ class CalendarRSVPEvent( companion object { const val KIND = 31925 - const val ALT = "Calendar event's invitation response" @OptIn(ExperimentalUuidApi::class) fun build( @@ -88,7 +86,6 @@ class CalendarRSVPEvent( calendarEventId?.let { add(it.toTagArray()) } calendarEventAuthor?.let { add(it.toTagArray()) } freebusy?.let { freebusy(it) } - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/clip/LiveActivitiesClipEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/clip/LiveActivitiesClipEvent.kt index 16f42ec884..2cb11ed6c6 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/clip/LiveActivitiesClipEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/clip/LiveActivitiesClipEvent.kt @@ -36,7 +36,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.aTag.aTag import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip01Core.tags.references.ReferenceTag import com.vitorpamplona.quartz.nip23LongContent.tags.TitleTag -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip53LiveActivities.streaming.LiveActivitiesEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -92,7 +91,6 @@ class LiveActivitiesClipEvent( companion object { const val KIND = 1313 - const val ALT = "Live activity clip" /** * Builds an event template for a clip. Typically published by the clip-authoring backend @@ -111,7 +109,6 @@ class LiveActivitiesClipEvent( add(PTag.assemble(host, null)) add(ReferenceTag.assemble(videoUrl)) add(TitleTag.assemble(title)) - add(AltTag.assemble(ALT)) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/meetingSpaces/MeetingRoomEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/meetingSpaces/MeetingRoomEvent.kt index c78c4208ea..2f5cc8c4b9 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/meetingSpaces/MeetingRoomEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/meetingSpaces/MeetingRoomEvent.kt @@ -36,8 +36,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip23LongContent.tags.ImageTag import com.vitorpamplona.quartz.nip23LongContent.tags.SummaryTag import com.vitorpamplona.quartz.nip23LongContent.tags.TitleTag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip53LiveActivities.LiveStreamLike import com.vitorpamplona.quartz.nip53LiveActivities.meetingSpaces.tags.MeetingSpaceTag @@ -160,13 +158,12 @@ class MeetingRoomEvent( companion object { const val KIND = 30313 - const val ALT = "Meeting room event" suspend fun create( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): MeetingRoomEvent { - val tags = arrayOf(AltTag.assemble(ALT)) + val tags = emptyArray>() return signer.sign(createdAt, KIND, tags, "") } @@ -185,7 +182,6 @@ class MeetingRoomEvent( title(title) starts(starts) status(status) - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/meetingSpaces/MeetingSpaceEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/meetingSpaces/MeetingSpaceEvent.kt index 2e8d2b09d5..69a4c5490b 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/meetingSpaces/MeetingSpaceEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/meetingSpaces/MeetingSpaceEvent.kt @@ -31,8 +31,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip23LongContent.tags.ImageTag import com.vitorpamplona.quartz.nip23LongContent.tags.SummaryTag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip53LiveActivities.meetingSpaces.tags.EndpointUrlTag import com.vitorpamplona.quartz.nip53LiveActivities.meetingSpaces.tags.RelayListTag @@ -133,13 +131,12 @@ class MeetingSpaceEvent( companion object Companion { const val KIND = 30312 - const val ALT = "Interactive room event" suspend fun create( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): MeetingSpaceEvent { - val tags = arrayOf(AltTag.assemble(ALT)) + val tags = emptyArray>() return signer.sign(createdAt, KIND, tags, "") } @@ -158,7 +155,6 @@ class MeetingSpaceEvent( status(status) service(service) participant(host.pubKey, host.relayHint, host.role, host.proof) - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/nestsServers/NestsServersEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/nestsServers/NestsServersEvent.kt index 90fdc09e08..36e045eae8 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/nestsServers/NestsServersEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/nestsServers/NestsServersEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.BaseReplaceableEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.utils.TimeUtils /** @@ -102,7 +101,6 @@ class NestsServersEvent( companion object { const val KIND = 10112 - const val ALT = "Audio-room (nests) MoQ servers used by the author" fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, FIXED_D_TAG) @@ -113,7 +111,6 @@ class NestsServersEvent( fun createTagArray(servers: List): Array> = servers .map { arrayOf("server", it.relay, it.auth) } - .plusElement(AltTag.assemble(ALT)) .toTypedArray() suspend fun updateRelayList( diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/presence/MeetingRoomPresenceEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/presence/MeetingRoomPresenceEvent.kt index 1a88ebd613..5e8d89253e 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/presence/MeetingRoomPresenceEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/presence/MeetingRoomPresenceEvent.kt @@ -29,7 +29,6 @@ import com.vitorpamplona.quartz.nip01Core.hints.AddressHintProvider import com.vitorpamplona.quartz.nip01Core.hints.types.AddressHint import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip53LiveActivities.meetingSpaces.MeetingRoomEvent import com.vitorpamplona.quartz.nip53LiveActivities.meetingSpaces.MeetingSpaceEvent import com.vitorpamplona.quartz.nip53LiveActivities.meetingSpaces.tags.MeetingSpaceTag @@ -67,7 +66,6 @@ class MeetingRoomPresenceEvent( companion object Companion { const val KIND = 10312 - const val ALT = "Room Presence tag" fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, FIXED_D_TAG) @@ -81,8 +79,6 @@ class MeetingRoomPresenceEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(root.title() ?: ALT) - roomMeeting(MeetingSpaceTag(root.address(), root.relays().firstOrNull())) handRaised?.let { @@ -106,8 +102,6 @@ class MeetingRoomPresenceEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(root.room() ?: ALT) - roomMeeting(MeetingSpaceTag(root.address(), root.relays().firstOrNull())) handRaised?.let { handRaised(it) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/streaming/LiveActivitiesEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/streaming/LiveActivitiesEvent.kt index ea20dece90..e02bf44442 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/streaming/LiveActivitiesEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/streaming/LiveActivitiesEvent.kt @@ -34,8 +34,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip23LongContent.tags.ImageTag import com.vitorpamplona.quartz.nip23LongContent.tags.SummaryTag import com.vitorpamplona.quartz.nip23LongContent.tags.TitleTag -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip53LiveActivities.LiveStreamLike import com.vitorpamplona.quartz.nip53LiveActivities.streaming.tags.CurrentParticipantsTag @@ -156,14 +154,13 @@ class LiveActivitiesEvent( companion object { const val KIND = 30311 - const val ALT = "Live activity event" const val GOAL_TAG = "goal" suspend fun create( signer: NostrSigner, createdAt: Long = TimeUtils.now(), ): LiveActivitiesEvent { - val tags = arrayOf(AltTag.assemble(ALT)) + val tags = emptyArray>() return signer.sign(createdAt, KIND, tags, "") } @@ -174,7 +171,6 @@ class LiveActivitiesEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { dTag(dTag) - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip54Wiki/WikiNoteEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip54Wiki/WikiNoteEvent.kt index ea7449d1fb..0298ab9346 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip54Wiki/WikiNoteEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip54Wiki/WikiNoteEvent.kt @@ -55,7 +55,6 @@ import com.vitorpamplona.quartz.nip23LongContent.tags.ImageTag import com.vitorpamplona.quartz.nip23LongContent.tags.PublishedAtTag import com.vitorpamplona.quartz.nip23LongContent.tags.SummaryTag import com.vitorpamplona.quartz.nip23LongContent.tags.TitleTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.uuid.ExperimentalUuidApi @@ -173,7 +172,6 @@ class WikiNoteEvent( ): EventTemplate = eventTemplate(KIND, description, createdAt) { dTag(dTag) - alt("Wiki entry: $title") title(title) summary?.let { summary(it) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip56Reports/ReportEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip56Reports/ReportEvent.kt index 95f6b87c62..422f31a0e8 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip56Reports/ReportEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip56Reports/ReportEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.AddressableEvent import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip56Reports.tags.DefaultReportTag import com.vitorpamplona.quartz.nip56Reports.tags.ReportedAddressTag import com.vitorpamplona.quartz.nip56Reports.tags.ReportedAuthorTag @@ -74,7 +73,6 @@ class ReportEvent( companion object { const val KIND = 1984 - const val ALT_PREFIX = "Report for " fun build( reportedPost: Event, @@ -82,7 +80,6 @@ class ReportEvent( comment: String = "", createdAt: Long = TimeUtils.now(), ) = eventTemplate(KIND, comment, createdAt) { - alt(ALT_PREFIX + type.code) event(reportedPost.id, type) user(reportedPost.pubKey, type) @@ -97,7 +94,6 @@ class ReportEvent( comment: String = "", createdAt: Long = TimeUtils.now(), ) = eventTemplate(KIND, comment, createdAt) { - alt(ALT_PREFIX + type.code) user(reportedUser, type) } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip57Zaps/LnZapRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip57Zaps/LnZapRequestEvent.kt index 371805438a..9e57317be8 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip57Zaps/LnZapRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip57Zaps/LnZapRequestEvent.kt @@ -36,7 +36,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag import com.vitorpamplona.quartz.nip01Core.tags.events.ETag import com.vitorpamplona.quartz.nip01Core.tags.kinds.KindTag import com.vitorpamplona.quartz.nip01Core.tags.people.PTag -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -98,7 +97,6 @@ class LnZapRequestEvent( companion object { const val KIND = 9734 - const val ALT = "Zap request" suspend fun create( zappedEvent: Event, @@ -118,7 +116,6 @@ class LnZapRequestEvent( arrayOf("p", toUserPubHex ?: zappedEvent.pubKey), arrayOf("relays") + relays.map { it.url }, KindTag.assemble(zappedEvent.kind), - AltTag.assemble(ALT), ) if (zappedEvent is AddressableEvent) { tags = tags + listOf(ATag.assemble(zappedEvent.address(), null)) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip58Badges/accepted/AcceptedBadgeSetEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip58Badges/accepted/AcceptedBadgeSetEvent.kt index 451de1943b..fe4d7be2ba 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip58Badges/accepted/AcceptedBadgeSetEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip58Badges/accepted/AcceptedBadgeSetEvent.kt @@ -34,7 +34,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip01Core.tags.events.ETag import com.vitorpamplona.quartz.nip01Core.tags.people.PTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip58Badges.accepted.tags.AcceptedBadge import com.vitorpamplona.quartz.utils.TimeUtils @@ -71,7 +70,6 @@ class AcceptedBadgeSetEvent( companion object { const val KIND = 30008 private const val STANDARD_D_TAG = "profile_badges" - const val ALT_DESCRIPTION = "List of accepted badges by the author" fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, STANDARD_D_TAG) @@ -88,7 +86,6 @@ class AcceptedBadgeSetEvent( val prefix = tagArray { dTag(STANDARD_D_TAG) - alt(ALT_DESCRIPTION) initializer() } val pairs = AcceptedBadge.assemble(acceptedBadges).toTypedArray() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip58Badges/award/BadgeAwardEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip58Badges/award/BadgeAwardEvent.kt index a858699f5e..32df688097 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip58Badges/award/BadgeAwardEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip58Badges/award/BadgeAwardEvent.kt @@ -31,7 +31,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag import com.vitorpamplona.quartz.nip01Core.tags.events.ETag import com.vitorpamplona.quartz.nip01Core.tags.people.PTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -66,7 +65,6 @@ class BadgeAwardEvent( companion object { const val KIND = 8 - const val ALT_DESCRIPTION = "Badge award" fun build( awardDefinition: ATag, @@ -74,7 +72,6 @@ class BadgeAwardEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) awardDefinition(awardDefinition) awardees(awardees) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip58Badges/definition/BadgeDefinitionEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip58Badges/definition/BadgeDefinitionEvent.kt index df73ec3dae..84b17898a4 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip58Badges/definition/BadgeDefinitionEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip58Badges/definition/BadgeDefinitionEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip58Badges.definition.tags.ImageTag import com.vitorpamplona.quartz.nip58Badges.definition.tags.ThumbTag @@ -59,7 +58,6 @@ class BadgeDefinitionEvent( companion object { const val KIND = 30009 - const val ALT_DESCRIPTION = "Badge definition" fun build( badgeId: String, @@ -71,7 +69,6 @@ class BadgeDefinitionEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { dTag(badgeId) - alt(ALT_DESCRIPTION) name?.let { name(it) } image?.let { image(it.url, it.dimensions) } description?.let { description(it) } @@ -92,7 +89,6 @@ class BadgeDefinitionEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { dTag(badgeId) - alt(ALT_DESCRIPTION) name?.let { name(it) } imageUrl?.let { image(it, imageDimensions) } description?.let { description(it) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip58Badges/profile/ProfileBadgesEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip58Badges/profile/ProfileBadgesEvent.kt index e683cc51c9..38bf805b9f 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip58Badges/profile/ProfileBadgesEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip58Badges/profile/ProfileBadgesEvent.kt @@ -33,7 +33,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag import com.vitorpamplona.quartz.nip01Core.tags.events.ETag import com.vitorpamplona.quartz.nip01Core.tags.people.PTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip58Badges.accepted.tags.AcceptedBadge import com.vitorpamplona.quartz.utils.TimeUtils @@ -69,7 +68,6 @@ class ProfileBadgesEvent( companion object { const val KIND = 10008 - const val ALT_DESCRIPTION = "List of accepted badges by the author" fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, "") @@ -85,7 +83,6 @@ class ProfileBadgesEvent( // the builder, then append the ordered pair tags verbatim. val prefix = tagArray { - alt(ALT_DESCRIPTION) initializer() } val pairs = AcceptedBadge.assemble(acceptedBadges).toTypedArray() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5aStaticWebsites/NamedSiteEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5aStaticWebsites/NamedSiteEvent.kt index 96f09e79b2..fd235c3c43 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5aStaticWebsites/NamedSiteEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5aStaticWebsites/NamedSiteEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip5aStaticWebsites.tags.PathTag import com.vitorpamplona.quartz.utils.TimeUtils @@ -57,7 +56,6 @@ class NamedSiteEvent( companion object { const val KIND = 35128 - const val ALT_DESCRIPTION = "Named Static Website" fun build( identifier: String, @@ -69,7 +67,6 @@ class NamedSiteEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) dTag(identifier) sitePaths(paths) if (servers.isNotEmpty()) siteServers(servers) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5aStaticWebsites/RootSiteEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5aStaticWebsites/RootSiteEvent.kt index 96af04bfed..52b45cfdc5 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5aStaticWebsites/RootSiteEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5aStaticWebsites/RootSiteEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.BaseReplaceableEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip5aStaticWebsites.tags.PathTag import com.vitorpamplona.quartz.utils.TimeUtils @@ -54,7 +53,6 @@ class RootSiteEvent( companion object { const val KIND = 15128 - const val ALT_DESCRIPTION = "Static Website" fun build( paths: List, @@ -65,7 +63,6 @@ class RootSiteEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) sitePaths(paths) if (servers.isNotEmpty()) siteServers(servers) title?.let { siteTitle(it) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5dNapplets/NamedNappletEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5dNapplets/NamedNappletEvent.kt index 349c42f605..40faba2996 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5dNapplets/NamedNappletEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5dNapplets/NamedNappletEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip5aStaticWebsites.siteAggregateHash import com.vitorpamplona.quartz.nip5aStaticWebsites.siteDescription @@ -59,7 +58,6 @@ class NamedNappletEvent( companion object { const val KIND = 35129 - const val ALT_DESCRIPTION = "Named Napplet" fun build( identifier: String, @@ -72,7 +70,6 @@ class NamedNappletEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) dTag(identifier) sitePaths(paths) siteAggregateHash(paths) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5dNapplets/NappletSnapshotEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5dNapplets/NappletSnapshotEvent.kt index 19aff15da0..3e77abbe2d 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5dNapplets/NappletSnapshotEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5dNapplets/NappletSnapshotEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip5aStaticWebsites.siteAggregateHash import com.vitorpamplona.quartz.nip5aStaticWebsites.siteDescription @@ -56,7 +55,6 @@ class NappletSnapshotEvent( companion object { const val KIND = 5129 - const val ALT_DESCRIPTION = "Napplet snapshot" fun build( paths: List, @@ -68,7 +66,6 @@ class NappletSnapshotEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) sitePaths(paths) siteAggregateHash(paths) if (servers.isNotEmpty()) siteServers(servers) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5dNapplets/RootNappletEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5dNapplets/RootNappletEvent.kt index 6efd223122..9f029a4eb9 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5dNapplets/RootNappletEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip5dNapplets/RootNappletEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.BaseReplaceableEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip5aStaticWebsites.siteAggregateHash import com.vitorpamplona.quartz.nip5aStaticWebsites.siteDescription @@ -56,7 +55,6 @@ class RootNappletEvent( companion object { const val KIND = 15129 - const val ALT_DESCRIPTION = "Napplet" fun build( paths: List, @@ -68,7 +66,6 @@ class RootNappletEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) sitePaths(paths) siteAggregateHash(paths) if (servers.isNotEmpty()) siteServers(servers) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip60Cashu/history/CashuSpendingHistoryEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip60Cashu/history/CashuSpendingHistoryEvent.kt index eebbfddea9..adcd455875 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip60Cashu/history/CashuSpendingHistoryEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip60Cashu/history/CashuSpendingHistoryEvent.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.utils.TimeUtils @@ -110,7 +109,6 @@ class CashuSpendingHistoryEvent( companion object { const val KIND = 7376 - const val ALT_DESCRIPTION = "Cashu spending history" suspend fun build( direction: SpendingDirection, @@ -121,7 +119,6 @@ class CashuSpendingHistoryEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) // Unencrypted "e" tags for redeemed markers tokenReferences .filter { it.marker == TokenReference.MARKER_REDEEMED } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip60Cashu/quote/CashuMintQuoteEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip60Cashu/quote/CashuMintQuoteEvent.kt index 5dde71e5bb..47566e7d7a 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip60Cashu/quote/CashuMintQuoteEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip60Cashu/quote/CashuMintQuoteEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip40Expiration.expiration import com.vitorpamplona.quartz.utils.TimeUtils import kotlinx.serialization.SerialName @@ -99,7 +98,6 @@ class CashuMintQuoteEvent( companion object { const val KIND = 7374 - const val ALT_DESCRIPTION = "Cashu mint quote" const val TWO_WEEKS_SECONDS = 14 * 24 * 60 * 60L suspend fun build( @@ -119,7 +117,6 @@ class CashuMintQuoteEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) expiration(expirationTimestamp) add(arrayOf("mint", mintUrl)) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip60Cashu/token/CashuTokenEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip60Cashu/token/CashuTokenEvent.kt index 9242511727..b19ae11e80 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip60Cashu/token/CashuTokenEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip60Cashu/token/CashuTokenEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils /** @@ -63,7 +62,6 @@ class CashuTokenEvent( companion object { const val KIND = 7375 - const val ALT_DESCRIPTION = "Cashu token" suspend fun build( tokenContent: TokenContent, @@ -71,7 +69,6 @@ class CashuTokenEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) initializer() }.let { template -> val encryptedContent = signer.nip44Encrypt(TokenContentParser.toJson(tokenContent), signer.pubKey) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip60Cashu/wallet/CashuWalletEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip60Cashu/wallet/CashuWalletEvent.kt index c9337d0429..9b2fd15b27 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip60Cashu/wallet/CashuWalletEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip60Cashu/wallet/CashuWalletEvent.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.utils.TimeUtils @@ -72,7 +71,6 @@ class CashuWalletEvent( companion object { const val KIND = 17375 - const val ALT_DESCRIPTION = "Cashu wallet" const val FIXED_D_TAG = "" fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, FIXED_D_TAG) @@ -84,7 +82,6 @@ class CashuWalletEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) initializer() }.let { template -> val privateTags = diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip61Nutzaps/info/NutzapInfoEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip61Nutzaps/info/NutzapInfoEvent.kt index 48ef04c993..8a876ccc7d 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip61Nutzaps/info/NutzapInfoEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip61Nutzaps/info/NutzapInfoEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip61Nutzaps.info.tags.NutzapMintTag import com.vitorpamplona.quartz.utils.TimeUtils @@ -48,7 +47,6 @@ class NutzapInfoEvent( companion object { const val KIND = 10019 - const val ALT_DESCRIPTION = "Nutzap receiving preferences" fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, BaseReplaceableEvent.FIXED_D_TAG) @@ -59,7 +57,6 @@ class NutzapInfoEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) mints(mints) relays(relays) p2pkPubkey(p2pkPubkey) @@ -67,8 +64,8 @@ class NutzapInfoEvent( } /** - * Build an empty kind:10019 — no mints, no relays, no P2PK pubkey, - * just the alt tag. Publishing this replaces a prior nutzap-info + * Build an empty kind:10019 — no mints, no relays, no P2PK pubkey. + * Publishing this replaces a prior nutzap-info * event and signals to other clients that this user no longer * advertises any way to receive nutzaps: a reader has no shared mint * and no pubkey to lock proofs against, so it cannot build a nutzap. @@ -81,7 +78,6 @@ class NutzapInfoEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip61Nutzaps/nutzap/NutzapEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip61Nutzaps/nutzap/NutzapEvent.kt index e7eb3262ac..0fb1a7b8da 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip61Nutzaps/nutzap/NutzapEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip61Nutzaps/nutzap/NutzapEvent.kt @@ -30,7 +30,6 @@ import com.vitorpamplona.quartz.nip01Core.hints.PubKeyHintProvider import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.events.ETag import com.vitorpamplona.quartz.nip01Core.tags.people.PTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -65,7 +64,6 @@ class NutzapEvent( companion object { const val KIND = 9321 - const val ALT_DESCRIPTION = "Nutzap" fun build( message: String, @@ -77,7 +75,6 @@ class NutzapEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, message, createdAt) { - alt(ALT_DESCRIPTION) proofs(proofs) mintUrl(mintUrl) unit(unit) @@ -100,7 +97,6 @@ class NutzapEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, message, createdAt) { - alt(ALT_DESCRIPTION) proofs(proofs) mintUrl(mintUrl) unit(unit) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip61Nutzaps/redemption/NutzapRedemptionEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip61Nutzaps/redemption/NutzapRedemptionEvent.kt index d15c42f726..8cfc908eef 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip61Nutzaps/redemption/NutzapRedemptionEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip61Nutzaps/redemption/NutzapRedemptionEvent.kt @@ -30,7 +30,6 @@ import com.vitorpamplona.quartz.nip01Core.hints.PubKeyHintProvider import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.events.ETag import com.vitorpamplona.quartz.nip01Core.tags.people.PTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip61Nutzaps.nutzap.NutzapEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -57,7 +56,6 @@ class NutzapRedemptionEvent( companion object { const val KIND = 7376 - const val ALT_DESCRIPTION = "Nutzap redemption" fun build( nutzap: EventHintBundle, @@ -65,7 +63,6 @@ class NutzapRedemptionEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, encryptedContent, createdAt) { - alt(ALT_DESCRIPTION) redeemedNutzap(nutzap) notifySender(nutzap) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip61Nutzaps/token/TokenEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip61Nutzaps/token/TokenEvent.kt index 1183bff2b1..0970ccde4a 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip61Nutzaps/token/TokenEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip61Nutzaps/token/TokenEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -39,14 +38,12 @@ class TokenEvent( ) : Event(id, pubKey, createdAt, KIND, tags, content, sig) { companion object { const val KIND = 7375 - const val ALT_DESCRIPTION = "Token" fun build( encryptedContent: String, createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, encryptedContent, createdAt) { - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip62RequestToVanish/RequestToVanishEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip62RequestToVanish/RequestToVanishEvent.kt index e374820fe0..ad297aa64e 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip62RequestToVanish/RequestToVanishEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip62RequestToVanish/RequestToVanishEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip62RequestToVanish.tags.shouldVanishFrom import com.vitorpamplona.quartz.nip62RequestToVanish.tags.vanishFrom import com.vitorpamplona.quartz.nip62RequestToVanish.tags.vanishFromAllRelays @@ -49,7 +48,6 @@ class RequestToVanishEvent( companion object { const val KIND = 62 - const val ALT = "Request to vanish" fun build( relay: NormalizedRelayUrl, @@ -57,7 +55,6 @@ class RequestToVanishEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, reason, createdAt) { - alt(ALT) vanishFrom(relay) initializer() } @@ -68,7 +65,6 @@ class RequestToVanishEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, reason, createdAt) { - alt(ALT) vanishFrom(relays) initializer() } @@ -78,7 +74,6 @@ class RequestToVanishEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, reason, createdAt) { - alt(ALT) vanishFromEverywhere() initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/challenge/accept/LiveChessGameAcceptEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/challenge/accept/LiveChessGameAcceptEvent.kt index a15fed4d9d..b378b328ff 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/challenge/accept/LiveChessGameAcceptEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/challenge/accept/LiveChessGameAcceptEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.hints.EventHintBundle import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip64Chess.baseEvent.BaseChessEvent import com.vitorpamplona.quartz.nip64Chess.challenge.offer.LiveChessGameChallengeEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -54,7 +53,6 @@ class LiveChessGameAcceptEvent( companion object { const val KIND = 30065 - const val ALT_DESCRIPTION = "Chess game acceptance" fun build( gameId: String, @@ -65,7 +63,6 @@ class LiveChessGameAcceptEvent( dTag(gameId) challenge(challengeEvent) challenger(challengeEvent) - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/challenge/offer/LiveChessGameChallengeEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/challenge/offer/LiveChessGameChallengeEvent.kt index ebd8897a6f..e6599ce1c7 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/challenge/offer/LiveChessGameChallengeEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/challenge/offer/LiveChessGameChallengeEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip64Chess.Color import com.vitorpamplona.quartz.nip64Chess.baseEvent.BaseChessEvent import com.vitorpamplona.quartz.nip64Chess.baseEvent.opponent @@ -61,7 +60,6 @@ class LiveChessGameChallengeEvent( companion object { const val KIND = 30064 - const val ALT_DESCRIPTION = "Chess game challenge" fun build( gameId: String, @@ -75,7 +73,6 @@ class LiveChessGameChallengeEvent( playerColor(playerColor) opponent?.let { opponent(opponent) } timeControl?.let { timeControl(it) } - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/draw/LiveChessDrawOfferEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/draw/LiveChessDrawOfferEvent.kt index 1870f62b59..9d2ad8358f 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/draw/LiveChessDrawOfferEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/draw/LiveChessDrawOfferEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip64Chess.baseEvent.BaseChessEvent import com.vitorpamplona.quartz.nip64Chess.baseEvent.opponent import com.vitorpamplona.quartz.nip64Chess.baseEvent.tags.OpponentTag @@ -56,7 +55,6 @@ class LiveChessDrawOfferEvent( companion object { const val KIND = 30068 - const val ALT_DESCRIPTION = "Chess draw offer" fun build( gameId: String, @@ -67,7 +65,6 @@ class LiveChessDrawOfferEvent( ) = eventTemplate(KIND, message, createdAt) { dTag(gameId) opponent(opponent) - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/end/LiveChessGameEndEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/end/LiveChessGameEndEvent.kt index 6f90d13161..83c74bb9c3 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/end/LiveChessGameEndEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/end/LiveChessGameEndEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip64Chess.GameResult import com.vitorpamplona.quartz.nip64Chess.GameTermination import com.vitorpamplona.quartz.nip64Chess.baseEvent.BaseChessEvent @@ -66,7 +65,6 @@ class LiveChessGameEndEvent( companion object { const val KIND = 30067 - const val ALT_DESCRIPTION = "Chess game ended" fun build( gameId: String, @@ -83,7 +81,6 @@ class LiveChessGameEndEvent( termination(termination) winnerPubkey?.let { winner(it) } opponent(opponent) - alt("$ALT_DESCRIPTION: ${result.notation}") initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/game/ChessGameEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/game/ChessGameEvent.kt index 002020023e..6a2f210ea3 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/game/ChessGameEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/game/ChessGameEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils /** @@ -57,24 +56,20 @@ class ChessGameEvent( companion object { const val KIND = 64 - const val ALT_DESCRIPTION = "Chess Game" /** * Create a chess game event from PGN content * Per NIP-64, clients should publish in strict "export format" * * @param pgnContent Valid PGN format string - * @param altDescription Alt text for non-supporting clients (NIP-31) * @param createdAt Event timestamp * @param initializer Additional tag builder operations */ fun build( pgnContent: String, - altDescription: String = ALT_DESCRIPTION, createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, pgnContent, createdAt) { - alt(altDescription) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/move/LiveChessMoveEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/move/LiveChessMoveEvent.kt index 843953cba1..7dddb2791b 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/move/LiveChessMoveEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip64Chess/move/LiveChessMoveEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip64Chess.baseEvent.BaseChessEvent import com.vitorpamplona.quartz.nip64Chess.baseEvent.opponent import com.vitorpamplona.quartz.nip64Chess.baseEvent.tags.OpponentTag @@ -66,7 +65,6 @@ class LiveChessMoveEvent( companion object { const val KIND = 30066 - const val ALT_DESCRIPTION = "Chess move" fun build( gameId: String, @@ -84,7 +82,6 @@ class LiveChessMoveEvent( san(san) fen(fen) opponent(opponent) - alt("$ALT_DESCRIPTION: $san") initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip66RelayMonitor/discovery/RelayDiscoveryEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip66RelayMonitor/discovery/RelayDiscoveryEvent.kt index 5601954437..9dfc43895c 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip66RelayMonitor/discovery/RelayDiscoveryEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip66RelayMonitor/discovery/RelayDiscoveryEvent.kt @@ -29,7 +29,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.normalizer.RelayUrlNormalizer import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip01Core.tags.geohash.geohashes -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip66RelayMonitor.discovery.tags.RttType import com.vitorpamplona.quartz.utils.TimeUtils @@ -82,7 +81,6 @@ class RelayDiscoveryEvent( companion object { const val KIND = 30166 - const val ALT_DESCRIPTION = "Relay discovery" fun build( relayUrl: NormalizedRelayUrl, @@ -90,7 +88,6 @@ class RelayDiscoveryEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, content, createdAt) { - alt(ALT_DESCRIPTION) dTag(relayUrl.url) initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip66RelayMonitor/monitor/RelayMonitorEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip66RelayMonitor/monitor/RelayMonitorEvent.kt index a84925eb36..2508667aab 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip66RelayMonitor/monitor/RelayMonitorEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip66RelayMonitor/monitor/RelayMonitorEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.geohash.geohash import com.vitorpamplona.quartz.nip01Core.tags.geohash.geohashes -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip66RelayMonitor.monitor.tags.CheckType import com.vitorpamplona.quartz.nip66RelayMonitor.monitor.tags.TimeoutTag import com.vitorpamplona.quartz.utils.TimeUtils @@ -63,7 +62,6 @@ class RelayMonitorEvent( companion object { const val KIND = 10166 - const val ALT_DESCRIPTION = "Relay monitor announcement" fun build( frequencySeconds: Long, @@ -73,7 +71,6 @@ class RelayMonitorEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) frequency(frequencySeconds) checks(checks) timeouts(timeouts) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip68Picture/PictureEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip68Picture/PictureEvent.kt index 4467964a30..12aa3abdc0 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip68Picture/PictureEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip68Picture/PictureEvent.kt @@ -29,7 +29,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.geohash.geohashes import com.vitorpamplona.quartz.nip01Core.tags.hashtags.hashtags import com.vitorpamplona.quartz.nip22Comments.RootScope import com.vitorpamplona.quartz.nip23LongContent.tags.TitleTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip68Picture.tags.LocationTag import com.vitorpamplona.quartz.nip92IMeta.imetas @@ -70,7 +69,6 @@ class PictureEvent( companion object { const val KIND = 20 - const val ALT_DESCRIPTION = "List of pictures" fun build( image: PictureMeta, @@ -97,7 +95,6 @@ class PictureEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, description, createdAt) { - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip69P2pOrderEvents/P2POrderEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip69P2pOrderEvents/P2POrderEvent.kt index ee4be304b5..50d3759304 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip69P2pOrderEvents/P2POrderEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip69P2pOrderEvents/P2POrderEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip40Expiration.expiration import com.vitorpamplona.quartz.nip69P2pOrderEvents.tags.FiatAmountTag import com.vitorpamplona.quartz.nip69P2pOrderEvents.tags.OrderStatus @@ -78,7 +77,6 @@ class P2POrderEvent( companion object { const val KIND = 38383 - const val ALT_DESCRIPTION = "P2P Order" @OptIn(ExperimentalUuidApi::class) fun build( @@ -122,7 +120,6 @@ class P2POrderEvent( makerName?.let { makerName(it) } geohash?.let { geohash(it) } bond?.let { bond(it) } - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip71Video/VideoHorizontalEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip71Video/VideoHorizontalEvent.kt index dbd5434a59..67abb889ff 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip71Video/VideoHorizontalEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip71Video/VideoHorizontalEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip22Comments.RootScope -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.uuid.ExperimentalUuidApi import kotlin.uuid.Uuid @@ -44,7 +43,6 @@ class VideoHorizontalEvent( RootScope { companion object { const val KIND = 34235 - const val ALT_DESCRIPTION = "Horizontal Video" fun build( video: VideoMeta, @@ -75,7 +73,6 @@ class VideoHorizontalEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, description, createdAt) { dTag(dTag) - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip71Video/VideoNormalEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip71Video/VideoNormalEvent.kt index 132a493762..f7a6079805 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip71Video/VideoNormalEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip71Video/VideoNormalEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip22Comments.RootScope -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -40,7 +39,6 @@ class VideoNormalEvent( RootScope { companion object { const val KIND = 21 - const val ALT_DESCRIPTION = "Horizontal Video" fun build( video: VideoMeta, @@ -67,7 +65,6 @@ class VideoNormalEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, description, createdAt) { - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip71Video/VideoShortEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip71Video/VideoShortEvent.kt index ecbda1e062..3650246586 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip71Video/VideoShortEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip71Video/VideoShortEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip22Comments.RootScope -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -40,7 +39,6 @@ class VideoShortEvent( RootScope { companion object { const val KIND = 22 - const val ALT_DESCRIPTION = "Vertical Video" fun build( video: VideoMeta, @@ -57,7 +55,6 @@ class VideoShortEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, description, createdAt) { - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip71Video/VideoVerticalEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip71Video/VideoVerticalEvent.kt index 0f46b0433e..880c8bf885 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip71Video/VideoVerticalEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip71Video/VideoVerticalEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip22Comments.RootScope -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils import kotlin.uuid.ExperimentalUuidApi import kotlin.uuid.Uuid @@ -44,7 +43,6 @@ class VideoVerticalEvent( RootScope { companion object { const val KIND = 34236 - const val ALT_DESCRIPTION = "Vertical Video" fun build( video: VideoMeta, @@ -64,7 +62,6 @@ class VideoVerticalEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, description, createdAt) { dTag(dTag) - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip72ModCommunities/approval/CommunityPostApprovalEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip72ModCommunities/approval/CommunityPostApprovalEvent.kt index a3eadc1b3f..3347b88a9e 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip72ModCommunities/approval/CommunityPostApprovalEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip72ModCommunities/approval/CommunityPostApprovalEvent.kt @@ -33,7 +33,6 @@ import com.vitorpamplona.quartz.nip01Core.hints.PubKeyHintProvider import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.kinds.kind import com.vitorpamplona.quartz.nip01Core.tags.people.PTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip72ModCommunities.approval.tags.ApprovedAddressTag import com.vitorpamplona.quartz.nip72ModCommunities.approval.tags.ApprovedEventTag import com.vitorpamplona.quartz.nip72ModCommunities.definition.CommunityDefinitionEvent @@ -95,7 +94,6 @@ class CommunityPostApprovalEvent( companion object { const val KIND = 4550 - const val ALT_DESCRIPTION = "Community post approval" val KIND_LIST = listOf(CommunityPostApprovalEvent.KIND) fun build( @@ -104,8 +102,6 @@ class CommunityPostApprovalEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) - community(community) approved(approvedPost) notifyAuthor(approvedPost) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip72ModCommunities/definition/CommunityDefinitionEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip72ModCommunities/definition/CommunityDefinitionEvent.kt index 6a8a679b42..a74aa022da 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip72ModCommunities/definition/CommunityDefinitionEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip72ModCommunities/definition/CommunityDefinitionEvent.kt @@ -33,7 +33,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag import com.vitorpamplona.quartz.nip01Core.tags.events.ETag import com.vitorpamplona.quartz.nip18Reposts.quotes.QTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip72ModCommunities.definition.tags.DescriptionTag import com.vitorpamplona.quartz.nip72ModCommunities.definition.tags.ImageTag @@ -94,7 +93,6 @@ class CommunityDefinitionEvent( companion object { const val KIND = 34550 const val KIND_STR = "34550" - const val ALT_DESCRIPTION = "Community definition" @OptIn(ExperimentalUuidApi::class) fun build( @@ -108,8 +106,6 @@ class CommunityDefinitionEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) - dTag(dTag) name(name) description(description) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip72ModCommunities/follow/CommunityListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip72ModCommunities/follow/CommunityListEvent.kt index dd6bbd16bc..7a1536713a 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip72ModCommunities/follow/CommunityListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip72ModCommunities/follow/CommunityListEvent.kt @@ -25,13 +25,10 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.hints.AddressHintProvider import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.remove @@ -59,7 +56,6 @@ class CommunityListEvent( companion object { const val KIND = 10004 - const val ALT = "Community List" const val FIXED_D_TAG = "" fun createAddress(pubKey: HexKey) = Address(KIND, pubKey, FIXED_D_TAG) @@ -188,16 +184,7 @@ class CommunityListEvent( tags: TagArray, signer: NostrSigner, createdAt: Long = TimeUtils.now(), - ): CommunityListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } - - return signer.sign(createdAt, KIND, newTags, content) - } + ): CommunityListEvent = signer.sign(createdAt, KIND, tags, content) suspend fun create( publicCommunities: List = emptyList(), @@ -220,7 +207,6 @@ class CommunityListEvent( description = PrivateTagsInContent.encryptNip44(privateCommunities.map { it.toTagArray() }.toTypedArray(), signer), createdAt = createdAt, ) { - alt(ALT) communities(publicCommunities) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip72ModCommunities/rules/CommunityRulesEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip72ModCommunities/rules/CommunityRulesEvent.kt index 6880633307..fe10a155f3 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip72ModCommunities/rules/CommunityRulesEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip72ModCommunities/rules/CommunityRulesEvent.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.hints.AddressHintProvider import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip72ModCommunities.rules.tags.KindRuleTag import com.vitorpamplona.quartz.nip72ModCommunities.rules.tags.MaxEventSizeTag import com.vitorpamplona.quartz.nip72ModCommunities.rules.tags.MinRulesCreatedAtTag @@ -101,7 +100,6 @@ class CommunityRulesEvent( companion object { const val KIND = 34551 const val KIND_STR = "34551" - const val ALT_DESCRIPTION = "Community rules" fun build( dTag: String, @@ -114,8 +112,6 @@ class CommunityRulesEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) - dTag(dTag) add(communityAddress.toATagArray()) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip75ZapGoals/GoalEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip75ZapGoals/GoalEvent.kt index a9e327cf5d..6aa94ed385 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip75ZapGoals/GoalEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip75ZapGoals/GoalEvent.kt @@ -40,7 +40,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip01Core.tags.references.reference import com.vitorpamplona.quartz.nip23LongContent.tags.ImageTag import com.vitorpamplona.quartz.nip23LongContent.tags.SummaryTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip75ZapGoals.tags.AmountTag import com.vitorpamplona.quartz.nip75ZapGoals.tags.ClosedAtTag @@ -88,7 +87,6 @@ class GoalEvent( companion object { const val KIND = 9041 - const val ALT_DESCRIPTION = "Zap Goal" fun build( description: String, @@ -114,7 +112,6 @@ class GoalEvent( } linked(it.toETag()) } - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip78AppData/AppDataEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip78AppData/AppDataEvent.kt index af8a560efe..a25f472abc 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip78AppData/AppDataEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip78AppData/AppDataEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.DTag import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils /** @@ -52,7 +51,6 @@ class AppDataEvent( companion object { const val KIND = 78 - const val ALT = "Arbitrary app data" fun build( content: String, @@ -60,7 +58,6 @@ class AppDataEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, content, createdAt) { - alt(ALT) dTag?.let { addUnique(DTag.assemble(it)) } initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip78AppData/AppSpecificDataEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip78AppData/AppSpecificDataEvent.kt index 85c4d9e290..eba9fd265e 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip78AppData/AppSpecificDataEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip78AppData/AppSpecificDataEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils class AppSpecificDataEvent( @@ -42,7 +41,6 @@ class AppSpecificDataEvent( companion object { const val KIND = 30078 - const val ALT = "Arbitrary app data" fun createAddress( pubKey: HexKey, @@ -60,7 +58,6 @@ class AppSpecificDataEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, description, createdAt) { - alt(ALT) dTag(dTag) initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip7DThreads/ThreadEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip7DThreads/ThreadEvent.kt index d0cef02576..94ffa12233 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip7DThreads/ThreadEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip7DThreads/ThreadEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip22Comments.RootScope -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -47,7 +46,6 @@ class ThreadEvent( companion object { const val KIND = 11 - const val ALT_DESCRIPTION = "Thread" fun build( content: String, @@ -55,7 +53,6 @@ class ThreadEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, content, createdAt) { - alt(ALT_DESCRIPTION) title(title) initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip84Highlights/HighlightEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip84Highlights/HighlightEvent.kt index 8327bd7a5d..f1fdbe1e97 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip84Highlights/HighlightEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip84Highlights/HighlightEvent.kt @@ -46,7 +46,6 @@ import com.vitorpamplona.quartz.nip19Bech32.eventIds import com.vitorpamplona.quartz.nip19Bech32.pubKeyHints import com.vitorpamplona.quartz.nip19Bech32.pubKeys import com.vitorpamplona.quartz.nip22Comments.RootScope -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip84Highlights.tags.CommentTag import com.vitorpamplona.quartz.nip84Highlights.tags.ContextTag @@ -132,12 +131,11 @@ class HighlightEvent( companion object { const val KIND = 9802 - const val ALT = "Highlight/quote event" suspend fun create( msg: String, signer: NostrSigner, createdAt: Long = TimeUtils.now(), - ): HighlightEvent = signer.sign(createdAt, KIND, arrayOf(AltTag.assemble(ALT)), msg) + ): HighlightEvent = signer.sign(createdAt, KIND, emptyArray(), msg) } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/addressables/AddressableAssertionEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/addressables/AddressableAssertionEvent.kt index 4a113de32e..2ed3ef2fb6 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/addressables/AddressableAssertionEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/addressables/AddressableAssertionEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip85TrustedAssertions.tags.CommentCountTag import com.vitorpamplona.quartz.nip85TrustedAssertions.tags.QuoteCountTag import com.vitorpamplona.quartz.nip85TrustedAssertions.tags.ReactionCountTag @@ -63,7 +62,6 @@ class AddressableAssertionEvent( companion object { const val KIND = 30384 - const val ALT = "Addressable Event Assertion" fun build( targetEventAddress: String, @@ -71,7 +69,6 @@ class AddressableAssertionEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { dTag(targetEventAddress) - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/events/EventAssertionEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/events/EventAssertionEvent.kt index b0a0791b32..3874fb6ba0 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/events/EventAssertionEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/events/EventAssertionEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip85TrustedAssertions.tags.CommentCountTag import com.vitorpamplona.quartz.nip85TrustedAssertions.tags.QuoteCountTag import com.vitorpamplona.quartz.nip85TrustedAssertions.tags.ReactionCountTag @@ -63,7 +62,6 @@ class EventAssertionEvent( companion object { const val KIND = 30383 - const val ALT = "Event Assertion" fun build( targetEventId: HexKey, @@ -71,7 +69,6 @@ class EventAssertionEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { dTag(targetEventId) - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/externalIds/ExternalIdAssertionEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/externalIds/ExternalIdAssertionEvent.kt index 68d2f877b4..bb11b4784d 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/externalIds/ExternalIdAssertionEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/externalIds/ExternalIdAssertionEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip85TrustedAssertions.tags.CommentCountTag import com.vitorpamplona.quartz.nip85TrustedAssertions.tags.ReactionCountTag import com.vitorpamplona.quartz.nip85TrustedAssertions.users.tags.RankTag @@ -51,7 +50,6 @@ class ExternalIdAssertionEvent( companion object { const val KIND = 30385 - const val ALT = "External Identifier Assertion" fun build( targetIdentifier: String, @@ -59,7 +57,6 @@ class ExternalIdAssertionEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { dTag(targetIdentifier) - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/list/TrustProviderListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/list/TrustProviderListEvent.kt index 0d255c1496..c901813730 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/list/TrustProviderListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/list/TrustProviderListEvent.kt @@ -25,12 +25,9 @@ import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.AltTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.removeParsing @@ -50,7 +47,6 @@ class TrustProviderListEvent( companion object { const val KIND = 10040 - const val ALT = "Trusted Service Providers" const val FIXED_D_TAG = "" fun createAddress(pubKey: HexKey) = Address(KIND, pubKey, FIXED_D_TAG) @@ -133,16 +129,7 @@ class TrustProviderListEvent( tags: TagArray, signer: NostrSigner, createdAt: Long = TimeUtils.now(), - ): TrustProviderListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } - - return signer.sign(createdAt, KIND, newTags, content) - } + ): TrustProviderListEvent = signer.sign(createdAt, KIND, tags, content) suspend fun create( publicProviders: List = emptyList(), @@ -162,7 +149,6 @@ class TrustProviderListEvent( description = PrivateTagsInContent.encryptNip44(privateProviders.map { it.toTagArray() }.toTypedArray(), signer), createdAt = createdAt, ) { - alt(ALT) serviceProviders(publicProviders) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/users/ContactCardEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/users/ContactCardEvent.kt index cb1c58b7b0..24b53cac48 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/users/ContactCardEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip85TrustedAssertions/users/ContactCardEvent.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.core.tagArray import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent @@ -109,7 +108,6 @@ class ContactCardEvent( companion object { const val KIND = 30382 - const val ALT = "Contact Card" fun createAddress( owner: HexKey, @@ -132,7 +130,6 @@ class ContactCardEvent( ): ContactCardEvent { val publicTags = tagArray { - alt(ALT) dTag(targetUser) publicInitializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip87Ecash/cashu/CashuMintEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip87Ecash/cashu/CashuMintEvent.kt index 12edf19132..d3db502775 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip87Ecash/cashu/CashuMintEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip87Ecash/cashu/CashuMintEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip87Ecash.NetworkType import com.vitorpamplona.quartz.utils.TimeUtils @@ -48,7 +47,6 @@ class CashuMintEvent( companion object { const val KIND = 38172 - const val ALT_DESCRIPTION = "Cashu Mint Announcement" fun build( mintPubKey: String, @@ -59,7 +57,6 @@ class CashuMintEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, metadata, createdAt) { - alt(ALT_DESCRIPTION) dTag(mintPubKey) mintUrl(mintUrl) nuts(nuts) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip87Ecash/fedimint/FedimintEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip87Ecash/fedimint/FedimintEvent.kt index ba6f81130a..ceea8374c1 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip87Ecash/fedimint/FedimintEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip87Ecash/fedimint/FedimintEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip87Ecash.NetworkType import com.vitorpamplona.quartz.utils.TimeUtils @@ -48,7 +47,6 @@ class FedimintEvent( companion object { const val KIND = 38173 - const val ALT_DESCRIPTION = "Fedimint Announcement" fun build( federationId: String, @@ -59,7 +57,6 @@ class FedimintEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, metadata, createdAt) { - alt(ALT_DESCRIPTION) dTag(federationId) inviteCodes(inviteCodes) modules(modules) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip87Ecash/recommendation/MintRecommendationEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip87Ecash/recommendation/MintRecommendationEvent.kt index d586cf7d23..9060bf7bf8 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip87Ecash/recommendation/MintRecommendationEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip87Ecash/recommendation/MintRecommendationEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip87Ecash.cashu.CashuMintEvent import com.vitorpamplona.quartz.nip87Ecash.fedimint.FedimintEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -53,7 +52,6 @@ class MintRecommendationEvent( companion object { const val KIND = 38000 - const val ALT_DESCRIPTION = "Mint Recommendation" fun build( mintIdentifier: String, @@ -65,7 +63,6 @@ class MintRecommendationEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, review, createdAt) { - alt(ALT_DESCRIPTION) dTag(mintIdentifier) kTag(mintKind) mintUrls.forEach { mintUrl(it) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip88Polls/poll/PollEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip88Polls/poll/PollEvent.kt index e6f0976082..3cf63ff717 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip88Polls/poll/PollEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip88Polls/poll/PollEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip22Comments.RootScope -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip88Polls.poll.tags.OptionTag import com.vitorpamplona.quartz.nip88Polls.poll.tags.PollType @@ -62,7 +61,6 @@ class PollEvent( companion object { const val KIND = 1068 - const val ALT_DESCRIPTION = "Poll" fun build( description: String, @@ -73,7 +71,6 @@ class PollEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, description, createdAt) { - alt(ALT_DESCRIPTION) poolType(pollType) options(options) relays(relays) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip88Polls/response/PollResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip88Polls/response/PollResponseEvent.kt index 9d579e2bb5..719512f9f8 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip88Polls/response/PollResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip88Polls/response/PollResponseEvent.kt @@ -30,7 +30,6 @@ import com.vitorpamplona.quartz.nip01Core.hints.PubKeyHintProvider import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip22Comments.RootScope -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip88Polls.poll.PollEvent import com.vitorpamplona.quartz.nip88Polls.response.tags.PollTag import com.vitorpamplona.quartz.utils.TimeUtils @@ -61,7 +60,6 @@ class PollResponseEvent( companion object { const val KIND = 1018 - const val ALT_DESCRIPTION = "Poll Response" fun build( poll: EventHintBundle, @@ -69,7 +67,6 @@ class PollResponseEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) poll(poll) notifyAuthor(poll) responses(responses) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip89AppHandlers/definition/AppDefinitionEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip89AppHandlers/definition/AppDefinitionEvent.kt index a250490e7f..78cf731091 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip89AppHandlers/definition/AppDefinitionEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip89AppHandlers/definition/AppDefinitionEvent.kt @@ -31,7 +31,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.kinds.kinds import com.vitorpamplona.quartz.nip01Core.tags.publishedAt.PublishedAtProvider import com.vitorpamplona.quartz.nip21UriScheme.toNostrUri import com.vitorpamplona.quartz.nip23LongContent.tags.PublishedAtTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip89AppHandlers.PlatformType import com.vitorpamplona.quartz.nip89AppHandlers.definition.tags.PlatformLinkTag @@ -119,7 +118,6 @@ class AppDefinitionEvent( companion object { const val KIND = 31990 - const val ALT_DESCRIPTION = "App definition event" // ["web", "https://..../a/", "nevent"] class PlatformLink( @@ -141,7 +139,6 @@ class AppDefinitionEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, details.toJson(), createdAt) { dTag(dTag) - alt(ALT_DESCRIPTION) kinds(supportedKinds) links(links) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip89AppHandlers/recommendation/AppRecommendationEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip89AppHandlers/recommendation/AppRecommendationEvent.kt index d2c0792df0..cd4ea491d3 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip89AppHandlers/recommendation/AppRecommendationEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip89AppHandlers/recommendation/AppRecommendationEvent.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.hints.AddressHintProvider import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.dTag.dTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip89AppHandlers.PlatformType import com.vitorpamplona.quartz.nip89AppHandlers.definition.AppDefinitionEvent import com.vitorpamplona.quartz.nip89AppHandlers.recommendation.tags.RecommendationTag @@ -54,7 +53,6 @@ class AppRecommendationEvent( companion object { const val KIND = 31989 - const val ALT_DESCRIPTION = "App recommendations by the author" class AppRecommendationItem( val appDefinitionEvent: AppDefinitionEvent, @@ -72,7 +70,6 @@ class AppRecommendationEvent( appReferences.forEach { recommend(it.appDefinitionEvent.addressTag(), it.relayHint, it.platform.code) } - alt(ALT_DESCRIPTION) initializer() } @@ -84,7 +81,6 @@ class AppRecommendationEvent( ) = eventTemplate(KIND, "", createdAt) { dTag(supportedKind) recommend(recommendations) - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/contentDiscoveryRequest/NIP90ContentDiscoveryRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/contentDiscoveryRequest/NIP90ContentDiscoveryRequestEvent.kt index 48d820f572..d6df3c9589 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/contentDiscoveryRequest/NIP90ContentDiscoveryRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/contentDiscoveryRequest/NIP90ContentDiscoveryRequestEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip90Dvms.tags.InputTag import com.vitorpamplona.quartz.nip90Dvms.tags.dvmParam import com.vitorpamplona.quartz.nip90Dvms.tags.inputs @@ -57,7 +56,6 @@ class NIP90ContentDiscoveryRequestEvent( companion object { const val KIND = 5300 - const val ALT = "NIP90 Content Discovery request" fun build( dvmPublicKey: HexKey, @@ -66,7 +64,6 @@ class NIP90ContentDiscoveryRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) dvmPubKey(dvmPublicKey) relays(relays) param("max_results", "200") diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/contentDiscoveryResponse/NIP90ContentDiscoveryResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/contentDiscoveryResponse/NIP90ContentDiscoveryResponseEvent.kt index 4ed27534b4..105a1d1fde 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/contentDiscoveryResponse/NIP90ContentDiscoveryResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/contentDiscoveryResponse/NIP90ContentDiscoveryResponseEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.OptimizedJsonMapper import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.Log import com.vitorpamplona.quartz.utils.TimeUtils @@ -70,13 +69,11 @@ class NIP90ContentDiscoveryResponseEvent( companion object { const val KIND = 6300 - const val ALT = "NIP90 Content Discovery reply" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/contentSearch/NIP90ContentSearchRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/contentSearch/NIP90ContentSearchRequestEvent.kt index f7093bfb5f..f2c6a7f069 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/contentSearch/NIP90ContentSearchRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/contentSearch/NIP90ContentSearchRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip90Dvms.tags.InputTag import com.vitorpamplona.quartz.nip90Dvms.tags.dvmParam import com.vitorpamplona.quartz.nip90Dvms.tags.firstInputByType @@ -57,7 +56,6 @@ class NIP90ContentSearchRequestEvent( companion object { const val KIND = 5302 - const val ALT = "NIP90 Content Search request" fun build( searchQuery: String, @@ -68,7 +66,6 @@ class NIP90ContentSearchRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) inputText(searchQuery) users?.let { param("users", it) } since?.let { param("since", it.toString()) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/contentSearch/NIP90ContentSearchResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/contentSearch/NIP90ContentSearchResponseEvent.kt index 57e07e894e..894a70dc90 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/contentSearch/NIP90ContentSearchResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/contentSearch/NIP90ContentSearchResponseEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.OptimizedJsonMapper import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.Log import com.vitorpamplona.quartz.utils.TimeUtils @@ -70,13 +69,11 @@ class NIP90ContentSearchResponseEvent( companion object { const val KIND = 6302 - const val ALT = "NIP90 Content Search response" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventCount/NIP90EventCountRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventCount/NIP90EventCountRequestEvent.kt index 7af5173577..504672ea10 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventCount/NIP90EventCountRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventCount/NIP90EventCountRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip90Dvms.tags.InputTag import com.vitorpamplona.quartz.nip90Dvms.tags.dvmParamAll import com.vitorpamplona.quartz.nip90Dvms.tags.inputText @@ -52,7 +51,6 @@ class NIP90EventCountRequestEvent( companion object { const val KIND = 5400 - const val ALT = "NIP90 Event Count request" fun build( inputs: List = emptyList(), @@ -62,7 +60,6 @@ class NIP90EventCountRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, filterJson, createdAt) { - alt(ALT) inputs.forEach { inputText(it) } relays.forEach { param("relay", it) } groups.forEach { param("group", it) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventCount/NIP90EventCountResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventCount/NIP90EventCountResponseEvent.kt index 8373cb998c..84f0d173d6 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventCount/NIP90EventCountResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventCount/NIP90EventCountResponseEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -41,13 +40,11 @@ class NIP90EventCountResponseEvent( companion object { const val KIND = 6400 - const val ALT = "NIP90 Event Count response" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventPowDelegation/NIP90EventPowDelegationRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventPowDelegation/NIP90EventPowDelegationRequestEvent.kt index c371a0d6c0..1f0d7570ae 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventPowDelegation/NIP90EventPowDelegationRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventPowDelegation/NIP90EventPowDelegationRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip90Dvms.tags.InputTag import com.vitorpamplona.quartz.nip90Dvms.tags.dvmParam import com.vitorpamplona.quartz.nip90Dvms.tags.inputText @@ -50,7 +49,6 @@ class NIP90EventPowDelegationRequestEvent( companion object { const val KIND = 5970 - const val ALT = "NIP90 Event PoW Delegation request" fun build( eventJson: String, @@ -58,7 +56,6 @@ class NIP90EventPowDelegationRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) inputText(eventJson) param("pow", pow.toString()) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventPowDelegation/NIP90EventPowDelegationResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventPowDelegation/NIP90EventPowDelegationResponseEvent.kt index 306972d3f6..ab46d67d28 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventPowDelegation/NIP90EventPowDelegationResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventPowDelegation/NIP90EventPowDelegationResponseEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -39,13 +38,11 @@ class NIP90EventPowDelegationResponseEvent( ) : Event(id, pubKey, createdAt, KIND, tags, content, sig) { companion object { const val KIND = 6970 - const val ALT = "NIP90 Event PoW Delegation response" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventPublishSchedule/NIP90EventPublishScheduleRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventPublishSchedule/NIP90EventPublishScheduleRequestEvent.kt index a82e27d51c..a6eab69fa8 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventPublishSchedule/NIP90EventPublishScheduleRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventPublishSchedule/NIP90EventPublishScheduleRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip90Dvms.tags.InputTag import com.vitorpamplona.quartz.nip90Dvms.tags.dvmParamValues import com.vitorpamplona.quartz.nip90Dvms.tags.inputText @@ -50,7 +49,6 @@ class NIP90EventPublishScheduleRequestEvent( companion object { const val KIND = 5905 - const val ALT = "NIP90 Event Publish Schedule request" fun build( eventJson: String, @@ -58,7 +56,6 @@ class NIP90EventPublishScheduleRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) inputText(eventJson) if (relays.isNotEmpty()) { param("relays", *relays.toTypedArray()) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventPublishSchedule/NIP90EventPublishScheduleResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventPublishSchedule/NIP90EventPublishScheduleResponseEvent.kt index a5b29b16e8..1dfa2e5980 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventPublishSchedule/NIP90EventPublishScheduleResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventPublishSchedule/NIP90EventPublishScheduleResponseEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -41,13 +40,11 @@ class NIP90EventPublishScheduleResponseEvent( companion object { const val KIND = 6905 - const val ALT = "NIP90 Event Publish Schedule response" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventTimestamping/NIP90EventTimestampingRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventTimestamping/NIP90EventTimestampingRequestEvent.kt index 3686612a4b..4280ea87ca 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventTimestamping/NIP90EventTimestampingRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventTimestamping/NIP90EventTimestampingRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip90Dvms.tags.InputTag import com.vitorpamplona.quartz.nip90Dvms.tags.firstInputByType import com.vitorpamplona.quartz.nip90Dvms.tags.inputEvent @@ -47,14 +46,12 @@ class NIP90EventTimestampingRequestEvent( companion object { const val KIND = 5900 - const val ALT = "NIP90 Event Timestamping request" fun build( eventId: HexKey, createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) inputEvent(eventId) initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventTimestamping/NIP90EventTimestampingResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventTimestamping/NIP90EventTimestampingResponseEvent.kt index b79d5ab557..604079190e 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventTimestamping/NIP90EventTimestampingResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/eventTimestamping/NIP90EventTimestampingResponseEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -41,13 +40,11 @@ class NIP90EventTimestampingResponseEvent( companion object { const val KIND = 6900 - const val ALT = "NIP90 Event Timestamping response" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/imageGeneration/NIP90ImageGenerationRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/imageGeneration/NIP90ImageGenerationRequestEvent.kt index 4d613568ab..f71aba97e7 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/imageGeneration/NIP90ImageGenerationRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/imageGeneration/NIP90ImageGenerationRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip90Dvms.tags.InputTag import com.vitorpamplona.quartz.nip90Dvms.tags.dvmParam import com.vitorpamplona.quartz.nip90Dvms.tags.firstInputByType @@ -62,7 +61,6 @@ class NIP90ImageGenerationRequestEvent( companion object { const val KIND = 5100 - const val ALT = "NIP90 Image Generation request" fun build( prompt: String, @@ -75,7 +73,6 @@ class NIP90ImageGenerationRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) sourceImageUrl?.let { inputUrl(it) } inputText(prompt) model?.let { param("model", it) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/imageGeneration/NIP90ImageGenerationResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/imageGeneration/NIP90ImageGenerationResponseEvent.kt index 8ea2870f87..ef07dd5fee 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/imageGeneration/NIP90ImageGenerationResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/imageGeneration/NIP90ImageGenerationResponseEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -39,13 +38,11 @@ class NIP90ImageGenerationResponseEvent( ) : Event(id, pubKey, createdAt, KIND, tags, content, sig) { companion object { const val KIND = 6100 - const val ALT = "NIP90 Image Generation response" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/imageToVideo/NIP90ImageToVideoRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/imageToVideo/NIP90ImageToVideoRequestEvent.kt index ab5720c980..98557b94d5 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/imageToVideo/NIP90ImageToVideoRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/imageToVideo/NIP90ImageToVideoRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip90Dvms.tags.InputTag import com.vitorpamplona.quartz.nip90Dvms.tags.firstInputByType import com.vitorpamplona.quartz.nip90Dvms.tags.inputUrl @@ -47,14 +46,12 @@ class NIP90ImageToVideoRequestEvent( companion object { const val KIND = 5202 - const val ALT = "NIP90 Image-to-Video request" fun build( imageUrl: String, createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) inputUrl(imageUrl) initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/imageToVideo/NIP90ImageToVideoResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/imageToVideo/NIP90ImageToVideoResponseEvent.kt index 7e7a9b94f4..9e3c21edfa 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/imageToVideo/NIP90ImageToVideoResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/imageToVideo/NIP90ImageToVideoResponseEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -39,13 +38,11 @@ class NIP90ImageToVideoResponseEvent( ) : Event(id, pubKey, createdAt, KIND, tags, content, sig) { companion object { const val KIND = 6202 - const val ALT = "NIP90 Image-to-Video response" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/malwareScanning/NIP90MalwareScanRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/malwareScanning/NIP90MalwareScanRequestEvent.kt index 489686c3ba..af90743b08 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/malwareScanning/NIP90MalwareScanRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/malwareScanning/NIP90MalwareScanRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip90Dvms.tags.InputTag import com.vitorpamplona.quartz.nip90Dvms.tags.firstInputByType import com.vitorpamplona.quartz.nip90Dvms.tags.inputUrl @@ -47,14 +46,12 @@ class NIP90MalwareScanRequestEvent( companion object { const val KIND = 5500 - const val ALT = "NIP90 Malware Scan request" fun build( fileUrl: String, createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) inputUrl(fileUrl) initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/malwareScanning/NIP90MalwareScanResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/malwareScanning/NIP90MalwareScanResponseEvent.kt index 02dfa7c191..37aae8e6df 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/malwareScanning/NIP90MalwareScanResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/malwareScanning/NIP90MalwareScanResponseEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -41,13 +40,11 @@ class NIP90MalwareScanResponseEvent( companion object { const val KIND = 6500 - const val ALT = "NIP90 Malware Scan response" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/opReturn/NIP90OpReturnRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/opReturn/NIP90OpReturnRequestEvent.kt index f3fbca7f9e..2cf9def354 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/opReturn/NIP90OpReturnRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/opReturn/NIP90OpReturnRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip90Dvms.tags.InputTag import com.vitorpamplona.quartz.nip90Dvms.tags.firstInputByType import com.vitorpamplona.quartz.nip90Dvms.tags.inputText @@ -47,7 +46,6 @@ class NIP90OpReturnRequestEvent( companion object { const val KIND = 5901 - const val ALT = "NIP90 OP_RETURN Creation request" const val MAX_OP_RETURN_BYTES = 80 fun build( @@ -55,7 +53,6 @@ class NIP90OpReturnRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) inputText(text) initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/opReturn/NIP90OpReturnResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/opReturn/NIP90OpReturnResponseEvent.kt index db3e2ff039..9e9b8e986c 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/opReturn/NIP90OpReturnResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/opReturn/NIP90OpReturnResponseEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -41,13 +40,11 @@ class NIP90OpReturnResponseEvent( companion object { const val KIND = 6901 - const val ALT = "NIP90 OP_RETURN Creation response" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/peopleSearch/NIP90PeopleSearchRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/peopleSearch/NIP90PeopleSearchRequestEvent.kt index a190815081..e204172a8d 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/peopleSearch/NIP90PeopleSearchRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/peopleSearch/NIP90PeopleSearchRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip90Dvms.tags.InputTag import com.vitorpamplona.quartz.nip90Dvms.tags.dvmParam import com.vitorpamplona.quartz.nip90Dvms.tags.firstInputByType @@ -51,7 +50,6 @@ class NIP90PeopleSearchRequestEvent( companion object { const val KIND = 5303 - const val ALT = "NIP90 People Search request" fun build( searchQuery: String, @@ -59,7 +57,6 @@ class NIP90PeopleSearchRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) inputText(searchQuery) maxResults?.let { param("max_results", it.toString()) } initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/peopleSearch/NIP90PeopleSearchResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/peopleSearch/NIP90PeopleSearchResponseEvent.kt index 4e8900353f..6156985d53 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/peopleSearch/NIP90PeopleSearchResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/peopleSearch/NIP90PeopleSearchResponseEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.OptimizedJsonMapper import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.Log import com.vitorpamplona.quartz.utils.TimeUtils @@ -70,13 +69,11 @@ class NIP90PeopleSearchResponseEvent( companion object { const val KIND = 6303 - const val ALT = "NIP90 People Search response" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/status/NIP90StatusEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/status/NIP90StatusEvent.kt index 0b157e3fc5..c01eb4cc38 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/status/NIP90StatusEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/status/NIP90StatusEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -43,13 +42,11 @@ class NIP90StatusEvent( companion object { const val KIND = 7000 - const val ALT = "NIP90 Status update" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/summarization/NIP90SummarizationRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/summarization/NIP90SummarizationRequestEvent.kt index 907d5f300e..3e7cf4a0db 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/summarization/NIP90SummarizationRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/summarization/NIP90SummarizationRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip90Dvms.tags.InputTag import com.vitorpamplona.quartz.nip90Dvms.tags.dvmParam import com.vitorpamplona.quartz.nip90Dvms.tags.inputEvent @@ -52,7 +51,6 @@ class NIP90SummarizationRequestEvent( companion object { const val KIND = 5001 - const val ALT = "NIP90 Summarization request" fun build( eventIds: List, @@ -61,7 +59,6 @@ class NIP90SummarizationRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) eventIds.forEach { inputEvent(it) } length?.let { param("length", it) } outputMimeType?.let { output(it) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/summarization/NIP90SummarizationResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/summarization/NIP90SummarizationResponseEvent.kt index f8acffd446..d4b97ca533 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/summarization/NIP90SummarizationResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/summarization/NIP90SummarizationResponseEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -39,13 +38,11 @@ class NIP90SummarizationResponseEvent( ) : Event(id, pubKey, createdAt, KIND, tags, content, sig) { companion object { const val KIND = 6001 - const val ALT = "NIP90 Summarization response" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textExtraction/NIP90TextExtractionRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textExtraction/NIP90TextExtractionRequestEvent.kt index 940e22716a..c61c29b542 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textExtraction/NIP90TextExtractionRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textExtraction/NIP90TextExtractionRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip90Dvms.tags.InputTag import com.vitorpamplona.quartz.nip90Dvms.tags.dvmParam import com.vitorpamplona.quartz.nip90Dvms.tags.dvmParamValues @@ -57,7 +56,6 @@ class NIP90TextExtractionRequestEvent( companion object { const val KIND = 5000 - const val ALT = "NIP90 Text Extraction request" fun build( inputUrl: String, @@ -68,7 +66,6 @@ class NIP90TextExtractionRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) inputUrl(inputUrl) outputMimeType?.let { output(it) } if (rangeStart != null && rangeEnd != null) { diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textExtraction/NIP90TextExtractionResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textExtraction/NIP90TextExtractionResponseEvent.kt index 54c50b593d..ae808faa45 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textExtraction/NIP90TextExtractionResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textExtraction/NIP90TextExtractionResponseEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -39,13 +38,11 @@ class NIP90TextExtractionResponseEvent( ) : Event(id, pubKey, createdAt, KIND, tags, content, sig) { companion object { const val KIND = 6000 - const val ALT = "NIP90 Text Extraction response" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textGeneration/NIP90TextGenerationRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textGeneration/NIP90TextGenerationRequestEvent.kt index 5d058c7399..52f4c28d93 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textGeneration/NIP90TextGenerationRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textGeneration/NIP90TextGenerationRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip90Dvms.tags.InputTag import com.vitorpamplona.quartz.nip90Dvms.tags.dvmParam import com.vitorpamplona.quartz.nip90Dvms.tags.inputPrompt @@ -62,7 +61,6 @@ class NIP90TextGenerationRequestEvent( companion object { const val KIND = 5050 - const val ALT = "NIP90 Text Generation request" fun build( prompt: String, @@ -76,7 +74,6 @@ class NIP90TextGenerationRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) inputPrompt(prompt) model?.let { param("model", it) } maxTokens?.let { param("max_tokens", it.toString()) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textGeneration/NIP90TextGenerationResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textGeneration/NIP90TextGenerationResponseEvent.kt index d249d9c3ba..ded0df9d9b 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textGeneration/NIP90TextGenerationResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textGeneration/NIP90TextGenerationResponseEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -39,13 +38,11 @@ class NIP90TextGenerationResponseEvent( ) : Event(id, pubKey, createdAt, KIND, tags, content, sig) { companion object { const val KIND = 6050 - const val ALT = "NIP90 Text Generation response" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textToSpeech/NIP90TextToSpeechRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textToSpeech/NIP90TextToSpeechRequestEvent.kt index 0a45650843..0700e56b69 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textToSpeech/NIP90TextToSpeechRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textToSpeech/NIP90TextToSpeechRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip90Dvms.tags.InputTag import com.vitorpamplona.quartz.nip90Dvms.tags.dvmParam import com.vitorpamplona.quartz.nip90Dvms.tags.firstInputByType @@ -51,7 +50,6 @@ class NIP90TextToSpeechRequestEvent( companion object { const val KIND = 5250 - const val ALT = "NIP90 Text-to-Speech request" fun build( text: String, @@ -59,7 +57,6 @@ class NIP90TextToSpeechRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) inputText(text) language?.let { param("language", it) } initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textToSpeech/NIP90TextToSpeechResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textToSpeech/NIP90TextToSpeechResponseEvent.kt index b0d654c63f..01cbf1e0ca 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textToSpeech/NIP90TextToSpeechResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/textToSpeech/NIP90TextToSpeechResponseEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -39,13 +38,11 @@ class NIP90TextToSpeechResponseEvent( ) : Event(id, pubKey, createdAt, KIND, tags, content, sig) { companion object { const val KIND = 6250 - const val ALT = "NIP90 Text-to-Speech response" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/translation/NIP90TranslationRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/translation/NIP90TranslationRequestEvent.kt index ad76d18e0b..aed285ea54 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/translation/NIP90TranslationRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/translation/NIP90TranslationRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip90Dvms.tags.InputTag import com.vitorpamplona.quartz.nip90Dvms.tags.dvmParam import com.vitorpamplona.quartz.nip90Dvms.tags.inputEvent @@ -48,7 +47,6 @@ class NIP90TranslationRequestEvent( companion object { const val KIND = 5002 - const val ALT = "NIP90 Translation request" fun build( eventIds: List, @@ -56,7 +54,6 @@ class NIP90TranslationRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) eventIds.forEach { inputEvent(it) } param("language", language) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/translation/NIP90TranslationResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/translation/NIP90TranslationResponseEvent.kt index a39fe56a51..b43ef64283 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/translation/NIP90TranslationResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/translation/NIP90TranslationResponseEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -39,13 +38,11 @@ class NIP90TranslationResponseEvent( ) : Event(id, pubKey, createdAt, KIND, tags, content, sig) { companion object { const val KIND = 6002 - const val ALT = "NIP90 Translation response" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/userDiscoveryRequest/NIP90UserDiscoveryRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/userDiscoveryRequest/NIP90UserDiscoveryRequestEvent.kt index b06a1cd63c..be937e06fe 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/userDiscoveryRequest/NIP90UserDiscoveryRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/userDiscoveryRequest/NIP90UserDiscoveryRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip90Dvms.tags.InputTag import com.vitorpamplona.quartz.nip90Dvms.tags.dvmParam import com.vitorpamplona.quartz.nip90Dvms.tags.inputs @@ -48,13 +47,11 @@ class NIP90UserDiscoveryRequestEvent( companion object { const val KIND = 5301 - const val ALT = "NIP90 User Discovery request" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/userDiscoveryResponse/NIP90UserDiscoveryResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/userDiscoveryResponse/NIP90UserDiscoveryResponseEvent.kt index 7e0f101439..ba220f40bd 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/userDiscoveryResponse/NIP90UserDiscoveryResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/userDiscoveryResponse/NIP90UserDiscoveryResponseEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.OptimizedJsonMapper import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.Log import com.vitorpamplona.quartz.utils.TimeUtils @@ -70,13 +69,11 @@ class NIP90UserDiscoveryResponseEvent( companion object { const val KIND = 6301 - const val ALT = "NIP90 User Discovery reply" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/videoConversion/NIP90VideoConversionRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/videoConversion/NIP90VideoConversionRequestEvent.kt index 6524e95507..ffc3adc0c5 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/videoConversion/NIP90VideoConversionRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/videoConversion/NIP90VideoConversionRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip90Dvms.tags.InputTag import com.vitorpamplona.quartz.nip90Dvms.tags.dvmParamValues import com.vitorpamplona.quartz.nip90Dvms.tags.inputUrl @@ -54,7 +53,6 @@ class NIP90VideoConversionRequestEvent( companion object { const val KIND = 5200 - const val ALT = "NIP90 Video Conversion request" fun build( videoUrl: String, @@ -64,7 +62,6 @@ class NIP90VideoConversionRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) inputUrl(videoUrl) outputMimeType?.let { output(it) } if (rangeStart != null && rangeEnd != null) { diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/videoConversion/NIP90VideoConversionResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/videoConversion/NIP90VideoConversionResponseEvent.kt index 3c5e832251..ebd7a9031c 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/videoConversion/NIP90VideoConversionResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/videoConversion/NIP90VideoConversionResponseEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -39,13 +38,11 @@ class NIP90VideoConversionResponseEvent( ) : Event(id, pubKey, createdAt, KIND, tags, content, sig) { companion object { const val KIND = 6200 - const val ALT = "NIP90 Video Conversion response" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/videoTranslation/NIP90VideoTranslationRequestEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/videoTranslation/NIP90VideoTranslationRequestEvent.kt index 8f32c372b7..859be0382c 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/videoTranslation/NIP90VideoTranslationRequestEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/videoTranslation/NIP90VideoTranslationRequestEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip90Dvms.tags.InputTag import com.vitorpamplona.quartz.nip90Dvms.tags.dvmParam import com.vitorpamplona.quartz.nip90Dvms.tags.dvmParamValues @@ -59,7 +58,6 @@ class NIP90VideoTranslationRequestEvent( companion object { const val KIND = 5201 - const val ALT = "NIP90 Video Translation request" fun build( videoUrl: String, @@ -71,7 +69,6 @@ class NIP90VideoTranslationRequestEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) inputUrl(videoUrl) param("language", language) subtitle?.let { param("subtitle", it) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/videoTranslation/NIP90VideoTranslationResponseEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/videoTranslation/NIP90VideoTranslationResponseEvent.kt index c9fb05efcb..cea768fdd5 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/videoTranslation/NIP90VideoTranslationResponseEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip90Dvms/videoTranslation/NIP90VideoTranslationResponseEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -39,13 +38,11 @@ class NIP90VideoTranslationResponseEvent( ) : Event(id, pubKey, createdAt, KIND, tags, content, sig) { companion object { const val KIND = 6201 - const val ALT = "NIP90 Video Translation response" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip94FileMetadata/FileHeaderEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip94FileMetadata/FileHeaderEvent.kt index ad9aa67433..5ff71a5190 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip94FileMetadata/FileHeaderEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip94FileMetadata/FileHeaderEvent.kt @@ -92,7 +92,6 @@ class FileHeaderEvent( companion object { const val KIND = 1063 - const val ALT_DESCRIPTION = "Verifiable file url" fun build( url: String, @@ -101,7 +100,9 @@ class FileHeaderEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, caption ?: "", createdAt) { url(url) - caption?.ifBlank { null }?.let { alt(caption) } ?: alt(ALT_DESCRIPTION) + // NIP-94 accessibility description of the file (kept; the deprecated + // generic NIP-31 boilerplate alt is not written). + caption?.ifBlank { null }?.let { alt(it) } initializer() } @@ -121,7 +122,9 @@ class FileHeaderEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, caption ?: "", createdAt) { url(url) - caption?.ifBlank { null }?.let { alt(caption) } ?: alt(ALT_DESCRIPTION) + // NIP-94 accessibility description of the file (kept; the deprecated + // generic NIP-31 boilerplate alt is not written). + caption?.ifBlank { null }?.let { alt(it) } hash?.let { hash(it) } size?.let { fileSize(it) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip96FileStorage/config/FileServersEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip96FileStorage/config/FileServersEvent.kt index a85f133178..3e112661b0 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip96FileStorage/config/FileServersEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip96FileStorage/config/FileServersEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip96FileStorage.config.tags.ServerTag import com.vitorpamplona.quartz.utils.TimeUtils @@ -44,7 +43,6 @@ class FileServersEvent( companion object { const val KIND = 10096 - const val ALT_DESCRIPTOR = "File servers used by the author" fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, FIXED_D_TAG) @@ -66,7 +64,6 @@ class FileServersEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTOR) servers(servers) initializer() } @@ -75,7 +72,6 @@ class FileServersEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTOR) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip99Classifieds/ClassifiedsEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip99Classifieds/ClassifiedsEvent.kt index b3c6101375..1f890a4d07 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip99Classifieds/ClassifiedsEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip99Classifieds/ClassifiedsEvent.kt @@ -33,7 +33,6 @@ import com.vitorpamplona.quartz.nip23LongContent.tags.ImageTag import com.vitorpamplona.quartz.nip23LongContent.tags.PublishedAtTag import com.vitorpamplona.quartz.nip23LongContent.tags.SummaryTag import com.vitorpamplona.quartz.nip23LongContent.tags.TitleTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nip92IMeta.imetas import com.vitorpamplona.quartz.nip99Classifieds.tags.ConditionTag @@ -110,7 +109,6 @@ class ClassifiedsEvent( companion object { const val KIND = 30402 - const val ALT_DESCRIPTION = "Classifieds listing" val REQUIRED_FIELDS = setOf(TitleTag.TAG_NAME, PriceTag.TAG_NAME, ImageTag.TAG_NAME) @@ -136,7 +134,6 @@ class ClassifiedsEvent( location?.let { location(it) } images?.let { images(images) } - alt(ALT_DESCRIPTION) initializer() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipA0VoiceMessages/BaseVoiceEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipA0VoiceMessages/BaseVoiceEvent.kt index 4f24892902..ed0227e58c 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipA0VoiceMessages/BaseVoiceEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipA0VoiceMessages/BaseVoiceEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip92IMeta.imetas import com.vitorpamplona.quartz.utils.TimeUtils @@ -45,11 +44,9 @@ open class BaseVoiceEvent( fun build( voiceMessage: AudioMeta, kind: Int, - alt: String, createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(kind, voiceMessage.url, createdAt) { - alt(alt) audioIMeta(voiceMessage) initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipA0VoiceMessages/VoiceEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipA0VoiceMessages/VoiceEvent.kt index 3af6a78c32..f39df32226 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipA0VoiceMessages/VoiceEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipA0VoiceMessages/VoiceEvent.kt @@ -36,7 +36,6 @@ class VoiceEvent( ) : BaseVoiceEvent(id, pubKey, createdAt, KIND, tags, content, sig) { companion object { const val KIND = 1222 - const val ALT_DESCRIPTION = "Voice message" fun build( url: String, @@ -50,6 +49,6 @@ class VoiceEvent( voiceMessage: AudioMeta, createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, - ) = build(voiceMessage, KIND, ALT_DESCRIPTION, createdAt, initializer) + ) = build(voiceMessage, KIND, createdAt, initializer) } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipA0VoiceMessages/VoiceReplyEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipA0VoiceMessages/VoiceReplyEvent.kt index f4843f10ea..102522ae66 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipA0VoiceMessages/VoiceReplyEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipA0VoiceMessages/VoiceReplyEvent.kt @@ -57,7 +57,6 @@ class VoiceReplyEvent( companion object { const val KIND = 1244 - const val ALT_DESCRIPTION = "Voice reply" fun build( url: String, @@ -73,7 +72,7 @@ class VoiceReplyEvent( replyingTo: EventHintBundle, createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, - ) = build(voiceMessage, KIND, ALT_DESCRIPTION, createdAt) { + ) = build(voiceMessage, KIND, createdAt) { replyEvent(replyingTo.event.id, replyingTo.relay, replyingTo.event.pubKey) replyKind(replyingTo.event.kind) replyAuthor(replyingTo.event.pubKey, replyingTo.authorHomeRelay) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipA4PublicMessages/PublicMessageEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipA4PublicMessages/PublicMessageEvent.kt index 0c3c440769..9753d5386d 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipA4PublicMessages/PublicMessageEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipA4PublicMessages/PublicMessageEvent.kt @@ -38,7 +38,6 @@ import com.vitorpamplona.quartz.nip19Bech32.eventHints import com.vitorpamplona.quartz.nip19Bech32.eventIds import com.vitorpamplona.quartz.nip19Bech32.pubKeyHints import com.vitorpamplona.quartz.nip19Bech32.pubKeys -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nipA4PublicMessages.tags.ReceiverTag import com.vitorpamplona.quartz.utils.TimeUtils @@ -93,13 +92,11 @@ class PublicMessageEvent( companion object { const val KIND = 24 - const val ALT_DESCRIPTION = "Public Message" fun build( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) initializer() remove("e") // NIP-A4: e tags must not be used } @@ -110,7 +107,6 @@ class PublicMessageEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, msg, createdAt) { - alt(ALT_DESCRIPTION) toUser(to) initializer() remove("e") // NIP-A4: e tags must not be used @@ -122,7 +118,6 @@ class PublicMessageEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, msg, createdAt) { - alt(ALT_DESCRIPTION) toGroup(to) initializer() remove("e") // NIP-A4: e tags must not be used diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallAnswerEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallAnswerEvent.kt index 553ee5ad8c..472560a311 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallAnswerEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallAnswerEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTagIds -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nipACWebRtcCalls.tags.callId @Immutable @@ -49,7 +48,6 @@ class CallAnswerEvent( companion object { const val KIND = 25051 - const val ALT_DESCRIPTION = "WebRTC call answer" fun build( sdpAnswer: String, @@ -57,7 +55,6 @@ class CallAnswerEvent( callId: String, initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, sdpAnswer) { - alt(ALT_DESCRIPTION) pTag(callerPubKey) callId(callId) initializer() @@ -69,7 +66,6 @@ class CallAnswerEvent( callId: String, initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, sdpAnswer) { - alt(ALT_DESCRIPTION) pTagIds(memberPubKeys) callId(callId) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallHangupEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallHangupEvent.kt index 6b5ae36734..49d8c887ae 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallHangupEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallHangupEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTagIds -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nipACWebRtcCalls.tags.callId @Immutable @@ -49,7 +48,6 @@ class CallHangupEvent( companion object { const val KIND = 25053 - const val ALT_DESCRIPTION = "WebRTC call hangup" fun build( peerPubKey: HexKey, @@ -57,7 +55,6 @@ class CallHangupEvent( reason: String = "", initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, reason) { - alt(ALT_DESCRIPTION) pTag(peerPubKey) callId(callId) initializer() @@ -69,7 +66,6 @@ class CallHangupEvent( reason: String = "", initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, reason) { - alt(ALT_DESCRIPTION) pTagIds(memberPubKeys) callId(callId) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallIceCandidateEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallIceCandidateEvent.kt index 76ff088c98..a7f7bde812 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallIceCandidateEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallIceCandidateEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.people.pTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nipACWebRtcCalls.tags.callId import kotlinx.serialization.json.Json import kotlinx.serialization.json.int @@ -64,7 +63,6 @@ class CallIceCandidateEvent( companion object { const val KIND = 25052 - const val ALT_DESCRIPTION = "WebRTC ICE candidate" fun serializeCandidate( sdp: String, @@ -82,7 +80,6 @@ class CallIceCandidateEvent( callId: String, initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, candidateJson) { - alt(ALT_DESCRIPTION) pTag(peerPubKey) callId(callId) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallOfferEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallOfferEvent.kt index 4356f8b316..2a1caa7813 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallOfferEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallOfferEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTagIds -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nipACWebRtcCalls.tags.CallType import com.vitorpamplona.quartz.nipACWebRtcCalls.tags.CallTypeTag import com.vitorpamplona.quartz.nipACWebRtcCalls.tags.callId @@ -60,7 +59,6 @@ class CallOfferEvent( companion object { const val KIND = 25050 - const val ALT_DESCRIPTION = "WebRTC call offer" fun build( sdpOffer: String, @@ -69,7 +67,6 @@ class CallOfferEvent( type: CallType, initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, sdpOffer) { - alt(ALT_DESCRIPTION) pTag(calleePubKey) callId(callId) callType(type) @@ -83,7 +80,6 @@ class CallOfferEvent( type: CallType, initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, sdpOffer) { - alt(ALT_DESCRIPTION) pTagIds(calleePubKeys) callId(callId) callType(type) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallRejectEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallRejectEvent.kt index 664bf923dc..8d2b0b3483 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallRejectEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallRejectEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTagIds -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nipACWebRtcCalls.tags.callId @Immutable @@ -49,7 +48,6 @@ class CallRejectEvent( companion object { const val KIND = 25054 - const val ALT_DESCRIPTION = "WebRTC call rejection" fun build( callerPubKey: HexKey, @@ -57,7 +55,6 @@ class CallRejectEvent( reason: String = "", initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, reason) { - alt(ALT_DESCRIPTION) pTag(callerPubKey) callId(callId) initializer() @@ -69,7 +66,6 @@ class CallRejectEvent( reason: String = "", initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, reason) { - alt(ALT_DESCRIPTION) pTagIds(memberPubKeys) callId(callId) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallRenegotiateEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallRenegotiateEvent.kt index df39efc94e..e57c4bd455 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallRenegotiateEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/events/CallRenegotiateEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.people.PTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTag import com.vitorpamplona.quartz.nip01Core.tags.people.pTagIds -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nipACWebRtcCalls.tags.callId @Immutable @@ -49,7 +48,6 @@ class CallRenegotiateEvent( companion object { const val KIND = 25055 - const val ALT_DESCRIPTION = "WebRTC call renegotiation" fun build( sdpOffer: String, @@ -57,7 +55,6 @@ class CallRenegotiateEvent( callId: String, initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, sdpOffer) { - alt(ALT_DESCRIPTION) pTag(peerPubKey) callId(callId) initializer() @@ -69,7 +66,6 @@ class CallRenegotiateEvent( callId: String, initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, sdpOffer) { - alt(ALT_DESCRIPTION) pTagIds(memberPubKeys) callId(callId) initializer() diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipB0WebBookmarks/WebBookmarkEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipB0WebBookmarks/WebBookmarkEvent.kt index 07272bee13..a5d09d2bdd 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipB0WebBookmarks/WebBookmarkEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipB0WebBookmarks/WebBookmarkEvent.kt @@ -31,7 +31,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.hashtags.hashtags import com.vitorpamplona.quartz.nip22Comments.RootScope import com.vitorpamplona.quartz.nip23LongContent.tags.PublishedAtTag import com.vitorpamplona.quartz.nip23LongContent.tags.TitleTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -63,7 +62,6 @@ class WebBookmarkEvent( companion object { const val KIND = 39701 - const val ALT_DESCRIPTION = "Web Bookmark" fun urlToDTag(url: String): String = url @@ -80,7 +78,6 @@ class WebBookmarkEvent( initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, description, createdAt) { dTag(urlToDTag(url)) - alt(ALT_DESCRIPTION) bookmarkTitle?.let { title(it) } publishedAt(createdAt) hashtags(tags) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipB7Blossom/BlossomServersEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipB7Blossom/BlossomServersEvent.kt index 2b34a31a8a..702eeb321b 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipB7Blossom/BlossomServersEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipB7Blossom/BlossomServersEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.BaseReplaceableEvent import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.utils.TimeUtils @Immutable @@ -49,7 +48,6 @@ class BlossomServersEvent( companion object { const val KIND = 10063 - const val ALT = "File servers used by the author" fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, FIXED_D_TAG) @@ -60,7 +58,6 @@ class BlossomServersEvent( fun createTagArray(servers: List): Array> = servers .map { arrayOf("server", it) } - .plusElement(AltTag.assemble(ALT)) .toTypedArray() suspend fun updateRelayList( diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipBCOnchainZaps/zap/OnchainZapEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipBCOnchainZaps/zap/OnchainZapEvent.kt index 2dfebe2a6c..4c7f660d42 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipBCOnchainZaps/zap/OnchainZapEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipBCOnchainZaps/zap/OnchainZapEvent.kt @@ -35,7 +35,6 @@ import com.vitorpamplona.quartz.nip01Core.tags.aTag.toATag import com.vitorpamplona.quartz.nip01Core.tags.events.ETag import com.vitorpamplona.quartz.nip01Core.tags.events.toETag import com.vitorpamplona.quartz.nip01Core.tags.people.PTag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -103,9 +102,6 @@ class OnchainZapEvent( companion object { const val KIND = 8333 - /** NIP-31 human-readable fallback. Includes the amount, as in the NIP-BC example. */ - fun altDescription(amountInSats: Long) = "Onchain zap: $amountInSats sats" - /** * Build an onchain zap that targets a specific event. */ @@ -118,7 +114,6 @@ class OnchainZapEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, content, createdAt) { - alt(altDescription(amountInSats)) txid(txid) recipient(recipientPubKey) amountInSats(amountInSats) @@ -141,7 +136,6 @@ class OnchainZapEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, content, createdAt) { - alt(altDescription(amountInSats)) txid(txid) recipient(recipientPubKey) amountInSats(amountInSats) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipC0CodeSnippets/CodeSnippetEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipC0CodeSnippets/CodeSnippetEvent.kt index 9c07eeb531..96675a8330 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipC0CodeSnippets/CodeSnippetEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipC0CodeSnippets/CodeSnippetEvent.kt @@ -26,7 +26,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip22Comments.RootScope -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -74,7 +73,6 @@ class CodeSnippetEvent( companion object { const val KIND = 1337 - const val ALT_DESCRIPTION = "Code snippet" fun build( code: String, @@ -89,7 +87,6 @@ class CodeSnippetEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, code, createdAt) { - alt(ALT_DESCRIPTION) language?.let { language(it) } extension?.let { extension(it) } name?.let { snippetName(it) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipC7Chats/ChatEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipC7Chats/ChatEvent.kt index 523b032fd1..50280faa69 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipC7Chats/ChatEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipC7Chats/ChatEvent.kt @@ -39,7 +39,6 @@ import com.vitorpamplona.quartz.nip19Bech32.eventIds import com.vitorpamplona.quartz.nip19Bech32.pubKeyHints import com.vitorpamplona.quartz.nip19Bech32.pubKeys import com.vitorpamplona.quartz.nip22Comments.RootScope -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.utils.TimeUtils @@ -88,14 +87,12 @@ class ChatEvent( companion object { const val KIND = 9 - const val ALT_DESCRIPTION = "Chat message" fun build( message: String, createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, message, createdAt) { - alt(ALT_DESCRIPTION) initializer() } @@ -105,7 +102,6 @@ class ChatEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, message, createdAt) { - alt(ALT_DESCRIPTION) quote(QEventTag(replyTo.event.id, replyTo.relay, replyTo.event.pubKey)) initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/authored/AuthoredPodcastsEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/authored/AuthoredPodcastsEvent.kt index abf626b368..efa3c555df 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/authored/AuthoredPodcastsEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/authored/AuthoredPodcastsEvent.kt @@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.hints.PubKeyHintProvider import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip51Lists.muteList.tags.UserTag import com.vitorpamplona.quartz.utils.TimeUtils @@ -61,7 +60,6 @@ class AuthoredPodcastsEvent( companion object { const val KIND = 10064 - const val ALT_DESCRIPTION = "List of authored podcasts" fun createAddress(pubKey: HexKey) = Address(KIND, pubKey, FIXED_D_TAG) @@ -72,7 +70,6 @@ class AuthoredPodcastsEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) podcasts.forEach { podcast(it) } initializer() } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/episode/PodcastEpisodeEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/episode/PodcastEpisodeEvent.kt index 107ed9435d..183f2702bf 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/episode/PodcastEpisodeEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/episode/PodcastEpisodeEvent.kt @@ -25,7 +25,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nipF4Podcasts.episode.tags.AudioTag import com.vitorpamplona.quartz.nipF4Podcasts.episode.tags.DescriptionTag @@ -62,7 +61,6 @@ class PodcastEpisodeEvent( companion object { const val KIND = 54 - const val ALT_DESCRIPTION_PREFIX = "Podcast episode" fun build( title: String, @@ -73,8 +71,6 @@ class PodcastEpisodeEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, markdownContent, createdAt) { - alt("$ALT_DESCRIPTION_PREFIX: $title") - title(title) description(description) image?.let { image(it) } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/favorites/FavoritePodcastsListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/favorites/FavoritePodcastsListEvent.kt index e492348c9f..aaf72d3ab6 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/favorites/FavoritePodcastsListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/favorites/FavoritePodcastsListEvent.kt @@ -24,10 +24,8 @@ import androidx.compose.runtime.Immutable import com.vitorpamplona.quartz.nip01Core.core.Address import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArray -import com.vitorpamplona.quartz.nip01Core.core.fastAny import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions -import com.vitorpamplona.quartz.nip31Alts.AltTag import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent import com.vitorpamplona.quartz.nip51Lists.muteList.tags.UserTag @@ -58,7 +56,6 @@ class FavoritePodcastsListEvent( companion object { const val KIND = 10054 - const val ALT = "Favorite podcasts list" fun createAddress(pubKey: HexKey) = Address(KIND, pubKey, "") @@ -157,14 +154,6 @@ class FavoritePodcastsListEvent( tags: TagArray, signer: NostrSigner, createdAt: Long = TimeUtils.now(), - ): FavoritePodcastsListEvent { - val newTags = - if (tags.fastAny(AltTag::match)) { - tags - } else { - tags + AltTag.assemble(ALT) - } - return signer.sign(createdAt, KIND, newTags, content) - } + ): FavoritePodcastsListEvent = signer.sign(createdAt, KIND, tags, content) } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/metadata/PodcastMetadataEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/metadata/PodcastMetadataEvent.kt index 8a9bdccabc..42874c0747 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/metadata/PodcastMetadataEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/metadata/PodcastMetadataEvent.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate import com.vitorpamplona.quartz.nip01Core.tags.aTag.ATag -import com.vitorpamplona.quartz.nip31Alts.alt import com.vitorpamplona.quartz.nip50Search.SearchableEvent import com.vitorpamplona.quartz.nipF4Podcasts.metadata.tags.AuthorTag import com.vitorpamplona.quartz.nipF4Podcasts.metadata.tags.DescriptionTag @@ -76,7 +75,6 @@ class PodcastMetadataEvent( companion object { const val KIND = 10154 - const val ALT_DESCRIPTION = "Podcast metadata" fun createAddress(pubKey: HexKey) = Address(KIND, pubKey, FIXED_D_TAG) @@ -91,8 +89,6 @@ class PodcastMetadataEvent( createdAt: Long = TimeUtils.now(), initializer: TagArrayBuilder.() -> Unit = {}, ) = eventTemplate(KIND, "", createdAt) { - alt(ALT_DESCRIPTION) - title(title) image(image) description(description) diff --git a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/experimental/roadstr/RoadEventTest.kt b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/experimental/roadstr/RoadEventTest.kt index fd66eeb1d2..6a19958d20 100644 --- a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/experimental/roadstr/RoadEventTest.kt +++ b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/experimental/roadstr/RoadEventTest.kt @@ -152,7 +152,6 @@ class RoadEventTest { assertEquals("48.8566140", template.tags.first { it[0] == "lat" }[1]) assertEquals("2.3522219", template.tags.first { it[0] == "lon" }[1]) assertEquals((createdAt + RoadEventReportEvent.RELAY_TTL_SECONDS).toString(), template.tags.first { it[0] == "expiration" }[1]) - assertEquals("Roadstr: speed_camera report", template.tags.first { it[0] == "alt" }[1]) } @Test @@ -161,7 +160,6 @@ class RoadEventTest { assertEquals(reportId, template.tags.first { it[0] == "e" }[1]) assertEquals("still_there", template.tags.first { it[0] == "status" }[1]) - assertEquals("Roadstr: event confirmed", template.tags.first { it[0] == "alt" }[1]) assertTrue(template.tags.none { it[0] == "g" || it[0] == "lat" || it[0] == "lon" }) } diff --git a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip01Core/metadata/UpdateMetadataTest.kt b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip01Core/metadata/UpdateMetadataTest.kt index 86aa586878..ac7e123165 100644 --- a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip01Core/metadata/UpdateMetadataTest.kt +++ b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip01Core/metadata/UpdateMetadataTest.kt @@ -53,16 +53,15 @@ class UpdateMetadataTest { val expected = MetadataEvent( - id = "490d7439e530423f2540d4f2bdb73a0a2935f3df9e1f2a6f699a140c7db311fe", + id = "b7a00acbc8e07b1a555eb0b50b515b54525f129f612b6dc8e3225a2184e79e03", pubKey = "70a9b3c312a6b83e476739bd29d60ca700da1d5b982cbca87b5f3d27d4038d67", createdAt = 1740669816, tags = arrayOf( - arrayOf("alt", "User profile for Vitor"), arrayOf("name", "Vitor"), ), content = "{\"name\":\"Vitor\"}", - sig = "977a6152199f17d103d8d56736ed1b7767054464cf9423d017c01c8cdd2344698f0a5e13da8dff98d01bb1f798837e3b6271e1fd1cac861bb90686f622ae6ef4", + sig = "fcb319f3f4ac616d14186a018b40d554f4614bfdddc15079be7027d2059d6cd76d12f0f2ac4fd0ca3694b95ec66b786d6503e350249e9d35d2caa0c39e77fc0a", ) assertEquals(expected, test) @@ -90,12 +89,11 @@ class UpdateMetadataTest { val expected = MetadataEvent( - id = "2b2761d66db4a83d5fb7a98cafb8414e9b0c238ceb67d729bedacc1a092d516f", + id = "e09f5a9f0005bc427ac0c1714c7c239ecb7f2454c8b29c2c5046477c5d945c6c", pubKey = "70a9b3c312a6b83e476739bd29d60ca700da1d5b982cbca87b5f3d27d4038d67", createdAt = 1740669816, tags = arrayOf( - arrayOf("alt", "User profile for Vitor"), arrayOf("name", "Vitor"), arrayOf("display_name", "Vitor Pamplona"), arrayOf("picture", "https://vitorpamplona.com/images/me_300.jpg"), @@ -109,19 +107,18 @@ class UpdateMetadataTest { arrayOf("i", "github:vitorpamplona", "cf19e2d1d7f8dac6348ad37b35ec8421"), ), content = "{\"name\":\"Vitor\",\"display_name\":\"Vitor Pamplona\",\"picture\":\"https://vitorpamplona.com/images/me_300.jpg\",\"banner\":\"https://pbs.twimg.com/profile_banners/15064756/1414451651/1080x360\",\"website\":\"https://vitorpamplona.com\",\"pronouns\":\"he/him\",\"about\":\"Nostr's Chief Android Officer - #Amethyst\",\"nip05\":\"_@vitorpamplona.com\",\"lud16\":\"vitor@vitorpamplona.com\",\"lud06\":\"TEST\"}", - sig = "0a8c78eb0c5e0ba46e4781cc445fb7b6d275b434cead9231bd19b4f95671e3ab872264e50d4456d6036a84cc81e517bfa24229571519aabefcbce431e0c7163e", + sig = "dddbe96bd6217bb3fce33f6766cc989b300d7e867aa57bdcfc7c9ad915e165ecc76c193770f215728e7e1f59d667a16365f081d1089be27938f40e69c682e623", ) assertEquals(expected, test) val expected2 = MetadataEvent( - id = "2e1e57fae4e4baddac025ea0b49afc093f2aa27610a05e584184ed26b29d7590", + id = "58c85c5a5183fcb017be943f83f92dc714b5595078f009afa0b5241ee27e8946", pubKey = "70a9b3c312a6b83e476739bd29d60ca700da1d5b982cbca87b5f3d27d4038d67", createdAt = 1740669817, tags = arrayOf( - arrayOf("alt", "User profile for 2 Vitor"), arrayOf("name", "2 Vitor"), arrayOf("display_name", "2 Vitor Pamplona"), arrayOf("picture", "2 https://vitorpamplona.com/images/me_300.jpg"), @@ -135,7 +132,7 @@ class UpdateMetadataTest { arrayOf("i", "github:vitorpamplona", "2cf19e2d1d7f8dac6348ad37b35ec8421"), ), content = "{\"name\":\"2 Vitor\",\"display_name\":\"2 Vitor Pamplona\",\"picture\":\"2 https://vitorpamplona.com/images/me_300.jpg\",\"banner\":\"2 https://pbs.twimg.com/profile_banners/15064756/1414451651/1080x360\",\"website\":\"2 https://vitorpamplona.com\",\"pronouns\":\"2 he/him\",\"about\":\"2 Nostr's Chief Android Officer - #Amethyst\",\"nip05\":\"2 _@vitorpamplona.com\",\"lud16\":\"2 vitor@vitorpamplona.com\",\"lud06\":\"2 TEST\"}", - sig = "a25483bc0fcc79ccd337e3ff846351097109fc13f1cd1c9cc15f7f2ad46417aeb7c05c1524aeadbab93036fc0743c8c310a5b2b7b482e1808649b12a3ee29d49", + sig = "162b7a369bb84070c20a2ed5733a5c4519b3c4d1b0c89042448fe16d3f201e42ed60eb544fa8f83c8b0eed73a4dc51a39267c29e3b0d2c05b713c81157662db0", ) val test2 = @@ -161,18 +158,17 @@ class UpdateMetadataTest { val expected3 = MetadataEvent( - id = "94879b9a27fecf1337ede32013006ec4dfd5a3286a1e819abddfa1c3c132f008", + id = "75488fae3320aebf9af573d5a43b406c3eb93511e484e2db0a348408c0cce42d", pubKey = "70a9b3c312a6b83e476739bd29d60ca700da1d5b982cbca87b5f3d27d4038d67", createdAt = 1740669817, tags = arrayOf( - arrayOf("alt", "User profile for 2 Vitor"), arrayOf("name", "2 Vitor"), arrayOf("picture", "2 https://vitorpamplona.com/images/me_300.jpg"), arrayOf("banner", "2 https://pbs.twimg.com/profile_banners/15064756/1414451651/1080x360"), ), content = "{\"name\":\"2 Vitor\",\"picture\":\"2 https://vitorpamplona.com/images/me_300.jpg\",\"banner\":\"2 https://pbs.twimg.com/profile_banners/15064756/1414451651/1080x360\"}", - sig = "729ee02364b4d429b6a66400ec850e80424602e3981ff2ad8a14d61bdee04f76ec68ddc4a0f38b0527f0218f7fa67668012a5c0f3c8ef943517b504040caa07e", + sig = "775f6a90c7152632b10c4d20779d9648fd8fec45966add84ef721e58d355ce5c5e1f48b81f334c1b31236c6afe076f51e191f1cf58819c62b6fd64cae04ef01a", ) val test3 = diff --git a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip10Notes/AltTagSurrogateTest.kt b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip10Notes/AltTagSurrogateTest.kt deleted file mode 100644 index 848c6094c9..0000000000 --- a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip10Notes/AltTagSurrogateTest.kt +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2025 Vitor Pamplona - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the - * Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ -package com.vitorpamplona.quartz.nip10Notes - -import com.vitorpamplona.quartz.nip31Alts.AltTag -import kotlin.test.Test -import kotlin.test.assertEquals -import kotlin.test.assertTrue - -class AltTagSurrogateTest { - // The summarizer truncates the note to 50 UTF-16 units for the NIP-31 "alt" - // tag. In this note the 50th unit falls between the two halves of the - // saluting-face emoji (🫡, U+1FAE1 = surrogate pair D83E DEE1), so a naive - // take(50) used to leave a lone high surrogate at the end of the alt tag. - // - // A lone surrogate is unencodable as UTF-8: it is kept in memory while the - // event id is hashed (so the signature is over that id), but it is replaced - // by '?' the moment the event is serialized to the relay. Relays therefore - // recompute a different id and reject the event as having an invalid id. - private val note = - "I had to toggle a setting in fit 👍 That's slick 🫡\n" + - "https://haven.downisontheup.ca/b598bd967080491578db15cb861ebacdfd056a6ba9e0701190444b183380933b.jpg" - - private fun altOf(note: String): String = TextNoteEvent.build(note).tags.firstNotNullOfOrNull(AltTag::parse)!! - - @Test - fun altTagHasNoLoneSurrogate() { - val alt = altOf(note) - val loneSurrogate = - alt.indices.any { i -> - val c = alt[i] - when { - c.isHighSurrogate() -> i + 1 >= alt.length || !alt[i + 1].isLowSurrogate() - c.isLowSurrogate() -> i == 0 || !alt[i - 1].isHighSurrogate() - else -> false - } - } - assertTrue(!loneSurrogate, "alt tag must not contain a lone surrogate: <$alt>") - } - - @Test - fun altTagSurvivesUtf8WireRoundTrip() { - // Models the UTF-8 encode the relay transport performs. A lone surrogate - // would be replaced (and the round-trip would differ), which is exactly - // what corrupted the event id. - val alt = altOf(note) - assertEquals(alt, alt.encodeToByteArray().decodeToString()) - } -} diff --git a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip30CustomEmoji/EmojiPackEventBuildTest.kt b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip30CustomEmoji/EmojiPackEventBuildTest.kt index bf8f04c8e7..cd149c97ea 100644 --- a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip30CustomEmoji/EmojiPackEventBuildTest.kt +++ b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip30CustomEmoji/EmojiPackEventBuildTest.kt @@ -25,11 +25,12 @@ import com.vitorpamplona.quartz.nip30CustomEmoji.pack.description import com.vitorpamplona.quartz.nip30CustomEmoji.pack.image import kotlin.test.Test import kotlin.test.assertEquals +import kotlin.test.assertFalse import kotlin.test.assertTrue class EmojiPackEventBuildTest { @Test - fun buildIncludesTitleDTagAltAndEmojis() { + fun buildIncludesTitleDTagAndEmojis() { val template = EmojiPackEvent.build(name = "My Pack", dTag = "my-pack") { description("A test pack") @@ -49,7 +50,7 @@ class EmojiPackEventBuildTest { assertEquals("A test pack", tagsByName["description"]!!.first()[1]) assertTrue(tagsByName.containsKey("image")) assertEquals("https://example.com/cover.jpg", tagsByName["image"]!!.first()[1]) - assertTrue(tagsByName.containsKey("alt")) + assertFalse(tagsByName.containsKey("alt")) assertTrue(tagsByName.containsKey("emoji")) assertEquals("smile", tagsByName["emoji"]!!.first()[1]) assertEquals("https://example.com/smile.png", tagsByName["emoji"]!!.first()[2]) diff --git a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/meetingSpaces/MeetingSpaceEventBuildTest.kt b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/meetingSpaces/MeetingSpaceEventBuildTest.kt index 1b643f5ba8..85acb24e8d 100644 --- a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/meetingSpaces/MeetingSpaceEventBuildTest.kt +++ b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/meetingSpaces/MeetingSpaceEventBuildTest.kt @@ -58,7 +58,6 @@ class MeetingSpaceEventBuildTest { assertEquals("https://api.example.com/hall", byName["streaming"]?.single()?.get(1)) assertEquals("The big room", byName["summary"]?.single()?.get(1)) assertEquals("https://example.com/hall.png", byName["image"]?.single()?.get(1)) - assertEquals(MeetingSpaceEvent.ALT, byName["alt"]?.single()?.get(1)) val hostTag = byName["p"]?.single() assertNotNull(hostTag) @@ -93,7 +92,6 @@ class MeetingSpaceEventBuildTest { assertEquals("planned", byName["status"]?.single()?.get(1)) assertEquals("10", byName["current_participants"]?.single()?.get(1)) assertEquals("100", byName["total_participants"]?.single()?.get(1)) - assertEquals(MeetingRoomEvent.ALT, byName["alt"]?.single()?.get(1)) val aTag = byName["a"]?.single() assertNotNull(aTag) diff --git a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/streaming/LiveActivitiesEventBuildTest.kt b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/streaming/LiveActivitiesEventBuildTest.kt index 83731fc9f4..cc3cc61aa4 100644 --- a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/streaming/LiveActivitiesEventBuildTest.kt +++ b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip53LiveActivities/streaming/LiveActivitiesEventBuildTest.kt @@ -61,7 +61,6 @@ class LiveActivitiesEventBuildTest { assertEquals("live", tagsByName["status"]?.single()?.get(1)) assertEquals("42", tagsByName["current_participants"]?.single()?.get(1)) assertEquals("100", tagsByName["total_participants"]?.single()?.get(1)) - assertEquals(LiveActivitiesEvent.ALT, tagsByName["alt"]?.single()?.get(1)) // Per NIP-53, role lives at index 3 of the p-tag; a missing relay must be // represented as an empty string placeholder, not dropped. diff --git a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip64Chess/ChessGameEventTest.kt b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip64Chess/ChessGameEventTest.kt index a52602ca6d..0528130e61 100644 --- a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip64Chess/ChessGameEventTest.kt +++ b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nip64Chess/ChessGameEventTest.kt @@ -202,11 +202,6 @@ class ChessGameEventTest { assertEquals(formattedPGN, testEvent.pgn()) } - @Test - fun `default alt text is Chess Game`() { - assertEquals("Chess Game", ChessGameEvent.ALT_DESCRIPTION) - } - @Test fun `event inherits from Event base class`() { val testEvent = diff --git a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipA4PublicMessages/PublicMessageEventTest.kt b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipA4PublicMessages/PublicMessageEventTest.kt index 8fd9bcbfab..b2202b0185 100644 --- a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipA4PublicMessages/PublicMessageEventTest.kt +++ b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipA4PublicMessages/PublicMessageEventTest.kt @@ -44,11 +44,6 @@ class PublicMessageEventTest { assertEquals(24, PublicMessageEvent.KIND) } - @Test - fun `verify alt description`() { - assertEquals("Public Message", PublicMessageEvent.ALT_DESCRIPTION) - } - @Test fun `build with single receiver`() { val receiver = ReceiverTag(receiverPubKey, null) @@ -58,7 +53,6 @@ class PublicMessageEventTest { assertEquals(24, event.kind) assertEquals("Hello!", event.content) assertTrue(event.tags.any { it[0] == "p" && it[1] == receiverPubKey }) - assertTrue(event.tags.any { it[0] == "alt" && it[1] == "Public Message" }) } @Test diff --git a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/NipACStateMachineTest.kt b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/NipACStateMachineTest.kt index c6a0b87ac5..028134d773 100644 --- a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/NipACStateMachineTest.kt +++ b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipACWebRtcCalls/NipACStateMachineTest.kt @@ -81,9 +81,6 @@ class NipACStateMachineTest { val callTypeTag = template.tags.firstOrNull { it[0] == "call-type" } assertNotNull(callTypeTag, "Call offer MUST include call-type tag") assertEquals("video", callTypeTag[1]) - - val altTag = template.tags.firstOrNull { it[0] == "alt" } - assertNotNull(altTag, "Call offer MUST include alt tag (NIP-31)") } @Test @@ -94,7 +91,6 @@ class NipACStateMachineTest { assertNotNull(template.tags.firstOrNull { it[0] == "p" }, "Call answer MUST include p tag") assertNotNull(template.tags.firstOrNull { it[0] == "call-id" }, "Call answer MUST include call-id tag") - assertNotNull(template.tags.firstOrNull { it[0] == "alt" }, "Call answer MUST include alt tag") } @Test @@ -113,7 +109,6 @@ class NipACStateMachineTest { assertNotNull(template.tags.firstOrNull { it[0] == "p" }) assertNotNull(template.tags.firstOrNull { it[0] == "call-id" }) - assertNotNull(template.tags.firstOrNull { it[0] == "alt" }) } @Test diff --git a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipBCOnchainZaps/zap/OnchainZapEventTest.kt b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipBCOnchainZaps/zap/OnchainZapEventTest.kt index 6919e20b53..598e3821ec 100644 --- a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipBCOnchainZaps/zap/OnchainZapEventTest.kt +++ b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipBCOnchainZaps/zap/OnchainZapEventTest.kt @@ -45,7 +45,6 @@ class OnchainZapEventTest { val tags = template.tags // Required NIP-BC tags, exact values. - assertEquals(listOf("alt", "Onchain zap: 25000 sats"), tags.tag("alt")?.toList()) assertEquals(listOf("i", "bitcoin:tx:$txid"), tags.tag("i")?.toList()) assertEquals(listOf("p", recipient), tags.tag("p")?.toList()) assertEquals(listOf("amount", "25000"), tags.tag("amount")?.toList()) @@ -75,7 +74,6 @@ class OnchainZapEventTest { assertEquals(listOf("i", "bitcoin:tx:$txid"), tags.tag("i")?.toList()) assertEquals(listOf("p", recipient), tags.tag("p")?.toList()) assertEquals(listOf("amount", "21000"), tags.tag("amount")?.toList()) - assertEquals("Onchain zap: 21000 sats", tags.tag("alt")?.get(1)) // The zapped event is referenced by an `e` tag and its kind by a `k` tag. val eTag = tags.tag("e") diff --git a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/FavoritePodcastsListEventTest.kt b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/FavoritePodcastsListEventTest.kt index 98a3570f3e..529e51a24c 100644 --- a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/FavoritePodcastsListEventTest.kt +++ b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/FavoritePodcastsListEventTest.kt @@ -195,17 +195,4 @@ class FavoritePodcastsListEventTest { assertEquals(listOf(podcast2), second.publicFavorites().map { it.pubKey }) } - - @Test - fun `alt tag is always present`() = - runTest { - val event = - FavoritePodcastsListEvent.create( - publicFavorites = listOf(UserTag(podcast1)), - signer = signer, - createdAt = 1_700_000_000, - ) - - assertTrue(event.tags.any { it[0] == "alt" && it[1] == FavoritePodcastsListEvent.ALT }) - } } diff --git a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/PodcastEpisodeEventTest.kt b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/PodcastEpisodeEventTest.kt index e841e19c7a..4de0180f55 100644 --- a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/PodcastEpisodeEventTest.kt +++ b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/PodcastEpisodeEventTest.kt @@ -27,7 +27,6 @@ import com.vitorpamplona.quartz.utils.nsecToKeyPair import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull -import kotlin.test.assertTrue class PodcastEpisodeEventTest { private val signer = @@ -98,19 +97,4 @@ class PodcastEpisodeEventTest { assertEquals("audio/opus", audios[1].mediaType) assertNull(audios[2].mediaType) } - - @Test - fun `alt tag includes title`() { - val template = - PodcastEpisodeEvent.build( - title = "Ep Title", - description = "x", - audios = listOf(AudioTag("https://example.com/x.mp3")), - ) - val event = signer.sign(template) - - val alt = event.tags.first { it[0] == "alt" } - assertTrue(alt[1].endsWith("Ep Title")) - assertTrue(alt[1].startsWith(PodcastEpisodeEvent.ALT_DESCRIPTION_PREFIX)) - } } diff --git a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/PodcastMetadataEventTest.kt b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/PodcastMetadataEventTest.kt index 1d9bd5bf91..728ab884ab 100644 --- a/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/PodcastMetadataEventTest.kt +++ b/quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/nipF4Podcasts/PodcastMetadataEventTest.kt @@ -106,19 +106,6 @@ class PodcastMetadataEventTest { assertNull(authors[0].role) } - @Test - fun `alt tag is emitted`() { - val template = - PodcastMetadataEvent.build( - title = "Show", - image = "https://example.com/cover.png", - description = "Desc", - ) - val event = signer.sign(template) - - assertTrue(event.tags.any { it[0] == "alt" && it[1] == PodcastMetadataEvent.ALT_DESCRIPTION }) - } - @Test fun `is replaceable with empty d-tag`() { val template =