Merge branch 'main' into amber

quartz/src/main/java/com/vitorpamplona/quartz/events/Event.kt

@@ -69,6 +69,16 @@ open class Event(
 
     override fun taggedUrls() = tags.filter { it.size > 1 && it[0] == "r" }.map { it[1] }
 
+    override fun firstTaggedUser() = tags.firstOrNull { it.size > 1 && it[0] == "p" }?.let { it[1] }
+    override fun firstTaggedEvent() = tags.firstOrNull { it.size > 1 && it[0] == "e" }?.let { it[1] }
+    override fun firstTaggedUrl() = tags.firstOrNull { it.size > 1 && it[0] == "r" }?.let { it[1] }
+    override fun firstTaggedAddress() = tags.firstOrNull { it.size > 1 && it[0] == "r" }?.let {
+        val aTagValue = it[1]
+        val relay = it.getOrNull(2)
+
+        ATag.parse(aTagValue, relay)
+    }
+
     override fun taggedEmojis() = tags.filter { it.size > 2 && it[0] == "emoji" }.map { EmojiUrl(it[1], it[2]) }
 
     override fun isSensitive() = tags.any {
@@ -120,6 +130,14 @@ open class Event(
         return tags.any { it.size > 1 && it[0] == "a" && it[1].startsWith(kindStr) }
     }
 
+    override fun expiration() = try {
+        tags.firstOrNull { it.size > 1 && it[0] == "expiration" }?.get(1)?.toLongOrNull()
+    } catch (_: Exception) {
+        null
+    }
+
+    override fun isExpired() = (expiration() ?: Long.MAX_VALUE) < TimeUtils.now()
+
     override fun getTagOfAddressableKind(kind: Int): ATag? {
         val kindStr = kind.toString()
         val aTag = tags

quartz/src/main/java/com/vitorpamplona/quartz/events/EventFactory.kt

@@ -74,6 +74,7 @@ class EventFactory {
             RelaySetEvent.kind -> RelaySetEvent(id, pubKey, createdAt, tags, content, sig)
             ReportEvent.kind -> ReportEvent(id, pubKey, createdAt, tags, content, sig)
             RepostEvent.kind -> RepostEvent(id, pubKey, createdAt, tags, content, sig)
+            StatusEvent.kind -> StatusEvent(id, pubKey, createdAt, tags, content, sig)
             TextNoteEvent.kind -> TextNoteEvent(id, pubKey, createdAt, tags, content, sig)
             else -> Event(id, pubKey, createdAt, kind, tags, content, sig)
         }

quartz/src/main/java/com/vitorpamplona/quartz/events/EventInterface.kt

@@ -49,6 +49,8 @@ interface EventInterface {
     fun isTaggedAddressableKind(kind: Int): Boolean
     fun getTagOfAddressableKind(kind: Int): ATag?
 
+    fun expiration(): Long?
+
     fun hashtags(): List<String>
     fun geohashes(): List<String>
 
@@ -66,6 +68,12 @@ interface EventInterface {
     fun taggedEvents(): List<HexKey>
     fun taggedUrls(): List<String>
 
+    fun firstTaggedAddress(): ATag?
+    fun firstTaggedUser(): HexKey?
+    fun firstTaggedEvent(): HexKey?
+    fun firstTaggedUrl(): String?
+
     fun taggedEmojis(): List<EmojiUrl>
     fun matchTag1With(text: String): Boolean
+    fun isExpired(): Boolean
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/StatusEvent.kt

@@ -0,0 +1,54 @@
+package com.vitorpamplona.quartz.events
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.quartz.utils.TimeUtils
+import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.encoders.ATag
+import com.vitorpamplona.quartz.encoders.HexKey
+
+@Immutable
+class StatusEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : BaseAddressableEvent(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    companion object {
+        const val kind = 30315
+
+        fun create(
+            msg: String,
+            type: String,
+            expiration: Long?,
+            privateKey: ByteArray,
+            createdAt: Long = TimeUtils.now()
+        ): StatusEvent {
+            val tags = mutableListOf<List<String>>()
+
+            tags.add(listOf("d", type))
+            expiration?.let { tags.add(listOf("expiration", it.toString())) }
+
+            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
+            val id = generateId(pubKey, createdAt, kind, tags, msg)
+            val sig = CryptoUtils.sign(id, privateKey)
+            return StatusEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
+        }
+
+        fun update(
+            event: StatusEvent,
+            newStatus: String,
+            privateKey: ByteArray,
+            createdAt: Long = TimeUtils.now()
+        ): StatusEvent {
+            val tags = event.tags
+            val pubKey = event.pubKey()
+            val id = generateId(pubKey, createdAt, kind, tags, newStatus)
+            val sig = CryptoUtils.sign(id, privateKey)
+            return StatusEvent(id.toHexKey(), pubKey, createdAt, tags, newStatus, sig.toHexKey())
+        }
+    }
+}

quartz/src/main/java/com/vitorpamplona/quartz/utils/TimeUtils.kt

@@ -13,6 +13,7 @@ object TimeUtils {
     fun now() = System.currentTimeMillis() / 1000
     fun fiveMinutesAgo() = now() - fiveMinutes
     fun oneHourAgo() = now() - oneHour
+    fun oneHourAhead() = now() + oneHour
     fun oneDayAgo() = now() - oneDay
     fun eightHoursAgo() = now() - eightHours
     fun oneWeekAgo() = now() - oneWeek