Migrates Video feed new posts from NIP-94 to Video and Picture events.

vitorpamplona · Nov 19, 2024 · 03662b9 · 03662b9
1 parent d33421f
commit 03662b9
Show file tree

Hide file tree

Showing 12 changed files with 248 additions and 108 deletions.
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
@@ -30,6 +30,7 @@ import androidx.lifecycle.switchMap
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.BuildConfig
+import com.vitorpamplona.amethyst.commons.richtext.RichTextParser
 import com.vitorpamplona.amethyst.service.FileHeader
 import com.vitorpamplona.amethyst.service.LocationState
 import com.vitorpamplona.amethyst.service.NostrLnZapPaymentResponseDataSource
@@ -94,6 +95,7 @@ import com.vitorpamplona.quartz.events.NIP17Factory
 import com.vitorpamplona.quartz.events.NIP90ContentDiscoveryRequestEvent
 import com.vitorpamplona.quartz.events.OtsEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
+import com.vitorpamplona.quartz.events.PictureEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.Price
 import com.vitorpamplona.quartz.events.PrivateDmEvent
@@ -110,6 +112,8 @@ import com.vitorpamplona.quartz.events.StatusEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 import com.vitorpamplona.quartz.events.TextNoteModificationEvent
 import com.vitorpamplona.quartz.events.TorrentCommentEvent
+import com.vitorpamplona.quartz.events.VideoHorizontalEvent
+import com.vitorpamplona.quartz.events.VideoVerticalEvent
 import com.vitorpamplona.quartz.events.WrappedEvent
 import com.vitorpamplona.quartz.events.ZapSplitSetup
 import com.vitorpamplona.quartz.signers.NostrSigner
@@ -1855,12 +1859,12 @@ class Account(
     }
 
     fun sendHeader(
-        signedEvent: FileHeaderEvent,
+        signedEvent: Event,
         relayList: List<RelaySetupInfo>,
         onReady: (Note) -> Unit,
     ) {
         Client.send(signedEvent, relayList = relayList)
-        LocalCache.consume(signedEvent, null)
+        LocalCache.justConsume(signedEvent, null)
 
         LocalCache.getNoteIfExists(signedEvent.id)?.let { onReady(it) }
     }
