From 4b260cfc0788e5cfcb889d51167ecb38be70e992 Mon Sep 17 00:00:00 2001
From: davotoula <david.kaspar@gmail.com>
Date: Sun, 2 Nov 2025 17:38:24 +0100
Subject: [PATCH] Add blurhash and dim to Nip96Uploader.kt

---
 .../service/uploads/nip96/Nip96Uploader.kt    | 41 ++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/nip96/Nip96Uploader.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/nip96/Nip96Uploader.kt
index 1490c1d7d..9e17ed898 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/nip96/Nip96Uploader.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/nip96/Nip96Uploader.kt
@@ -30,6 +30,7 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.service.HttpStatusMessages
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.service.uploads.BlurhashMetadataCalculator
 import com.vitorpamplona.amethyst.service.uploads.MediaUploadResult
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.quartz.nip01Core.core.JsonMapper
@@ -106,24 +107,36 @@ class Nip96Uploader {
         val myContentType = contentType ?: contentResolver.getType(uri)
         val length = size ?: contentResolver.querySize(uri) ?: fileSize(uri) ?: 0
 
+        val localMetadata = BlurhashMetadataCalculator.computeFromUri(context, uri, myContentType)
         val imageInputStream = contentResolver.openInputStream(uri)
 
         checkNotNull(imageInputStream) { "Can't open the image input stream" }
 
-        return imageInputStream.use { stream ->
-            upload(
-                stream,
-                length,
-                myContentType,
-                alt,
-                sensitiveContent,
-                server,
-                okHttpClient,
-                onProgress,
-                httpAuth,
-                context,
-            )
-        }
+        val serverResult =
+            imageInputStream.use { stream ->
+                upload(
+                    stream,
+                    length,
+                    myContentType,
+                    alt,
+                    sensitiveContent,
+                    server,
+                    okHttpClient,
+                    onProgress,
+                    httpAuth,
+                    context,
+                )
+            }
+
+        val merged =
+            localMetadata?.let { (blur, dim) ->
+                serverResult.copy(
+                    dimension = dim ?: serverResult.dimension,
+                    blurHash = blur ?: serverResult.blurHash,
+                )
+            } ?: serverResult
+
+        return merged
     }
 
     suspend fun upload(