@@ -1894,7 +1898,7 @@ class Account(
     }
 
     fun sendHeader(
-        imageUrl: String,
+        url: String,
         magnetUri: String?,
         headerInfo: FileHeader,
         alt: String?,
@@ -1905,20 +1909,72 @@ class Account(
     ) {
         if (!isWriteable()) return
 
-        FileHeaderEvent.create(
-            url = imageUrl,
-            magnetUri = magnetUri,
-            mimeType = headerInfo.mimeType,
-            hash = headerInfo.hash,
-            size = headerInfo.size.toString(),
-            dimensions = headerInfo.dim,
-            blurhash = headerInfo.blurHash,
-            alt = alt,
-            originalHash = originalHash,
-            sensitiveContent = sensitiveContent,
-            signer = signer,
-        ) { event ->
-            sendHeader(event, relayList = relayList, onReady)
+        val isImage = headerInfo.mimeType?.startsWith("image/") == true || RichTextParser.isImageUrl(url)
+        val isVideo = headerInfo.mimeType?.startsWith("video/") == true || RichTextParser.isVideoUrl(url)
+
+        if (isImage) {
+            PictureEvent.create(
+                url = url,
+                mimeType = headerInfo.mimeType,
+                hash = headerInfo.hash,
+                size = headerInfo.size.toLong(),
+                dimensions = headerInfo.dim,
+                blurhash = headerInfo.blurHash,
+                alt = alt,
+                signer = signer,
+            ) { event ->
+                sendHeader(event, relayList = relayList, onReady)
+            }
+        } else if (isVideo && headerInfo.dim != null) {
+            if (headerInfo.dim.height > headerInfo.dim.width) {
+                VideoVerticalEvent.create(
+                    url = url,
+                    magnetUri = magnetUri,
+                    mimeType = headerInfo.mimeType,
+                    hash = headerInfo.hash,
+                    size = headerInfo.size.toString(),
+                    dimensions = headerInfo.dim,
+                    blurhash = headerInfo.blurHash,
+                    alt = alt,
+                    originalHash = originalHash,
+                    sensitiveContent = sensitiveContent,
+                    signer = signer,
+                ) { event ->
+                    sendHeader(event, relayList = relayList, onReady)
+                }
+            } else {
+                VideoHorizontalEvent.create(
+                    url = url,
+                    magnetUri = magnetUri,
+                    mimeType = headerInfo.mimeType,
+                    hash = headerInfo.hash,
+                    size = headerInfo.size.toString(),
+                    dimensions = headerInfo.dim,
+                    blurhash = headerInfo.blurHash,
+                    alt = alt,
+                    originalHash = originalHash,
+                    sensitiveContent = sensitiveContent,
+                    signer = signer,
+                ) { event ->
+                    sendHeader(event, relayList = relayList, onReady)
+                }
+            }
+        } else {
+            FileHeaderEvent.create(
+                url = url,
+                magnetUri = magnetUri,
+                mimeType = headerInfo.mimeType,
+                hash = headerInfo.hash,
+                size = headerInfo.size.toString(),
+                dimensions = headerInfo.dim,
+                blurhash = headerInfo.blurHash,
+                alt = alt,
+                originalHash = originalHash,
+                sensitiveContent = sensitiveContent,
+                signer = signer,
+            ) { event ->
+                sendHeader(event, relayList = relayList, onReady)
+            }
         }
     }
 

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/FileHeader.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/FileHeader.kt
@@ -31,6 +31,7 @@ import android.util.Log
 import com.vitorpamplona.amethyst.ui.actions.ImageDownloader
 import com.vitorpamplona.quartz.crypto.CryptoUtils
 import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.events.Dimension
 import io.trbl.blurhash.BlurHash
 import kotlinx.coroutines.CancellationException
 import java.io.IOException
@@ -40,14 +41,14 @@ class FileHeader(
     val mimeType: String?,
     val hash: String,
     val size: Int,
-    val dim: String?,
+    val dim: Dimension?,
     val blurHash: String?,
 ) {
     companion object {
         suspend fun prepare(
             fileUrl: String,
             mimeType: String?,
-            dimPrecomputed: String?,
+            dimPrecomputed: Dimension?,
             forceProxy: Boolean,
             onReady: (FileHeader) -> Unit,
             onError: (String) -> Unit,
@@ -70,7 +71,7 @@ class FileHeader(
         fun prepare(
             data: ByteArray,
             mimeType: String?,
-            dimPrecomputed: String?,
+            dimPrecomputed: Dimension?,
             onReady: (FileHeader) -> Unit,
             onError: (String) -> Unit,
         ) {
@@ -95,7 +96,7 @@ class FileHeader(
                             mBitmap.height,
                         )
 
-                        val dim = "${mBitmap.width}x${mBitmap.height}"
+                        val dim = Dimension(mBitmap.width, mBitmap.height)
 
                         val aspectRatio = (mBitmap.width).toFloat() / (mBitmap.height).toFloat()
 
@@ -166,7 +167,7 @@ class FileHeader(
                                 }
                             }
 
-                        if (newDim != "0x0") {
+                        if (newDim?.hasSize() == true) {
                             Pair(blurhash, newDim)
                         } else {
                             Pair(blurhash, null)
@@ -212,11 +213,15 @@ fun MediaMetadataRetriever.getThumbnail(): Bitmap? {
     }
 }
 
-fun MediaMetadataRetriever.prepareDimFromVideo(): String? {
+fun MediaMetadataRetriever.prepareDimFromVideo(): Dimension? {
     val width = prepareVideoWidth() ?: return null
     val height = prepareVideoHeight() ?: return null
 
-    return "${width}x$height"
+    return if (width > 0 && height > 0) {
+        Dimension(width, height)
+    } else {
+        null
+    }
 }
 
 fun MediaMetadataRetriever.prepareVideoWidth(): Int? {

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostViewModel.kt
@@ -45,6 +45,7 @@ import com.vitorpamplona.amethyst.ui.components.MediaCompressor
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.ammolite.relays.RelaySetupInfo
+import com.vitorpamplona.quartz.events.Dimension
 import com.vitorpamplona.quartz.events.FileHeaderEvent
 import com.vitorpamplona.quartz.events.FileStorageEvent
 import com.vitorpamplona.quartz.events.FileStorageHeaderEvent
@@ -341,6 +342,7 @@ open class EditPostViewModel : ViewModel() {
                 ?.firstOrNull { it.size > 1 && it[0] == "dim" }
                 ?.get(1)
                 ?.ifBlank { null }
+                ?.let { Dimension.parse(it) }
         val magnet =
             uploadingResult.tags
                 ?.firstOrNull { it.size > 1 && it[0] == "magnet" }

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt
@@ -37,6 +37,7 @@ import com.vitorpamplona.amethyst.service.Nip96Uploader
 import com.vitorpamplona.amethyst.ui.components.MediaCompressor
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.ammolite.relays.RelaySetupInfo
+import com.vitorpamplona.quartz.events.Dimension
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -217,6 +218,7 @@ open class NewMediaModel : ViewModel() {
                 ?.firstOrNull { it.size > 1 && it[0] == "dim" }
                 ?.get(1)
                 ?.ifBlank { null }
+                ?.let { Dimension.parse(it) }
         val magnet =
             uploadingResult.tags
                 ?.firstOrNull { it.size > 1 && it[0] == "magnet" }

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt
@@ -61,6 +61,7 @@ import com.vitorpamplona.quartz.events.ChatMessageEvent
 import com.vitorpamplona.quartz.events.ClassifiedsEvent
 import com.vitorpamplona.quartz.events.CommentEvent
 import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
+import com.vitorpamplona.quartz.events.Dimension
 import com.vitorpamplona.quartz.events.DraftEvent
 import com.vitorpamplona.quartz.events.Event
 import com.vitorpamplona.quartz.events.FileHeaderEvent
@@ -1205,6 +1206,7 @@ open class NewPostViewModel : ViewModel() {
                 ?.firstOrNull { it.size > 1 && it[0] == "dim" }
                 ?.get(1)
                 ?.ifBlank { null }
+                ?.let { Dimension.parse(it) }
         val magnet =
             uploadingResult.tags
                 ?.firstOrNull { it.size > 1 && it[0] == "magnet" }

diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/encoders/ATag.kt b/quartz/src/main/java/com/vitorpamplona/quartz/encoders/ATag.kt
@@ -60,7 +60,7 @@ data class ATag(
         TlvBuilder()
             .apply {
                 addString(Nip19Bech32.TlvTypes.SPECIAL, dTag)
-                addStringIfNotNull(Nip19Bech32.TlvTypes.RELAY, overrideRelay)
+                addStringIfNotNull(Nip19Bech32.TlvTypes.RELAY, overrideRelay ?: relay)
                 addHex(Nip19Bech32.TlvTypes.AUTHOR, pubKeyHex)
                 addInt(Nip19Bech32.TlvTypes.KIND, kind)
             }.build()

diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/FileHeaderEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/FileHeaderEvent.kt
@@ -81,7 +81,7 @@ class FileHeaderEvent(
             alt: String? = null,
             hash: String? = null,
             size: String? = null,
-            dimensions: String? = null,
+            dimensions: Dimension? = null,
             blurhash: String? = null,
             originalHash: String? = null,
             magnetURI: String? = null,
@@ -99,7 +99,7 @@ class FileHeaderEvent(
                     alt?.ifBlank { null }?.let { arrayOf(ALT, it) } ?: arrayOf("alt", ALT_DESCRIPTION),
                     hash?.let { arrayOf(HASH, it) },
                     size?.let { arrayOf(FILE_SIZE, it) },
-                    dimensions?.let { arrayOf(DIMENSION, it) },
+                    dimensions?.let { arrayOf(DIMENSION, it.toString()) },
                     blurhash?.let { arrayOf(BLUR_HASH, it) },
                     originalHash?.let { arrayOf(ORIGINAL_HASH, it) },
                     magnetURI?.let { arrayOf(MAGNET_URI, it) },

diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/FileStorageHeaderEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/FileStorageHeaderEvent.kt
@@ -74,7 +74,7 @@ class FileStorageHeaderEvent(
             alt: String? = null,
             hash: String? = null,
             size: String? = null,
-            dimensions: String? = null,
+            dimensions: Dimension? = null,
             blurhash: String? = null,
             magnetURI: String? = null,
             torrentInfoHash: String? = null,
@@ -90,7 +90,7 @@ class FileStorageHeaderEvent(
                     hash?.let { arrayOf(HASH, it) },
                     alt?.let { arrayOf(ALT, it) } ?: arrayOf("alt", ALT_DESCRIPTION),
                     size?.let { arrayOf(FILE_SIZE, it) },
-                    dimensions?.let { arrayOf(DIMENSION, it) },
+                    dimensions?.let { arrayOf(DIMENSION, it.toString()) },
                     blurhash?.let { arrayOf(BLUR_HASH, it) },
                     magnetURI?.let { arrayOf(MAGNET_URI, it) },
                     torrentInfoHash?.let { arrayOf(TORRENT_INFOHASH, it) },