v0.94.2

New Crowdin Translations

.github/ISSUE_TEMPLATE/bug_report.md

@@ -30,4 +30,6 @@ If applicable, add a video and/or screenshots to help explain your problem.
  - Amber Version (if using it to sign):
 
 **Bounty (in Bitcoin sats) offered for a solution**
-Incentivize developers to work on your issue. Describe clear milestones to claim payment.
+The size of the bounty is proportional to how much this matters to you. If no bounty is offered,
+not even a small one, this bug will not be worked on because it doesn't matter to you. We prioritize
+bug fixing to issues that have bounties, even small ones.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,14 +7,10 @@ assignees: ''
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
 
 **Bounty (in Bitcoin sats) offered for the implementation**
-Incentivize developers to work on your feature. Describe clear milestones to claim payment. 
-
-**Additional context**
-Add any other context, video, or screenshots about the feature request here.
+The size of the bounty is proportional to how much this matters to you. If no bounty is offered,
+not even a small one, this feature will not be coded because it doesn't actually matter to you.
+We prioritize feature development by its bounty size compared to how much work is required to get it done.

.github/workflows/build.yml

@@ -42,15 +42,30 @@ jobs:
       - name: Build APK (gradle)
         run: ./gradlew assembleDebug --no-daemon
 
-      - name: Upload APK
+      - name: Upload Play APK
         uses: actions/upload-artifact@v4
         with:
-          name: Debug APK
-          path: amethyst/build/outputs/apk/debug/app-debug.apk
+          name: Play Debug APK
+          path: amethyst/build/outputs/apk/play/debug/amethyst-play-universal-debug.apk
+
+      - name: Upload FDroid APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: FDroid Debug APK
+          path: amethyst/build/outputs/apk/fdroid/debug/amethyst-fdroid-universal-debug.apk
+
+      - name: Upload Compose Reports
+        uses: actions/upload-artifact@v4
+        with:
+          name: Compose Reports
+          path: amethyst/build/compose_compiler
+
+      - name: Tests
+        run: ./gradlew test --no-daemon
 
       - name: Upload Test Results
         uses: actions/upload-artifact@v4
         with:
-          name: Build Reports
+          name: Test Reports
           path: amethyst/build/reports
 

.idea/kotlinc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.0" />
+    <option name="version" value="2.1.0" />
   </component>
 </project>

README.md

@@ -20,6 +20,9 @@ Join the social network you control.
 
 ## Download and Install
 
+[<img src="./docs/design/zapstore.svg"
+alt="Get it on Zap Store"
+height="70">](https://github.com/zapstore/zapstore/releases)
 [<img src="./docs/design/obtainium.png"
 alt="Get it on Obtaininum"
 height="70">](https://github.com/ImranR98/Obtainium)
@@ -105,7 +108,7 @@ height="70">](https://github.com/vitorpamplona/amethyst/releases)
 - [x] Video Events (NIP-71)
 - [x] Moderated Communities (NIP-72)
 - [ ] Zap Goals (NIP-75)
-- [ ] Arbitrary Custom App Data (NIP-78)
+- [x] Arbitrary Custom App Data (NIP-78)
 - [x] Highlights (NIP-84)
 - [x] Notify Request (NIP-88/Draft)
 - [x] Recommended Application Handlers (NIP-89)

amethyst/build.gradle

@@ -16,9 +16,9 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk libs.versions.android.minSdk.get().toInteger()
         targetSdk libs.versions.android.targetSdk.get().toInteger()
-        versionCode 409
-        versionName "0.92.4"
-        buildConfigField "String", "RELEASE_NOTES_ID", "\"98f2acaf9b3eb70d87607942e576f9a086ac28adf37869da9a29f4815cecac86\""
+        versionCode 417
+        versionName "0.94.2"
+        buildConfigField "String", "RELEASE_NOTES_ID", "\"fd42b23b9ef792059b1c1a89555443abbb11578f4b3c8430b452559eec7325f3\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -230,9 +230,8 @@ dependencies {
     implementation libs.coil.gif
     // view svgs
     implementation libs.coil.svg
-
-    // create blurhash
-    implementation libs.trbl.blurhash
+    // enables network for coil
+    implementation libs.coil.okhttp
 
     // Permission to upload pictures:
     implementation libs.accompanist.permissions

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/ImageUploadTesting.kt

@@ -26,12 +26,17 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.AccountSettings
-import com.vitorpamplona.amethyst.service.FileHeader
-import com.vitorpamplona.amethyst.service.Nip96MediaServers
-import com.vitorpamplona.amethyst.service.Nip96Retriever
-import com.vitorpamplona.amethyst.service.Nip96Uploader
-import com.vitorpamplona.amethyst.ui.actions.ImageDownloader
+import com.vitorpamplona.amethyst.service.uploads.FileHeader
+import com.vitorpamplona.amethyst.service.uploads.ImageDownloader
+import com.vitorpamplona.amethyst.service.uploads.blossom.BlossomUploader
+import com.vitorpamplona.amethyst.service.uploads.nip96.Nip96Uploader
+import com.vitorpamplona.amethyst.service.uploads.nip96.ServerInfoRetriever
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.DEFAULT_MEDIA_SERVERS
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerName
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerType
+import com.vitorpamplona.quartz.crypto.CryptoUtils
 import com.vitorpamplona.quartz.crypto.KeyPair
+import com.vitorpamplona.quartz.encoders.toHexKey
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.fail
 import kotlinx.coroutines.CoroutineScope
@@ -47,63 +52,98 @@ import kotlin.random.Random
 
 @RunWith(AndroidJUnit4::class)
 class ImageUploadTesting {
-    private suspend fun testBase(server: Nip96MediaServers.ServerName) {
-        val serverInfo =
-            Nip96Retriever()
-                .loadInfo(
-                    server.baseUrl,
-                    false,
-                )
+    val account =
+        Account(
+            AccountSettings(KeyPair()),
+            scope = CoroutineScope(Dispatchers.IO + SupervisorJob()),
+        )
 
+    private suspend fun getBitmap(): ByteArray {
         val bitmap = Bitmap.createBitmap(200, 300, Bitmap.Config.ARGB_8888)
         for (x in 0 until bitmap.width) {
             for (y in 0 until bitmap.height) {
                 bitmap.setPixel(x, y, Color.rgb(Random.nextInt(), Random.nextInt(), Random.nextInt()))
             }
         }
+
         val baos = ByteArrayOutputStream()
         bitmap.compress(Bitmap.CompressFormat.PNG, 100, baos)
-        val bytes = baos.toByteArray()
-        val inputStream = bytes.inputStream()
+        return baos.toByteArray()
+    }
 
-        val account =
-            Account(
-                AccountSettings(KeyPair()),
-                scope = CoroutineScope(Dispatchers.IO + SupervisorJob()),
-            )
+    private suspend fun testBase(server: ServerName) {
+        if (server.type == ServerType.NIP96) {
+            testNip96(server)
+        } else {
+            testBlossom(server)
+        }
+    }
 
+    private suspend fun testBlossom(server: ServerName) {
+        val paylod = getBitmap()
+        val initialHash = CryptoUtils.sha256(paylod).toHexKey()
+        val inputStream = paylod.inputStream()
         val result =
-            Nip96Uploader(account)
+            BlossomUploader()
                 .uploadImage(
-                    inputStream,
-                    bytes.size.toLong(),
-                    "image/png",
+                    inputStream = inputStream,
+                    hash = initialHash,
+                    length = paylod.size,
+                    baseFileName = "filename.png",
+                    contentType = "image/png",
                     alt = null,
                     sensitiveContent = null,
-                    serverInfo,
+                    serverBaseUrl = server.baseUrl,
                     forceProxy = { false },
-                    onProgress = {},
+                    httpAuth = account::createBlossomUploadAuth,
                     context = InstrumentationRegistry.getInstrumentation().targetContext,
                 )
 
-        val url = result.tags!!.first { it[0] == "url" }.get(1)
-        val size =
-            result.tags!!
-                .firstOrNull { it[0] == "size" }
-                ?.get(1)
-                ?.ifBlank { null }
-        val dim =
-            result.tags!!
-                .firstOrNull { it[0] == "dim" }
-                ?.get(1)
-                ?.ifBlank { null }
-        val hash =
-            result.tags!!
-                .firstOrNull { it[0] == "x" }
-                ?.get(1)
-                ?.ifBlank { null }
-        val contentType = result.tags!!.first { it[0] == "m" }.get(1)
-        val ox = result.tags!!.first { it[0] == "ox" }.get(1)
+        assertEquals("image/png", result.type)
+        assertEquals(paylod.size.toLong(), result.size)
+        assertEquals(initialHash, result.sha256)
+        assertEquals("${server.baseUrl}/$initialHash", result.url?.removeSuffix(".png"))
+
+        val imageData: ByteArray =
+            ImageDownloader().waitAndGetImage(result.url!!, false)
+                ?: run {
+                    fail("${server.name}: Should not be null")
+                    return
+                }
+
+        val downloadedHash = CryptoUtils.sha256(imageData).toHexKey()
+        assertEquals(initialHash, downloadedHash)
+    }
+
+    private suspend fun testNip96(server: ServerName) {
+        val serverInfo =
+            ServerInfoRetriever()
+                .loadInfo(
+                    server.baseUrl,
+                    false,
+                )
+
+        val paylod = getBitmap()
+        val inputStream = paylod.inputStream()
+        val result =
+            Nip96Uploader()
+                .uploadImage(
+                    inputStream = inputStream,
+                    length = paylod.size.toLong(),
+                    contentType = "image/png",
+                    alt = null,
+                    sensitiveContent = null,
+                    server = serverInfo,
+                    forceProxy = { false },
+                    onProgress = {},
+                    httpAuth = account::createHTTPAuthorization,
+                    context = InstrumentationRegistry.getInstrumentation().targetContext,
+                )
+
+        val url = result.url!!
+        val size = result.size
+        val dim = result.dimension
+        val hash = result.sha256
 
         Assert.assertTrue("${server.name}: Invalid result url", url.startsWith("http"))
 
@@ -114,22 +154,23 @@ class ImageUploadTesting {
                     return
                 }
 
-        FileHeader.prepare(
-            imageData,
-            "image/png",
-            null,
-            onReady = {
+        val prepared =
+            FileHeader.prepare(
+                imageData,
+                "image/png",
+                null,
+            )
+
+        prepared.fold(
+            onSuccess = {
                 if (dim != null) {
-                    // assertEquals("${server.name}: Invalid dimensions", it.dim, dim)
+                    assertEquals("${server.name}: Invalid dimensions", it.dim.toString(), dim.toString())
                 }
                 if (size != null) {
-                    // assertEquals("${server.name}: Invalid size", it.size.toString(), size)
-                }
-                if (hash != null) {
-                    assertEquals("${server.name}: Invalid hash", it.hash, hash)
+                    assertEquals("${server.name}: Invalid size", it.size.toString(), size)
                 }
             },
-            onError = { fail("${server.name}: It should not fail") },
+            onFailure = { fail("${server.name}: It should not fail") },
         )
 
         // delay(1000)
@@ -140,66 +181,88 @@ class ImageUploadTesting {
     @Test
     fun runTestOnDefaultServers() =
         runBlocking {
-            Nip96MediaServers.DEFAULT.forEach {
-                testBase(it)
+            DEFAULT_MEDIA_SERVERS.forEach {
+                // skip paid servers and primal server is buggy.
+                if (!it.name.contains("Paid") && !it.name.contains("Primal")) {
+                    testBase(it)
+                }
             }
         }
 
     @Test()
     fun testNostrCheck() =
         runBlocking {
-            testBase(Nip96MediaServers.ServerName("nostrcheck.me", "https://nostrcheck.me"))
+            testBase(ServerName("nostrcheck.me", "https://nostrcheck.me", ServerType.NIP96))
         }
 
     @Test()
     @Ignore("Not Working anymore")
     fun testNostrage() =
         runBlocking {
-            testBase(Nip96MediaServers.ServerName("nostrage", "https://nostrage.com"))
+            testBase(ServerName("nostrage", "https://nostrage.com", ServerType.NIP96))
         }
 
     @Test()
     @Ignore("Not Working anymore")
     fun testSove() =
         runBlocking {
-            testBase(Nip96MediaServers.ServerName("sove", "https://sove.rent"))
+            testBase(ServerName("sove", "https://sove.rent", ServerType.NIP96))
         }
 
     @Test()
     fun testNostrBuild() =
         runBlocking {
-            testBase(Nip96MediaServers.ServerName("nostr.build", "https://nostr.build"))
+            testBase(ServerName("nostr.build", "https://nostr.build", ServerType.NIP96))
         }
 
     @Test()
     @Ignore("Not Working anymore")
     fun testSovbit() =
         runBlocking {
-            testBase(Nip96MediaServers.ServerName("sovbit", "https://files.sovbit.host"))
+            testBase(ServerName("sovbit", "https://files.sovbit.host", ServerType.NIP96))
         }
 
     @Test()
     fun testVoidCat() =
         runBlocking {
-            testBase(Nip96MediaServers.ServerName("void.cat", "https://void.cat"))
+            testBase(ServerName("void.cat", "https://void.cat", ServerType.NIP96))
         }
 
     @Test()
+    @Ignore("Returns invalid image size")
     fun testNostrPic() =
         runBlocking {
-            testBase(Nip96MediaServers.ServerName("nostpic.com", "https://nostpic.com"))
+            testBase(ServerName("nostpic.com", "https://nostpic.com", ServerType.NIP96))
         }
 
     @Test(expected = RuntimeException::class)
     fun testSprovoostNl() =
         runBlocking {
-            testBase(Nip96MediaServers.ServerName("sprovoost.nl", "https://img.sprovoost.nl/"))
+            testBase(ServerName("sprovoost.nl", "https://img.sprovoost.nl/", ServerType.NIP96))
         }
 
     @Test()
     @Ignore("Not Working anymore")
     fun testNostrOnch() =
         runBlocking {
-            testBase(Nip96MediaServers.ServerName("nostr.onch.services", "https://nostr.onch.services"))
+            testBase(ServerName("nostr.onch.services", "https://nostr.onch.services", ServerType.NIP96))
+        }
+
+    @Ignore("Changes sha256")
+    fun testPrimalBlossom() =
+        runBlocking {
+            testBase(ServerName("primal.net", "https://blossom.primal.net", ServerType.Blossom))
+        }
+
+    @Test()
+    fun testNostrCheckBlossom() =
+        runBlocking {
+            testBase(ServerName("nostrcheck", "https://cdn.nostrcheck.me", ServerType.Blossom))
+        }
+
+    @Ignore("Requires Payment")
+    fun testSatelliteBlossom() =
+        runBlocking {
+            testBase(ServerName("satellite", "https://cdn.satellite.earth", ServerType.Blossom))
         }
 }

amethyst/src/androidTest/java/com/vitorpamplona/amethyst/URIParserTest.kt

@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2024 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.amethyst
+
+import com.vitorpamplona.amethyst.ui.navigation.findParameterValue
+import junit.framework.TestCase.assertEquals
+import org.junit.Test
+import java.net.URI
+
+class URIParserTest {
+    @Test
+    fun testNEventWithAccount() {
+        val test = "nevent1qqsp9wg5r3vkuv5al0459h3h44yxh6r0y7chgvu3pkdxhcj99t3msrgpzdmhxue69uhhwmm59e6hg7r09ehkuef0qgsdhcrqt2w8x9et446j8ge8kgmd2h4ykc6wsrnc4yqnmdu3lr74ktqrqsqqqqqp578kku?account=npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"
+        val testUri = URI(test)
+
+        // assertEquals("nostr", testUri.scheme)
+        assertEquals(null, testUri.authority)
+        assertEquals(null, testUri.host)
+        assertEquals(-1, testUri.port)
+        assertEquals(null, testUri.userInfo)
+        assertEquals("nevent1qqsp9wg5r3vkuv5al0459h3h44yxh6r0y7chgvu3pkdxhcj99t3msrgpzdmhxue69uhhwmm59e6hg7r09ehkuef0qgsdhcrqt2w8x9et446j8ge8kgmd2h4ykc6wsrnc4yqnmdu3lr74ktqrqsqqqqqp578kku", testUri.path)
+        assertEquals(null, testUri.fragment)
+        assertEquals("account=npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z", testUri.rawQuery)
+
+        assertEquals("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z", testUri.findParameterValue("account"))
+    }
+
+    @Test
+    fun testNotificationsWithAccount() {
+        val test = "notifications?account=npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"
+        val testUri = URI(test)
+
+        // assertEquals("nostr", testUri.scheme)
+        assertEquals(null, testUri.authority)
+        assertEquals(null, testUri.host)
+        assertEquals(-1, testUri.port)
+        assertEquals(null, testUri.userInfo)
+        assertEquals("notifications", testUri.path)
+        assertEquals(null, testUri.fragment)
+        assertEquals("account=npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z", testUri.rawQuery)
+
+        assertEquals("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z", testUri.findParameterValue("account"))
+    }
+}

amethyst/src/androidTestPlay/java/com/vitorpamplona/amethyst/TranslationsTest.kt

@@ -27,6 +27,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.util.concurrent.CancellationException
 
 @RunWith(AndroidJUnit4::class)
 class TranslationsTest {
@@ -124,7 +125,10 @@ class TranslationsTest {
             "Have you seen this: lnbc12u1p3lvjeupp5a5ecgp45k6pa8tu7rnkgzfuwdy3l5ylv3k5tdzrg4cr8rj2f364sdq5g9kxy7fqd9h8vmmfvdjscqzpgxqyz5vqsp5zuzyetf33aphetf0e80w7tztw6dfsjs4lmvya4cyk8umfsx00qts9qyyssqke9hphcr36zvcav8wr502g0mhfhxpy8m9tt36zttg8vldm2qxw039ulccr8nwy3hjg2sw5vk65e99lwuhrhw0nuya2u57qszltvx7egp74jydn I think I have to pay",
             "pt",
         )
+    }
 
+    @Test(expected = CancellationException::class)
+    fun testTranslationLnInvoice2() {
         assertTranslateContains(
             "lnbc10u1p3l0wg0pp5y5y3vxt3429m28uuq56uqhwxadftn67yaarq06h3y9nqapz72n6sdqqxqyjw5q9q7sqqqqqqqqqqqqqqqqqqqqqqqqq9qsqsp5y2tazp42xde3c0tdsz30zqcekrt0lzrneszdtagy2qn7vs0d3p5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll7jdvcln4lhw5qqqqlgqqqqqeqqjqdau9jzseecmvmh03h88xyf5f980xx45fmn0cej654v5jr79ye36pww90jwdda38damlmgt54v8rn6q9kywtw057rh4v3wwrmn8fajagqnssr7v",
             "Test lnbc10u1p3l0wg0pp5y5y3vxt3429m28uuq56uqhwxadftn67yaarq06h3y9nqapz72n6sdqqxqyjw5q9q7sqqqqqqqqqqqqqqqqqqqqqqqqq9qsqsp5y2tazp42xde3c0tdsz30zqcekrt0lzrneszdtagy2qn7vs0d3p5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll7jdvcln4lhw5qqqqlgqqqqqeqqjqdau9jzseecmvmh03h88xyf5f980xx45fmn0cej654v5jr79ye36pww90jwdda38damlmgt54v8rn6q9kywtw057rh4v3wwrmn8fajagqnssr7v",
@@ -132,7 +136,7 @@ class TranslationsTest {
         )
     }
 
-    @Test
+    @Test(expected = CancellationException::class)
     fun testNostrEvents() {
         assertTranslateContains(
             "nostr:nevent1qqs0tsw8hjacs4fppgdg7f5yhgwwfkyua4xcs3re9wwkpkk2qeu6mhql22rcy",
@@ -162,4 +166,15 @@ class TranslationsTest {
             "pt",
         )
     }
+
+    @Test
+    fun testHttp() {
+        val text = "https://m.primal.net/MdDd.png \nRunning... \uD83D\uDE01   nostr:npub126ntw5mnermmj0znhjhgdk8lh2af72sm8qfzq48umdlnhaj9kuns3le9ll  nostr:npub1getal6ykt05fsz5nqu4uld09nfj3y3qxmv8crys4aeut53unfvlqr80nfm"
+
+        assertTranslateContains(
+            "https://m.primal.net/MdDd.png",
+            text,
+            "pt",
+        )
+    }
 }

amethyst/src/fdroid/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:name=".Amethyst">

amethyst/src/main/AndroidManifest.xml

@@ -19,12 +19,8 @@
     <!-- To take pictures -->
     <uses-permission android:name="android.permission.CAMERA" />
 
-    <!-- To Upload media (newer devices) -->
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
-    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
-
     <!-- To Upload media (old devices) -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
 
     <!-- To read QRs that contain nostr:<NIP19> -->
     <uses-permission android:name="android.permission.CAMERA" />
@@ -120,10 +116,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="image/*" />
             </intent-filter>
-
-            <meta-data
-                android:name="android.app.lib_name"
-                android:value="" />
         </activity>
 
         <activity
@@ -152,6 +144,15 @@
                 android:resource="@xml/file_paths" />
         </provider>
 
+        <receiver
+            android:name=".service.notifications.PokeyReceiver"
+            android:exported="true"
+            >
+            <intent-filter>
+                <action android:name="com.shared.NOSTR" />
+            </intent-filter>
+        </receiver>
     </application>
 
+
 </manifest>

amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt

@@ -23,17 +23,23 @@ package com.vitorpamplona.amethyst
 import android.app.Application
 import android.content.ContentResolver
 import android.content.Context
+import android.content.IntentFilter
+import android.os.Build
 import android.os.Looper
 import android.os.StrictMode
 import android.os.StrictMode.ThreadPolicy
 import android.os.StrictMode.VmPolicy
 import android.util.Log
 import androidx.security.crypto.EncryptedSharedPreferences
-import coil.ImageLoader
-import coil.disk.DiskCache
-import coil.memory.MemoryCache
+import coil3.ImageLoader
+import coil3.disk.DiskCache
+import coil3.memory.MemoryCache
+import com.vitorpamplona.amethyst.service.LocationState
+import com.vitorpamplona.amethyst.service.notifications.PokeyReceiver
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
+import com.vitorpamplona.amethyst.service.okhttp.OkHttpWebSocket
 import com.vitorpamplona.amethyst.service.playback.VideoCache
-import com.vitorpamplona.ammolite.service.HttpClientManager
+import com.vitorpamplona.ammolite.relays.NostrClient
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
@@ -42,17 +48,24 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
+import okio.Path.Companion.toOkioPath
 import java.io.File
 import kotlin.time.measureTimedValue
 
 class Amethyst : Application() {
     val applicationIOScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
 
+    val client: NostrClient = NostrClient(OkHttpWebSocket.Builder())
+
     // Service Manager is only active when the activity is active.
-    val serviceManager = ServiceManager(applicationIOScope)
+    val serviceManager = ServiceManager(client, applicationIOScope)
+    val locationManager = LocationState(this, applicationIOScope)
+
+    val pokeyReceiver = PokeyReceiver()
 
     override fun onTerminate() {
         super.onTerminate()
+        unregisterReceiver(pokeyReceiver)
         applicationIOScope.cancel()
     }
 
@@ -72,15 +85,16 @@ class Amethyst : Application() {
     val coilCache: DiskCache by lazy {
         DiskCache
             .Builder()
-            .directory(safeCacheDir.resolve("image_cache"))
+            .directory(safeCacheDir.resolve("image_cache").toOkioPath())
             .maxSizePercent(0.2)
             .maximumMaxSizeBytes(1024 * 1024 * 1024) // 1GB
             .build()
     }
 
-    val coilMemCache: MemoryCache by lazy {
+    val memoryCache: MemoryCache by lazy {
         MemoryCache
-            .Builder(this)
+            .Builder()
+            .maxSizePercent(this)
             .build()
     }
 
@@ -120,14 +134,26 @@ class Amethyst : Application() {
                 }
             Log.d("Rendering Metrics", "VideoCache initialized in $elapsed")
         }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            registerReceiver(
+                pokeyReceiver,
+                IntentFilter(PokeyReceiver.POKEY_ACTION),
+                RECEIVER_EXPORTED,
+            )
+        } else {
+            registerReceiver(
+                pokeyReceiver,
+                IntentFilter(PokeyReceiver.POKEY_ACTION),
+            )
+        }
     }
 
     fun imageLoaderBuilder(): ImageLoader.Builder =
         ImageLoader
             .Builder(this)
             .diskCache { coilCache }
-            .memoryCache { coilMemCache }
-            .crossfade(true)
+            .memoryCache { memoryCache }
 
     fun encryptedStorage(npub: String? = null): EncryptedSharedPreferences = EncryptedStorage.preferences(instance, npub)
 
@@ -140,7 +166,10 @@ class Amethyst : Application() {
     override fun onTrimMemory(level: Int) {
         super.onTrimMemory(level)
         println("Trim Memory $level")
-        GlobalScope.launch(Dispatchers.Default) { serviceManager.trimMemory() }
+        GlobalScope.launch(Dispatchers.Default) {
+            println("Trim Memory Inside $level")
+            serviceManager.trimMemory()
+        }
     }
 
     companion object {

amethyst/src/main/java/com/vitorpamplona/amethyst/DebugUtils.kt

@@ -26,7 +26,6 @@ import android.content.pm.ApplicationInfo
 import android.os.Debug
 import android.util.Log
 import androidx.core.content.getSystemService
-import coil.Coil
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
@@ -44,11 +43,9 @@ import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.service.NostrThreadDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
 import com.vitorpamplona.amethyst.service.NostrVideoDataSource
-import com.vitorpamplona.ammolite.relays.Client
-import com.vitorpamplona.ammolite.relays.RelayPool
 
 fun debugState(context: Context) {
-    Client
+    Amethyst.instance.client
         .allSubscriptions()
         .forEach { Log.d("STATE DUMP", "${it.key} ${it.value.joinToString { it.filter.toDebugJson() }}") }
 
@@ -90,16 +87,15 @@ fun debugState(context: Context) {
         Log.d("STATE DUMP", "Memory Class " + memClass + " MB (largeHeap $isLargeHeap)")
     }
 
-    Log.d("STATE DUMP", "Connected Relays: " + RelayPool.connectedRelays())
+    Log.d("STATE DUMP", "Connected Relays: " + Amethyst.instance.client.connectedRelays())
 
-    val imageLoader = Coil.imageLoader(context)
     Log.d(
         "STATE DUMP",
-        "Image Disk Cache ${(imageLoader.diskCache?.size ?: 0) / (1024 * 1024)}/${(imageLoader.diskCache?.maxSize ?: 0) / (1024 * 1024)} MB",
+        "Image Disk Cache ${(Amethyst.instance.coilCache.size) / (1024 * 1024)}/${(Amethyst.instance.coilCache.maxSize) / (1024 * 1024)} MB",
     )
     Log.d(
         "STATE DUMP",
-        "Image Memory Cache ${(imageLoader.memoryCache?.size ?: 0) / (1024 * 1024)}/${(imageLoader.memoryCache?.maxSize ?: 0) / (1024 * 1024)} MB",
+        "Image Memory Cache ${(Amethyst.instance.memoryCache.size) / (1024 * 1024)}/${(Amethyst.instance.memoryCache.size) / (1024 * 1024)} MB",
     )
 
     Log.d(

amethyst/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt

@@ -26,14 +26,20 @@ import android.content.SharedPreferences
 import android.util.Log
 import androidx.compose.runtime.Immutable
 import com.fasterxml.jackson.module.kotlin.readValue
+import com.vitorpamplona.amethyst.model.AccountLanguagePreferencesInternal
+import com.vitorpamplona.amethyst.model.AccountReactionPreferencesInternal
+import com.vitorpamplona.amethyst.model.AccountSecurityPreferencesInternal
 import com.vitorpamplona.amethyst.model.AccountSettings
+import com.vitorpamplona.amethyst.model.AccountSyncedSettingsInternal
+import com.vitorpamplona.amethyst.model.AccountZapPreferencesInternal
 import com.vitorpamplona.amethyst.model.DefaultReactions
 import com.vitorpamplona.amethyst.model.DefaultZapAmounts
 import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
 import com.vitorpamplona.amethyst.model.Settings
-import com.vitorpamplona.amethyst.service.Nip96MediaServers
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.DEFAULT_MEDIA_SERVERS
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerName
 import com.vitorpamplona.amethyst.ui.tor.TorSettings
 import com.vitorpamplona.amethyst.ui.tor.TorSettingsFlow
 import com.vitorpamplona.amethyst.ui.tor.TorType
@@ -45,6 +51,7 @@ import com.vitorpamplona.quartz.encoders.hexToByteArray
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.encoders.toNpub
 import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
+import com.vitorpamplona.quartz.events.AppSpecificDataEvent
 import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent
 import com.vitorpamplona.quartz.events.ContactListEvent
 import com.vitorpamplona.quartz.events.Event
@@ -53,11 +60,9 @@ import com.vitorpamplona.quartz.events.MetadataEvent
 import com.vitorpamplona.quartz.events.MuteListEvent
 import com.vitorpamplona.quartz.events.PrivateOutboxRelayListEvent
 import com.vitorpamplona.quartz.events.SearchRelayListEvent
-import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
@@ -104,6 +109,7 @@ private object PrefKeys {
     const val LATEST_SEARCH_RELAY_LIST = "latestSearchRelayList"
     const val LATEST_MUTE_LIST = "latestMuteList"
     const val LATEST_PRIVATE_HOME_RELAY_LIST = "latestPrivateHomeRelayList"
+    const val LATEST_APP_SPECIFIC_DATA = "latestAppSpecificData"
     const val HIDE_DELETE_REQUEST_DIALOG = "hide_delete_request_dialog"
     const val HIDE_BLOCK_ALERT_DIALOG = "hide_block_alert_dialog"
     const val HIDE_NIP_17_WARNING_DIALOG = "hide_nip24_warning_dialog" // delete later
@@ -310,19 +316,7 @@ object LocalPreferences {
                         }
                         settings.keyPair.pubKey.let { putString(PrefKeys.NOSTR_PUBKEY, it.toHexKey()) }
                         putString(PrefKeys.RELAYS, Event.mapper.writeValueAsString(settings.localRelays))
-                        putStringSet(PrefKeys.DONT_TRANSLATE_FROM, settings.dontTranslateFrom)
-                        putStringSet(PrefKeys.LOCAL_RELAY_SERVERS, settings.localRelayServers)
-                        putString(
-                            PrefKeys.LANGUAGE_PREFS,
-                            Event.mapper.writeValueAsString(settings.languagePreferences),
-                        )
-                        putString(PrefKeys.TRANSLATE_TO, settings.translateTo)
-                        putString(PrefKeys.ZAP_AMOUNTS, Event.mapper.writeValueAsString(settings.zapAmountChoices.value))
-                        putString(
-                            PrefKeys.REACTION_CHOICES,
-                            Event.mapper.writeValueAsString(settings.reactionChoices.value),
-                        )
-                        putString(PrefKeys.DEFAULT_ZAPTYPE, settings.defaultZapType.value.name)
+
                         putString(
                             PrefKeys.DEFAULT_FILE_SERVER,
                             Event.mapper.writeValueAsString(settings.defaultFileServer),
@@ -386,6 +380,12 @@ object LocalPreferences {
                             remove(PrefKeys.LATEST_SEARCH_RELAY_LIST)
                         }
 
+                        if (settings.localRelayServers.isNotEmpty()) {
+                            putStringSet(PrefKeys.LOCAL_RELAY_SERVERS, settings.localRelayServers)
+                        } else {
+                            remove(PrefKeys.LOCAL_RELAY_SERVERS)
+                        }
+
                         if (settings.backupMuteList != null) {
                             putString(
                                 PrefKeys.LATEST_MUTE_LIST,
@@ -404,6 +404,15 @@ object LocalPreferences {
                             remove(PrefKeys.LATEST_PRIVATE_HOME_RELAY_LIST)
                         }
 
+                        if (settings.backupAppSpecificData != null) {
+                            putString(
+                                PrefKeys.LATEST_APP_SPECIFIC_DATA,
+                                Event.mapper.writeValueAsString(settings.backupAppSpecificData),
+                            )
+                        } else {
+                            remove(PrefKeys.LATEST_APP_SPECIFIC_DATA)
+                        }
+
                         putBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, settings.hideDeleteRequestDialog)
                         putBoolean(PrefKeys.HIDE_NIP_17_WARNING_DIALOG, settings.hideNIP17WarningDialog)
                         putBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, settings.hideBlockAlertDialog)
@@ -414,9 +423,6 @@ object LocalPreferences {
 
                         putString(PrefKeys.TOR_SETTINGS, Event.mapper.writeValueAsString(settings.torSettings.toSettings()))
 
-                        putBoolean(PrefKeys.WARN_ABOUT_REPORTS, settings.warnAboutPostsWithReports)
-                        putBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, settings.filterSpamFromStrangers)
-
                         val regularMap =
                             settings.lastReadPerRoute.value.mapValues {
                                 it.value.value
@@ -428,12 +434,6 @@ object LocalPreferences {
                         )
                         putStringSet(PrefKeys.HAS_DONATED_IN_VERSION, settings.hasDonatedInVersion.value)
 
-                        if (settings.showSensitiveContent.value == null) {
-                            remove(PrefKeys.SHOW_SENSITIVE_CONTENT)
-                        } else {
-                            putBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, settings.showSensitiveContent.value!!)
-                        }
-
                         putString(
                             PrefKeys.PENDING_ATTESTATIONS,
                             Event.mapper.writeValueAsString(settings.pendingAttestations.value),
@@ -441,6 +441,7 @@ object LocalPreferences {
                     }.apply()
             }
         }
+        Log.d("LocalPreferences", "Saved to encrypted storage")
     }
 
     suspend fun loadCurrentAccountFromEncryptedStorage(): AccountSettings? = currentAccount()?.let { loadCurrentAccountFromEncryptedStorage(it) }
@@ -510,9 +511,6 @@ object LocalPreferences {
                     getString(PrefKeys.SIGNER_PACKAGE_NAME, null)
                         ?: if (getBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, false)) "com.greenart7c3.nostrsigner" else null
 
-                val dontTranslateFrom = getStringSet(PrefKeys.DONT_TRANSLATE_FROM, null) ?: setOf()
-                val localRelayServers = getStringSet(PrefKeys.LOCAL_RELAY_SERVERS, null) ?: setOf()
-                val translateTo = getString(PrefKeys.TRANSLATE_TO, null) ?: Locale.getDefault().language
                 val defaultHomeFollowList =
                     getString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, null) ?: KIND3_FOLLOWS
                 val defaultStoriesFollowList =
@@ -528,13 +526,12 @@ object LocalPreferences {
                     } ?: LnZapEvent.ZapType.PUBLIC
 
                 val localRelays = parseOrNull<Set<RelaySetupInfo>>(PrefKeys.RELAYS) ?: emptySet()
-                val reactionChoices = parseOrNull<List<String>>(PrefKeys.REACTION_CHOICES)?.ifEmpty { DefaultReactions } ?: DefaultReactions
-                val zapAmountChoices = parseOrNull<List<Long>>(PrefKeys.ZAP_AMOUNTS)?.ifEmpty { DefaultZapAmounts } ?: DefaultZapAmounts
 
-                val defaultFileServer = parseOrNull<Nip96MediaServers.ServerName>(PrefKeys.DEFAULT_FILE_SERVER) ?: Nip96MediaServers.DEFAULT[0]
                 val zapPaymentRequestServer = parseOrNull<Nip47WalletConnect.Nip47URI>(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER)
+                val defaultFileServer = parseOrNull<ServerName>(PrefKeys.DEFAULT_FILE_SERVER) ?: DEFAULT_MEDIA_SERVERS[0]
+
                 val pendingAttestations = parseOrNull<Map<HexKey, String>>(PrefKeys.PENDING_ATTESTATIONS) ?: mapOf()
-                val languagePreferences = parseOrNull<Map<String, String>>(PrefKeys.LANGUAGE_PREFS) ?: mapOf()
+                val localRelayServers = getStringSet(PrefKeys.LOCAL_RELAY_SERVERS, null) ?: setOf()
 
                 val latestUserMetadata = parseEventOrNull<MetadataEvent>(PrefKeys.LATEST_USER_METADATA)
                 val latestContactList = parseEventOrNull<ContactListEvent>(PrefKeys.LATEST_CONTACT_LIST)
@@ -543,6 +540,54 @@ object LocalPreferences {
                 val latestSearchRelayList = parseEventOrNull<SearchRelayListEvent>(PrefKeys.LATEST_SEARCH_RELAY_LIST)
                 val latestMuteList = parseEventOrNull<MuteListEvent>(PrefKeys.LATEST_MUTE_LIST)
                 val latestPrivateHomeRelayList = parseEventOrNull<PrivateOutboxRelayListEvent>(PrefKeys.LATEST_PRIVATE_HOME_RELAY_LIST)
+                val latestAppSpecificData = parseEventOrNull<AppSpecificDataEvent>(PrefKeys.LATEST_APP_SPECIFIC_DATA)
+
+                val syncedSettings =
+                    if (latestAppSpecificData != null) {
+                        null
+                    } else {
+                        // previous version. Delete this when ready.
+                        val reactionChoices = parseOrNull<List<String>>(PrefKeys.REACTION_CHOICES)?.ifEmpty { DefaultReactions } ?: DefaultReactions
+                        val zapAmountChoices = parseOrNull<List<Long>>(PrefKeys.ZAP_AMOUNTS)?.ifEmpty { DefaultZapAmounts } ?: DefaultZapAmounts
+
+                        val languagePreferences = parseOrNull<Map<String, String>>(PrefKeys.LANGUAGE_PREFS) ?: mapOf()
+
+                        val showSensitiveContent =
+                            if (contains(PrefKeys.SHOW_SENSITIVE_CONTENT)) {
+                                getBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, false)
+                            } else {
+                                null
+                            }
+                        val filterSpam = getBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, true)
+                        val warnAboutReports = getBoolean(PrefKeys.WARN_ABOUT_REPORTS, true)
+
+                        val dontTranslateFrom = getStringSet(PrefKeys.DONT_TRANSLATE_FROM, null) ?: setOf()
+                        val translateTo = getString(PrefKeys.TRANSLATE_TO, null) ?: Locale.getDefault().language
+
+                        AccountSyncedSettingsInternal(
+                            reactions =
+                                AccountReactionPreferencesInternal(
+                                    reactionChoices = reactionChoices,
+                                ),
+                            zaps =
+                                AccountZapPreferencesInternal(
+                                    zapAmountChoices = zapAmountChoices,
+                                    defaultZapType = defaultZapType,
+                                ),
+                            languages =
+                                AccountLanguagePreferencesInternal(
+                                    dontTranslateFrom = dontTranslateFrom,
+                                    languagePreferences = languagePreferences,
+                                    translateTo = translateTo,
+                                ),
+                            security =
+                                AccountSecurityPreferencesInternal(
+                                    showSensitiveContent = showSensitiveContent,
+                                    warnAboutPostsWithReports = warnAboutReports,
+                                    filterSpamFromStrangers = filterSpam,
+                                ),
+                        )
+                    }
 
                 val hideDeleteRequestDialog = getBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, false)
                 val hideBlockAlertDialog = getBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, false)
@@ -571,15 +616,6 @@ object LocalPreferences {
                         parseOrNull<TorSettings>(PrefKeys.TOR_SETTINGS) ?: TorSettings()
                     }
 
-                val showSensitiveContent =
-                    if (contains(PrefKeys.SHOW_SENSITIVE_CONTENT)) {
-                        getBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, false)
-                    } else {
-                        null
-                    }
-                val filterSpam = getBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, true)
-                val warnAboutReports = getBoolean(PrefKeys.WARN_ABOUT_REPORTS, true)
-
                 val lastReadPerRoute =
                     parseOrNull<Map<String, Long>>(PrefKeys.LAST_READ_PER_ROUTE)?.mapValues {
                         MutableStateFlow(it.value)
@@ -594,12 +630,6 @@ object LocalPreferences {
                     externalSignerPackageName = externalSignerPackageName,
                     localRelays = localRelays,
                     localRelayServers = localRelayServers,
-                    dontTranslateFrom = dontTranslateFrom,
-                    languagePreferences = languagePreferences,
-                    translateTo = translateTo,
-                    zapAmountChoices = MutableStateFlow(zapAmountChoices.toImmutableList()),
-                    reactionChoices = MutableStateFlow(reactionChoices.toImmutableList()),
-                    defaultZapType = MutableStateFlow(defaultZapType),
                     defaultFileServer = defaultFileServer,
                     defaultHomeFollowList = MutableStateFlow(defaultHomeFollowList),
                     defaultStoriesFollowList = MutableStateFlow(defaultStoriesFollowList),
@@ -616,10 +646,9 @@ object LocalPreferences {
                     backupSearchRelayList = latestSearchRelayList,
                     backupPrivateHomeRelayList = latestPrivateHomeRelayList,
                     backupMuteList = latestMuteList,
+                    backupAppSpecificData = latestAppSpecificData,
+                    backupSyncedSettings = syncedSettings,
                     torSettings = TorSettingsFlow.build(torSettings),
-                    showSensitiveContent = MutableStateFlow(showSensitiveContent),
-                    warnAboutPostsWithReports = warnAboutReports,
-                    filterSpamFromStrangers = filterSpam,
                     lastReadPerRoute = MutableStateFlow(lastReadPerRoute),
                     hasDonatedInVersion = MutableStateFlow(hasDonatedInVersion),
                     pendingAttestations = MutableStateFlow(pendingAttestations),

amethyst/src/main/java/com/vitorpamplona/amethyst/ParallelUtils.kt

@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) 2024 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.amethyst
+
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.joinAll
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withTimeoutOrNull
+import kotlin.coroutines.Continuation
+import kotlin.coroutines.resume
+
+/**
+ * Launches an async coroutine for each item, runs the
+ * function and waits for everybody to finsih
+ */
+suspend fun <T> launchAndWaitAll(
+    items: List<T>,
+    asyncFunc: suspend (T) -> Unit,
+) {
+    coroutineScope {
+        val jobs =
+            items.map { next ->
+                async {
+                    asyncFunc(next)
+                }
+            }
+
+        // runs in parallel to avoid overcrowding Amber.
+        withTimeoutOrNull(15000) {
+            jobs.joinAll()
+        }
+    }
+}
+
+/**
+ * Runs the function and waits for 10 seconds for any result.
+ */
+suspend inline fun <T> tryAndWait(
+    timeoutMillis: Long = 10000,
+    crossinline asyncFunc: (Continuation<T>) -> Unit,
+): T? =
+    withTimeoutOrNull(timeoutMillis) {
+        suspendCancellableCoroutine { continuation ->
+            asyncFunc(continuation)
+        }
+    }
+
+/**
+ * Runs an async coroutine for each one of the items,
+ * runs the request for that item,
+ * and gathers all the results in the output map.
+ */
+suspend fun <T, K> collectSuccessfulOperations(
+    items: List<T>,
+    runRequestFor: (T, (K) -> Unit) -> Unit,
+    output: MutableList<K> = mutableListOf(),
+    onReady: suspend (List<K>) -> Unit,
+) {
+    if (items.isEmpty()) {
+        onReady(output)
+        return
+    }
+
+    launchAndWaitAll(items) {
+        val result =
+            tryAndWait { continuation ->
+                runRequestFor(it) { result: K -> continuation.resume(result) }
+            }
+
+        if (result != null) {
+            output.add(result)
+        }
+    }
+
+    onReady(output)
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt

@@ -23,15 +23,18 @@ package com.vitorpamplona.amethyst
 import android.os.Build
 import android.util.Log
 import androidx.compose.runtime.Stable
-import coil.Coil
-import coil.decode.GifDecoder
-import coil.decode.ImageDecoderDecoder
-import coil.decode.SvgDecoder
-import coil.size.Precision
-import coil.util.DebugLogger
+import coil3.SingletonImageLoader
+import coil3.annotation.DelicateCoilApi
+import coil3.gif.AnimatedImageDecoder
+import coil3.gif.GifDecoder
+import coil3.network.okhttp.OkHttpNetworkFetcherFactory
+import coil3.size.Precision
+import coil3.svg.SvgDecoder
+import coil3.util.DebugLogger
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.Base64Fetcher
+import com.vitorpamplona.amethyst.service.BlurHashFetcher
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomDataSource
@@ -48,12 +51,12 @@ import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.service.NostrThreadDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
 import com.vitorpamplona.amethyst.service.NostrVideoDataSource
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 import com.vitorpamplona.amethyst.service.ots.OkHttpBlockstreamExplorer
 import com.vitorpamplona.amethyst.service.ots.OkHttpCalendarBuilder
 import com.vitorpamplona.amethyst.ui.tor.TorManager
 import com.vitorpamplona.amethyst.ui.tor.TorType
-import com.vitorpamplona.ammolite.relays.Client
-import com.vitorpamplona.ammolite.service.HttpClientManager
+import com.vitorpamplona.ammolite.relays.NostrClient
 import com.vitorpamplona.quartz.encoders.bechToBytes
 import com.vitorpamplona.quartz.encoders.decodePublicKeyAsHexOrNull
 import com.vitorpamplona.quartz.encoders.toHexKey
@@ -71,10 +74,12 @@ import kotlinx.coroutines.runBlocking
 
 @Stable
 class ServiceManager(
+    val client: NostrClient,
     val scope: CoroutineScope,
 ) {
-    private var isStarted: Boolean =
-        false // to not open amber in a loop trying to use auth relays and registering for notifications
+    // to not open amber in a loop trying to use auth relays and registering for notifications
+    private var isStarted: Boolean = false
+
     private var account: Account? = null
 
     private var collectorJob: Job? = null
@@ -84,12 +89,13 @@ class ServiceManager(
         start()
     }
 
+    @OptIn(DelicateCoilApi::class)
     private fun start() {
         Log.d("ServiceManager", "Pre Starting Relay Services $isStarted $account")
         if (isStarted && account != null) {
             return
         }
-        Log.d("ServiceManager", "Starting Relay Services")
+        Log.d("ServiceManager", "Starting Relay Services Tor: ${account?.settings?.torSettings?.torType?.value}")
 
         val myAccount = account
 
@@ -115,33 +121,46 @@ class ServiceManager(
             HttpClientManager.setDefaultProxy(null)
         }
 
-        LocalCache.antiSpam.active = account?.settings?.filterSpamFromStrangers ?: true
-        Coil.setImageLoader {
+        // Convert this into a flow
+        LocalCache.antiSpam.active = account
+            ?.settings
+            ?.syncedSettings
+            ?.security
+            ?.filterSpamFromStrangers ?: true
+
+        SingletonImageLoader.setUnsafe {
             Amethyst.instance
                 .imageLoaderBuilder()
                 .components {
                     if (Build.VERSION.SDK_INT >= 28) {
-                        add(ImageDecoderDecoder.Factory())
+                        add(AnimatedImageDecoder.Factory())
                     } else {
                         add(GifDecoder.Factory())
                     }
                     add(SvgDecoder.Factory())
                     add(Base64Fetcher.Factory)
+                    add(BlurHashFetcher.Factory)
+                    add(Base64Fetcher.BKeyer)
+                    add(BlurHashFetcher.BKeyer)
+                    add(
+                        OkHttpNetworkFetcherFactory(
+                            callFactory = {
+                                myAccount?.shouldUseTorForImageDownload()?.let { HttpClientManager.getHttpClient(it) }
+                                    ?: HttpClientManager.getHttpClient(false)
+                            },
+                        ),
+                    )
                 }.apply {
                     if (BuildConfig.DEBUG || BuildConfig.BUILD_TYPE == "benchmark") {
                         this.logger(DebugLogger())
                     }
-                }.okHttpClient {
-                    myAccount?.shouldUseTorForImageDownload()?.let { HttpClientManager.getHttpClient(it) }
-                        ?: HttpClientManager.getHttpClient(false)
                 }.precision(Precision.INEXACT)
-                .respectCacheHeaders(false)
                 .build()
         }
 
         if (myAccount != null) {
             val relaySet = myAccount.connectToRelaysWithProxy.value
-            Client.reconnect(relaySet)
+            client.reconnect(relaySet)
 
             collectorJob?.cancel()
             collectorJob = null
@@ -150,7 +169,7 @@ class ServiceManager(
                     myAccount.connectToRelaysWithProxy.collectLatest {
                         delay(500)
                         if (isStarted) {
-                            Client.reconnect(it, onlyIfChanged = true)
+                            client.reconnect(it, onlyIfChanged = true)
                         }
                     }
                 }
@@ -216,7 +235,7 @@ class ServiceManager(
         NostrUserProfileDataSource.stopSync()
         NostrVideoDataSource.stopSync()
 
-        Client.reconnect(null)
+        client.reconnect(null)
         isStarted = false
     }
 

amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt

@@ -20,10 +20,11 @@
  */
 package com.vitorpamplona.amethyst.model
 
-import android.content.res.Resources
+import android.util.Log
 import androidx.compose.runtime.Stable
-import androidx.core.os.ConfigurationCompat
-import com.vitorpamplona.amethyst.service.Nip96MediaServers
+import com.vitorpamplona.amethyst.Amethyst
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.DEFAULT_MEDIA_SERVERS
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerName
 import com.vitorpamplona.amethyst.ui.tor.TorSettings
 import com.vitorpamplona.amethyst.ui.tor.TorSettingsFlow
 import com.vitorpamplona.ammolite.relays.Constants
@@ -34,6 +35,7 @@ import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
 import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
+import com.vitorpamplona.quartz.events.AppSpecificDataEvent
 import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent
 import com.vitorpamplona.quartz.events.ContactListEvent
 import com.vitorpamplona.quartz.events.LnZapEvent
@@ -44,8 +46,6 @@ import com.vitorpamplona.quartz.events.SearchRelayListEvent
 import com.vitorpamplona.quartz.signers.ExternalSignerLauncher
 import com.vitorpamplona.quartz.signers.NostrSignerExternal
 import com.vitorpamplona.quartz.signers.NostrSignerInternal
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -61,17 +61,6 @@ val DefaultChannels =
         "42224859763652914db53052103f0b744df79dfc4efef7e950fc0802fc3df3c5",
     )
 
-val DefaultReactions =
-    persistentListOf(
-        "\uD83D\uDE80",
-        "\uD83E\uDEC2",
-        "\uD83D\uDC40",
-        "\uD83D\uDE02",
-        "\uD83C\uDF89",
-        "\uD83E\uDD14",
-        "\uD83D\uDE31",
-    )
-
 val DefaultNIP65List =
     listOf(
         AdvertisedRelayListEvent.AdvertisedRelayInfo(RelayUrlFormatter.normalize("wss://nostr.mom/"), AdvertisedRelayListEvent.AdvertisedRelayType.BOTH),
@@ -81,9 +70,9 @@ val DefaultNIP65List =
 
 val DefaultDMRelayList =
     listOf(
-        RelayUrlFormatter.normalize("wss://auth.nostr1.com/"),
-        RelayUrlFormatter.normalize("wss://nostr.mom/"),
-        RelayUrlFormatter.normalize("wss://nos.lol/"),
+        RelayUrlFormatter.normalize("wss://auth.nostr1.com"),
+        RelayUrlFormatter.normalize("wss://relay.0xchat.com"),
+        RelayUrlFormatter.normalize("wss://nos.lol"),
     )
 
 val DefaultSearchRelayList =
@@ -91,25 +80,18 @@ val DefaultSearchRelayList =
         RelayUrlFormatter.normalize("wss://relay.nostr.band"),
         RelayUrlFormatter.normalize("wss://nostr.wine"),
         RelayUrlFormatter.normalize("wss://relay.noswhere.com"),
+        RelayUrlFormatter.normalize("wss://search.nos.today"),
     )
 
-val DefaultZapAmounts = persistentListOf(100L, 500L, 1000L)
-
-fun getLanguagesSpokenByUser(): Set<String> {
-    val languageList = ConfigurationCompat.getLocales(Resources.getSystem().getConfiguration())
-    val codedList = mutableSetOf<String>()
-    for (i in 0 until languageList.size()) {
-        languageList.get(i)?.let { codedList.add(it.language) }
-    }
-    return codedList
-}
-
 // This has spaces to avoid mixing with a potential NIP-51 list with the same name.
 val GLOBAL_FOLLOWS = " Global "
 
 // This has spaces to avoid mixing with a potential NIP-51 list with the same name.
 val KIND3_FOLLOWS = " All Follows "
 
+// This has spaces to avoid mixing with a potential NIP-51 list with the same name.
+val AROUND_ME = " Around Me "
+
 @Stable
 class AccountSettings(
     val keyPair: KeyPair,
@@ -117,13 +99,7 @@ class AccountSettings(
     var externalSignerPackageName: String? = null,
     var localRelays: Set<RelaySetupInfo> = Constants.defaultRelays.toSet(),
     var localRelayServers: Set<String> = setOf(),
-    var dontTranslateFrom: Set<String> = getLanguagesSpokenByUser(),
-    var languagePreferences: Map<String, String> = mapOf(),
-    var translateTo: String = Locale.getDefault().language,
-    var zapAmountChoices: MutableStateFlow<ImmutableList<Long>> = MutableStateFlow(DefaultZapAmounts),
-    var reactionChoices: MutableStateFlow<ImmutableList<String>> = MutableStateFlow(DefaultReactions),
-    val defaultZapType: MutableStateFlow<LnZapEvent.ZapType> = MutableStateFlow(LnZapEvent.ZapType.PUBLIC),
-    var defaultFileServer: Nip96MediaServers.ServerName = Nip96MediaServers.DEFAULT[0],
+    var defaultFileServer: ServerName = DEFAULT_MEDIA_SERVERS[0],
     val defaultHomeFollowList: MutableStateFlow<String> = MutableStateFlow(KIND3_FOLLOWS),
     val defaultStoriesFollowList: MutableStateFlow<String> = MutableStateFlow(GLOBAL_FOLLOWS),
     val defaultNotificationFollowList: MutableStateFlow<String> = MutableStateFlow(GLOBAL_FOLLOWS),
@@ -139,15 +115,17 @@ class AccountSettings(
     var backupSearchRelayList: SearchRelayListEvent? = null,
     var backupMuteList: MuteListEvent? = null,
     var backupPrivateHomeRelayList: PrivateOutboxRelayListEvent? = null,
+    var backupAppSpecificData: AppSpecificDataEvent? = null,
+    backupSyncedSettings: AccountSyncedSettingsInternal? = null, // only exist for migration purposes
     val torSettings: TorSettingsFlow = TorSettingsFlow(),
-    val showSensitiveContent: MutableStateFlow<Boolean?> = MutableStateFlow(null),
-    var warnAboutPostsWithReports: Boolean = true,
-    var filterSpamFromStrangers: Boolean = true,
     val lastReadPerRoute: MutableStateFlow<Map<String, MutableStateFlow<Long>>> = MutableStateFlow(mapOf()),
     var hasDonatedInVersion: MutableStateFlow<Set<String>> = MutableStateFlow(setOf<String>()),
     val pendingAttestations: MutableStateFlow<Map<HexKey, String>> = MutableStateFlow<Map<HexKey, String>>(mapOf()),
 ) {
     val saveable = MutableStateFlow(AccountSettingsUpdater(this))
+    val syncedSettings: AccountSyncedSettings =
+        backupSyncedSettings?.let { AccountSyncedSettings(it) }
+            ?: AccountSyncedSettings(AccountSyncedSettingsInternal())
 
     class AccountSettingsUpdater(
         val accountSettings: AccountSettings,
@@ -165,7 +143,19 @@ class AccountSettings(
         } else {
             when (val packageName = externalSignerPackageName) {
                 null -> NostrSignerInternal(keyPair)
-                else -> NostrSignerExternal(keyPair.pubKey.toHexKey(), ExternalSignerLauncher(keyPair.pubKey.toHexKey(), packageName))
+                else -> {
+                    val externalSignerLauncher = ExternalSignerLauncher(keyPair.pubKey.toHexKey(), packageName)
+                    // TODO: How to handle the launcher here?
+                    try {
+                        externalSignerLauncher.registerLauncher(
+                            launcher = { },
+                            contentResolver = Amethyst.instance::contentResolverFn,
+                        )
+                    } catch (e: Exception) {
+                        Log.d("AccountSettings", "Failed to initialize external signer", e)
+                    }
+                    NostrSignerExternal(keyPair.pubKey.toHexKey(), externalSignerLauncher)
+                }
             }
         }
 
@@ -173,39 +163,47 @@ class AccountSettings(
     // Zaps and Reactions
     // ---
 
-    fun changeDefaultZapType(zapType: LnZapEvent.ZapType) {
-        if (defaultZapType.value != zapType) {
-            defaultZapType.tryEmit(zapType)
+    fun changeDefaultZapType(zapType: LnZapEvent.ZapType): Boolean {
+        if (syncedSettings.zaps.defaultZapType.value != zapType) {
+            syncedSettings.zaps.defaultZapType.tryEmit(zapType)
             saveAccountSettings()
+            return true
         }
+        return false
     }
 
-    fun changeZapAmounts(newAmounts: List<Long>) {
-        if (zapAmountChoices.value != newAmounts) {
-            zapAmountChoices.tryEmit(newAmounts.toImmutableList())
+    fun changeZapAmounts(newAmounts: List<Long>): Boolean {
+        if (syncedSettings.zaps.zapAmountChoices.value != newAmounts) {
+            syncedSettings.zaps.zapAmountChoices.tryEmit(newAmounts.toImmutableList())
             saveAccountSettings()
+            return true
         }
+        return false
     }
 
-    fun changeZapPaymentRequest(newServer: Nip47WalletConnect.Nip47URI?) {
+    fun changeReactionTypes(newTypes: List<String>): Boolean {
+        if (syncedSettings.reactions.reactionChoices.value != newTypes) {
+            syncedSettings.reactions.reactionChoices.tryEmit(newTypes.toImmutableList())
+            saveAccountSettings()
+            return true
+        }
+        return false
+    }
+
+    fun changeZapPaymentRequest(newServer: Nip47WalletConnect.Nip47URI?): Boolean {
         if (zapPaymentRequest != newServer) {
             zapPaymentRequest = newServer
             saveAccountSettings()
+            return true
         }
-    }
-
-    fun changeReactionTypes(newTypes: List<String>) {
-        if (reactionChoices.value != newTypes) {
-            reactionChoices.tryEmit(newTypes.toImmutableList())
-            saveAccountSettings()
-        }
+        return false
     }
 
     // ---
     // file servers
     // ---
 
-    fun changeDefaultFileServer(server: Nip96MediaServers.ServerName) {
+    fun changeDefaultFileServer(server: ServerName) {
         if (defaultFileServer != server) {
             defaultFileServer = server
             saveAccountSettings()
@@ -260,22 +258,18 @@ class AccountSettings(
     // language services
     // ---
     fun toggleDontTranslateFrom(languageCode: String) {
-        if (!dontTranslateFrom.contains(languageCode)) {
-            dontTranslateFrom = dontTranslateFrom.plus(languageCode)
-            saveAccountSettings()
-        } else {
-            dontTranslateFrom = dontTranslateFrom.minus(languageCode)
-            saveAccountSettings()
-        }
+        syncedSettings.languages.toggleDontTranslateFrom(languageCode)
+        saveAccountSettings()
     }
 
-    fun translateToContains(languageCode: Locale) = translateTo.contains(languageCode.language)
+    fun translateToContains(languageCode: Locale) = syncedSettings.languages.translateTo.contains(languageCode.language)
 
-    fun updateTranslateTo(languageCode: Locale) {
-        if (translateTo != languageCode.language) {
-            translateTo = languageCode.language
+    fun updateTranslateTo(languageCode: Locale): Boolean {
+        if (syncedSettings.languages.updateTranslateTo(languageCode)) {
             saveAccountSettings()
+            return true
         }
+        return false
     }
 
     fun prefer(
@@ -283,23 +277,14 @@ class AccountSettings(
         target: String,
         preference: String,
     ) {
-        val key = "$source,$target"
-        if (key !in languagePreferences) {
-            languagePreferences = languagePreferences + Pair(key, preference)
-            saveAccountSettings()
-        } else {
-            if (languagePreferences.get(key) == preference) {
-                languagePreferences = languagePreferences.minus(key)
-            } else {
-                languagePreferences = languagePreferences + Pair(key, preference)
-            }
-        }
+        syncedSettings.languages.prefer(source, target, preference)
+        saveAccountSettings()
     }
 
     fun preferenceBetween(
         source: String,
         target: String,
-    ): String? = languagePreferences["$source,$target"]
+    ): String? = syncedSettings.languages.preferenceBetween(source, target)
 
     // ----
     // Backup Lists
@@ -382,6 +367,21 @@ class AccountSettings(
         }
     }
 
+    fun updateAppSpecificData(
+        appSettings: AppSpecificDataEvent?,
+        newSyncedSettings: AccountSyncedSettingsInternal,
+    ) {
+        if (appSettings == null || appSettings.content().isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupAppSpecificData?.id != appSettings.id) {
+            backupAppSpecificData = appSettings
+            syncedSettings.updateFrom(newSyncedSettings)
+
+            saveAccountSettings()
+        }
+    }
+
     // ----
     // Warning dialogs
     // ----
@@ -407,15 +407,6 @@ class AccountSettings(
         }
     }
 
-    fun updateShowSensitiveContent(show: Boolean?): Boolean {
-        if (showSensitiveContent.value != show) {
-            showSensitiveContent.update { show }
-            saveAccountSettings()
-            return true
-        }
-        return false
-    }
-
     // ---
     // donations
     // ---
@@ -509,16 +500,20 @@ class AccountSettings(
     // ---
     // filters
     // ---
+    fun updateShowSensitiveContent(show: Boolean?): Boolean {
+        if (syncedSettings.security.updateShowSensitiveContent(show)) {
+            saveAccountSettings()
+            return true
+        }
+        return false
+    }
+
     fun updateOptOutOptions(
         warnReports: Boolean,
         filterSpam: Boolean,
     ): Boolean =
-        if (warnAboutPostsWithReports != warnReports || filterSpam != filterSpamFromStrangers) {
-            warnAboutPostsWithReports = warnReports
-            filterSpamFromStrangers = filterSpam
-
+        if (syncedSettings.security.updateOptOutOptions(warnReports, filterSpam)) {
             saveAccountSettings()
-
             true
         } else {
             false

amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSyncedSettings.kt

@@ -0,0 +1,208 @@
+/**
+ * Copyright (c) 2024 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.amethyst.model
+
+import androidx.compose.runtime.Stable
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.equalImmutableLists
+import com.vitorpamplona.quartz.events.LnZapEvent
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
+import java.util.Locale
+
+@Stable
+class AccountSyncedSettings(
+    internalSettings: AccountSyncedSettingsInternal,
+) {
+    val reactions = AccountReactionPreferences(MutableStateFlow(internalSettings.reactions.reactionChoices.toImmutableList()))
+    val zaps =
+        AccountZapPreferences(
+            MutableStateFlow(internalSettings.zaps.zapAmountChoices.toImmutableList()),
+            MutableStateFlow(internalSettings.zaps.defaultZapType),
+        )
+    val languages =
+        AccountLanguagePreferences(
+            internalSettings.languages.dontTranslateFrom,
+            internalSettings.languages.languagePreferences,
+            internalSettings.languages.translateTo,
+        )
+    val security =
+        AccountSecurityPreferences(
+            MutableStateFlow(internalSettings.security.showSensitiveContent),
+            internalSettings.security.warnAboutPostsWithReports,
+            internalSettings.security.filterSpamFromStrangers,
+        )
+
+    fun toInternal(): AccountSyncedSettingsInternal =
+        AccountSyncedSettingsInternal(
+            reactions = AccountReactionPreferencesInternal(reactions.reactionChoices.value),
+            zaps =
+                AccountZapPreferencesInternal(
+                    zaps.zapAmountChoices.value,
+                    zaps.defaultZapType.value,
+                ),
+            languages =
+                AccountLanguagePreferencesInternal(
+                    languages.dontTranslateFrom,
+                    languages.languagePreferences,
+                    languages.translateTo,
+                ),
+            security =
+                AccountSecurityPreferencesInternal(
+                    security.showSensitiveContent.value,
+                    security.warnAboutPostsWithReports,
+                    security.filterSpamFromStrangers,
+                ),
+        )
+
+    fun updateFrom(syncedSettingsInternal: AccountSyncedSettingsInternal) {
+        val newReactionChoices = syncedSettingsInternal.reactions.reactionChoices.toImmutableList()
+        if (!equalImmutableLists(reactions.reactionChoices.value, newReactionChoices)) {
+            reactions.reactionChoices.tryEmit(newReactionChoices)
+        }
+
+        val newZapChoices = syncedSettingsInternal.zaps.zapAmountChoices.toImmutableList()
+        if (!equalImmutableLists(zaps.zapAmountChoices.value, newZapChoices)) {
+            zaps.zapAmountChoices.tryEmit(newZapChoices)
+        }
+
+        if (zaps.defaultZapType.value != syncedSettingsInternal.zaps.defaultZapType) {
+            zaps.defaultZapType.tryEmit(syncedSettingsInternal.zaps.defaultZapType)
+        }
+
+        if (languages.dontTranslateFrom != syncedSettingsInternal.languages.dontTranslateFrom) {
+            languages.dontTranslateFrom = syncedSettingsInternal.languages.dontTranslateFrom
+        }
+
+        if (languages.languagePreferences != syncedSettingsInternal.languages.languagePreferences) {
+            languages.languagePreferences = syncedSettingsInternal.languages.languagePreferences
+        }
+
+        if (languages.translateTo != syncedSettingsInternal.languages.translateTo) {
+            languages.translateTo = syncedSettingsInternal.languages.translateTo
+        }
+
+        if (security.showSensitiveContent.value != syncedSettingsInternal.security.showSensitiveContent) {
+            security.showSensitiveContent.tryEmit(syncedSettingsInternal.security.showSensitiveContent)
+        }
+
+        if (security.filterSpamFromStrangers != syncedSettingsInternal.security.filterSpamFromStrangers) {
+            security.filterSpamFromStrangers = syncedSettingsInternal.security.filterSpamFromStrangers
+        }
+
+        if (security.warnAboutPostsWithReports != syncedSettingsInternal.security.warnAboutPostsWithReports) {
+            security.warnAboutPostsWithReports = syncedSettingsInternal.security.warnAboutPostsWithReports
+        }
+    }
+}
+
+@Stable
+class AccountReactionPreferences(
+    var reactionChoices: MutableStateFlow<ImmutableList<String>>,
+)
+
+@Stable
+class AccountZapPreferences(
+    var zapAmountChoices: MutableStateFlow<ImmutableList<Long>>,
+    val defaultZapType: MutableStateFlow<LnZapEvent.ZapType>,
+)
+
+@Stable
+class AccountLanguagePreferences(
+    var dontTranslateFrom: Set<String>,
+    var languagePreferences: Map<String, String>,
+    var translateTo: String,
+) {
+    // ---
+    // language services
+    // ---
+    fun toggleDontTranslateFrom(languageCode: String) {
+        if (!dontTranslateFrom.contains(languageCode)) {
+            dontTranslateFrom = dontTranslateFrom.plus(languageCode)
+        } else {
+            dontTranslateFrom = dontTranslateFrom.minus(languageCode)
+        }
+    }
+
+    fun translateToContains(languageCode: Locale) = translateTo.contains(languageCode.language)
+
+    fun updateTranslateTo(languageCode: Locale): Boolean {
+        if (translateTo != languageCode.language) {
+            translateTo = languageCode.language
+            return true
+        }
+        return false
+    }
+
+    fun prefer(
+        source: String,
+        target: String,
+        preference: String,
+    ) {
+        val key = "$source,$target"
+        if (key !in languagePreferences) {
+            languagePreferences = languagePreferences + Pair(key, preference)
+        } else {
+            if (languagePreferences.get(key) == preference) {
+                languagePreferences = languagePreferences.minus(key)
+            } else {
+                languagePreferences = languagePreferences + Pair(key, preference)
+            }
+        }
+    }
+
+    fun preferenceBetween(
+        source: String,
+        target: String,
+    ): String? = languagePreferences["$source,$target"]
+}
+
+@Stable
+class AccountSecurityPreferences(
+    val showSensitiveContent: MutableStateFlow<Boolean?> = MutableStateFlow(null),
+    var warnAboutPostsWithReports: Boolean = true,
+    var filterSpamFromStrangers: Boolean = true,
+) {
+    fun updateShowSensitiveContent(show: Boolean?): Boolean {
+        if (showSensitiveContent.value != show) {
+            showSensitiveContent.update { show }
+            return true
+        }
+        return false
+    }
+
+    // ---
+    // filters
+    // ---
+    fun updateOptOutOptions(
+        warnReports: Boolean,
+        filterSpam: Boolean,
+    ): Boolean =
+        if (warnAboutPostsWithReports != warnReports || filterSpam != filterSpamFromStrangers) {
+            warnAboutPostsWithReports = warnReports
+            filterSpamFromStrangers = filterSpam
+
+            true
+        } else {
+            false
+        }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSyncedSettingsInternal.kt

@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) 2024 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.amethyst.model
+
+import android.content.res.Resources
+import androidx.core.os.ConfigurationCompat
+import com.vitorpamplona.quartz.events.LnZapEvent
+import java.util.Locale
+
+val DefaultReactions =
+    listOf(
+        "\uD83D\uDE80",
+        "\uD83E\uDEC2",
+        "\uD83D\uDC40",
+        "\uD83D\uDE02",
+        "\uD83C\uDF89",
+        "\uD83E\uDD14",
+        "\uD83D\uDE31",
+    )
+
+val DefaultZapAmounts = listOf(100L, 500L, 1000L)
+
+fun getLanguagesSpokenByUser(): Set<String> {
+    val languageList = ConfigurationCompat.getLocales(Resources.getSystem().getConfiguration())
+    val codedList = mutableSetOf<String>()
+    for (i in 0 until languageList.size()) {
+        languageList.get(i)?.let { codedList.add(it.language) }
+    }
+    return codedList
+}
+
+class AccountSyncedSettingsInternal(
+    val reactions: AccountReactionPreferencesInternal = AccountReactionPreferencesInternal(),
+    val zaps: AccountZapPreferencesInternal = AccountZapPreferencesInternal(),
+    val languages: AccountLanguagePreferencesInternal = AccountLanguagePreferencesInternal(),
+    val security: AccountSecurityPreferencesInternal = AccountSecurityPreferencesInternal(),
+)
+
+class AccountReactionPreferencesInternal(
+    var reactionChoices: List<String> = DefaultReactions,
+)
+
+class AccountZapPreferencesInternal(
+    var zapAmountChoices: List<Long> = DefaultZapAmounts,
+    val defaultZapType: LnZapEvent.ZapType = LnZapEvent.ZapType.PUBLIC,
+)
+
+class AccountLanguagePreferencesInternal(
+    var dontTranslateFrom: Set<String> = getLanguagesSpokenByUser(),
+    var languagePreferences: Map<String, String> = mapOf(),
+    var translateTo: String = Locale.getDefault().language,
+)
+
+class AccountSecurityPreferencesInternal(
+    val showSensitiveContent: Boolean? = null,
+    var warnAboutPostsWithReports: Boolean = true,
+    var filterSpamFromStrangers: Boolean = true,
+)

amethyst/src/main/java/com/vitorpamplona/amethyst/model/Channel.kt

@@ -31,7 +31,7 @@ import com.vitorpamplona.ammolite.relays.BundledUpdate
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.Hex
 import com.vitorpamplona.quartz.encoders.HexKey
-import com.vitorpamplona.quartz.encoders.toNote
+import com.vitorpamplona.quartz.encoders.toNEvent
 import com.vitorpamplona.quartz.events.ChannelCreateEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesEvent
 import kotlinx.coroutines.Dispatchers
@@ -107,7 +107,7 @@ abstract class Channel(
 
     open fun id() = Hex.decode(idHex)
 
-    open fun idNote() = id().toNote()
+    open fun idNote() = id().toNEvent()
 
     open fun idDisplayNote() = idNote().toShortenHex()
 

amethyst/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt

@@ -34,6 +34,7 @@ import com.vitorpamplona.amethyst.commons.hashtags.Cashu
 import com.vitorpamplona.amethyst.commons.hashtags.Coffee
 import com.vitorpamplona.amethyst.commons.hashtags.CustomHashTagIcons
 import com.vitorpamplona.amethyst.commons.hashtags.Footstr
+import com.vitorpamplona.amethyst.commons.hashtags.Gamestr
 import com.vitorpamplona.amethyst.commons.hashtags.Grownostr
 import com.vitorpamplona.amethyst.commons.hashtags.Lightning
 import com.vitorpamplona.amethyst.commons.hashtags.Mate
@@ -56,7 +57,7 @@ import com.vitorpamplona.quartz.events.EmptyTagList
 fun RenderHashTagIconsPreview() {
     ThemeComparisonColumn {
         RenderRegular(
-            "Testing rendering of hashtags: #Bitcoin, #nostr, #lightning, #zap, #amethyst, #cashu, #plebs, #coffee, #skullofsatoshi, #grownostr, #footstr, #tunestr, #weed, #mate",
+            "Testing rendering of hashtags: #Bitcoin, #nostr, #lightning, #zap, #amethyst, #cashu, #plebs, #coffee, #skullofsatoshi, #grownostr, #footstr, #tunestr, #weed, #mate, #gamestr, #gamechain",
             EmptyTagList,
         ) { word, state ->
             when (word) {
@@ -83,6 +84,7 @@ fun checkForHashtagWithIcon(tag: String): HashtagIcon? =
         "tunestr", "music", "nowplaying" -> tunestr
         "mate", "matechain", "matestr" -> matestr
         "weed", "weedstr", "420", "cannabis", "marijuana" -> weed
+        "gamestr", "gaming", "gamechain" -> gamestr
         else -> null
     }
 
@@ -100,6 +102,7 @@ val footstr = HashtagIcon(CustomHashTagIcons.Footstr, "Footstr", Modifier.paddin
 val tunestr = HashtagIcon(CustomHashTagIcons.Tunestr, "Tunestr", Modifier.padding(start = 1.dp, bottom = 1.dp, top = 1.dp))
 val weed = HashtagIcon(CustomHashTagIcons.Weed, "Weed", Modifier.padding(start = 1.dp, bottom = 0.dp, top = 0.dp))
 val matestr = HashtagIcon(CustomHashTagIcons.Mate, "Mate", Modifier.padding(start = 1.dp, bottom = 0.dp, top = 0.dp))
+val gamestr = HashtagIcon(CustomHashTagIcons.Gamestr, "GameStr", Modifier.padding(start = 1.dp, bottom = 0.dp, top = 0.dp))
 
 @Immutable
 class HashtagIcon(

amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt

@@ -40,12 +40,15 @@ import com.vitorpamplona.quartz.events.AddressableEvent
 import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.events.AppDefinitionEvent
 import com.vitorpamplona.quartz.events.AppRecommendationEvent
+import com.vitorpamplona.quartz.events.AppSpecificDataEvent
 import com.vitorpamplona.quartz.events.AudioHeaderEvent
 import com.vitorpamplona.quartz.events.AudioTrackEvent
 import com.vitorpamplona.quartz.events.BadgeAwardEvent
 import com.vitorpamplona.quartz.events.BadgeDefinitionEvent
 import com.vitorpamplona.quartz.events.BadgeProfilesEvent
 import com.vitorpamplona.quartz.events.BaseAddressableEvent
+import com.vitorpamplona.quartz.events.BaseTextNoteEvent
+import com.vitorpamplona.quartz.events.BlossomServersEvent
 import com.vitorpamplona.quartz.events.BookmarkListEvent
 import com.vitorpamplona.quartz.events.CalendarDateSlotEvent
 import com.vitorpamplona.quartz.events.CalendarEvent
@@ -57,10 +60,12 @@ import com.vitorpamplona.quartz.events.ChannelListEvent
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.ChannelMetadataEvent
 import com.vitorpamplona.quartz.events.ChannelMuteUserEvent
+import com.vitorpamplona.quartz.events.ChatMessageEncryptedFileHeaderEvent
 import com.vitorpamplona.quartz.events.ChatMessageEvent
 import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent
 import com.vitorpamplona.quartz.events.ChatroomKey
 import com.vitorpamplona.quartz.events.ClassifiedsEvent
+import com.vitorpamplona.quartz.events.CommentEvent
 import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
 import com.vitorpamplona.quartz.events.CommunityListEvent
 import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
@@ -82,6 +87,9 @@ import com.vitorpamplona.quartz.events.GitPatchEvent
 import com.vitorpamplona.quartz.events.GitReplyEvent
 import com.vitorpamplona.quartz.events.GitRepositoryEvent
 import com.vitorpamplona.quartz.events.HighlightEvent
+import com.vitorpamplona.quartz.events.InteractiveStoryPrologueEvent
+import com.vitorpamplona.quartz.events.InteractiveStoryReadingStateEvent
+import com.vitorpamplona.quartz.events.InteractiveStorySceneEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesEvent
 import com.vitorpamplona.quartz.events.LnZapEvent
@@ -99,6 +107,7 @@ import com.vitorpamplona.quartz.events.NIP90UserDiscoveryResponseEvent
 import com.vitorpamplona.quartz.events.NNSEvent
 import com.vitorpamplona.quartz.events.OtsEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
+import com.vitorpamplona.quartz.events.PictureEvent
 import com.vitorpamplona.quartz.events.PinListEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.PrivateDmEvent
@@ -106,6 +115,7 @@ import com.vitorpamplona.quartz.events.PrivateOutboxRelayListEvent
 import com.vitorpamplona.quartz.events.ProfileGalleryEntryEvent
 import com.vitorpamplona.quartz.events.ReactionEvent
 import com.vitorpamplona.quartz.events.RecommendRelayEvent
+import com.vitorpamplona.quartz.events.RelationshipStatusEvent
 import com.vitorpamplona.quartz.events.RelaySetEvent
 import com.vitorpamplona.quartz.events.ReportEvent
 import com.vitorpamplona.quartz.events.RepostEvent
@@ -437,61 +447,30 @@ object LocalCache {
     fun consume(
         event: TextNoteEvent,
         relay: Relay? = null,
-    ) {
-        val note = getOrCreateNote(event.id)
-        val author = getOrCreateUser(event.pubKey)
-
-        if (relay != null) {
-            author.addRelayBeingUsed(relay, event.createdAt)
-            note.addRelay(relay)
-        }
-
-        // Already processed this event.
-        if (note.event != null) return
-
-        if (antiSpam.isSpam(event, relay)) {
-            return
-        }
-
-        val replyTo = computeReplyTo(event)
-
-        note.loadEvent(event, author, replyTo)
-
-        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()}
-        // ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
-
-        // Counts the replies
-        replyTo.forEach { it.addReply(note) }
-
-        refreshObservers(note)
-    }
+    ) = consumeRegularEvent(event, relay)
 
     fun consume(
         event: TorrentEvent,
         relay: Relay?,
-    ) {
-        val note = getOrCreateNote(event.id)
-        val author = getOrCreateUser(event.pubKey)
-
-        if (relay != null) {
-            author.addRelayBeingUsed(relay, event.createdAt)
-            note.addRelay(relay)
-        }
-
-        // Already processed this event.
-        if (note.event != null) return
-
-        if (antiSpam.isSpam(event, relay)) {
-            return
-        }
-
-        note.loadEvent(event, author, emptyList())
-
-        refreshObservers(note)
-    }
+    ) = consumeRegularEvent(event, relay)
 
     fun consume(
-        event: TorrentCommentEvent,
+        event: InteractiveStoryPrologueEvent,
+        relay: Relay?,
+    ) = consumeBaseReplaceable(event, relay)
+
+    fun consume(
+        event: InteractiveStorySceneEvent,
+        relay: Relay?,
+    ) = consumeBaseReplaceable(event, relay)
+
+    fun consume(
+        event: InteractiveStoryReadingStateEvent,
+        relay: Relay?,
+    ) = consumeBaseReplaceable(event, relay)
+
+    fun consumeRegularEvent(
+        event: Event,
         relay: Relay?,
     ) {
         val note = getOrCreateNote(event.id)
@@ -505,242 +484,69 @@ object LocalCache {
         // Already processed this event.
         if (note.event != null) return
 
-        if (antiSpam.isSpam(event, relay)) {
+        val replyTo = computeReplyTo(event)
+
+        if (event is BaseTextNoteEvent && antiSpam.isSpam(event, relay)) {
             return
         }
 
-        val replyTo = computeReplyTo(event)
-
         note.loadEvent(event, author, replyTo)
 
         // Counts the replies
-        replyTo.forEach {
-            it.addReply(note)
-        }
+        replyTo.forEach { it.addReply(note) }
 
         refreshObservers(note)
     }
 
+    fun consume(
+        event: PictureEvent,
+        relay: Relay?,
+    ) = consumeRegularEvent(event, relay)
+
+    fun consume(
+        event: TorrentCommentEvent,
+        relay: Relay?,
+    ) = consumeRegularEvent(event, relay)
+
     fun consume(
         event: NIP90ContentDiscoveryResponseEvent,
-        relay: Relay? = null,
-    ) {
-        val note = getOrCreateNote(event.id)
-        val author = getOrCreateUser(event.pubKey)
-
-        // Log.d("TN", "New Response ${event.taggedEvents().joinToString(", ") { it }}}")
-
-        if (relay != null) {
-            author.addRelayBeingUsed(relay, event.createdAt)
-            note.addRelay(relay)
-        }
-
-        // Already processed this event.
-        if (note.event != null) return
-
-        val replyTo = computeReplyTo(event)
-
-        note.loadEvent(event, author, replyTo)
-
-        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()}
-        // ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
-
-        // Counts the replies
-        replyTo.forEach { it.addReply(note) }
-
-        refreshObservers(note)
-    }
+        relay: Relay?,
+    ) = consumeRegularEvent(event, relay)
 
     fun consume(
         event: NIP90ContentDiscoveryRequestEvent,
-        relay: Relay? = null,
-    ) {
-        val note = getOrCreateNote(event.id)
-        val author = getOrCreateUser(event.pubKey)
-
-        if (relay != null) {
-            author.addRelayBeingUsed(relay, event.createdAt)
-            note.addRelay(relay)
-        }
-
-        // Already processed this event.
-        if (note.event != null) return
-
-        val replyTo = computeReplyTo(event)
-
-        note.loadEvent(event, author, replyTo)
-
-        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()}
-        // ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
-
-        // Counts the replies
-        replyTo.forEach { it.addReply(note) }
-
-        refreshObservers(note)
-    }
+        relay: Relay?,
+    ) = consumeRegularEvent(event, relay)
 
     fun consume(
         event: NIP90StatusEvent,
-        relay: Relay? = null,
-    ) {
-        val note = getOrCreateNote(event.id)
-        val author = getOrCreateUser(event.pubKey)
-
-        if (relay != null) {
-            author.addRelayBeingUsed(relay, event.createdAt)
-            note.addRelay(relay)
-        }
-
-        // Already processed this event.
-        if (note.event != null) return
-
-        val replyTo = computeReplyTo(event)
-
-        note.loadEvent(event, author, replyTo)
-
-        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()}
-        // ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
-
-        // Counts the replies
-        replyTo.forEach { it.addReply(note) }
-
-        refreshObservers(note)
-    }
+        relay: Relay?,
+    ) = consumeRegularEvent(event, relay)
 
     fun consume(
         event: NIP90UserDiscoveryResponseEvent,
-        relay: Relay? = null,
-    ) {
-        val note = getOrCreateNote(event.id)
-        val author = getOrCreateUser(event.pubKey)
-
-        if (relay != null) {
-            author.addRelayBeingUsed(relay, event.createdAt)
-            note.addRelay(relay)
-        }
-
-        // Already processed this event.
-        if (note.event != null) return
-
-        val replyTo = computeReplyTo(event)
-
-        note.loadEvent(event, author, replyTo)
-
-        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()}
-        // ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
-
-        // Counts the replies
-        replyTo.forEach { it.addReply(note) }
-
-        refreshObservers(note)
-    }
+        relay: Relay?,
+    ) = consumeRegularEvent(event, relay)
 
     fun consume(
         event: NIP90UserDiscoveryRequestEvent,
-        relay: Relay? = null,
-    ) {
-        val note = getOrCreateNote(event.id)
-        val author = getOrCreateUser(event.pubKey)
-
-        if (relay != null) {
-            author.addRelayBeingUsed(relay, event.createdAt)
-            note.addRelay(relay)
-        }
-
-        // Already processed this event.
-        if (note.event != null) return
-
-        val replyTo = computeReplyTo(event)
-
-        note.loadEvent(event, author, replyTo)
-
-        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()}
-        // ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
-
-        // Counts the replies
-        replyTo.forEach { it.addReply(note) }
-
-        refreshObservers(note)
-    }
+        relay: Relay?,
+    ) = consumeRegularEvent(event, relay)
 
     fun consume(
         event: GitPatchEvent,
-        relay: Relay? = null,
-    ) {
-        val note = getOrCreateNote(event.id)
-        val author = getOrCreateUser(event.pubKey)
-
-        if (relay != null) {
-            author.addRelayBeingUsed(relay, event.createdAt)
-            note.addRelay(relay)
-        }
-
-        // Already processed this event.
-        if (note.event != null) return
-
-        if (antiSpam.isSpam(event, relay)) {
-            return
-        }
-
-        note.loadEvent(event, author, emptyList())
-
-        refreshObservers(note)
-    }
+        relay: Relay?,
+    ) = consumeRegularEvent(event, relay)
 
     fun consume(
         event: GitIssueEvent,
-        relay: Relay? = null,
-    ) {
-        val note = getOrCreateNote(event.id)
-        val author = getOrCreateUser(event.pubKey)
-
-        if (relay != null) {
-            author.addRelayBeingUsed(relay, event.createdAt)
-            note.addRelay(relay)
-        }
-
-        // Already processed this event.
-        if (note.event != null) return
-
-        if (antiSpam.isSpam(event, relay)) {
-            return
-        }
-
-        note.loadEvent(event, author, emptyList())
-
-        refreshObservers(note)
-    }
+        relay: Relay?,
+    ) = consumeRegularEvent(event, relay)
 
     fun consume(
         event: GitReplyEvent,
-        relay: Relay? = null,
-    ) {
-        val note = getOrCreateNote(event.id)
-        val author = getOrCreateUser(event.pubKey)
-
-        if (relay != null) {
-            author.addRelayBeingUsed(relay, event.createdAt)
-            note.addRelay(relay)
-        }
-
-        // Already processed this event.
-        if (note.event != null) return
-
-        if (antiSpam.isSpam(event, relay)) {
-            return
-        }
-
-        val replyTo = computeReplyTo(event)
-
-        // println("New GitReply ${event.id} for ${replyTo.firstOrNull()?.event?.id()} ${event.tagsWithoutCitations().filter { it != event.repository()?.toTag() }.firstOrNull()}")
-
-        note.loadEvent(event, author, replyTo)
-
-        // Counts the replies
-        replyTo.forEach { it.addReply(note) }
-
-        refreshObservers(note)
-    }
+        relay: Relay?,
+    ) = consumeRegularEvent(event, relay)
 
     fun consume(
         event: LongTextNoteEvent,
@@ -817,7 +623,11 @@ object LocalCache {
             is LongTextNoteEvent -> event.tagsWithoutCitations().mapNotNull { checkGetOrCreateNote(it) }
             is GitReplyEvent -> event.tagsWithoutCitations().filter { it != event.repository()?.toTag() }.mapNotNull { checkGetOrCreateNote(it) }
             is TextNoteEvent -> event.tagsWithoutCitations().mapNotNull { checkGetOrCreateNote(it) }
+            is CommentEvent -> event.tagsWithoutCitations().mapNotNull { checkGetOrCreateNote(it) }
+
             is ChatMessageEvent -> event.taggedEvents().mapNotNull { checkGetOrCreateNote(it) }
+            is ChatMessageEncryptedFileHeaderEvent -> event.taggedEvents().mapNotNull { checkGetOrCreateNote(it) }
+
             is LnZapEvent ->
                 event.zappedPost().mapNotNull { checkGetOrCreateNote(it) } +
                     event.taggedAddresses().map { getOrCreateAddressableNote(it) } +
@@ -865,35 +675,8 @@ object LocalCache {
 
     fun consume(
         event: PollNoteEvent,
-        relay: Relay? = null,
-    ) {
-        val note = getOrCreateNote(event.id)
-        val author = getOrCreateUser(event.pubKey)
-
-        if (relay != null) {
-            author.addRelayBeingUsed(relay, event.createdAt)
-            note.addRelay(relay)
-        }
-
-        // Already processed this event.
-        if (note.event != null) return
-
-        if (antiSpam.isSpam(event, relay)) {
-            return
-        }
-
-        val replyTo = computeReplyTo(event)
-
-        note.loadEvent(event, author, replyTo)
-
-        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()}
-        // ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
-
-        // Counts the replies
-        replyTo.forEach { it.addReply(note) }
-
-        refreshObservers(note)
-    }
+        relay: Relay?,
+    ) = consumeRegularEvent(event, relay)
 
     private fun consume(
         event: LiveActivitiesEvent,
@@ -953,6 +736,13 @@ object LocalCache {
         consumeBaseReplaceable(event, relay)
     }
 
+    fun consume(
+        event: BlossomServersEvent,
+        relay: Relay?,
+    ) {
+        consumeBaseReplaceable(event, relay)
+    }
+
     fun consume(
         event: FileServersEvent,
         relay: Relay?,
@@ -1083,6 +873,13 @@ object LocalCache {
         }
     }
 
+    fun consume(
+        event: RelationshipStatusEvent,
+        relay: Relay?,
+    ) {
+        consumeBaseReplaceable(event, relay)
+    }
+
     fun consume(
         event: OtsEvent,
         relay: Relay?,
@@ -1133,25 +930,10 @@ object LocalCache {
         }
     }
 
-    fun consume(event: BadgeAwardEvent) {
-        val note = getOrCreateNote(event.id)
-
-        // Already processed this event.
-        if (note.event != null) return
-
-        // Log.d("TN", "New Boost (${notes.size},${users.size}) ${note.author?.toBestDisplayName()}
-        // ${formattedDateTime(event.createdAt)}")
-
-        val author = getOrCreateUser(event.pubKey)
-        val awardDefinition = computeReplyTo(event)
-
-        note.loadEvent(event, author, awardDefinition)
-
-        // Replies of an Badge Definition are Award Events
-        awardDefinition.forEach { it.addReply(note) }
-
-        refreshObservers(note)
-    }
+    fun consume(
+        event: BadgeAwardEvent,
+        relay: Relay?,
+    ) = consumeRegularEvent(event, relay)
 
     private fun comsume(
         event: NNSEvent,
@@ -1232,6 +1014,13 @@ object LocalCache {
         consumeBaseReplaceable(event, relay)
     }
 
+    fun consume(
+        event: AppSpecificDataEvent,
+        relay: Relay?,
+    ) {
+        consumeBaseReplaceable(event, relay)
+    }
+
     @Suppress("UNUSED_PARAMETER")
     fun consume(event: RecommendRelayEvent) {
         //        // Log.d("RR", event.toJson())
@@ -1624,6 +1413,11 @@ object LocalCache {
         refreshObservers(note)
     }
 
+    fun consume(
+        event: CommentEvent,
+        relay: Relay?,
+    ) = consumeRegularEvent(event, relay)
+
     fun consume(
         event: LiveActivitiesChatMessageEvent,
         relay: Relay?,
@@ -1719,102 +1513,27 @@ object LocalCache {
     fun consume(
         event: AudioHeaderEvent,
         relay: Relay?,
-    ) {
-        val note = getOrCreateNote(event.id)
-        val author = getOrCreateUser(event.pubKey)
-
-        if (relay != null) {
-            author.addRelayBeingUsed(relay, event.createdAt)
-            note.addRelay(relay)
-        }
-
-        // Already processed this event.
-        if (note.event != null) return
-
-        note.loadEvent(event, author, emptyList())
-
-        refreshObservers(note)
-    }
+    ) = consumeRegularEvent(event, relay)
 
     fun consume(
         event: FileHeaderEvent,
         relay: Relay?,
-    ) {
-        val note = getOrCreateNote(event.id)
-        val author = getOrCreateUser(event.pubKey)
-
-        if (relay != null) {
-            author.addRelayBeingUsed(relay, event.createdAt)
-            note.addRelay(relay)
-        }
-
-        // Already processed this event.
-        if (note.event != null) return
-
-        note.loadEvent(event, author, emptyList())
-
-        refreshObservers(note)
-    }
+    ) = consumeRegularEvent(event, relay)
 
     fun consume(
         event: ProfileGalleryEntryEvent,
         relay: Relay?,
-    ) {
-        val note = getOrCreateNote(event.id)
-        val author = getOrCreateUser(event.pubKey)
-
-        if (relay != null) {
-            author.addRelayBeingUsed(relay, event.createdAt)
-            note.addRelay(relay)
-        }
-
-        // Already processed this event.
-        if (note.event != null) return
-
-        note.loadEvent(event, author, emptyList())
-
-        refreshObservers(note)
-    }
+    ) = consumeRegularEvent(event, relay)
 
     fun consume(
         event: FileStorageHeaderEvent,
         relay: Relay?,
-    ) {
-        val note = getOrCreateNote(event.id)
-        val author = getOrCreateUser(event.pubKey)
-
-        if (relay != null) {
-            author.addRelayBeingUsed(relay, event.createdAt)
-            note.addRelay(relay)
-        }
-
-        // Already processed this event.
-        if (note.event != null) return
-
-        note.loadEvent(event, author, emptyList())
-
-        refreshObservers(note)
-    }
+    ) = consumeRegularEvent(event, relay)
 
     fun consume(
         event: FhirResourceEvent,
         relay: Relay?,
-    ) {
-        val note = getOrCreateNote(event.id)
-        val author = getOrCreateUser(event.pubKey)
-
-        if (relay != null) {
-            author.addRelayBeingUsed(relay, event.createdAt)
-            note.addRelay(relay)
-        }
-
-        // Already processed this event.
-        if (note.event != null) return
-
-        note.loadEvent(event, author, emptyList())
-
-        refreshObservers(note)
-    }
+    ) = consumeRegularEvent(event, relay)
 
     fun consume(
         event: TextNoteModificationEvent,
@@ -1847,22 +1566,7 @@ object LocalCache {
     fun consume(
         event: HighlightEvent,
         relay: Relay?,
-    ) {
-        val note = getOrCreateNote(event.id)
-        val author = getOrCreateUser(event.pubKey)
-
-        if (relay != null) {
-            author.addRelayBeingUsed(relay, event.createdAt)
-            note.addRelay(relay)
-        }
-
-        // Already processed this event.
-        if (note.event != null) return
-
-        note.loadEvent(event, author, emptyList())
-
-        refreshObservers(note)
-    }
+    ) = consumeRegularEvent(event, relay)
 
     fun consume(
         event: FileStorageEvent,
@@ -1920,7 +1624,50 @@ object LocalCache {
         // Already processed this event.
         if (note.event != null) return
 
-        val recipientsHex = event.recipientsPubKey().plus(event.pubKey).toSet()
+        val recipientsHex = event.groupMembers()
+        val recipients = recipientsHex.mapNotNull { checkGetOrCreateUser(it) }.toSet()
+
+        // Log.d("PM", "${author.toBestDisplayName()} to ${recipient?.toBestDisplayName()}")
+
+        val repliesTo = computeReplyTo(event)
+
+        note.loadEvent(event, author, repliesTo)
+
+        if (recipients.isNotEmpty()) {
+            recipients.forEach {
+                val groupMinusRecipient = recipientsHex.minus(it.pubkeyHex)
+
+                val authorGroup =
+                    if (groupMinusRecipient.isEmpty()) {
+                        // note to self
+                        ChatroomKey(persistentSetOf(it.pubkeyHex))
+                    } else {
+                        ChatroomKey(groupMinusRecipient.toImmutableSet())
+                    }
+
+                it.addMessage(authorGroup, note)
+            }
+        }
+
+        refreshObservers(note)
+    }
+
+    private fun consume(
+        event: ChatMessageEncryptedFileHeaderEvent,
+        relay: Relay?,
+    ) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        val recipientsHex = event.groupMembers()
         val recipients = recipientsHex.mapNotNull { checkGetOrCreateUser(it) }.toSet()
 
         // Log.d("PM", "${author.toBestDisplayName()} to ${recipient?.toBestDisplayName()}")
@@ -2035,7 +1782,10 @@ object LocalCache {
         }
     }
 
-    fun findUsersStartingWith(username: String): List<User> {
+    fun findUsersStartingWith(
+        username: String,
+        forAccount: Account?,
+    ): List<User> {
         checkNotInMainThread()
 
         val key = decodePublicKeyAsHexOrNull(username)
@@ -2047,14 +1797,30 @@ object LocalCache {
             }
         }
 
-        return users.filter { _, user: User ->
-            (user.anyNameStartsWith(username)) ||
-                user.pubkeyHex.startsWith(username, true) ||
-                user.pubkeyNpub().startsWith(username, true)
-        }
+        val finds =
+            users.filter { _, user: User ->
+                (
+                    (user.anyNameStartsWith(username)) ||
+                        user.pubkeyHex.startsWith(username, true) ||
+                        user.pubkeyNpub().startsWith(username, true)
+                ) &&
+                    (forAccount == null || (!forAccount.isHidden(user) && !user.containsAny(forAccount.flowHiddenUsers.value.hiddenWordsCase)))
+            }
+
+        return finds.sortedWith(
+            compareBy(
+                { forAccount?.isFollowing(it) == false },
+                { !it.toBestDisplayName().startsWith(username, ignoreCase = true) },
+                { it.toBestDisplayName().lowercase() },
+                { it.pubkeyHex },
+            ),
+        )
     }
 
-    fun findNotesStartingWith(text: String): List<Note> {
+    fun findNotesStartingWith(
+        text: String,
+        forAccount: Account,
+    ): List<Note> {
         checkNotInMainThread()
 
         val key = decodeEventIdAsHexOrNull(text)
@@ -2078,14 +1844,21 @@ object LocalCache {
             }
 
             if (note.event?.matchTag1With(text) == true ||
-                note.idHex.startsWith(text, true) ||
-                note.idNote().startsWith(text, true)
+                note.idHex.startsWith(text, true)
             ) {
-                return@filter true
+                if (!note.isHiddenFor(forAccount.flowHiddenUsers.value)) {
+                    return@filter true
+                } else {
+                    return@filter false
+                }
             }
 
             if (note.event?.isContentEncoded() == false) {
-                return@filter note.event?.content()?.contains(text, true) ?: false
+                if (!note.isHiddenFor(forAccount.flowHiddenUsers.value)) {
+                    return@filter note.event?.content()?.contains(text, true) ?: false
+                } else {
+                    return@filter false
+                }
             }
 
             return@filter false
@@ -2104,11 +1877,19 @@ object LocalCache {
                 if (addressable.event?.matchTag1With(text) == true ||
                     addressable.idHex.startsWith(text, true)
                 ) {
-                    return@filter true
+                    if (!addressable.isHiddenFor(forAccount.flowHiddenUsers.value)) {
+                        return@filter true
+                    } else {
+                        return@filter false
+                    }
                 }
 
                 if (addressable.event?.isContentEncoded() == false) {
-                    return@filter addressable.event?.content()?.contains(text, true) ?: false
+                    if (!addressable.isHiddenFor(forAccount.flowHiddenUsers.value)) {
+                        return@filter addressable.event?.content()?.contains(text, true) ?: false
+                    } else {
+                        return@filter false
+                    }
                 }
 
                 return@filter false
@@ -2529,7 +2310,27 @@ object LocalCache {
                 }
             }
             is ChatMessageEvent -> {
-                val recipientsHex = draft.recipientsPubKey().plus(draftWrap.pubKey).toSet()
+                val recipientsHex = draft.groupMembers()
+                val recipients = recipientsHex.mapNotNull { checkGetOrCreateUser(it) }.toSet()
+
+                if (recipients.isNotEmpty()) {
+                    recipients.forEach {
+                        val groupMinusRecipient = recipientsHex.minus(it.pubkeyHex)
+
+                        val authorGroup =
+                            if (groupMinusRecipient.isEmpty()) {
+                                // note to self
+                                ChatroomKey(persistentSetOf(it.pubkeyHex))
+                            } else {
+                                ChatroomKey(groupMinusRecipient.toImmutableSet())
+                            }
+
+                        it.addMessage(authorGroup, note)
+                    }
+                }
+            }
+            is ChatMessageEncryptedFileHeaderEvent -> {
+                val recipientsHex = draft.groupMembers()
                 val recipients = recipientsHex.mapNotNull { checkGetOrCreateUser(it) }.toSet()
 
                 if (recipients.isNotEmpty()) {
@@ -2597,6 +2398,26 @@ object LocalCache {
                     }
                 }
             }
+            is ChatMessageEncryptedFileHeaderEvent -> {
+                val recipientsHex = draft.groupMembers()
+                val recipients = recipientsHex.mapNotNull { checkGetOrCreateUser(it) }.toSet()
+
+                if (recipients.isNotEmpty()) {
+                    recipients.forEach {
+                        val groupMinusRecipient = recipientsHex.minus(it.pubkeyHex)
+
+                        val authorGroup =
+                            if (groupMinusRecipient.isEmpty()) {
+                                // note to self
+                                ChatroomKey(persistentSetOf(it.pubkeyHex))
+                            } else {
+                                ChatroomKey(groupMinusRecipient.toImmutableSet())
+                            }
+
+                        it.removeMessage(authorGroup, draftWrap)
+                    }
+                }
+            }
             is ChannelMessageEvent -> {
                 draft.channel()?.let { channelId ->
                     checkGetOrCreateChannel(channelId)?.let { channel ->
@@ -2645,11 +2466,13 @@ object LocalCache {
                 is AdvertisedRelayListEvent -> consume(event, relay)
                 is AppDefinitionEvent -> consume(event, relay)
                 is AppRecommendationEvent -> consume(event, relay)
+                is AppSpecificDataEvent -> consume(event, relay)
                 is AudioHeaderEvent -> consume(event, relay)
                 is AudioTrackEvent -> consume(event, relay)
-                is BadgeAwardEvent -> consume(event)
+                is BadgeAwardEvent -> consume(event, relay)
                 is BadgeDefinitionEvent -> consume(event, relay)
                 is BadgeProfilesEvent -> consume(event)
+                is BlossomServersEvent -> consume(event, relay)
                 is BookmarkListEvent -> consume(event)
                 is CalendarEvent -> consume(event, relay)
                 is CalendarDateSlotEvent -> consume(event, relay)
@@ -2661,9 +2484,11 @@ object LocalCache {
                 is ChannelMessageEvent -> consume(event, relay)
                 is ChannelMetadataEvent -> consume(event)
                 is ChannelMuteUserEvent -> consume(event)
+                is ChatMessageEncryptedFileHeaderEvent -> consume(event, relay)
                 is ChatMessageEvent -> consume(event, relay)
                 is ChatMessageRelayListEvent -> consume(event, relay)
                 is ClassifiedsEvent -> consume(event, relay)
+                is CommentEvent -> consume(event, relay)
                 is CommunityDefinitionEvent -> consume(event, relay)
                 is CommunityListEvent -> consume(event, relay)
                 is CommunityPostApprovalEvent -> {
@@ -2691,6 +2516,9 @@ object LocalCache {
                 is GitPatchEvent -> consume(event, relay)
                 is GitRepositoryEvent -> consume(event, relay)
                 is HighlightEvent -> consume(event, relay)
+                is InteractiveStoryPrologueEvent -> consume(event, relay)
+                is InteractiveStorySceneEvent -> consume(event, relay)
+                is InteractiveStoryReadingStateEvent -> consume(event, relay)
                 is LiveActivitiesEvent -> consume(event, relay)
                 is LiveActivitiesChatMessageEvent -> consume(event, relay)
                 is LnZapEvent -> {
@@ -2713,6 +2541,7 @@ object LocalCache {
                 is MuteListEvent -> consume(event, relay)
                 is NNSEvent -> comsume(event, relay)
                 is OtsEvent -> consume(event, relay)
+                is PictureEvent -> consume(event, relay)
                 is PrivateDmEvent -> consume(event, relay)
                 is PrivateOutboxRelayListEvent -> consume(event, relay)
                 is PinListEvent -> consume(event, relay)
@@ -2720,6 +2549,7 @@ object LocalCache {
                 is PollNoteEvent -> consume(event, relay)
                 is ReactionEvent -> consume(event)
                 is RecommendRelayEvent -> consume(event)
+                is RelationshipStatusEvent -> consume(event, relay)
                 is RelaySetEvent -> consume(event, relay)
                 is ReportEvent -> consume(event, relay)
                 is RepostEvent -> {

amethyst/src/main/java/com/vitorpamplona/amethyst/model/Note.kt

@@ -25,9 +25,11 @@ import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.distinctUntilChanged
+import com.vitorpamplona.amethyst.launchAndWaitAll
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.firstFullCharOrEmoji
+import com.vitorpamplona.amethyst.tryAndWait
 import com.vitorpamplona.amethyst.ui.actions.relays.updated
 import com.vitorpamplona.amethyst.ui.note.combineWith
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
@@ -40,7 +42,6 @@ import com.vitorpamplona.quartz.encoders.Hex
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.encoders.LnInvoiceUtil
 import com.vitorpamplona.quartz.encoders.Nip19Bech32
-import com.vitorpamplona.quartz.encoders.toNote
 import com.vitorpamplona.quartz.events.AddressableEvent
 import com.vitorpamplona.quartz.events.BaseTextNoteEvent
 import com.vitorpamplona.quartz.events.ChannelCreateEvent
@@ -70,18 +71,17 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.coroutines.withTimeoutOrNull
 import java.math.BigDecimal
+import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
 
 @Stable
 class AddressableNote(
     val address: ATag,
 ) : Note(address.toTag()) {
-    override fun idNote() = address.toNAddr()
+    override fun idNote() = address.toNAddr(relayHintUrl())
 
-    override fun toNEvent() = address.toNAddr()
+    override fun toNEvent() = address.toNAddr(relayHintUrl())
 
     override fun idDisplayNote() = idNote().toShortenHex()
 
@@ -96,7 +96,7 @@ class AddressableNote(
         return minOf(publishedAt, lastCreatedAt)
     }
 
-    fun dTag(): String? = (event as? AddressableEvent)?.dTag()
+    fun dTag(): String = address.dTag
 
     override fun wasOrShouldBeDeletedBy(
         deletionEvents: Set<HexKey>,
@@ -145,7 +145,7 @@ open class Note(
 
     fun id() = Hex.decode(idHex)
 
-    open fun idNote() = id().toNote()
+    open fun idNote() = toNEvent()
 
     open fun toNEvent(): String {
         val myEvent = event
@@ -156,13 +156,27 @@ open class Note(
                     host.id,
                     host.pubKey,
                     host.kind,
-                    relays.firstOrNull()?.url,
+                    relayHintUrl(),
                 )
             } else {
-                Nip19Bech32.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relays.firstOrNull()?.url)
+                Nip19Bech32.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relayHintUrl())
             }
         } else {
-            Nip19Bech32.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relays.firstOrNull()?.url)
+            Nip19Bech32.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relayHintUrl())
+        }
+    }
+
+    fun relayHintUrl(): String? {
+        val authorRelay = author?.latestMetadataRelay
+
+        return if (relays.isNotEmpty()) {
+            if (authorRelay != null && relays.any { it.url == authorRelay }) {
+                authorRelay
+            } else {
+                relays.firstOrNull()?.url
+            }
+        } else {
+            null
         }
     }
 
@@ -423,31 +437,36 @@ open class Note(
         }
     }
 
-    private fun recursiveIsPaidByCalculation(
+    private suspend fun isPaidByCalculation(
         account: Account,
-        remainingZapPayments: List<Pair<Note, Note?>>,
+        zapEvents: List<Pair<Note, Note?>>,
         onWasZappedByAuthor: () -> Unit,
     ) {
-        if (remainingZapPayments.isEmpty()) {
+        if (zapEvents.isEmpty()) {
             return
         }
 
-        val next = remainingZapPayments.first()
+        var hasSentOne = false
 
-        val zapResponseEvent = next.second?.event as? LnZapPaymentResponseEvent
-        if (zapResponseEvent != null) {
-            account.decryptZapPaymentResponseEvent(zapResponseEvent) { response ->
-                if (
-                    response is PayInvoiceSuccessResponse &&
-                    account.isNIP47Author(zapResponseEvent.requestAuthor())
-                ) {
+        launchAndWaitAll(zapEvents) { next ->
+            val zapResponseEvent = next.second?.event as? LnZapPaymentResponseEvent
+
+            if (zapResponseEvent != null) {
+                val result =
+                    tryAndWait { continuation ->
+                        account.decryptZapPaymentResponseEvent(zapResponseEvent) { response ->
+                            if (
+                                response is PayInvoiceSuccessResponse &&
+                                account.isNIP47Author(zapResponseEvent.requestAuthor())
+                            ) {
+                                continuation.resume(true)
+                            }
+                        }
+                    }
+
+                if (!hasSentOne && result == true) {
+                    hasSentOne = true
                     onWasZappedByAuthor()
-                } else {
-                    recursiveIsPaidByCalculation(
-                        account,
-                        remainingZapPayments.minus(next),
-                        onWasZappedByAuthor,
-                    )
                 }
             }
         }
@@ -457,14 +476,14 @@ open class Note(
         option: Int?,
         user: User,
         account: Account,
-        remainingZapEvents: Map<Note, Note?>,
+        zapEvents: Map<Note, Note?>,
         onWasZappedByAuthor: () -> Unit,
     ) {
-        if (remainingZapEvents.isEmpty()) {
+        if (zapEvents.isEmpty()) {
             return
         }
 
-        remainingZapEvents.forEach { next ->
+        zapEvents.forEach { next ->
             val zapRequest = next.key.event as LnZapRequestEvent
             val zapEvent = next.value?.event as? LnZapEvent
 
@@ -487,11 +506,9 @@ open class Note(
                 } else {
                     if (account.isWriteable()) {
                         val result =
-                            withTimeoutOrNull(1000) {
-                                suspendCancellableCoroutine { continuation ->
-                                    zapRequest.decryptPrivateZap(account.signer) {
-                                        continuation.resume(it)
-                                    }
+                            tryAndWait { continuation ->
+                                zapRequest.decryptPrivateZap(account.signer) {
+                                    continuation.resume(it)
                                 }
                             }
 
@@ -512,7 +529,7 @@ open class Note(
     ) {
         isZappedByCalculation(null, user, account, zaps, onWasZappedByAuthor)
         if (account.userProfile() == user) {
-            recursiveIsPaidByCalculation(account, zapPayments.toList(), onWasZappedByAuthor)
+            isPaidByCalculation(account, zapPayments.toList(), onWasZappedByAuthor)
         }
     }
 
@@ -564,23 +581,79 @@ open class Note(
         zapsAmount = sumOfAmounts
     }
 
-    private fun recursiveZappedAmountCalculation(
-        invoiceSet: LinkedHashSet<String>,
-        remainingZapPayments: List<Pair<Note, Note?>>,
+    private suspend fun zappedAmountCalculation(
+        startAmount: BigDecimal,
+        paidInvoiceSet: LinkedHashSet<String>,
+        zapPayments: List<Pair<Note, Note?>>,
         signer: NostrSigner,
-        output: BigDecimal,
         onReady: (BigDecimal) -> Unit,
     ) {
-        if (remainingZapPayments.isEmpty()) {
-            onReady(output)
+        if (zapPayments.isEmpty()) {
+            onReady(startAmount)
             return
         }
 
-        val next = remainingZapPayments.first()
+        var output: BigDecimal = startAmount
 
-        (next.second?.event as? LnZapPaymentResponseEvent)?.response(signer) { noteEvent ->
+        launchAndWaitAll(zapPayments) { next ->
+            val result =
+                tryAndWait { continuation ->
+                    processZapAmountFromResponse(
+                        next.first,
+                        next.second,
+                        continuation,
+                        signer,
+                    )
+                }
+
+            if (result != null && !paidInvoiceSet.contains(result.invoice)) {
+                paidInvoiceSet.add(result.invoice)
+                output = output.add(result.amount)
+            }
+        }
+
+        onReady(output)
+    }
+
+    private fun processZapAmountFromResponse(
+        paymentRequest: Note,
+        paymentResponse: Note?,
+        continuation: Continuation<InvoiceAmount?>,
+        signer: NostrSigner,
+    ) {
+        val nwcRequest = paymentRequest.event as? LnZapPaymentRequestEvent
+        val nwcResponse = paymentResponse?.event as? LnZapPaymentResponseEvent
+
+        if (nwcRequest != null && nwcResponse != null) {
+            processZapAmountFromResponse(
+                nwcRequest,
+                nwcResponse,
+                continuation,
+                signer,
+            )
+        } else {
+            continuation.resume(null)
+        }
+    }
+
+    class InvoiceAmount(
+        val invoice: String,
+        val amount: BigDecimal,
+    )
+
+    private fun processZapAmountFromResponse(
+        nwcRequest: LnZapPaymentRequestEvent,
+        nwcResponse: LnZapPaymentResponseEvent,
+        continuation: Continuation<InvoiceAmount?>,
+        signer: NostrSigner,
+    ) {
+        // if we can decrypt the reply
+        nwcResponse.response(signer) { noteEvent ->
+            // if it is a sucess
             if (noteEvent is PayInvoiceSuccessResponse) {
-                (next.first.event as? LnZapPaymentRequestEvent)?.lnInvoice(signer) { invoice ->
+                // if we can decrypt the invoice
+                nwcRequest.lnInvoice(signer) { invoice ->
+                    // if we can parse the amount
                     val amount =
                         try {
                             LnInvoiceUtil.getAmountInSats(invoice)
@@ -589,26 +662,20 @@ open class Note(
                             null
                         }
 
-                    var newAmount = output
-
-                    if (amount != null && !invoiceSet.contains(invoice)) {
-                        invoiceSet.add(invoice)
-                        newAmount += amount
+                    // avoid double counting
+                    if (amount != null) {
+                        continuation.resume(InvoiceAmount(invoice, amount))
+                    } else {
+                        continuation.resume(null)
                     }
-
-                    recursiveZappedAmountCalculation(
-                        invoiceSet,
-                        remainingZapPayments.minus(next),
-                        signer,
-                        newAmount,
-                        onReady,
-                    )
                 }
+            } else {
+                continuation.resume(null)
             }
         }
     }
 
-    fun zappedAmountWithNWCPayments(
+    suspend fun zappedAmountWithNWCPayments(
         signer: NostrSigner,
         onReady: (BigDecimal) -> Unit,
     ) {
@@ -619,11 +686,11 @@ open class Note(
         val invoiceSet = LinkedHashSet<String>(zaps.size + zapPayments.size)
         zaps.forEach { (it.value?.event as? LnZapEvent)?.lnInvoice()?.let { invoiceSet.add(it) } }
 
-        recursiveZappedAmountCalculation(
+        zappedAmountCalculation(
+            zapsAmount,
             invoiceSet,
             zapPayments.toList(),
             signer,
-            zapsAmount,
             onReady,
         )
     }
@@ -771,29 +838,11 @@ open class Note(
                 return true
             }
 
-            if (author?.toBestDisplayName()?.containsAny(accountChoices.hiddenWordsCase) == true) {
+            if (thisEvent.anyHashTag { it.containsAny(accountChoices.hiddenWordsCase) }) {
                 return true
             }
 
-            if (author?.profilePicture()?.containsAny(accountChoices.hiddenWordsCase) == true) {
-                return true
-            }
-
-            if (author?.info?.banner?.containsAny(accountChoices.hiddenWordsCase) == true) {
-                return true
-            }
-
-            if (author?.info?.about?.containsAny(accountChoices.hiddenWordsCase) == true) {
-                return true
-            }
-
-            if (author?.info?.lud06?.containsAny(accountChoices.hiddenWordsCase) == true) {
-                return true
-            }
-
-            if (author?.info?.lud16?.containsAny(accountChoices.hiddenWordsCase) == true) {
-                return true
-            }
+            if (author?.containsAny(accountChoices.hiddenWordsCase) == true) return true
         }
 
         return false

amethyst/src/main/java/com/vitorpamplona/amethyst/model/ThreadAssembler.kt

@@ -20,12 +20,14 @@
  */
 package com.vitorpamplona.amethyst.model
 
+import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.events.AddressableEvent
 import com.vitorpamplona.quartz.events.GenericRepostEvent
 import com.vitorpamplona.quartz.events.RepostEvent
-import kotlin.time.measureTimedValue
+import kotlinx.collections.immutable.ImmutableSet
+import kotlinx.collections.immutable.toImmutableSet
 
 class ThreadAssembler {
     private fun searchRoot(
@@ -71,32 +73,50 @@ class ThreadAssembler {
         return null
     }
 
-    fun findThreadFor(noteId: String): Set<Note> {
+    @Stable
+    class ThreadInfo(
+        val root: Note,
+        val allNotes: ImmutableSet<Note>,
+    )
+
+    fun findThreadFor(noteId: String): ThreadInfo? {
         checkNotInMainThread()
 
-        val (result, elapsed) =
-            measureTimedValue {
-                val note = LocalCache.checkGetOrCreateNote(noteId) ?: return emptySet<Note>()
+        val note = LocalCache.checkGetOrCreateNote(noteId) ?: return null
 
-                if (note.event != null) {
-                    val thread = OnlyLatestVersionSet()
+        return if (note.event != null) {
+            val thread = OnlyLatestVersionSet()
 
-                    val threadRoot = searchRoot(note, thread) ?: note
+            val threadRoot = searchRoot(note, thread) ?: note
 
-                    loadDown(threadRoot, thread)
-                    // adds the replies of the note in case the search for Root
-                    // did not added them.
-                    note.replies.forEach { loadDown(it, thread) }
+            loadUp(note, thread)
 
-                    thread
-                } else {
-                    setOf(note)
-                }
-            }
+            loadDown(threadRoot, thread)
+            // adds the replies of the note in case the search for Root
+            // did not added them.
+            note.replies.forEach { loadDown(it, thread) }
 
-        println("Model Refresh: Thread loaded in $elapsed")
+            ThreadInfo(
+                root = note,
+                allNotes = thread.toImmutableSet(),
+            )
+        } else {
+            ThreadInfo(
+                root = note,
+                allNotes = setOf(note).toImmutableSet(),
+            )
+        }
+    }
 
-        return result
+    fun loadUp(
+        note: Note,
+        thread: MutableSet<Note>,
+    ) {
+        if (note !in thread) {
+            thread.add(note)
+
+            note.replyTo?.forEach { loadUp(it, thread) }
+        }
     }
 
     fun loadDown(

amethyst/src/main/java/com/vitorpamplona/amethyst/model/ThreadLevelCalculator.kt

@@ -23,6 +23,7 @@ package com.vitorpamplona.amethyst.model
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.events.GenericRepostEvent
 import com.vitorpamplona.quartz.events.RepostEvent
+import java.lang.Long.min
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
@@ -54,13 +55,23 @@ object ThreadLevelCalculator {
         now: Long,
     ): LevelSignature {
         val replyTo = note.replyTo
+
+        // estimates the min date by replies if it doesn't exist.
+        val createdAt =
+            note.createdAt() ?: min(
+                note.replies.minOfOrNull { it.createdAt() ?: now } ?: now,
+                note.reactions.values.minOfOrNull { it.minOfOrNull { it.createdAt() ?: now } ?: now } ?: now,
+            )
+
+        val noteAuthor = note.author
+
         if (
             note.event is RepostEvent || note.event is GenericRepostEvent || replyTo == null || replyTo.isEmpty()
         ) {
             return LevelSignature(
-                signature = "/" + formattedDateTime(note.createdAt() ?: 0) + note.idHex.substring(0, 8) + ";",
-                createdAt = note.createdAt(),
-                author = note.author,
+                signature = "/" + formattedDateTime(createdAt) + note.idHex.substring(0, 8) + ";",
+                createdAt = createdAt,
+                author = noteAuthor,
             )
         }
 
@@ -86,23 +97,21 @@ object ThreadLevelCalculator {
         val parentSignature = parent?.signature?.removeSuffix(";") ?: ""
 
         val threadOrder =
-            if (parent?.author == note.author && note.createdAt() != null) {
+            if (noteAuthor != null && parent?.author == noteAuthor) {
                 // author of the thread first, in **ascending** order
-                "9" +
-                    formattedDateTime((parent?.createdAt ?: 0) + (now - (note.createdAt() ?: 0))) +
-                    note.idHex.substring(0, 8)
-            } else if (note.author?.pubkeyHex == account.pubkeyHex) {
-                "8" + formattedDateTime(note.createdAt() ?: 0) + note.idHex.substring(0, 8) // my replies
-            } else if (note.author?.pubkeyHex in accountFollowingSet) {
-                "7" + formattedDateTime(note.createdAt() ?: 0) + note.idHex.substring(0, 8) // my follows replies.
+                "9" + formattedDateTime((parent.createdAt ?: 0) + (now - createdAt)) + note.idHex.substring(0, 8)
+            } else if (noteAuthor != null && noteAuthor.pubkeyHex == account.pubkeyHex) {
+                "8" + formattedDateTime(createdAt) + note.idHex.substring(0, 8) // my replies
+            } else if (noteAuthor != null && noteAuthor.pubkeyHex in accountFollowingSet) {
+                "7" + formattedDateTime(createdAt) + note.idHex.substring(0, 8) // my follows replies.
             } else {
-                "0" + formattedDateTime(note.createdAt() ?: 0) + note.idHex.substring(0, 8) // everyone else.
+                "0" + formattedDateTime(createdAt) + note.idHex.substring(0, 8) // everyone else.
             }
 
         val mySignature =
             LevelSignature(
-                signature = parentSignature + "/" + threadOrder + ";",
-                createdAt = note.createdAt(),
+                signature = "$parentSignature/$threadOrder;",
+                createdAt = createdAt,
                 author = note.author,
             )
 
@@ -118,11 +127,17 @@ object ThreadLevelCalculator {
         if (
             note.event is RepostEvent || note.event is GenericRepostEvent || replyTo == null || replyTo.isEmpty()
         ) {
+            cachedLevels[note] = 0
             return 0
         }
 
-        return replyTo.maxOf {
-            cachedLevels[it] ?: replyLevel(it, cachedLevels).apply { cachedLevels.put(it, this) }
-        } + 1
+        val thisLevel =
+            replyTo.maxOf {
+                cachedLevels[it] ?: replyLevel(it, cachedLevels)
+            } + 1
+
+        cachedLevels[note] = thisLevel
+
+        return thisLevel
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/model/User.kt

@@ -45,6 +45,8 @@ import com.vitorpamplona.quartz.events.MetadataEvent
 import com.vitorpamplona.quartz.events.ReportEvent
 import com.vitorpamplona.quartz.events.UserMetadata
 import com.vitorpamplona.quartz.events.toImmutableListOfLists
+import com.vitorpamplona.quartz.utils.DualCase
+import com.vitorpamplona.quartz.utils.containsAny
 import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -337,19 +339,9 @@ class User(
 
     fun isFollowing(user: User): Boolean = latestContactList?.isTaggedUser(user.pubkeyHex) ?: false
 
-    fun isFollowingHashtag(tag: String): Boolean {
-        return latestContactList?.unverifiedFollowTagSet()?.map { it.lowercase() }?.toSet()?.let {
-            return tag.lowercase() in it
-        }
-            ?: false
-    }
+    fun isFollowingHashtag(tag: String) = latestContactList?.isTaggedHash(tag) ?: false
 
-    fun isFollowingGeohash(geoTag: String): Boolean {
-        return latestContactList?.unverifiedFollowAddressSet()?.toSet()?.let {
-            return geoTag.lowercase() in it
-        }
-            ?: false
-    }
+    fun isFollowingGeohash(geoTag: String) = latestContactList?.isTaggedGeoHash(geoTag) ?: false
 
     fun transientFollowCount(): Int? = latestContactList?.unverifiedFollowKeySet()?.size
 
@@ -370,6 +362,40 @@ class User(
                 (it.event as ReportEvent).reportedAuthor().any { it.reportType == type }
         } != null
 
+    fun containsAny(hiddenWordsCase: List<DualCase>): Boolean {
+        if (hiddenWordsCase.isEmpty()) return false
+
+        if (toBestDisplayName().containsAny(hiddenWordsCase)) {
+            return true
+        }
+
+        if (profilePicture()?.containsAny(hiddenWordsCase) == true) {
+            return true
+        }
+
+        if (info?.banner?.containsAny(hiddenWordsCase) == true) {
+            return true
+        }
+
+        if (info?.about?.containsAny(hiddenWordsCase) == true) {
+            return true
+        }
+
+        if (info?.lud06?.containsAny(hiddenWordsCase) == true) {
+            return true
+        }
+
+        if (info?.lud16?.containsAny(hiddenWordsCase) == true) {
+            return true
+        }
+
+        if (info?.nip05?.containsAny(hiddenWordsCase) == true) {
+            return true
+        }
+
+        return false
+    }
+
     fun anyNameStartsWith(username: String): Boolean = info?.anyNameStartsWith(username) ?: false
 
     var liveSet: UserLiveSet? = null

amethyst/src/main/java/com/vitorpamplona/amethyst/service/AmethystNostrDataSource.kt

@@ -20,6 +20,7 @@
  */
 package com.vitorpamplona.amethyst.service
 
+import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.ammolite.relays.NostrDataSource
 import com.vitorpamplona.ammolite.relays.Relay
@@ -28,7 +29,7 @@ import com.vitorpamplona.quartz.events.Event
 
 abstract class AmethystNostrDataSource(
     debugName: String,
-) : NostrDataSource(debugName) {
+) : NostrDataSource(Amethyst.instance.client, debugName) {
     override fun consume(
         event: Event,
         relay: Relay,

amethyst/src/main/java/com/vitorpamplona/amethyst/service/Base64Image.kt

@@ -22,17 +22,20 @@ package com.vitorpamplona.amethyst.service
 
 import android.content.Context
 import android.graphics.BitmapFactory
-import android.net.Uri
 import androidx.compose.runtime.Stable
-import androidx.core.graphics.drawable.toDrawable
-import coil.ImageLoader
-import coil.decode.DataSource
-import coil.fetch.DrawableResult
-import coil.fetch.FetchResult
-import coil.fetch.Fetcher
-import coil.request.ImageRequest
-import coil.request.Options
+import coil3.ImageLoader
+import coil3.Uri
+import coil3.asImage
+import coil3.decode.DataSource
+import coil3.fetch.FetchResult
+import coil3.fetch.Fetcher
+import coil3.fetch.ImageFetchResult
+import coil3.key.Keyer
+import coil3.request.ImageRequest
+import coil3.request.Options
 import com.vitorpamplona.amethyst.commons.richtext.RichTextParser.Companion.base64contentPattern
+import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.encoders.toHexKey
 import java.util.Base64
 
 @Stable
@@ -51,8 +54,8 @@ class Base64Fetcher(
             val byteArray = Base64.getDecoder().decode(base64String)
             val bitmap = BitmapFactory.decodeByteArray(byteArray, 0, byteArray.size) ?: throw Exception("Unable to load base64 $base64String")
 
-            return DrawableResult(
-                drawable = bitmap.toDrawable(options.context.resources),
+            return ImageFetchResult(
+                image = bitmap.asImage(true),
                 isSampled = false,
                 dataSource = DataSource.MEMORY,
             )
@@ -66,13 +69,24 @@ class Base64Fetcher(
             data: Uri,
             options: Options,
             imageLoader: ImageLoader,
-        ): Fetcher? {
-            return if (base64contentPattern.matcher(data.toString()).find()) {
-                return Base64Fetcher(options, data)
+        ): Fetcher? =
+            if (data.scheme == "data") {
+                Base64Fetcher(options, data)
+            } else {
+                null
+            }
+    }
+
+    object BKeyer : Keyer<Uri> {
+        override fun key(
+            data: Uri,
+            options: Options,
+        ): String? =
+            if (data.scheme == "data") {
+                CryptoUtils.sha256(data.toString().toByteArray()).toHexKey()
             } else {
                 null
             }
-        }
     }
 }
 

amethyst/src/main/java/com/vitorpamplona/amethyst/service/BlurHashImage.kt

@@ -20,60 +20,52 @@
  */
 package com.vitorpamplona.amethyst.service
 
-import android.content.Context
-import android.net.Uri
 import androidx.compose.runtime.Stable
-import androidx.core.graphics.drawable.toDrawable
-import coil.ImageLoader
-import coil.decode.DataSource
-import coil.fetch.DrawableResult
-import coil.fetch.FetchResult
-import coil.fetch.Fetcher
-import coil.request.ImageRequest
-import coil.request.Options
-import com.vitorpamplona.amethyst.commons.preview.BlurHashDecoder
-import java.net.URLDecoder
-import java.net.URLEncoder
+import coil3.ImageLoader
+import coil3.asImage
+import coil3.decode.DataSource
+import coil3.fetch.FetchResult
+import coil3.fetch.Fetcher
+import coil3.fetch.ImageFetchResult
+import coil3.key.Keyer
+import coil3.request.Options
+import com.vitorpamplona.amethyst.commons.blurhash.BlurHashDecoder
+
+class Blurhash(
+    val blurhash: String,
+)
 
 @Stable
 class BlurHashFetcher(
     private val options: Options,
-    private val data: Uri,
+    private val data: Blurhash,
 ) : Fetcher {
     override suspend fun fetch(): FetchResult {
         checkNotInMainThread()
 
-        val hash = URLDecoder.decode(data.toString().removePrefix("bluehash:"), "utf-8")
+        val hash = data.blurhash
 
-        val bitmap = BlurHashDecoder.decodeKeepAspectRatio(hash, 25) ?: throw Exception("Unable to convert Bluehash $data")
+        val bitmap = BlurHashDecoder.decodeKeepAspectRatio(hash, 25) ?: throw Exception("Unable to convert Blurhash $data")
 
-        return DrawableResult(
-            drawable = bitmap.toDrawable(options.context.resources),
+        return ImageFetchResult(
+            image = bitmap.asImage(true),
             isSampled = false,
             dataSource = DataSource.MEMORY,
         )
     }
 
-    object Factory : Fetcher.Factory<Uri> {
+    object Factory : Fetcher.Factory<Blurhash> {
         override fun create(
-            data: Uri,
+            data: Blurhash,
             options: Options,
             imageLoader: ImageLoader,
         ): Fetcher = BlurHashFetcher(options, data)
     }
-}
 
-object BlurHashRequester {
-    fun imageRequest(
-        context: Context,
-        message: String,
-    ): ImageRequest {
-        val encodedMessage = URLEncoder.encode(message, "utf-8")
-
-        return ImageRequest
-            .Builder(context)
-            .data("bluehash:$encodedMessage")
-            .fetcherFactory(BlurHashFetcher.Factory)
-            .build()
+    object BKeyer : Keyer<Blurhash> {
+        override fun key(
+            data: Blurhash,
+            options: Options,
+        ): String = data.blurhash
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/service/CashuProcessor.kt

@@ -27,9 +27,9 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 import com.vitorpamplona.amethyst.ui.components.GenericLoadable
 import com.vitorpamplona.amethyst.ui.stringRes
-import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.events.Event
 import kotlinx.collections.immutable.ImmutableList

amethyst/src/main/java/com/vitorpamplona/amethyst/service/LocationState.kt

@@ -0,0 +1,239 @@
+/**
+ * Copyright (c) 2024 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.amethyst.service
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.location.Geocoder
+import android.location.Location
+import android.location.LocationListener
+import android.location.LocationManager
+import android.os.Build
+import android.os.Looper
+import android.util.Log
+import android.util.LruCache
+import com.fonfon.kgeohash.GeoHash
+import com.fonfon.kgeohash.toGeoHash
+import com.vitorpamplona.amethyst.service.LocationState.Companion.MIN_DISTANCE
+import com.vitorpamplona.amethyst.service.LocationState.Companion.MIN_TIME
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.transformLatest
+import kotlinx.coroutines.launch
+
+class LocationFlow(
+    private val context: Context,
+) {
+    @SuppressLint("MissingPermission")
+    fun get(
+        minTimeMs: Long = MIN_TIME,
+        minDistanceM: Float = MIN_DISTANCE,
+    ): Flow<Location> =
+        callbackFlow {
+            val locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
+
+            val locationCallback =
+                object : LocationListener {
+                    override fun onLocationChanged(location: Location) {
+                        launch { send(location) }
+                    }
+
+                    override fun onProviderEnabled(provider: String) {}
+
+                    override fun onProviderDisabled(provider: String) {}
+                }
+
+            Log.d("Location Service", "LocationState Start")
+            locationManager.requestLocationUpdates(
+                LocationManager.NETWORK_PROVIDER,
+                minTimeMs,
+                minDistanceM,
+                locationCallback,
+                Looper.getMainLooper(),
+            )
+
+            awaitClose {
+                locationManager.removeUpdates(locationCallback)
+                Log.d("Location Service", "LocationState Stop")
+            }
+        }
+}
+
+class LocationState(
+    context: Context,
+    scope: CoroutineScope,
+) {
+    companion object {
+        const val MIN_TIME: Long = 10000L
+        const val MIN_DISTANCE: Float = 100.0f
+    }
+
+    sealed class LocationResult {
+        data class Success(
+            val geoHash: GeoHash,
+        ) : LocationResult()
+
+        object LackPermission : LocationResult()
+
+        object Loading : LocationResult()
+    }
+
+    private var hasLocationPermission = MutableStateFlow<Boolean>(false)
+    private var latestLocation: LocationResult = LocationResult.Loading
+
+    fun setLocationPermission(newValue: Boolean) {
+        if (newValue != hasLocationPermission.value) {
+            hasLocationPermission.tryEmit(newValue)
+        }
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val geohashStateFlow =
+        hasLocationPermission
+            .transformLatest {
+                emitAll(
+                    LocationFlow
+                        (context)
+                        .get(MIN_TIME, MIN_DISTANCE)
+                        .map {
+                            LocationResult.Success(it.toGeoHash(com.vitorpamplona.amethyst.ui.actions.GeohashPrecision.KM_5_X_5.digits)) as LocationResult
+                        }.onEach {
+                            latestLocation = it
+                        }.catch { e ->
+                            e.printStackTrace()
+                            latestLocation = LocationResult.LackPermission
+                            emit(LocationResult.LackPermission)
+                        },
+                )
+            }.stateIn(
+                scope,
+                SharingStarted.WhileSubscribed(5000),
+                latestLocation,
+            )
+}
+
+object CachedGeoLocations {
+    val locationNames = LruCache<String, String>(20)
+
+    fun cached(geoHashStr: String): String? = locationNames[geoHashStr]
+
+    suspend fun geoLocate(
+        geoHashStr: String,
+        location: Location,
+        context: Context,
+    ): String? {
+        locationNames[geoHashStr]?.let {
+            return it
+        }
+
+        val name = ReverseGeoLocationUtil().execute(location, context)?.ifBlank { null }
+
+        if (name != null) {
+            locationNames.put(geoHashStr, name)
+        }
+
+        return name
+    }
+}
+
+private class ReverseGeoLocationUtil {
+    suspend fun execute(
+        location: Location,
+        context: Context,
+    ): String? {
+        return try {
+            Geocoder(context)
+                .getFromLocation(
+                    location.latitude,
+                    location.longitude,
+                    1,
+                )?.firstOrNull()
+                ?.let { address ->
+                    listOfNotNull(address.locality ?: address.subAdminArea, address.countryCode)
+                        .joinToString(", ")
+                }
+        } catch (e: Exception) {
+            if (e is CancellationException) throw e
+            e.printStackTrace()
+            return null
+        }
+    }
+}
+
+class ReverseGeoLocationFlow(
+    private val context: Context,
+) {
+    @SuppressLint("MissingPermission")
+    fun get(location: Location): Flow<String?> =
+        callbackFlow {
+            val locationManager = Geocoder(context)
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                val locationCallback =
+                    (
+                        Geocoder.GeocodeListener { addresses ->
+                            launch {
+                                send(
+                                    addresses.firstOrNull()?.let {
+                                        listOfNotNull(it.locality ?: it.subAdminArea, it.countryCode).joinToString(", ")
+                                    },
+                                )
+                            }
+                        }
+                    )
+                Log.d("GeoLocation Service", "LocationState Start")
+
+                locationManager
+                    .getFromLocation(
+                        location.latitude,
+                        location.longitude,
+                        1,
+                        locationCallback,
+                    )
+            } else {
+                launch {
+                    send(
+                        Geocoder(context)
+                            .getFromLocation(
+                                location.latitude,
+                                location.longitude,
+                                1,
+                            )?.firstOrNull()
+                            ?.let { address ->
+                                listOfNotNull(address.locality ?: address.subAdminArea, address.countryCode)
+                                    .joinToString(", ")
+                            },
+                    )
+                }
+            }
+        }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/LocationUtil.kt

@@ -1,141 +0,0 @@
-/**
- * Copyright (c) 2024 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.amethyst.service
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.location.Geocoder
-import android.location.Location
-import android.location.LocationListener
-import android.location.LocationManager
-import android.os.HandlerThread
-import android.util.LruCache
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.flow.MutableStateFlow
-
-class LocationUtil(
-    context: Context,
-) {
-    companion object {
-        const val MIN_TIME: Long = 1000L
-        const val MIN_DISTANCE: Float = 0.0f
-    }
-
-    private val locationManager =
-        context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
-    private var locationListener: LocationListener? = null
-
-    val locationStateFlow = MutableStateFlow<Location>(Location(LocationManager.NETWORK_PROVIDER))
-    val providerState = mutableStateOf(false)
-    val isStart: MutableState<Boolean> = mutableStateOf(false)
-
-    private val locHandlerThread = HandlerThread("LocationUtil Thread")
-
-    init {
-        locHandlerThread.start()
-    }
-
-    @SuppressLint("MissingPermission")
-    fun start(
-        minTimeMs: Long = MIN_TIME,
-        minDistanceM: Float = MIN_DISTANCE,
-    ) {
-        locationListener().let {
-            locationListener = it
-            locationManager.requestLocationUpdates(
-                LocationManager.NETWORK_PROVIDER,
-                minTimeMs,
-                minDistanceM,
-                it,
-                locHandlerThread.looper,
-            )
-        }
-        providerState.value = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
-        isStart.value = true
-    }
-
-    fun stop() {
-        locationListener?.let { locationManager.removeUpdates(it) }
-        isStart.value = false
-    }
-
-    private fun locationListener() =
-        object : LocationListener {
-            override fun onLocationChanged(location: Location) {
-                locationStateFlow.value = location
-            }
-
-            override fun onProviderEnabled(provider: String) {
-                providerState.value = true
-            }
-
-            override fun onProviderDisabled(provider: String) {
-                providerState.value = false
-            }
-        }
-}
-
-object CachedGeoLocations {
-    val locationNames = LruCache<String, String>(20)
-
-    fun cached(geoHashStr: String): String? = locationNames[geoHashStr]
-
-    suspend fun geoLocate(
-        geoHashStr: String,
-        location: Location,
-        context: Context,
-    ): String? {
-        locationNames[geoHashStr]?.let {
-            return it
-        }
-
-        val name = ReverseGeoLocationUtil().execute(location, context)?.ifBlank { null }
-
-        if (name != null) {
-            locationNames.put(geoHashStr, name)
-        }
-
-        return name
-    }
-}
-
-private class ReverseGeoLocationUtil {
-    suspend fun execute(
-        location: Location,
-        context: Context,
-    ): String? {
-        return try {
-            Geocoder(context)
-                .getFromLocation(location.latitude, location.longitude, 1)
-                ?.firstOrNull()
-                ?.let { address ->
-                    listOfNotNull(address.locality ?: address.subAdminArea, address.countryCode)
-                        .joinToString(", ")
-                }
-        } catch (e: Exception) {
-            if (e is CancellationException) throw e
-            e.printStackTrace()
-            return null
-        }
-    }
-}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip05NostrAddressVerifier.kt

@@ -22,7 +22,7 @@ package com.vitorpamplona.amethyst.service
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
-import com.vitorpamplona.ammolite.service.HttpClientManager
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip11RelayInfoRetriever.kt

@@ -22,7 +22,7 @@ package com.vitorpamplona.amethyst.service
 
 import android.util.Log
 import android.util.LruCache
-import com.vitorpamplona.ammolite.service.HttpClientManager
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 import com.vitorpamplona.quartz.encoders.Nip11RelayInformation
 import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
 import com.vitorpamplona.quartz.utils.TimeUtils

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt

@@ -25,7 +25,6 @@ import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
-import com.vitorpamplona.ammolite.relays.Client
 import com.vitorpamplona.ammolite.relays.EVENT_FINDER_TYPES
 import com.vitorpamplona.ammolite.relays.Relay
 import com.vitorpamplona.ammolite.relays.TypedFilter
@@ -33,14 +32,17 @@ import com.vitorpamplona.ammolite.relays.filters.EOSETime
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
+import com.vitorpamplona.quartz.events.AppSpecificDataEvent
 import com.vitorpamplona.quartz.events.BadgeAwardEvent
 import com.vitorpamplona.quartz.events.BadgeProfilesEvent
+import com.vitorpamplona.quartz.events.BlossomServersEvent
 import com.vitorpamplona.quartz.events.BookmarkListEvent
 import com.vitorpamplona.quartz.events.CalendarDateSlotEvent
 import com.vitorpamplona.quartz.events.CalendarRSVPEvent
 import com.vitorpamplona.quartz.events.CalendarTimeSlotEvent
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent
+import com.vitorpamplona.quartz.events.CommentEvent
 import com.vitorpamplona.quartz.events.ContactListEvent
 import com.vitorpamplona.quartz.events.DraftEvent
 import com.vitorpamplona.quartz.events.EmojiPackSelectionEvent
@@ -53,6 +55,8 @@ import com.vitorpamplona.quartz.events.GitIssueEvent
 import com.vitorpamplona.quartz.events.GitPatchEvent
 import com.vitorpamplona.quartz.events.GitReplyEvent
 import com.vitorpamplona.quartz.events.HighlightEvent
+import com.vitorpamplona.quartz.events.InteractiveStoryPrologueEvent
+import com.vitorpamplona.quartz.events.InteractiveStorySceneEvent
 import com.vitorpamplona.quartz.events.LnZapEvent
 import com.vitorpamplona.quartz.events.LnZapPaymentResponseEvent
 import com.vitorpamplona.quartz.events.MetadataEvent
@@ -68,7 +72,6 @@ import com.vitorpamplona.quartz.events.SearchRelayListEvent
 import com.vitorpamplona.quartz.events.StatusEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 import com.vitorpamplona.quartz.utils.TimeUtils
-import kotlinx.coroutines.flow.filter
 
 // TODO: Migrate this to a property of AccountVi
 object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
@@ -78,44 +81,25 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
     val latestEOSEs = EOSEAccount()
     val hasLoadedTheBasics = mutableMapOf<User, Boolean>()
 
-    fun createAccountContactListFilter(): TypedFilter =
-        TypedFilter(
-            types = COMMON_FEED_TYPES,
-            filter =
-                SincePerRelayFilter(
-                    kinds = listOf(ContactListEvent.KIND),
-                    authors = listOf(account.userProfile().pubkeyHex),
-                    limit = 1,
-                ),
-        )
-
     fun createAccountMetadataFilter(): TypedFilter =
-        TypedFilter(
-            types = COMMON_FEED_TYPES,
-            filter =
-                SincePerRelayFilter(
-                    kinds = listOf(MetadataEvent.KIND),
-                    authors = listOf(account.userProfile().pubkeyHex),
-                    limit = 1,
-                ),
-        )
-
-    fun createAccountRelayListFilter(): TypedFilter =
         TypedFilter(
             types = COMMON_FEED_TYPES,
             filter =
                 SincePerRelayFilter(
                     kinds =
                         listOf(
+                            MetadataEvent.KIND,
+                            ContactListEvent.KIND,
                             StatusEvent.KIND,
                             AdvertisedRelayListEvent.KIND,
                             ChatMessageRelayListEvent.KIND,
                             SearchRelayListEvent.KIND,
                             FileServersEvent.KIND,
+                            BlossomServersEvent.KIND,
                             PrivateOutboxRelayListEvent.KIND,
                         ),
                     authors = listOf(account.userProfile().pubkeyHex),
-                    limit = 10,
+                    limit = 20,
                 ),
         )
 
@@ -134,11 +118,12 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
                             ChatMessageRelayListEvent.KIND,
                             SearchRelayListEvent.KIND,
                             FileServersEvent.KIND,
+                            BlossomServersEvent.KIND,
                             MuteListEvent.KIND,
                             PeopleListEvent.KIND,
                         ),
                     authors = otherAuthors,
-                    limit = 100,
+                    limit = otherAuthors.size * 20,
                 ),
         )
     }
@@ -154,6 +139,18 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
                 ),
         )
 
+    fun createAccountSettings2Filter(): TypedFilter =
+        TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter =
+                SincePerRelayFilter(
+                    kinds = listOf(AppSpecificDataEvent.KIND),
+                    authors = listOf(account.userProfile().pubkeyHex),
+                    tags = mapOf("d" to listOf(Account.APP_SPECIFIC_DATA_D_TAG)),
+                    limit = 1,
+                ),
+        )
+
     fun createAccountReportsFilter(): TypedFilter =
         TypedFilter(
             types = COMMON_FEED_TYPES,
@@ -244,9 +241,12 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
                             GitIssueEvent.KIND,
                             GitPatchEvent.KIND,
                             HighlightEvent.KIND,
+                            CommentEvent.KIND,
                             CalendarDateSlotEvent.KIND,
                             CalendarTimeSlotEvent.KIND,
                             CalendarRSVPEvent.KIND,
+                            InteractiveStoryPrologueEvent.KIND,
+                            InteractiveStorySceneEvent.KIND,
                         ),
                     tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
                     limit = 400,
@@ -465,8 +465,7 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
             accountChannel.typedFilters =
                 listOfNotNull(
                     createAccountMetadataFilter(),
-                    createAccountContactListFilter(),
-                    createAccountRelayListFilter(),
+                    createAccountSettings2Filter(),
                     createNotificationFilter(),
                     createNotificationFilter2(),
                     createGiftWrapsToMeFilter(),
@@ -480,9 +479,8 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
             accountChannel.typedFilters =
                 listOf(
                     createAccountMetadataFilter(),
-                    createAccountContactListFilter(),
-                    createAccountRelayListFilter(),
                     createAccountSettingsFilter(),
+                    createAccountSettings2Filter(),
                 ).ifEmpty { null }
         }
 
@@ -493,9 +491,7 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
         super.auth(relay, challenge)
 
         if (this::account.isInitialized) {
-            account.createAuthEvent(relay, challenge) {
-                Client.sendIfExists(it, relay)
-            }
+            account.sendAuthEvent(relay, challenge)
         }
     }
 

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrDiscoveryDataSource.kt

@@ -124,10 +124,7 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
                             kinds = listOf(ClassifiedsEvent.KIND),
                             tags =
                                 mapOf(
-                                    "g" to
-                                        it
-                                            .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
-                                            .flatten(),
+                                    "g" to it,
                                 ),
                             limit = 300,
                             since =
@@ -162,7 +159,7 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
     fun createLiveStreamFilter(): List<TypedFilter> {
         val follows =
             account.liveDiscoveryFollowLists.value
-                ?.users
+                ?.authors
                 ?.toList()
                 ?.ifEmpty { null }
 
@@ -304,13 +301,7 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
             filter =
                 SincePerRelayFilter(
                     kinds = listOf(LiveActivitiesChatMessageEvent.KIND, LiveActivitiesEvent.KIND),
-                    tags =
-                        mapOf(
-                            "g" to
-                                hashToLoad
-                                    .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
-                                    .flatten(),
-                        ),
+                    tags = mapOf("g" to hashToLoad),
                     limit = 300,
                     since =
                         latestEOSEs.users[account.userProfile()]
@@ -367,12 +358,7 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
                     kinds =
                         listOf(ChannelCreateEvent.KIND, ChannelMetadataEvent.KIND, ChannelMessageEvent.KIND),
                     tags =
-                        mapOf(
-                            "g" to
-                                hashToLoad
-                                    .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
-                                    .flatten(),
-                        ),
+                        mapOf("g" to hashToLoad),
                     limit = 300,
                     since =
                         latestEOSEs.users[account.userProfile()]
@@ -426,13 +412,7 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
             filter =
                 SincePerRelayFilter(
                     kinds = listOf(CommunityDefinitionEvent.KIND, CommunityPostApprovalEvent.KIND),
-                    tags =
-                        mapOf(
-                            "g" to
-                                hashToLoad
-                                    .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
-                                    .flatten(),
-                        ),
+                    tags = mapOf("g" to hashToLoad),
                     limit = 300,
                     since =
                         latestEOSEs.users[account.userProfile()]

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrGeohashDataSource.kt

@@ -27,8 +27,8 @@ import com.vitorpamplona.quartz.events.AudioHeaderEvent
 import com.vitorpamplona.quartz.events.AudioTrackEvent
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.ClassifiedsEvent
+import com.vitorpamplona.quartz.events.CommentEvent
 import com.vitorpamplona.quartz.events.HighlightEvent
-import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
 import com.vitorpamplona.quartz.events.LongTextNoteEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
@@ -57,12 +57,12 @@ object NostrGeohashDataSource : AmethystNostrDataSource("SingleGeoHashFeed") {
                             ChannelMessageEvent.KIND,
                             LongTextNoteEvent.KIND,
                             PollNoteEvent.KIND,
-                            LiveActivitiesChatMessageEvent.KIND,
                             ClassifiedsEvent.KIND,
                             HighlightEvent.KIND,
                             AudioTrackEvent.KIND,
                             AudioHeaderEvent.KIND,
                             WikiNoteEvent.KIND,
+                            CommentEvent.KIND,
                         ),
                     limit = 200,
                 ),

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrHashtagDataSource.kt

@@ -27,7 +27,9 @@ import com.vitorpamplona.quartz.events.AudioHeaderEvent
 import com.vitorpamplona.quartz.events.AudioTrackEvent
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.ClassifiedsEvent
+import com.vitorpamplona.quartz.events.CommentEvent
 import com.vitorpamplona.quartz.events.HighlightEvent
+import com.vitorpamplona.quartz.events.InteractiveStorySceneEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
 import com.vitorpamplona.quartz.events.LongTextNoteEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
@@ -37,45 +39,59 @@ import com.vitorpamplona.quartz.events.WikiNoteEvent
 object NostrHashtagDataSource : AmethystNostrDataSource("SingleHashtagFeed") {
     private var hashtagToWatch: String? = null
 
-    fun createLoadHashtagFilter(): TypedFilter? {
-        val hashToLoad = hashtagToWatch ?: return null
+    fun createLoadHashtagFilter(): List<TypedFilter> {
+        val hashToLoad = hashtagToWatch ?: return emptyList()
 
-        return TypedFilter(
-            types = COMMON_FEED_TYPES,
-            filter =
-                SincePerRelayFilter(
-                    tags =
-                        mapOf(
-                            "t" to
-                                listOf(
-                                    hashToLoad,
-                                    hashToLoad.lowercase(),
-                                    hashToLoad.uppercase(),
-                                    hashToLoad.capitalize(),
-                                ),
-                        ),
-                    kinds =
-                        listOf(
-                            TextNoteEvent.KIND,
-                            ChannelMessageEvent.KIND,
-                            LongTextNoteEvent.KIND,
-                            PollNoteEvent.KIND,
-                            LiveActivitiesChatMessageEvent.KIND,
-                            ClassifiedsEvent.KIND,
-                            HighlightEvent.KIND,
-                            AudioTrackEvent.KIND,
-                            AudioHeaderEvent.KIND,
-                            WikiNoteEvent.KIND,
-                        ),
-                    limit = 200,
-                ),
+        val hashtagsToFollow =
+            listOf(
+                hashToLoad,
+                hashToLoad.lowercase(),
+                hashToLoad.uppercase(),
+                hashToLoad.capitalize(),
+            )
+
+        return listOf(
+            TypedFilter(
+                types = COMMON_FEED_TYPES,
+                filter =
+                    SincePerRelayFilter(
+                        tags = mapOf("t" to hashtagsToFollow),
+                        kinds =
+                            listOf(
+                                TextNoteEvent.KIND,
+                                ChannelMessageEvent.KIND,
+                                LongTextNoteEvent.KIND,
+                                PollNoteEvent.KIND,
+                                LiveActivitiesChatMessageEvent.KIND,
+                                ClassifiedsEvent.KIND,
+                                HighlightEvent.KIND,
+                                AudioTrackEvent.KIND,
+                                AudioHeaderEvent.KIND,
+                                WikiNoteEvent.KIND,
+                                CommentEvent.KIND,
+                            ),
+                        limit = 200,
+                    ),
+            ),
+            TypedFilter(
+                types = COMMON_FEED_TYPES,
+                filter =
+                    SincePerRelayFilter(
+                        tags = mapOf("t" to hashtagsToFollow),
+                        kinds =
+                            listOf(
+                                InteractiveStorySceneEvent.KIND,
+                            ),
+                        limit = 200,
+                    ),
+            ),
         )
     }
 
     val loadHashtagChannel = requestNewChannel()
 
     override fun updateChannelFilters() {
-        loadHashtagChannel.typedFilters = listOfNotNull(createLoadHashtagFilter()).ifEmpty { null }
+        loadHashtagChannel.typedFilters = createLoadHashtagFilter().ifEmpty { null }
     }
 
     fun loadHashtag(tag: String?) {

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt

@@ -31,9 +31,11 @@ import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.events.AudioHeaderEvent
 import com.vitorpamplona.quartz.events.AudioTrackEvent
 import com.vitorpamplona.quartz.events.ClassifiedsEvent
+import com.vitorpamplona.quartz.events.CommentEvent
 import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
 import com.vitorpamplona.quartz.events.GenericRepostEvent
 import com.vitorpamplona.quartz.events.HighlightEvent
+import com.vitorpamplona.quartz.events.InteractiveStoryPrologueEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesEvent
 import com.vitorpamplona.quartz.events.LongTextNoteEvent
@@ -85,38 +87,57 @@ object NostrHomeDataSource : AmethystNostrDataSource("HomeFeed") {
         job2?.cancel()
     }
 
-    fun createFollowAccountsFilter(): TypedFilter {
+    fun createFollowAccountsFilter(): List<TypedFilter> {
         val follows =
             account.liveHomeListAuthorsPerRelay.value
 
-        return TypedFilter(
-            types = setOf(if (follows == null) FeedType.GLOBAL else FeedType.FOLLOWS),
-            filter =
-                SinceAuthorPerRelayFilter(
-                    kinds =
-                        listOf(
-                            TextNoteEvent.KIND,
-                            RepostEvent.KIND,
-                            GenericRepostEvent.KIND,
-                            ClassifiedsEvent.KIND,
-                            LongTextNoteEvent.KIND,
-                            PollNoteEvent.KIND,
-                            HighlightEvent.KIND,
-                            AudioTrackEvent.KIND,
-                            AudioHeaderEvent.KIND,
-                            PinListEvent.KIND,
-                            LiveActivitiesChatMessageEvent.KIND,
-                            LiveActivitiesEvent.KIND,
-                            WikiNoteEvent.KIND,
-                        ),
-                    authors = follows,
-                    limit = 400,
-                    since =
-                        latestEOSEs.users[account.userProfile()]
-                            ?.followList
-                            ?.get(account.settings.defaultHomeFollowList.value)
-                            ?.relayList,
-                ),
+        return listOf(
+            TypedFilter(
+                types = setOf(if (follows == null) FeedType.GLOBAL else FeedType.FOLLOWS),
+                filter =
+                    SinceAuthorPerRelayFilter(
+                        kinds =
+                            listOf(
+                                TextNoteEvent.KIND,
+                                RepostEvent.KIND,
+                                GenericRepostEvent.KIND,
+                                ClassifiedsEvent.KIND,
+                                LongTextNoteEvent.KIND,
+                                PollNoteEvent.KIND,
+                                HighlightEvent.KIND,
+                                AudioTrackEvent.KIND,
+                                AudioHeaderEvent.KIND,
+                                PinListEvent.KIND,
+                            ),
+                        authors = follows,
+                        limit = 400,
+                        since =
+                            latestEOSEs.users[account.userProfile()]
+                                ?.followList
+                                ?.get(account.settings.defaultHomeFollowList.value)
+                                ?.relayList,
+                    ),
+            ),
+            TypedFilter(
+                types = setOf(if (follows == null) FeedType.GLOBAL else FeedType.FOLLOWS),
+                filter =
+                    SinceAuthorPerRelayFilter(
+                        kinds =
+                            listOf(
+                                InteractiveStoryPrologueEvent.KIND,
+                                LiveActivitiesChatMessageEvent.KIND,
+                                LiveActivitiesEvent.KIND,
+                                WikiNoteEvent.KIND,
+                            ),
+                        authors = follows,
+                        limit = 400,
+                        since =
+                            latestEOSEs.users[account.userProfile()]
+                                ?.followList
+                                ?.get(account.settings.defaultHomeFollowList.value)
+                                ?.relayList,
+                    ),
+            ),
         )
     }
 
@@ -164,8 +185,8 @@ object NostrHomeDataSource : AmethystNostrDataSource("HomeFeed") {
                             ClassifiedsEvent.KIND,
                             HighlightEvent.KIND,
                             AudioHeaderEvent.KIND,
-                            AudioTrackEvent.KIND,
-                            PinListEvent.KIND,
+                            InteractiveStoryPrologueEvent.KIND,
+                            CommentEvent.KIND,
                             WikiNoteEvent.KIND,
                         ),
                     tags =
@@ -202,17 +223,13 @@ object NostrHomeDataSource : AmethystNostrDataSource("HomeFeed") {
                             LongTextNoteEvent.KIND,
                             ClassifiedsEvent.KIND,
                             HighlightEvent.KIND,
-                            AudioHeaderEvent.KIND,
-                            AudioTrackEvent.KIND,
-                            PinListEvent.KIND,
+                            InteractiveStoryPrologueEvent.KIND,
                             WikiNoteEvent.KIND,
+                            CommentEvent.KIND,
                         ),
                     tags =
                         mapOf(
-                            "g" to
-                                hashToLoad
-                                    .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
-                                    .flatten(),
+                            "g" to hashToLoad.toList(),
                         ),
                     limit = 100,
                     since =
@@ -225,7 +242,7 @@ object NostrHomeDataSource : AmethystNostrDataSource("HomeFeed") {
     }
 
     fun createFollowCommunitiesFilter(): TypedFilter? {
-        val communitiesToLoad = account.liveHomeFollowLists.value?.communities ?: return null
+        val communitiesToLoad = account.liveHomeFollowLists.value?.addresses ?: return null
 
         if (communitiesToLoad.isEmpty()) return null
 
@@ -239,11 +256,10 @@ object NostrHomeDataSource : AmethystNostrDataSource("HomeFeed") {
                             LongTextNoteEvent.KIND,
                             ClassifiedsEvent.KIND,
                             HighlightEvent.KIND,
-                            AudioHeaderEvent.KIND,
-                            AudioTrackEvent.KIND,
-                            PinListEvent.KIND,
                             WikiNoteEvent.KIND,
                             CommunityPostApprovalEvent.KIND,
+                            CommentEvent.KIND,
+                            InteractiveStoryPrologueEvent.KIND,
                         ),
                     tags =
                         mapOf(
@@ -271,12 +287,14 @@ object NostrHomeDataSource : AmethystNostrDataSource("HomeFeed") {
 
     override fun updateChannelFilters() {
         followAccountChannel.typedFilters =
-            listOfNotNull(
-                createFollowAccountsFilter(),
-                createFollowMetadataAndReleaseFilter(),
-                createFollowCommunitiesFilter(),
-                createFollowTagsFilter(),
-                createFollowGeohashesFilter(),
+            (
+                createFollowAccountsFilter() +
+                    listOfNotNull(
+                        createFollowMetadataAndReleaseFilter(),
+                        createFollowCommunitiesFilter(),
+                        createFollowTagsFilter(),
+                        createFollowGeohashesFilter(),
+                    )
             ).ifEmpty { null }
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt

@@ -20,7 +20,7 @@
  */
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
+import com.vitorpamplona.ammolite.relays.ALL_FEED_TYPES
 import com.vitorpamplona.ammolite.relays.FeedType
 import com.vitorpamplona.ammolite.relays.TypedFilter
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
@@ -38,9 +38,12 @@ import com.vitorpamplona.quartz.events.BookmarkListEvent
 import com.vitorpamplona.quartz.events.ChannelCreateEvent
 import com.vitorpamplona.quartz.events.ChannelMetadataEvent
 import com.vitorpamplona.quartz.events.ClassifiedsEvent
+import com.vitorpamplona.quartz.events.CommentEvent
 import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
 import com.vitorpamplona.quartz.events.EmojiPackEvent
 import com.vitorpamplona.quartz.events.HighlightEvent
+import com.vitorpamplona.quartz.events.InteractiveStoryPrologueEvent
+import com.vitorpamplona.quartz.events.InteractiveStorySceneEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesEvent
 import com.vitorpamplona.quartz.events.LongTextNoteEvent
 import com.vitorpamplona.quartz.events.MetadataEvent
@@ -93,7 +96,7 @@ object NostrSearchEventOrUserDataSource : AmethystNostrDataSource("SearchEventFe
                     listOfNotNull(
                         ATag.parse(it, null)?.let { aTag ->
                             TypedFilter(
-                                types = COMMON_FEED_TYPES,
+                                types = ALL_FEED_TYPES,
                                 filter =
                                     SincePerRelayFilter(
                                         kinds = listOf(MetadataEvent.KIND, aTag.kind),
@@ -108,19 +111,19 @@ object NostrSearchEventOrUserDataSource : AmethystNostrDataSource("SearchEventFe
                     // event ids
                     listOf(
                         TypedFilter(
-                            types = COMMON_FEED_TYPES,
+                            types = ALL_FEED_TYPES,
                             filter =
                                 SincePerRelayFilter(
-                                    ids = listOfNotNull(hexToWatch),
+                                    ids = listOfNotNull(it),
                                 ),
                         ),
                         // authors
                         TypedFilter(
-                            types = COMMON_FEED_TYPES,
+                            types = ALL_FEED_TYPES,
                             filter =
                                 SincePerRelayFilter(
                                     kinds = listOf(MetadataEvent.KIND),
-                                    authors = listOfNotNull(hexToWatch),
+                                    authors = listOfNotNull(it),
                                     // just to be sure
                                     limit = 5,
                                 ),
@@ -177,6 +180,20 @@ object NostrSearchEventOrUserDataSource : AmethystNostrDataSource("SearchEventFe
                                     PollNoteEvent.KIND,
                                     NNSEvent.KIND,
                                     WikiNoteEvent.KIND,
+                                    CommentEvent.KIND,
+                                ),
+                            search = mySearchString,
+                            limit = 100,
+                        ),
+                ),
+                TypedFilter(
+                    types = setOf(FeedType.SEARCH),
+                    filter =
+                        SincePerRelayFilter(
+                            kinds =
+                                listOf(
+                                    InteractiveStoryPrologueEvent.KIND,
+                                    InteractiveStorySceneEvent.KIND,
                                 ),
                             search = mySearchString,
                             limit = 100,

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleUserDataSource.kt

@@ -28,6 +28,7 @@ import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
 import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent
 import com.vitorpamplona.quartz.events.MetadataEvent
+import com.vitorpamplona.quartz.events.RelationshipStatusEvent
 import com.vitorpamplona.quartz.events.ReportEvent
 import com.vitorpamplona.quartz.events.StatusEvent
 
@@ -71,7 +72,7 @@ object NostrSingleUserDataSource : AmethystNostrDataSource("SingleUserFeed") {
                             types = EVENT_FINDER_TYPES,
                             filter =
                                 SincePerRelayFilter(
-                                    kinds = listOf(MetadataEvent.KIND, StatusEvent.KIND, AdvertisedRelayListEvent.KIND, ChatMessageRelayListEvent.KIND),
+                                    kinds = listOf(MetadataEvent.KIND, StatusEvent.KIND, RelationshipStatusEvent.KIND, AdvertisedRelayListEvent.KIND, ChatMessageRelayListEvent.KIND),
                                     authors = groupIds,
                                     since = minEOSEs,
                                 ),

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrThreadDataSource.kt

@@ -20,6 +20,7 @@
  */
 package com.vitorpamplona.amethyst.service
 
+import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.ThreadAssembler
 import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.ammolite.relays.TypedFilter
@@ -28,26 +29,55 @@ import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
 object NostrThreadDataSource : AmethystNostrDataSource("SingleThreadFeed") {
     private var eventToWatch: String? = null
 
-    fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
-        val threadToLoad = eventToWatch ?: return null
+    fun createLoadEventsIfNotLoadedFilter(): List<TypedFilter> {
+        val threadToLoad = eventToWatch ?: return emptyList()
+
+        val branch = ThreadAssembler().findThreadFor(threadToLoad) ?: return emptyList()
 
         val eventsToLoad =
-            ThreadAssembler()
-                .findThreadFor(threadToLoad)
+            branch.allNotes
                 .filter { it.event == null }
                 .map { it.idHex }
                 .toSet()
                 .ifEmpty { null }
-                ?: return null
 
-        if (eventsToLoad.isEmpty()) return null
+        val address = if (branch.root is AddressableNote) branch.root.idHex else null
+        val event = if (branch.root !is AddressableNote) branch.root.idHex else branch.root.event?.id()
 
-        return TypedFilter(
-            types = COMMON_FEED_TYPES,
-            filter =
-                SincePerRelayFilter(
-                    ids = eventsToLoad.toList(),
-                ),
+        return listOfNotNull(
+            eventsToLoad?.let {
+                TypedFilter(
+                    types = COMMON_FEED_TYPES,
+                    filter =
+                        SincePerRelayFilter(
+                            ids = it.toList(),
+                        ),
+                )
+            },
+            event?.let {
+                TypedFilter(
+                    types = COMMON_FEED_TYPES,
+                    filter =
+                        SincePerRelayFilter(
+                            tags =
+                                mapOf(
+                                    "e" to listOf(event),
+                                ),
+                        ),
+                )
+            },
+            address?.let {
+                TypedFilter(
+                    types = COMMON_FEED_TYPES,
+                    filter =
+                        SincePerRelayFilter(
+                            tags =
+                                mapOf(
+                                    "a" to listOf(address),
+                                ),
+                        ),
+                )
+            },
         )
     }
 
@@ -59,8 +89,7 @@ object NostrThreadDataSource : AmethystNostrDataSource("SingleThreadFeed") {
         }
 
     override fun updateChannelFilters() {
-        loadEventsChannel.typedFilters =
-            listOfNotNull(createLoadEventsIfNotLoadedFilter()).ifEmpty { null }
+        loadEventsChannel.typedFilters = createLoadEventsIfNotLoadedFilter()
     }
 
     fun loadThread(noteId: String?) {

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt

@@ -30,13 +30,16 @@ import com.vitorpamplona.quartz.events.AudioTrackEvent
 import com.vitorpamplona.quartz.events.BadgeAwardEvent
 import com.vitorpamplona.quartz.events.BadgeProfilesEvent
 import com.vitorpamplona.quartz.events.BookmarkListEvent
+import com.vitorpamplona.quartz.events.CommentEvent
 import com.vitorpamplona.quartz.events.ContactListEvent
 import com.vitorpamplona.quartz.events.GenericRepostEvent
 import com.vitorpamplona.quartz.events.HighlightEvent
+import com.vitorpamplona.quartz.events.InteractiveStoryPrologueEvent
 import com.vitorpamplona.quartz.events.LnZapEvent
 import com.vitorpamplona.quartz.events.LongTextNoteEvent
 import com.vitorpamplona.quartz.events.MetadataEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
+import com.vitorpamplona.quartz.events.PictureEvent
 import com.vitorpamplona.quartz.events.PinListEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.ProfileGalleryEntryEvent
@@ -44,6 +47,8 @@ import com.vitorpamplona.quartz.events.RepostEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 import com.vitorpamplona.quartz.events.TorrentCommentEvent
 import com.vitorpamplona.quartz.events.TorrentEvent
+import com.vitorpamplona.quartz.events.VideoHorizontalEvent
+import com.vitorpamplona.quartz.events.VideoVerticalEvent
 import com.vitorpamplona.quartz.events.WikiNoteEvent
 
 object NostrUserProfileDataSource : AmethystNostrDataSource("UserProfileFeed") {
@@ -101,9 +106,11 @@ object NostrUserProfileDataSource : AmethystNostrDataSource("UserProfileFeed") {
                             listOf(
                                 TorrentEvent.KIND,
                                 TorrentCommentEvent.KIND,
+                                InteractiveStoryPrologueEvent.KIND,
+                                CommentEvent.KIND,
                             ),
                         authors = listOf(it.pubkeyHex),
-                        limit = 20,
+                        limit = 50,
                     ),
             )
         }
@@ -180,7 +187,7 @@ object NostrUserProfileDataSource : AmethystNostrDataSource("UserProfileFeed") {
                 filter =
                     SincePerRelayFilter(
                         kinds =
-                            listOf(ProfileGalleryEntryEvent.KIND),
+                            listOf(ProfileGalleryEntryEvent.KIND, PictureEvent.KIND, VideoVerticalEvent.KIND, VideoHorizontalEvent.KIND),
                         authors = listOf(it.pubkeyHex),
                         limit = 1000,
                     ),

amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrVideoDataSource.kt

@@ -29,6 +29,7 @@ import com.vitorpamplona.ammolite.relays.filters.SinceAuthorPerRelayFilter
 import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
 import com.vitorpamplona.quartz.events.FileHeaderEvent
 import com.vitorpamplona.quartz.events.FileStorageHeaderEvent
+import com.vitorpamplona.quartz.events.PictureEvent
 import com.vitorpamplona.quartz.events.VideoHorizontalEvent
 import com.vitorpamplona.quartz.events.VideoVerticalEvent
 import kotlinx.coroutines.Dispatchers
@@ -64,85 +65,136 @@ object NostrVideoDataSource : AmethystNostrDataSource("VideoFeed") {
         job?.cancel()
     }
 
-    fun createContextualFilter(): TypedFilter {
+    fun createContextualFilter(): List<TypedFilter> {
         val follows = account.liveStoriesListAuthorsPerRelay.value
 
-        return TypedFilter(
-            types = if (follows == null) setOf(FeedType.GLOBAL) else setOf(FeedType.FOLLOWS),
-            filter =
-                SinceAuthorPerRelayFilter(
-                    authors = follows,
-                    kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND, VideoHorizontalEvent.KIND, VideoVerticalEvent.KIND),
-                    limit = 200,
-                    tags = mapOf("m" to SUPPORTED_VIDEO_FEED_MIME_TYPES),
-                    since =
-                        latestEOSEs.users[account.userProfile()]
-                            ?.followList
-                            ?.get(account.settings.defaultStoriesFollowList.value)
-                            ?.relayList,
-                ),
+        val types = if (follows == null) setOf(FeedType.GLOBAL) else setOf(FeedType.FOLLOWS)
+
+        return listOf(
+            TypedFilter(
+                types = types,
+                filter =
+                    SinceAuthorPerRelayFilter(
+                        authors = follows,
+                        kinds = listOf(PictureEvent.KIND, VideoHorizontalEvent.KIND, VideoVerticalEvent.KIND),
+                        limit = 200,
+                        since =
+                            latestEOSEs.users[account.userProfile()]
+                                ?.followList
+                                ?.get(account.settings.defaultStoriesFollowList.value)
+                                ?.relayList,
+                    ),
+            ),
+            TypedFilter(
+                types = types,
+                filter =
+                    SinceAuthorPerRelayFilter(
+                        authors = follows,
+                        kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND),
+                        limit = 200,
+                        tags = mapOf("m" to SUPPORTED_VIDEO_FEED_MIME_TYPES),
+                        since =
+                            latestEOSEs.users[account.userProfile()]
+                                ?.followList
+                                ?.get(account.settings.defaultStoriesFollowList.value)
+                                ?.relayList,
+                    ),
+            ),
         )
     }
 
-    fun createFollowTagsFilter(): TypedFilter? {
+    fun createFollowTagsFilter(): List<TypedFilter> {
         val hashToLoad =
             account.liveStoriesFollowLists.value
                 ?.hashtags
-                ?.toList() ?: return null
+                ?.toList() ?: return emptyList()
 
-        if (hashToLoad.isEmpty()) return null
+        if (hashToLoad.isEmpty()) return emptyList()
 
-        return TypedFilter(
-            types = setOf(FeedType.GLOBAL),
-            filter =
-                SincePerRelayFilter(
-                    kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND, VideoHorizontalEvent.KIND, VideoVerticalEvent.KIND),
-                    tags =
-                        mapOf(
-                            "t" to
-                                hashToLoad
-                                    .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
-                                    .flatten(),
-                            "m" to SUPPORTED_VIDEO_FEED_MIME_TYPES,
-                        ),
-                    limit = 100,
-                    since =
-                        latestEOSEs.users[account.userProfile()]
-                            ?.followList
-                            ?.get(account.settings.defaultStoriesFollowList.value)
-                            ?.relayList,
-                ),
+        val hashtags =
+            hashToLoad
+                .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
+                .flatten()
+
+        return listOf(
+            TypedFilter(
+                types = setOf(FeedType.GLOBAL),
+                filter =
+                    SincePerRelayFilter(
+                        kinds = listOf(PictureEvent.KIND, VideoHorizontalEvent.KIND, VideoVerticalEvent.KIND),
+                        tags = mapOf("t" to hashtags),
+                        limit = 100,
+                        since =
+                            latestEOSEs.users[account.userProfile()]
+                                ?.followList
+                                ?.get(account.settings.defaultStoriesFollowList.value)
+                                ?.relayList,
+                    ),
+            ),
+            TypedFilter(
+                types = setOf(FeedType.GLOBAL),
+                filter =
+                    SincePerRelayFilter(
+                        kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND),
+                        tags =
+                            mapOf(
+                                "t" to hashtags,
+                                "m" to SUPPORTED_VIDEO_FEED_MIME_TYPES,
+                            ),
+                        limit = 100,
+                        since =
+                            latestEOSEs.users[account.userProfile()]
+                                ?.followList
+                                ?.get(account.settings.defaultStoriesFollowList.value)
+                                ?.relayList,
+                    ),
+            ),
         )
     }
 
-    fun createFollowGeohashesFilter(): TypedFilter? {
+    fun createFollowGeohashesFilter(): List<TypedFilter> {
         val hashToLoad =
             account.liveStoriesFollowLists.value
                 ?.geotags
-                ?.toList() ?: return null
+                ?.toList() ?: return emptyList()
 
-        if (hashToLoad.isEmpty()) return null
+        if (hashToLoad.isEmpty()) return emptyList()
 
-        return TypedFilter(
-            types = setOf(FeedType.GLOBAL),
-            filter =
-                SincePerRelayFilter(
-                    kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND, VideoHorizontalEvent.KIND, VideoVerticalEvent.KIND),
-                    tags =
-                        mapOf(
-                            "g" to
-                                hashToLoad
-                                    .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
-                                    .flatten(),
-                            "m" to SUPPORTED_VIDEO_FEED_MIME_TYPES,
-                        ),
-                    limit = 100,
-                    since =
-                        latestEOSEs.users[account.userProfile()]
-                            ?.followList
-                            ?.get(account.settings.defaultStoriesFollowList.value)
-                            ?.relayList,
-                ),
+        val geoHashes = hashToLoad
+
+        return listOf(
+            TypedFilter(
+                types = setOf(FeedType.GLOBAL),
+                filter =
+                    SincePerRelayFilter(
+                        kinds = listOf(PictureEvent.KIND, VideoHorizontalEvent.KIND, VideoVerticalEvent.KIND),
+                        tags = mapOf("g" to geoHashes),
+                        limit = 100,
+                        since =
+                            latestEOSEs.users[account.userProfile()]
+                                ?.followList
+                                ?.get(account.settings.defaultStoriesFollowList.value)
+                                ?.relayList,
+                    ),
+            ),
+            TypedFilter(
+                types = setOf(FeedType.GLOBAL),
+                filter =
+                    SincePerRelayFilter(
+                        kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND),
+                        tags =
+                            mapOf(
+                                "g" to geoHashes,
+                                "m" to SUPPORTED_VIDEO_FEED_MIME_TYPES,
+                            ),
+                        limit = 100,
+                        since =
+                            latestEOSEs.users[account.userProfile()]
+                                ?.followList
+                                ?.get(account.settings.defaultStoriesFollowList.value)
+                                ?.relayList,
+                    ),
+            ),
         )
     }
 
@@ -162,6 +214,6 @@ object NostrVideoDataSource : AmethystNostrDataSource("VideoFeed") {
                 createContextualFilter(),
                 createFollowTagsFilter(),
                 createFollowGeohashesFilter(),
-            ).ifEmpty { null }
+            ).flatten().ifEmpty { null }
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/service/OnlineCheck.kt

@@ -24,7 +24,7 @@ import android.util.Log
 import android.util.LruCache
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.BuildConfig
-import com.vitorpamplona.ammolite.service.HttpClientManager
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 import com.vitorpamplona.quartz.crypto.CryptoUtils
 import okhttp3.EventListener
 import okhttp3.Protocol

amethyst/src/main/java/com/vitorpamplona/amethyst/service/ZapPaymentHandler.kt

@@ -23,13 +23,13 @@ package com.vitorpamplona.amethyst.service
 import android.content.Context
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.collectSuccessfulOperations
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource.user
 import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.collectSuccessfulSigningOperations
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.events.AppDefinitionEvent
@@ -62,7 +62,7 @@ class ZapPaymentHandler(
         context: Context,
         showErrorIfNoLnAddress: Boolean,
         forceProxy: (String) -> Boolean,
-        onError: (String, String) -> Unit,
+        onError: (String, String, User?) -> Unit,
         onProgress: (percent: Float) -> Unit,
         onPayViaIntent: (ImmutableList<Payable>) -> Unit,
         zapType: LnZapEvent.ZapType,
@@ -90,6 +90,7 @@ class ZapPaymentHandler(
                                     context,
                                     R.string.user_does_not_have_a_lightning_address_setup_to_receive_sats,
                                 ),
+                                note.author,
                             )
                         }
                         return@withContext
@@ -108,6 +109,7 @@ class ZapPaymentHandler(
                                 context,
                                 R.string.user_does_not_have_a_lightning_address_setup_to_receive_sats,
                             ),
+                            note.author,
                         )
                     }
                     return@withContext
@@ -125,10 +127,10 @@ class ZapPaymentHandler(
                 onProgress(0.05f)
             }
 
-            assembleAllInvoices(splitZapRequestPairs.toList(), amountMilliSats, message, showErrorIfNoLnAddress, forceProxy, onError, onProgress = {
+            assembleAllInvoices(splitZapRequestPairs, amountMilliSats, message, showErrorIfNoLnAddress, forceProxy, onError, onProgress = {
                 onProgress(it * 0.7f + 0.05f) // keeps within range.
-            }, context) {
-                if (it.isEmpty()) {
+            }, context) { payables ->
+                if (payables.isEmpty()) {
                     onProgress(0.00f)
                     return@assembleAllInvoices
                 } else {
@@ -136,22 +138,14 @@ class ZapPaymentHandler(
                 }
 
                 if (account.hasWalletConnectSetup()) {
-                    payViaNWC(it.values.map { it.invoice }, note, onError, onProgress = {
+                    payViaNWC(payables, note, onError = onError, onProgress = {
                         onProgress(it * 0.25f + 0.75f) // keeps within range.
                     }, context) {
                         // onProgress(1f)
                     }
                 } else {
                     onPayViaIntent(
-                        it
-                            .map {
-                                Payable(
-                                    info = it.key.first,
-                                    user = it.key.second.user,
-                                    amountMilliSats = it.value.zapValue,
-                                    invoice = it.value.invoice,
-                                )
-                            }.toImmutableList(),
+                        payables.toImmutableList(),
                     )
 
                     onProgress(0f)
@@ -170,7 +164,8 @@ class ZapPaymentHandler(
         return roundedZapValue
     }
 
-    class SignAllZapRequestsReturn(
+    class ZapRequestReady(
+        val inputSetup: ZapSplitSetup,
         val zapRequestJson: String?,
         val user: User? = null,
     )
@@ -181,7 +176,7 @@ class ZapPaymentHandler(
         message: String,
         zapType: LnZapEvent.ZapType,
         zapsToSend: List<ZapSplitSetup>,
-        onAllDone: suspend (MutableMap<ZapSplitSetup, SignAllZapRequestsReturn>) -> Unit,
+        onAllDone: suspend (List<ZapRequestReady>) -> Unit,
     ) {
         val authorRelayList =
             note.author
@@ -195,13 +190,13 @@ class ZapPaymentHandler(
                     )?.readRelays()
                 }?.toSet()
 
-        collectSuccessfulSigningOperations<ZapSplitSetup, SignAllZapRequestsReturn>(
-            operationsInput = zapsToSend,
+        collectSuccessfulOperations<ZapSplitSetup, ZapRequestReady>(
+            items = zapsToSend,
             runRequestFor = { next: ZapSplitSetup, onReady ->
                 if (next.isLnAddress) {
                     prepareZapRequestIfNeeded(note, pollOption, message, zapType) { zapRequestJson ->
                         if (zapRequestJson != null) {
-                            onReady(SignAllZapRequestsReturn(zapRequestJson))
+                            onReady(ZapRequestReady(next, zapRequestJson))
                         }
                     }
                 } else {
@@ -217,7 +212,7 @@ class ZapPaymentHandler(
                         ) + (authorRelayList ?: emptySet())
 
                     prepareZapRequestIfNeeded(note, pollOption, message, zapType, user, userRelayList) { zapRequestJson ->
-                        onReady(SignAllZapRequestsReturn(zapRequestJson, user))
+                        onReady(ZapRequestReady(next, zapRequestJson, user))
                     }
                 }
             },
@@ -226,32 +221,33 @@ class ZapPaymentHandler(
     }
 
     suspend fun assembleAllInvoices(
-        invoices: List<Pair<ZapSplitSetup, SignAllZapRequestsReturn>>,
+        requests: List<ZapRequestReady>,
         totalAmountMilliSats: Long,
         message: String,
         showErrorIfNoLnAddress: Boolean,
         forceProxy: (String) -> Boolean,
-        onError: (String, String) -> Unit,
+        onError: (String, String, User?) -> Unit,
         onProgress: (percent: Float) -> Unit,
         context: Context,
-        onAllDone: suspend (MutableMap<Pair<ZapSplitSetup, SignAllZapRequestsReturn>, AssembleInvoiceReturn>) -> Unit,
+        onAllDone: suspend (List<Payable>) -> Unit,
     ) {
         var progressAllPayments = 0.00f
-        val totalWeight = invoices.sumOf { it.first.weight }
+        val totalWeight = requests.sumOf { it.inputSetup.weight }
 
-        collectSuccessfulSigningOperations<Pair<ZapSplitSetup, SignAllZapRequestsReturn>, AssembleInvoiceReturn>(
-            operationsInput = invoices,
-            runRequestFor = { splitZapRequestPair: Pair<ZapSplitSetup, SignAllZapRequestsReturn>, onReady ->
+        collectSuccessfulOperations<ZapRequestReady, Payable>(
+            items = requests,
+            runRequestFor = { splitZapRequestPair: ZapRequestReady, onReady ->
                 assembleInvoice(
-                    splitSetup = splitZapRequestPair.first,
-                    nostrZapRequest = splitZapRequestPair.second.zapRequestJson,
-                    zapValue = calculateZapValue(totalAmountMilliSats, splitZapRequestPair.first.weight, totalWeight),
+                    splitSetup = splitZapRequestPair.inputSetup,
+                    nostrZapRequest = splitZapRequestPair.zapRequestJson,
+                    toUser = splitZapRequestPair.user,
+                    zapValue = calculateZapValue(totalAmountMilliSats, splitZapRequestPair.inputSetup.weight, totalWeight),
                     message = message,
                     showErrorIfNoLnAddress = showErrorIfNoLnAddress,
                     forceProxy = forceProxy,
                     onError = onError,
                     onProgressStep = { percentStepForThisPayment ->
-                        progressAllPayments += percentStepForThisPayment / invoices.size
+                        progressAllPayments += percentStepForThisPayment / requests.size
                         onProgress(progressAllPayments)
                     },
                     context = context,
@@ -262,30 +258,35 @@ class ZapPaymentHandler(
         )
     }
 
+    class Paid(
+        payable: Payable,
+        success: Boolean,
+    )
+
     suspend fun payViaNWC(
-        invoices: List<String>,
+        payables: List<Payable>,
         note: Note,
-        onError: (String, String) -> Unit,
+        onError: (String, String, User?) -> Unit,
         onProgress: (percent: Float) -> Unit,
         context: Context,
-        onAllDone: suspend (MutableMap<String, Boolean>) -> Unit,
+        onAllDone: suspend (List<Paid>) -> Unit,
     ) {
         var progressAllPayments = 0.00f
 
-        collectSuccessfulSigningOperations<String, Boolean>(
-            operationsInput = invoices,
-            runRequestFor = { invoice: String, onReady ->
+        collectSuccessfulOperations<Payable, Paid>(
+            items = payables,
+            runRequestFor = { payable: Payable, onReady ->
                 account.sendZapPaymentRequestFor(
-                    bolt11 = invoice,
+                    bolt11 = payable.invoice,
                     zappedNote = note,
                     onSent = {
-                        progressAllPayments += 0.5f / invoices.size
+                        progressAllPayments += 0.5f / payables.size
                         onProgress(progressAllPayments)
-                        onReady(true)
+                        onReady(Paid(payable, true))
                     },
                     onResponse = { response ->
                         if (response is PayInvoiceErrorResponse) {
-                            progressAllPayments += 0.5f / invoices.size
+                            progressAllPayments += 0.5f / payables.size
                             onProgress(progressAllPayments)
                             onError(
                                 stringRes(context, R.string.error_dialog_pay_invoice_error),
@@ -295,9 +296,10 @@ class ZapPaymentHandler(
                                     response.error?.message
                                         ?: response.error?.code?.toString() ?: "Error parsing error message",
                                 ),
+                                payable.user,
                             )
                         } else {
-                            progressAllPayments += 0.5f / invoices.size
+                            progressAllPayments += 0.5f / payables.size
                             onProgress(progressAllPayments)
                         }
                     },
@@ -307,32 +309,26 @@ class ZapPaymentHandler(
         )
     }
 
-    class AssembleInvoiceReturn(
-        val zapValue: Long,
-        val invoice: String,
-    )
-
     private fun assembleInvoice(
         splitSetup: ZapSplitSetup,
         nostrZapRequest: String?,
+        toUser: User?,
         zapValue: Long,
         message: String,
         showErrorIfNoLnAddress: Boolean = true,
         forceProxy: (String) -> Boolean,
-        onError: (String, String) -> Unit,
+        onError: (String, String, User?) -> Unit,
         onProgressStep: (percent: Float) -> Unit,
         context: Context,
-        onReady: (AssembleInvoiceReturn) -> Unit,
+        onReady: (Payable) -> Unit,
     ) {
         var progressThisPayment = 0.00f
 
-        var user: User? = null
         val lud16 =
             if (splitSetup.isLnAddress) {
                 splitSetup.lnAddressOrPubKeyHex
             } else {
-                user = LocalCache.getUserIfExists(splitSetup.lnAddressOrPubKeyHex)
-                user?.info?.lnAddress()
+                toUser?.info?.lnAddress()
             }
 
         if (lud16 != null) {
@@ -343,7 +339,9 @@ class ZapPaymentHandler(
                     message = message,
                     nostrRequest = nostrZapRequest,
                     forceProxy = forceProxy,
-                    onError = onError,
+                    onError = { title, msg ->
+                        onError(title, msg, toUser)
+                    },
                     onProgress = {
                         val step = it - progressThisPayment
                         progressThisPayment = it
@@ -352,7 +350,14 @@ class ZapPaymentHandler(
                     context = context,
                     onSuccess = {
                         onProgressStep(1 - progressThisPayment)
-                        onReady(AssembleInvoiceReturn(zapValue, it))
+                        onReady(
+                            Payable(
+                                info = splitSetup,
+                                user = toUser,
+                                amountMilliSats = zapValue,
+                                invoice = it,
+                            ),
+                        )
                     },
                 )
         } else {
@@ -367,6 +372,7 @@ class ZapPaymentHandler(
                         R.string.user_x_does_not_have_a_lightning_address_setup_to_receive_sats,
                         user?.toBestDisplayName() ?: splitSetup.lnAddressOrPubKeyHex,
                     ),
+                    null,
                 )
             }
         }
@@ -383,7 +389,6 @@ class ZapPaymentHandler(
     ) {
         if (zapType != LnZapEvent.ZapType.NONZAP) {
             account.createZapRequestFor(note, pollOption, message, zapType, overrideUser, additionalRelays) { zapRequest ->
-                println("Zap Request " + zapRequest.toJson())
                 onReady(zapRequest.toJson())
             }
         } else {

amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt

@@ -24,12 +24,14 @@ import android.content.Context
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.service.HttpStatusMessages
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 import com.vitorpamplona.amethyst.ui.stringRes
-import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.encoders.LnInvoiceUtil
 import com.vitorpamplona.quartz.encoders.Lud06
 import okhttp3.Request
+import okhttp3.Response
 import java.math.BigDecimal
 import java.math.RoundingMode
 import java.net.URLEncoder
@@ -95,7 +97,7 @@ class LightningAddressResolver {
                                 .the_receiver_s_lightning_service_at_is_not_available_it_was_calculated_from_the_lightning_address_error_check_if_the_server_is_up_and_if_the_lightning_address_is_correct,
                             url,
                             lnaddress,
-                            it.code.toString(),
+                            errorMessage(it, context),
                         ),
                     )
                 }
@@ -154,12 +156,36 @@ class LightningAddressResolver {
             } else {
                 onError(
                     stringRes(context, R.string.error_unable_to_fetch_invoice),
-                    stringRes(context, R.string.could_not_fetch_invoice_from, lnCallback),
+                    stringRes(context, R.string.could_not_fetch_invoice_from_details, lnCallback, errorMessage(it, context)),
                 )
             }
         }
     }
 
+    fun errorMessage(
+        response: Response,
+        context: Context,
+    ): String {
+        val errorMessage =
+            runCatching {
+                jacksonObjectMapper().readTree(response.body.string())
+            }.getOrNull()?.let { tree ->
+                val status = tree.get("status")?.asText()
+                val message = tree.get("message")?.asText()
+
+                if (status == "error" && message != null) {
+                    message
+                } else {
+                    tree.get("error")?.get("message")?.asText()
+                }
+            }
+
+        return errorMessage
+            ?: HttpStatusMessages.resourceIdFor(response.code)?.let { stringRes(context, it) }
+            ?: response.message.ifBlank { null }
+            ?: response.code.toString()
+    }
+
     fun lnAddressInvoice(
         lnaddress: String,
         milliSats: Long,
@@ -195,7 +221,7 @@ class LightningAddressResolver {
                         null
                     }
 
-                val callback = lnurlp?.get("callback")?.asText()
+                val callback = lnurlp?.get("callback")?.asText()?.ifBlank { null }
 
                 if (callback == null) {
                     onError(

amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/EventNotificationConsumer.kt

@@ -34,6 +34,8 @@ import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendDM
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendZapNotification
 import com.vitorpamplona.amethyst.ui.note.showAmount
 import com.vitorpamplona.amethyst.ui.stringRes
+import com.vitorpamplona.quartz.encoders.toNpub
+import com.vitorpamplona.quartz.events.ChatMessageEncryptedFileHeaderEvent
 import com.vitorpamplona.quartz.events.ChatMessageEvent
 import com.vitorpamplona.quartz.events.DraftEvent
 import com.vitorpamplona.quartz.events.Event
@@ -58,7 +60,6 @@ class EventNotificationConsumer(
     suspend fun consume(event: GiftWrapEvent) {
         Log.d(TAG, "New Notification Arrived")
         if (!LocalCache.justVerify(event)) return
-        if (!notificationManager().areNotificationsEnabled()) return
 
         // PushNotification Wraps don't include a receiver.
         // Test with all logged in accounts
@@ -94,22 +95,71 @@ class EventNotificationConsumer(
         }
 
         pushWrappedEvent.unwrapThrowing(signer) { notificationEvent ->
-            val consumed = LocalCache.hasConsumed(notificationEvent)
-            val verified = LocalCache.justVerify(notificationEvent)
-            Log.d(TAG, "New Notification ${notificationEvent.kind} ${notificationEvent.id} Arrived for ${signer.pubKey} consumed= $consumed && verified= $verified")
-            if (!consumed && verified) {
-                Log.d(TAG, "New Notification was verified")
-                unwrapAndConsume(notificationEvent, signer) { innerEvent ->
-                    Log.d(TAG, "Unwrapped consume $consumed ${innerEvent.javaClass.simpleName}")
-                    if (innerEvent is PrivateDmEvent) {
-                        Log.d(TAG, "New Nip-04 DM to Notify")
-                        notify(innerEvent, signer, account)
-                    } else if (innerEvent is LnZapEvent) {
-                        Log.d(TAG, "New Zap to Notify")
-                        notify(innerEvent, signer, account)
-                    } else if (innerEvent is ChatMessageEvent) {
-                        Log.d(TAG, "New ChatMessage to Notify")
-                        notify(innerEvent, signer, account)
+            consumeNotificationEvent(notificationEvent, signer, account)
+        }
+    }
+
+    fun consumeNotificationEvent(
+        notificationEvent: Event,
+        signer: NostrSigner,
+        account: AccountSettings,
+    ) {
+        val consumed = LocalCache.hasConsumed(notificationEvent)
+        val verified = LocalCache.justVerify(notificationEvent)
+        Log.d(TAG, "New Notification ${notificationEvent.kind} ${notificationEvent.id} Arrived for ${signer.pubKey} consumed= $consumed && verified= $verified")
+        if (!consumed && verified) {
+            Log.d(TAG, "New Notification was verified")
+            unwrapAndConsume(notificationEvent, signer) { innerEvent ->
+                if (!notificationManager().areNotificationsEnabled()) return@unwrapAndConsume
+
+                Log.d(TAG, "Unwrapped consume $consumed ${innerEvent.javaClass.simpleName}")
+                if (innerEvent is PrivateDmEvent) {
+                    Log.d(TAG, "New Nip-04 DM to Notify")
+                    notify(innerEvent, signer, account)
+                } else if (innerEvent is LnZapEvent) {
+                    Log.d(TAG, "New Zap to Notify")
+                    notify(innerEvent, signer, account)
+                } else if (innerEvent is ChatMessageEvent) {
+                    Log.d(TAG, "New ChatMessage to Notify")
+                    notify(innerEvent, signer, account)
+                } else if (innerEvent is ChatMessageEncryptedFileHeaderEvent) {
+                    Log.d(TAG, "New ChatMessage File to Notify")
+                    notify(innerEvent, signer, account)
+                }
+            }
+        }
+    }
+
+    suspend fun findAccountAndConsume(event: Event) {
+        Log.d(TAG, "New Notification Arrived")
+        if (!LocalCache.justVerify(event)) return
+
+        val users = event.taggedUsers().map { LocalCache.getOrCreateUser(it) }
+        val npubs = users.map { it.pubkeyNpub() }.toSet()
+
+        // PushNotification Wraps don't include a receiver.
+        // Test with all logged in accounts
+        var matchAccount = false
+        LocalPreferences.allSavedAccounts().forEach {
+            if (!matchAccount && (it.hasPrivKey || it.loggedInWithExternalSigner) && it.npub in npubs) {
+                LocalPreferences.loadCurrentAccountFromEncryptedStorage(it.npub)?.let { acc ->
+                    Log.d(TAG, "New Notification Testing if for ${it.npub}")
+                    try {
+                        // TODO: Modify the external launcher to launch as different users.
+                        // Right now it only registers if Amber has already approved this signature
+                        val signer = acc.createSigner()
+                        if (signer is NostrSignerExternal) {
+                            signer.launcher.registerLauncher(
+                                launcher = { },
+                                contentResolver = Amethyst.instance::contentResolverFn,
+                            )
+                        }
+
+                        consumeNotificationEvent(event, signer, acc)
+                        matchAccount = true
+                    } catch (e: Exception) {
+                        if (e is CancellationException) throw e
+                        Log.d(TAG, "Message was not for user ${it.npub}: ${e.message}")
                     }
                 }
             }
@@ -149,13 +199,14 @@ class EventNotificationConsumer(
     }
 
     private fun notify(
-        event: ChatMessageEvent,
+        event: ChatMessageEncryptedFileHeaderEvent,
         signer: NostrSigner,
         acc: AccountSettings,
     ) {
         if (
-            event.createdAt > TimeUtils.fifteenMinutesAgo() &&
             // old event being re-broadcasted
+            event.createdAt > TimeUtils.fifteenMinutesAgo() &&
+            // don't display if it comes from me.
             event.pubKey != signer.pubKey
         ) { // from the user
             Log.d(TAG, "Notifying")
@@ -175,7 +226,52 @@ class EventNotificationConsumer(
                 val content = chatNote.event?.content() ?: ""
                 val user = chatNote.author?.toBestDisplayName() ?: ""
                 val userPicture = chatNote.author?.profilePicture()
-                val noteUri = chatNote.toNEvent()
+                val noteUri = chatNote.toNEvent() + "?account=" + acc.keyPair.pubKey.toNpub()
+
+                // TODO: Show Image on notification
+                notificationManager()
+                    .sendDMNotification(
+                        event.id,
+                        content,
+                        user,
+                        event.createdAt,
+                        userPicture,
+                        noteUri,
+                        applicationContext,
+                    )
+            }
+        }
+    }
+
+    private fun notify(
+        event: ChatMessageEvent,
+        signer: NostrSigner,
+        acc: AccountSettings,
+    ) {
+        if (
+            // old event being re-broadcasted
+            event.createdAt > TimeUtils.fifteenMinutesAgo() &&
+            // don't display if it comes from me.
+            event.pubKey != signer.pubKey
+        ) { // from the user
+            Log.d(TAG, "Notifying")
+            val myUser = LocalCache.getUserIfExists(signer.pubKey) ?: return
+            val chatNote = LocalCache.getNoteIfExists(event.id) ?: return
+            val chatRoom = event.chatroomKey(signer.pubKey)
+
+            val followingKeySet = acc.backupContactList?.unverifiedFollowKeySet()?.toSet() ?: return
+
+            val isKnownRoom =
+                (
+                    myUser.privateChatrooms[chatRoom]?.senderIntersects(followingKeySet) == true ||
+                        myUser.hasSentMessagesTo(chatRoom)
+                )
+
+            if (isKnownRoom) {
+                val content = chatNote.event?.content() ?: ""
+                val user = chatNote.author?.toBestDisplayName() ?: ""
+                val userPicture = chatNote.author?.profilePicture()
+                val noteUri = chatNote.toNEvent() + "?account=" + acc.keyPair.pubKey.toNpub()
                 notificationManager()
                     .sendDMNotification(
                         event.id,
@@ -215,7 +311,7 @@ class EventNotificationConsumer(
                     decryptContent(note, signer) { content ->
                         val user = note.author?.toBestDisplayName() ?: ""
                         val userPicture = note.author?.profilePicture()
-                        val noteUri = note.toNEvent()
+                        val noteUri = note.toNEvent() + "?account=" + acc.keyPair.pubKey.toNpub()
                         notificationManager()
                             .sendDMNotification(event.id, content, user, event.createdAt, userPicture, noteUri, applicationContext)
                     }
@@ -321,7 +417,7 @@ class EventNotificationConsumer(
                                     )
                             }
                             val userPicture = senderInfo.first.profilePicture()
-                            val noteUri = "nostr:Notifications"
+                            val noteUri = "notifications?account=" + acc.keyPair.pubKey.toNpub()
 
                             Log.d(TAG, "Notify ${event.id} $content $title $noteUri")
 
@@ -352,9 +448,9 @@ class EventNotificationConsumer(
                             )
 
                         val userPicture = senderInfo.first.profilePicture()
-                        val noteUri = "nostr:Notifications"
+                        val noteUri = "notifications?account=" + acc.keyPair.pubKey.toNpub()
 
-                        Log.d(TAG, "Notify ${event.id} $content $title $noteUri")
+                        Log.d(TAG, "Notify ${event.id} $title $noteUri")
 
                         notificationManager()
                             .sendZapNotification(

amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/NotificationUtils.kt

@@ -29,9 +29,10 @@ import android.graphics.drawable.BitmapDrawable
 import android.net.Uri
 import android.service.notification.StatusBarNotification
 import androidx.core.app.NotificationCompat
-import coil.ImageLoader
-import coil.executeBlocking
-import coil.request.ImageRequest
+import coil3.ImageLoader
+import coil3.asDrawable
+import coil3.executeBlocking
+import coil3.request.ImageRequest
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.MainActivity
 import com.vitorpamplona.amethyst.ui.stringRes
@@ -157,7 +158,7 @@ object NotificationUtils {
                 messageBody = messageBody,
                 messageTitle = messageTitle,
                 time = time,
-                picture = imageResult.drawable as? BitmapDrawable,
+                picture = imageResult.image?.asDrawable(applicationContext.resources) as? BitmapDrawable,
                 uri = uri,
                 channelId,
                 notificationGroupKey,
@@ -220,9 +221,6 @@ object NotificationUtils {
                 .setContentTitle(messageTitle)
                 .setContentText(stringRes(applicationContext, R.string.app_notification_private_message))
                 .setLargeIcon(picture?.bitmap)
-                // .setGroup(messageTitle)
-                // .setGroup(notificationGroupKey) //-> Might need a Group summary as well before we
-                // activate this
                 .setContentIntent(contentPendingIntent)
                 .setPriority(NotificationCompat.PRIORITY_HIGH)
                 .setAutoCancel(true)
@@ -238,9 +236,6 @@ object NotificationUtils {
                 .setContentTitle(messageTitle)
                 .setContentText(messageBody)
                 .setLargeIcon(picture?.bitmap)
-                // .setGroup(messageTitle)
-                // .setGroup(notificationGroupKey)  //-> Might need a Group summary as well before we
-                // activate this
                 .setContentIntent(contentPendingIntent)
                 .setPublicVersion(builderPublic.build())
                 .setPriority(NotificationCompat.PRIORITY_HIGH)

amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/PokeyReceiver.kt

@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2024 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.amethyst.service.notifications
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import com.vitorpamplona.quartz.events.Event
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
+
+class PokeyReceiver : BroadcastReceiver() {
+    companion object {
+        val POKEY_ACTION = "com.shared.NOSTR"
+        val TAG = "PokeyReceiver"
+    }
+
+    private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+
+    override fun onReceive(
+        context: Context,
+        intent: Intent,
+    ) {
+        if (intent.action == POKEY_ACTION) { // it's best practice to verify intent action before performing any operation
+            val eventStr = intent.getStringExtra("EVENT")
+            Log.d(TAG, "New Pokey Notification Arrived $eventStr")
+
+            if (eventStr == null) return
+
+            scope.launch(Dispatchers.IO) {
+                try {
+                    EventNotificationConsumer(context.applicationContext).findAccountAndConsume(Event.fromJson(eventStr))
+                } catch (e: Exception) {
+                    Log.e(TAG, "Failed to parse Pokey Event", e)
+                }
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt

@@ -25,18 +25,15 @@ import com.vitorpamplona.amethyst.AccountInfo
 import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.LocalPreferences
+import com.vitorpamplona.amethyst.launchAndWaitAll
 import com.vitorpamplona.amethyst.model.AccountSettings
-import com.vitorpamplona.ammolite.service.HttpClientManager
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
+import com.vitorpamplona.amethyst.tryAndWait
 import com.vitorpamplona.quartz.events.RelayAuthEvent
 import com.vitorpamplona.quartz.signers.NostrSignerExternal
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.joinAll
-import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
-import kotlinx.coroutines.withTimeoutOrNull
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -63,38 +60,26 @@ class RegisterAccounts(
             return
         }
 
-        coroutineScope {
-            val jobs =
-                remainingTos.map { accountRelayPair ->
-                    async {
-                        val result =
-                            withTimeoutOrNull(10000) {
-                                suspendCancellableCoroutine { continuation ->
-                                    val signer = accountRelayPair.first.createSigner()
-                                    // TODO: Modify the external launcher to launch as different users.
-                                    // Right now it only registers if Amber has already approved this signature
-                                    if (signer is NostrSignerExternal) {
-                                        signer.launcher.registerLauncher(
-                                            launcher = { },
-                                            contentResolver = Amethyst.instance::contentResolverFn,
-                                        )
-                                    }
+        launchAndWaitAll(remainingTos) { accountRelayPair ->
+            val result =
+                tryAndWait { continuation ->
+                    val signer = accountRelayPair.first.createSigner()
+                    // TODO: Modify the external launcher to launch as different users.
+                    // Right now it only registers if Amber has already approved this signature
+                    if (signer is NostrSignerExternal) {
+                        signer.launcher.registerLauncher(
+                            launcher = { },
+                            contentResolver = Amethyst.instance::contentResolverFn,
+                        )
+                    }
 
-                                    RelayAuthEvent.create(accountRelayPair.second, notificationToken, signer) { result ->
-                                        continuation.resume(result)
-                                    }
-                                }
-                            }
-
-                        if (result != null) {
-                            output.add(result)
-                        }
+                    RelayAuthEvent.create(accountRelayPair.second, notificationToken, signer) { result ->
+                        continuation.resume(result)
                     }
                 }
 
-            // runs in parallel to avoid overcrowding Amber.
-            withTimeoutOrNull(15000) {
-                jobs.joinAll()
+            if (result != null) {
+                output.add(result)
             }
         }
 
@@ -181,8 +166,6 @@ class RegisterAccounts(
         if (notificationToken.isNotEmpty()) {
             withContext(Dispatchers.IO) {
                 signEventsToProveControlOfAccounts(accounts, notificationToken) { postRegistrationEvent(it) }
-
-                PushNotificationUtils.hasInit = true
             }
         }
     }

amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/DefaultContentTypeInterceptor.kt

@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2024 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.amethyst.service.okhttp
+
+import okhttp3.Interceptor
+import okhttp3.Request
+import okhttp3.Response
+
+class DefaultContentTypeInterceptor(
+    private val userAgentHeader: String,
+) : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val originalRequest: Request = chain.request()
+        val requestWithUserAgent: Request =
+            originalRequest
+                .newBuilder()
+                .header("User-Agent", userAgentHeader)
+                .build()
+        return chain.proceed(requestWithUserAgent)
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/EncryptedBlobInterceptor.kt

@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) 2024 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.amethyst.service.okhttp
+
+import android.util.Log
+import com.vitorpamplona.quartz.crypto.nip17.AESGCM
+import com.vitorpamplona.quartz.crypto.nip17.NostrCipher
+import okhttp3.Interceptor
+import okhttp3.Response
+import okhttp3.ResponseBody.Companion.toResponseBody
+
+class EncryptedBlobInterceptor(
+    val cache: EncryptionKeyCache,
+) : Interceptor {
+    fun Response.decrypt(cipher: NostrCipher): Response {
+        val body = peekBody(Long.MAX_VALUE)
+        val decryptedBytes = cipher.decrypt(body.bytes())
+        val newBody = decryptedBytes.toResponseBody(body.contentType())
+        return newBuilder().body(newBody).build()
+    }
+
+    fun Response.decryptOrNull(cipher: NostrCipher): Response? =
+        try {
+            decrypt(cipher)
+        } catch (e: Exception) {
+            Log.w("EncryptedBlobInterceptor", "Failed to decrypt", e)
+            null
+        }
+
+    private fun Response.decryptOrNullWithErrorCorrection(cipher: NostrCipher): Response? {
+        return decryptOrNull(cipher) ?: return if (cipher is AESGCM) {
+            decryptOrNull(cipher.copyUsingUTF8Nonce())
+        } else {
+            null
+        }
+    }
+
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val request = chain.request()
+        val response = chain.proceed(request)
+
+        val cipher = cache.get(request.url.toString()) ?: return response
+
+        if (response.isSuccessful) {
+            return response.decryptOrNullWithErrorCorrection(cipher) ?: response
+        } else {
+            // Log redirections to be able to use the cipher.
+            response.header("Location")?.let {
+                cache.add(it, cipher)
+            }
+        }
+        return response
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/EncryptionKeyCache.kt

@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2024 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.amethyst.service.okhttp
+
+import android.util.LruCache
+import com.vitorpamplona.quartz.crypto.nip17.NostrCipher
+
+/**
+ * Neigther ExoPlayer, nor Coil support passing key and nonce to the Interceptor via
+ * Request.tag, which would be the right way to do this.
+ *
+ * This class serves as a key cache to decrypt the body of HTTP calls that need it.
+ */
+class EncryptionKeyCache {
+    val cache = LruCache<String, NostrCipher>(100)
+
+    fun add(
+        url: String?,
+        cipher: NostrCipher,
+    ) {
+        if (cache.get(url) == null) {
+            cache.put(url, cipher)
+        }
+    }
+
+    fun get(url: String): NostrCipher? = cache.get(url)
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/HttpClientManager.kt

@@ -18,43 +18,17 @@
  * 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.ammolite.service
+package com.vitorpamplona.amethyst.service.okhttp
 
 import android.util.Log
-import com.vitorpamplona.ammolite.service.HttpClientManager.setDefaultProxy
-import okhttp3.Interceptor
+import com.vitorpamplona.quartz.crypto.nip17.NostrCipher
 import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import java.io.IOException
 import java.net.InetSocketAddress
 import java.net.Proxy
 import java.time.Duration
 
-class LoggingInterceptor : Interceptor {
-    @Throws(IOException::class)
-    override fun intercept(chain: Interceptor.Chain): Response {
-        val request: Request = chain.request()
-        val t1 = System.nanoTime()
-        val port =
-            (
-                chain
-                    .connection()
-                    ?.route()
-                    ?.proxy
-                    ?.address() as? InetSocketAddress
-            )?.port
-        val response: Response = chain.proceed(request)
-        val t2 = System.nanoTime()
-
-        Log.d("OkHttpLog", "Req $port ${request.url} in ${(t2 - t1) / 1e6}ms")
-
-        return response
-    }
-}
-
 object HttpClientManager {
-    val rootClient =
+    private val rootClient =
         OkHttpClient
             .Builder()
             .followRedirects(true)
@@ -71,35 +45,37 @@ object HttpClientManager {
 
     private var currentProxy: Proxy? = null
 
+    private val cache = EncryptionKeyCache()
+
     fun setDefaultProxy(proxy: Proxy?) {
         if (currentProxy != proxy) {
             Log.d("HttpClient", "Changing proxy to: ${proxy != null}")
-            this.currentProxy = proxy
+            currentProxy = proxy
 
             // recreates singleton
-            this.defaultHttpClient = buildHttpClient(currentProxy, defaultTimeout)
+            defaultHttpClient = buildHttpClient(currentProxy, defaultTimeout)
         }
     }
 
-    fun getCurrentProxy(): Proxy? = this.currentProxy
+    fun getCurrentProxy(): Proxy? = currentProxy
 
     fun setDefaultTimeout(timeout: Duration) {
         Log.d("HttpClient", "Changing timeout to: $timeout")
-        if (this.defaultTimeout.seconds != timeout.seconds) {
-            this.defaultTimeout = timeout
+        if (defaultTimeout.seconds != timeout.seconds) {
+            defaultTimeout = timeout
 
             // recreates singleton
-            this.defaultHttpClient = buildHttpClient(currentProxy, defaultTimeout)
-            this.defaultHttpClientWithoutProxy = buildHttpClient(null, defaultTimeout)
+            defaultHttpClient = buildHttpClient(currentProxy, defaultTimeout)
+            defaultHttpClientWithoutProxy = buildHttpClient(null, defaultTimeout)
         }
     }
 
     fun setDefaultUserAgent(userAgentHeader: String) {
         Log.d("HttpClient", "Changing userAgent")
         if (userAgent != userAgentHeader) {
-            this.userAgent = userAgentHeader
-            this.defaultHttpClient = buildHttpClient(currentProxy, defaultTimeout)
-            this.defaultHttpClientWithoutProxy = buildHttpClient(null, defaultTimeout)
+            userAgent = userAgentHeader
+            defaultHttpClient = buildHttpClient(currentProxy, defaultTimeout)
+            defaultHttpClientWithoutProxy = buildHttpClient(null, defaultTimeout)
         }
     }
 
@@ -117,24 +93,10 @@ object HttpClientManager {
             .writeTimeout(duration)
             .addInterceptor(DefaultContentTypeInterceptor(userAgent))
             .addNetworkInterceptor(LoggingInterceptor())
+            .addNetworkInterceptor(EncryptedBlobInterceptor(cache))
             .build()
     }
 
-    class DefaultContentTypeInterceptor(
-        private val userAgentHeader: String,
-    ) : Interceptor {
-        @Throws(IOException::class)
-        override fun intercept(chain: Interceptor.Chain): Response {
-            val originalRequest: Request = chain.request()
-            val requestWithUserAgent: Request =
-                originalRequest
-                    .newBuilder()
-                    .header("User-Agent", userAgentHeader)
-                    .build()
-            return chain.proceed(requestWithUserAgent)
-        }
-    }
-
     fun getCurrentProxyPort(useProxy: Boolean): Int? =
         if (useProxy) {
             (currentProxy?.address() as? InetSocketAddress)?.port
@@ -144,13 +106,13 @@ object HttpClientManager {
 
     fun getHttpClient(useProxy: Boolean): OkHttpClient =
         if (useProxy) {
-            if (this.defaultHttpClient == null) {
-                this.defaultHttpClient = buildHttpClient(currentProxy, defaultTimeout)
+            if (defaultHttpClient == null) {
+                defaultHttpClient = buildHttpClient(currentProxy, defaultTimeout)
             }
             defaultHttpClient!!
         } else {
-            if (this.defaultHttpClientWithoutProxy == null) {
-                this.defaultHttpClientWithoutProxy = buildHttpClient(null, defaultTimeout)
+            if (defaultHttpClientWithoutProxy == null) {
+                defaultHttpClientWithoutProxy = buildHttpClient(null, defaultTimeout)
             }
             defaultHttpClientWithoutProxy!!
         }
@@ -158,4 +120,9 @@ object HttpClientManager {
     fun setDefaultProxyOnPort(port: Int) {
         setDefaultProxy(Proxy(Proxy.Type.SOCKS, InetSocketAddress("127.0.0.1", port)))
     }
+
+    fun addCipherToCache(
+        url: String,
+        cipher: NostrCipher,
+    ) = cache.add(url, cipher)
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/LoggingInterceptor.kt

@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2024 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.amethyst.service.okhttp
+
+import android.util.Log
+import okhttp3.Interceptor
+import okhttp3.Request
+import okhttp3.Response
+import java.net.InetSocketAddress
+
+class LoggingInterceptor : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val request: Request = chain.request()
+        val t1 = System.nanoTime()
+        val port =
+            (
+                chain
+                    .connection()
+                    ?.route()
+                    ?.proxy
+                    ?.address() as? InetSocketAddress
+            )?.port
+        val response: Response = chain.proceed(request)
+        val t2 = System.nanoTime()
+
+        Log.d("OkHttpLog", "Req $port ${request.url} in ${(t2 - t1) / 1e6}ms")
+
+        return response
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpWebSocket.kt

@@ -0,0 +1,89 @@
+/**
+ * Copyright (c) 2024 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.amethyst.service.okhttp
+
+import com.vitorpamplona.ammolite.sockets.WebSocket
+import com.vitorpamplona.ammolite.sockets.WebSocketListener
+import com.vitorpamplona.ammolite.sockets.WebsocketBuilder
+import okhttp3.Request
+import okhttp3.Response
+
+class OkHttpWebSocket(
+    val url: String,
+    val forceProxy: Boolean,
+    val out: WebSocketListener,
+) : WebSocket {
+    private val listener = OkHttpWebsocketListener()
+    private var socket: okhttp3.WebSocket? = null
+
+    fun buildRequest() = Request.Builder().url(url.trim()).build()
+
+    override fun connect() {
+        socket = HttpClientManager.getHttpClient(forceProxy).newWebSocket(buildRequest(), listener)
+    }
+
+    inner class OkHttpWebsocketListener : okhttp3.WebSocketListener() {
+        override fun onOpen(
+            webSocket: okhttp3.WebSocket,
+            response: Response,
+        ) = out.onOpen(
+            response.receivedResponseAtMillis - response.sentRequestAtMillis,
+            response.headers.get("Sec-WebSocket-Extensions")?.contains("permessage-deflate") ?: false,
+        )
+
+        override fun onMessage(
+            webSocket: okhttp3.WebSocket,
+            text: String,
+        ) = out.onMessage(text)
+
+        override fun onClosing(
+            webSocket: okhttp3.WebSocket,
+            code: Int,
+            reason: String,
+        ) = out.onClosing(code, reason)
+
+        override fun onClosed(
+            webSocket: okhttp3.WebSocket,
+            code: Int,
+            reason: String,
+        ) = out.onClosed(code, reason)
+
+        override fun onFailure(
+            webSocket: okhttp3.WebSocket,
+            t: Throwable,
+            response: Response?,
+        ) = out.onFailure(t, response?.message)
+    }
+
+    class Builder : WebsocketBuilder {
+        override fun build(
+            url: String,
+            forceProxy: Boolean,
+            out: WebSocketListener,
+        ) = OkHttpWebSocket(url, forceProxy, out)
+    }
+
+    override fun cancel() {
+        socket?.cancel()
+    }
+
+    override fun send(msg: String): Boolean = socket?.send(msg) ?: false
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpBlockstreamExplorer.kt

@@ -24,7 +24,7 @@ import android.util.Log
 import android.util.LruCache
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
-import com.vitorpamplona.ammolite.service.HttpClientManager
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 import com.vitorpamplona.quartz.ots.BitcoinExplorer
 import com.vitorpamplona.quartz.ots.BlockHeader
 import com.vitorpamplona.quartz.ots.exceptions.UrlException

amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendar.kt

@@ -21,7 +21,7 @@
 package com.vitorpamplona.amethyst.service.ots
 
 import com.vitorpamplona.amethyst.BuildConfig
-import com.vitorpamplona.ammolite.service.HttpClientManager
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 import com.vitorpamplona.quartz.encoders.Hex
 import com.vitorpamplona.quartz.ots.ICalendar
 import com.vitorpamplona.quartz.ots.StreamDeserializationContext

amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendarAsyncSubmit.kt

@@ -21,7 +21,7 @@
 package com.vitorpamplona.amethyst.service.ots
 
 import com.vitorpamplona.amethyst.BuildConfig
-import com.vitorpamplona.ammolite.service.HttpClientManager
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 import com.vitorpamplona.quartz.ots.ICalendarAsyncSubmit
 import com.vitorpamplona.quartz.ots.StreamDeserializationContext
 import com.vitorpamplona.quartz.ots.Timestamp

amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/MultiPlayerPlaybackManager.kt

@@ -49,7 +49,7 @@ class MultiPlayerPlaybackManager(
     private val playingMap = mutableMapOf<String, MediaSession>()
 
     private val cache =
-        object : LruCache<String, MediaSession>(10) { // up to 10 videos in the screen at the same time
+        object : LruCache<String, MediaSession>(20) { // up to 10 videos in the screen at the same time
             override fun entryRemoved(
                 evicted: Boolean,
                 key: String?,
@@ -91,7 +91,7 @@ class MultiPlayerPlaybackManager(
 
         val player =
             ExoPlayer.Builder(context).run {
-                dataSourceFactory?.let { setMediaSourceFactory(it) }
+                setMediaSourceFactory(dataSourceFactory)
                 build()
             }
 

amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/PlaybackService.kt

@@ -26,7 +26,7 @@ import androidx.annotation.OptIn
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.session.MediaSession
 import androidx.media3.session.MediaSessionService
-import com.vitorpamplona.ammolite.service.HttpClientManager
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 
 class PlaybackService : MediaSessionService() {
     private var videoViewedPositionCache = VideoViewedPositionCache()

amethyst/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlPreview.kt

@@ -21,7 +21,7 @@
 package com.vitorpamplona.amethyst.service.previews
 
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.ammolite.service.HttpClientManager
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/EncryptFiles.kt

@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) 2024 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.amethyst.service.uploads
+
+import android.content.Context
+import android.net.Uri
+import androidx.core.net.toUri
+import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.nip17.NostrCipher
+import com.vitorpamplona.quartz.encoders.toHexKey
+import java.io.File
+
+class EncryptFilesResult(
+    val uri: Uri,
+    val contentType: String?,
+    val originalHash: String,
+    val encryptedHash: String,
+    val size: Long?,
+)
+
+class EncryptFiles {
+    fun encryptFile(
+        context: Context,
+        inputFile: Uri,
+        cipher: NostrCipher,
+    ): EncryptFilesResult {
+        val resolver = context.contentResolver
+
+        val encryptedFile = File.createTempFile("EncryptFiles", ".encrypted", context.getCacheDir())
+
+        resolver.openInputStream(inputFile)!!.use { inputStream ->
+            val bytes = inputStream.readBytes()
+            val originalHash = CryptoUtils.sha256(bytes).toHexKey()
+            val encrypted = cipher.encrypt(bytes)
+            val encryptedHash = CryptoUtils.sha256(encrypted).toHexKey()
+
+            encryptedFile.outputStream().use { outputStream ->
+                outputStream.write(encrypted)
+            }
+
+            return EncryptFilesResult(
+                encryptedFile.toUri(),
+                "application/octet-stream",
+                originalHash,
+                encryptedHash,
+                encrypted.size.toLong(),
+            )
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/FileHeader.kt

@@ -18,7 +18,7 @@
  * 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.amethyst.service
+package com.vitorpamplona.amethyst.service.uploads
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
@@ -28,52 +28,51 @@ import android.media.MediaMetadataRetriever
 import android.media.MediaMetadataRetriever.BitmapParams
 import android.os.Build
 import android.util.Log
-import com.vitorpamplona.amethyst.ui.actions.ImageDownloader
+import com.vitorpamplona.amethyst.commons.blurhash.toBlurhash
+import com.vitorpamplona.amethyst.service.Blurhash
 import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.encoders.Dimension
 import com.vitorpamplona.quartz.encoders.toHexKey
-import io.trbl.blurhash.BlurHash
 import kotlinx.coroutines.CancellationException
 import java.io.IOException
-import kotlin.math.roundToInt
 
 class FileHeader(
     val mimeType: String?,
     val hash: String,
     val size: Int,
-    val dim: String?,
-    val blurHash: String?,
+    val dim: Dimension?,
+    val blurHash: Blurhash?,
 ) {
+    class UnableToDownload(
+        val fileUrl: String,
+    ) : Exception()
+
     companion object {
         suspend fun prepare(
             fileUrl: String,
             mimeType: String?,
-            dimPrecomputed: String?,
+            dimPrecomputed: Dimension?,
             forceProxy: Boolean,
-            onReady: (FileHeader) -> Unit,
-            onError: (String) -> Unit,
-        ) {
+        ): Result<FileHeader> =
             try {
                 val imageData: ByteArray? = ImageDownloader().waitAndGetImage(fileUrl, forceProxy)
 
                 if (imageData != null) {
-                    prepare(imageData, mimeType, dimPrecomputed, onReady, onError)
+                    prepare(imageData, mimeType, dimPrecomputed)
                 } else {
-                    onError("Unable to download image from $fileUrl")
+                    Result.failure(UnableToDownload(fileUrl))
                 }
             } catch (e: Exception) {
                 if (e is CancellationException) throw e
                 Log.e("ImageDownload", "Couldn't download image from server: ${e.message}")
-                onError(e.message ?: e.javaClass.simpleName)
+                Result.failure(e)
             }
-        }
 
         fun prepare(
             data: ByteArray,
             mimeType: String?,
-            dimPrecomputed: String?,
-            onReady: (FileHeader) -> Unit,
-            onError: (String) -> Unit,
-        ) {
+            dimPrecomputed: Dimension?,
+        ): Result<FileHeader> =
             try {
                 val hash = CryptoUtils.sha256(data).toHexKey()
                 val size = data.size
@@ -83,90 +82,15 @@ class FileHeader(
                         val opt = BitmapFactory.Options()
                         opt.inPreferredConfig = Bitmap.Config.ARGB_8888
                         val mBitmap = BitmapFactory.decodeByteArray(data, 0, data.size, opt)
-
-                        val intArray = IntArray(mBitmap.width * mBitmap.height)
-                        mBitmap.getPixels(
-                            intArray,
-                            0,
-                            mBitmap.width,
-                            0,
-                            0,
-                            mBitmap.width,
-                            mBitmap.height,
-                        )
-
-                        val dim = "${mBitmap.width}x${mBitmap.height}"
-
-                        val aspectRatio = (mBitmap.width).toFloat() / (mBitmap.height).toFloat()
-
-                        if (aspectRatio > 1) {
-                            Pair(
-                                BlurHash.encode(
-                                    intArray,
-                                    mBitmap.width,
-                                    mBitmap.height,
-                                    9,
-                                    (9 * (1 / aspectRatio)).roundToInt(),
-                                ),
-                                dim,
-                            )
-                        } else if (aspectRatio < 1) {
-                            Pair(
-                                BlurHash.encode(
-                                    intArray,
-                                    mBitmap.width,
-                                    mBitmap.height,
-                                    (9 * aspectRatio).roundToInt(),
-                                    9,
-                                ),
-                                dim,
-                            )
-                        } else {
-                            Pair(BlurHash.encode(intArray, mBitmap.width, mBitmap.height, 4, 4), dim)
-                        }
+                        Pair(Blurhash(mBitmap.toBlurhash()), Dimension(mBitmap.width, mBitmap.height))
                     } else if (mimeType?.startsWith("video/") == true) {
                         val mediaMetadataRetriever = MediaMetadataRetriever()
                         mediaMetadataRetriever.setDataSource(ByteArrayMediaDataSource(data))
 
                         val newDim = mediaMetadataRetriever.prepareDimFromVideo() ?: dimPrecomputed
+                        val blurhash = mediaMetadataRetriever.getThumbnail()?.toBlurhash()?.let { Blurhash(it) }
 
-                        val blurhash =
-                            mediaMetadataRetriever.getThumbnail()?.let { thumbnail ->
-                                val aspectRatio = (thumbnail.width).toFloat() / (thumbnail.height).toFloat()
-
-                                val intArray = IntArray(thumbnail.width * thumbnail.height)
-                                thumbnail.getPixels(
-                                    intArray,
-                                    0,
-                                    thumbnail.width,
-                                    0,
-                                    0,
-                                    thumbnail.width,
-                                    thumbnail.height,
-                                )
-
-                                if (aspectRatio > 1) {
-                                    BlurHash.encode(
-                                        intArray,
-                                        thumbnail.width,
-                                        thumbnail.height,
-                                        9,
-                                        (9 * (1 / aspectRatio)).roundToInt(),
-                                    )
-                                } else if (aspectRatio < 1) {
-                                    BlurHash.encode(
-                                        intArray,
-                                        thumbnail.width,
-                                        thumbnail.height,
-                                        (9 * aspectRatio).roundToInt(),
-                                        9,
-                                    )
-                                } else {
-                                    BlurHash.encode(intArray, thumbnail.width, thumbnail.height, 4, 4)
-                                }
-                            }
-
-                        if (newDim != "0x0") {
+                        if (newDim?.hasSize() == true) {
                             Pair(blurhash, newDim)
                         } else {
                             Pair(blurhash, null)
@@ -175,13 +99,12 @@ class FileHeader(
                         Pair(null, null)
                     }
 
-                onReady(FileHeader(mimeType, hash, size, dim, blurHash))
+                Result.success(FileHeader(mimeType, hash, size, dim, blurHash))
             } catch (e: Exception) {
                 if (e is CancellationException) throw e
                 Log.e("ImageDownload", "Couldn't convert image in to File Header: ${e.message}")
-                onError(e.message ?: e.javaClass.simpleName)
+                Result.failure(e)
             }
-        }
     }
 }
 
@@ -212,11 +135,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? {

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/ImageDownloader.kt

@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) 2024 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.amethyst.service.uploads
+
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.withContext
+import java.net.HttpURLConnection
+import java.net.URL
+
+class ImageDownloader {
+    suspend fun waitAndGetImage(
+        imageUrl: String,
+        forceProxy: Boolean,
+    ): ByteArray? =
+        withContext(Dispatchers.IO) {
+            var imageData: ByteArray? = null
+            var tentatives = 0
+
+            // Servers are usually not ready.. so tries to download it for 15 times/seconds.
+            while (imageData == null && tentatives < 15) {
+                imageData =
+                    try {
+                        tryGetTheImage(imageUrl, forceProxy)
+                    } catch (e: Exception) {
+                        if (e is CancellationException) throw e
+                        null
+                    }
+
+                if (imageData == null) {
+                    tentatives++
+                    delay(1000)
+                }
+            }
+
+            return@withContext imageData
+        }
+
+    private suspend fun tryGetTheImage(
+        imageUrl: String,
+        forceProxy: Boolean,
+    ): ByteArray? =
+        withContext(Dispatchers.IO) {
+            // TODO: Migrate to OkHttp
+            HttpURLConnection.setFollowRedirects(true)
+            var url = URL(imageUrl)
+            var huc =
+                if (forceProxy) {
+                    url.openConnection(HttpClientManager.getCurrentProxy()) as HttpURLConnection
+                } else {
+                    url.openConnection() as HttpURLConnection
+                }
+            huc.instanceFollowRedirects = true
+            var responseCode = huc.responseCode
+
+            if (responseCode in 300..400) {
+                val newUrl: String = huc.getHeaderField("Location")
+
+                // open the new connnection again
+                url = URL(newUrl)
+                huc =
+                    if (forceProxy) {
+                        url.openConnection(HttpClientManager.getCurrentProxy()) as HttpURLConnection
+                    } else {
+                        url.openConnection() as HttpURLConnection
+                    }
+                responseCode = huc.responseCode
+            }
+
+            return@withContext if (responseCode in 200..300) {
+                huc.inputStream.use { it.readBytes() }
+            } else {
+                null
+            }
+        }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MediaCompressor.kt

@@ -0,0 +1,221 @@
+/**
+ * Copyright (c) 2024 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.amethyst.service.uploads
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.net.Uri
+import android.util.Log
+import androidx.core.net.toUri
+import com.abedelazizshe.lightcompressorlibrary.CompressionListener
+import com.abedelazizshe.lightcompressorlibrary.VideoCompressor
+import com.abedelazizshe.lightcompressorlibrary.VideoQuality
+import com.abedelazizshe.lightcompressorlibrary.config.AppSpecificStorageConfiguration
+import com.abedelazizshe.lightcompressorlibrary.config.Configuration
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.ui.components.util.MediaCompressorFileUtils
+import id.zelory.compressor.Compressor
+import id.zelory.compressor.constraint.default
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withTimeoutOrNull
+import java.io.File
+import java.util.UUID
+import kotlin.coroutines.resume
+
+class MediaCompressorResult(
+    val uri: Uri,
+    val contentType: String?,
+    val size: Long?,
+)
+
+class MediaCompressor {
+    // ALL ERRORS ARE IGNORED. The original file is returned.
+    suspend fun compress(
+        uri: Uri,
+        contentType: String?,
+        mediaQuality: CompressorQuality,
+        applicationContext: Context,
+    ): MediaCompressorResult {
+        // Skip compression if user selected uncompressed
+        if (mediaQuality == CompressorQuality.UNCOMPRESSED) {
+            Log.d("MediaCompressor", "UNCOMPRESSED quality selected, skipping compression.")
+            return MediaCompressorResult(uri, contentType, null)
+        }
+
+        checkNotInMainThread()
+
+        // branch into compression based on content type
+        return when {
+            contentType?.startsWith("video", ignoreCase = true) == true -> compressVideo(uri, contentType, applicationContext, mediaQuality)
+            contentType?.startsWith("image", ignoreCase = true) == true &&
+                !contentType.contains("gif") &&
+                !contentType.contains("svg") ->
+                compressImage(uri, contentType, applicationContext, mediaQuality)
+            else -> MediaCompressorResult(uri, contentType, null)
+        }
+    }
+
+    private suspend fun compressVideo(
+        uri: Uri,
+        contentType: String?,
+        applicationContext: Context,
+        mediaQuality: CompressorQuality,
+    ): MediaCompressorResult {
+        val videoQuality =
+            when (mediaQuality) {
+                CompressorQuality.VERY_LOW -> VideoQuality.VERY_LOW
+                CompressorQuality.LOW -> VideoQuality.LOW
+                CompressorQuality.MEDIUM -> VideoQuality.MEDIUM
+                CompressorQuality.HIGH -> VideoQuality.HIGH
+                CompressorQuality.VERY_HIGH -> VideoQuality.VERY_HIGH
+                else -> VideoQuality.MEDIUM
+            }
+
+        Log.d("MediaCompressor", "Using video compression $mediaQuality")
+
+        val result =
+            withTimeoutOrNull(30000) {
+                suspendCancellableCoroutine { continuation ->
+                    VideoCompressor.start(
+                        // => This is required
+                        context = applicationContext,
+                        // => Source can be provided as content uris
+                        uris = listOf(uri),
+                        isStreamable = false,
+                        // THIS STORAGE
+                        // sharedStorageConfiguration = SharedStorageConfiguration(
+                        //    saveAt = SaveLocation.movies, // => default is movies
+                        //    videoName = "compressed_video" // => required name
+                        // ),
+                        // OR AND NOT BOTH
+                        appSpecificStorageConfiguration = AppSpecificStorageConfiguration(),
+                        configureWith =
+                            Configuration(
+                                quality = videoQuality,
+                                // => required name
+                                videoNames = listOf(UUID.randomUUID().toString()),
+                            ),
+                        listener =
+                            object : CompressionListener {
+                                override fun onProgress(
+                                    index: Int,
+                                    percent: Float,
+                                ) {}
+
+                                override fun onStart(index: Int) {}
+
+                                override fun onSuccess(
+                                    index: Int,
+                                    size: Long,
+                                    path: String?,
+                                ) {
+                                    if (path != null) {
+                                        Log.d("MediaCompressor", "Video compression success. Compressed size [$size]")
+                                        continuation.resume(MediaCompressorResult(Uri.fromFile(File(path)), contentType, size))
+                                    } else {
+                                        Log.d("MediaCompressor", "Video compression successful, but returned null path")
+                                        continuation.resume(null)
+                                    }
+                                }
+
+                                override fun onFailure(
+                                    index: Int,
+                                    failureMessage: String,
+                                ) {
+                                    Log.d("MediaCompressor", "Video compression failed: $failureMessage")
+                                    // keeps going with original video
+                                    continuation.resume(null)
+                                }
+
+                                override fun onCancelled(index: Int) {
+                                    continuation.resume(null)
+                                }
+                            },
+                    )
+                }
+            }
+
+        return result ?: MediaCompressorResult(uri, contentType, null)
+    }
+
+    private suspend fun compressImage(
+        uri: Uri,
+        contentType: String?,
+        context: Context,
+        mediaQuality: CompressorQuality,
+    ): MediaCompressorResult {
+        val imageQuality =
+            when (mediaQuality) {
+                CompressorQuality.VERY_LOW -> 40
+                CompressorQuality.LOW -> 50
+                CompressorQuality.MEDIUM -> 60
+                CompressorQuality.HIGH -> 80
+                CompressorQuality.VERY_HIGH -> 90
+                else -> 60
+            }
+
+        return try {
+            Log.d("MediaCompressor", "Using image compression $mediaQuality")
+            val tempFile = MediaCompressorFileUtils.from(uri, context)
+            val compressedImageFile =
+                Compressor.compress(context, tempFile) {
+                    default(width = 640, format = Bitmap.CompressFormat.JPEG, quality = imageQuality)
+                }
+            Log.d("MediaCompressor", "Image compression success. Original size [${tempFile.length()}], new size [${compressedImageFile.length()}]")
+            MediaCompressorResult(compressedImageFile.toUri(), contentType, compressedImageFile.length())
+        } catch (e: Exception) {
+            Log.d("MediaCompressor", "Image compression failed: ${e.message}")
+            if (e is CancellationException) throw e
+            e.printStackTrace()
+            MediaCompressorResult(uri, contentType, null)
+        }
+    }
+
+    companion object {
+        fun intToCompressorQuality(mediaQualityFloat: Int): CompressorQuality =
+            when (mediaQualityFloat) {
+                0 -> CompressorQuality.LOW
+                1 -> CompressorQuality.MEDIUM
+                2 -> CompressorQuality.HIGH
+                3 -> CompressorQuality.UNCOMPRESSED
+                else -> CompressorQuality.MEDIUM
+            }
+
+        fun compressorQualityToInt(compressorQuality: CompressorQuality): Int =
+            when (compressorQuality) {
+                CompressorQuality.LOW -> 0
+                CompressorQuality.MEDIUM -> 1
+                CompressorQuality.HIGH -> 2
+                CompressorQuality.UNCOMPRESSED -> 3
+                else -> 1
+            }
+    }
+}
+
+enum class CompressorQuality {
+    VERY_LOW,
+    LOW,
+    MEDIUM,
+    HIGH,
+    VERY_HIGH,
+    UNCOMPRESSED,
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MediaUploadResult.kt

@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2024 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.amethyst.service.uploads
+
+import com.vitorpamplona.quartz.encoders.Dimension
+import com.vitorpamplona.quartz.encoders.HexKey
+
+data class MediaUploadResult(
+    // A publicly accessible URL to the BUD-01 GET /<sha256> endpoint (optionally with a file extension)
+    val url: String?,
+    // The sha256 hash of the blob
+    val sha256: HexKey? = null,
+    // The size of the blob in bytes
+    val size: Long? = null,
+    // (optional) The MIME type of the blob
+    val type: String? = null,
+    // upload time
+    val uploaded: Long? = null,
+    // dimensions
+    val dimension: Dimension? = null,
+    // magnet link
+    val magnet: String? = null,
+    // info hash
+    val infohash: String? = null,
+    // ipfs link
+    val ipfs: String? = null,
+)

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MultiOrchestrator.kt

@@ -0,0 +1,130 @@
+/**
+ * Copyright (c) 2024 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.amethyst.service.uploads
+
+import android.content.Context
+import androidx.compose.runtime.Stable
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerName
+import com.vitorpamplona.amethyst.ui.actions.uploads.SelectedMedia
+import com.vitorpamplona.amethyst.ui.actions.uploads.SelectedMediaProcessing
+import com.vitorpamplona.quartz.crypto.nip17.NostrCipher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.joinAll
+import kotlinx.coroutines.launch
+
+class MultiOrchestrator(
+    uris: List<SelectedMedia>,
+) {
+    private var list: List<SelectedMediaProcessing> = uris.map { SelectedMediaProcessing(it) }
+
+    @Stable
+    class Result(
+        val allGood: Boolean,
+        val successful: List<UploadingState.Finished>,
+        val errors: List<UploadingState.Error>,
+    )
+
+    fun first() = list.first()
+
+    suspend fun upload(
+        scope: CoroutineScope,
+        alt: String?,
+        sensitiveContent: Boolean,
+        mediaQuality: CompressorQuality,
+        server: ServerName,
+        account: Account,
+        context: Context,
+    ): Result {
+        val jobs =
+            list.map { item ->
+                scope.launch(Dispatchers.IO) {
+                    item.orchestrator.upload(
+                        item.media.uri,
+                        item.media.mimeType,
+                        alt,
+                        sensitiveContent,
+                        mediaQuality,
+                        server,
+                        account,
+                        context,
+                    )
+                }
+            }
+
+        jobs.joinAll()
+
+        return computeFinalResults()
+    }
+
+    suspend fun uploadEncrypted(
+        scope: CoroutineScope,
+        alt: String?,
+        sensitiveContent: Boolean,
+        mediaQuality: CompressorQuality,
+        cipher: NostrCipher,
+        server: ServerName,
+        account: Account,
+        context: Context,
+    ): Result {
+        val jobs =
+            list.map { item ->
+                scope.launch(Dispatchers.IO) {
+                    item.orchestrator.uploadEncrypted(
+                        item.media.uri,
+                        item.media.mimeType,
+                        alt,
+                        sensitiveContent,
+                        mediaQuality,
+                        cipher,
+                        server,
+                        account,
+                        context,
+                    )
+                }
+            }
+
+        jobs.joinAll()
+
+        return computeFinalResults()
+    }
+
+    private fun computeFinalResults(): Result {
+        val resultsByState =
+            list.map {
+                it.orchestrator.progressState.value
+            }
+
+        val finished = resultsByState.filterIsInstance<UploadingState.Finished>()
+        val errors = resultsByState.filterIsInstance<UploadingState.Error>()
+
+        return Result(finished.size == list.size, finished, errors)
+    }
+
+    fun remove(selected: SelectedMediaProcessing) {
+        list = list.filter { it != selected }
+    }
+
+    fun size() = list.size
+
+    fun get(index: Int) = list.get(index)
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/UploadOrchestrator.kt

@@ -0,0 +1,330 @@
+/**
+ * Copyright (c) 2024 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.amethyst.service.uploads
+
+import android.content.Context
+import android.net.Uri
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.service.uploads.UploadingState.UploadingFinalState
+import com.vitorpamplona.amethyst.service.uploads.blossom.BlossomUploader
+import com.vitorpamplona.amethyst.service.uploads.nip96.Nip96Uploader
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerName
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerType
+import com.vitorpamplona.quartz.crypto.nip17.NostrCipher
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.map
+import kotlin.coroutines.cancellation.CancellationException
+
+sealed class UploadingState {
+    data object Ready : UploadingState()
+
+    data object Compressing : UploadingState()
+
+    data object Uploading : UploadingState()
+
+    data object ServerProcessing : UploadingState()
+
+    data object Downloading : UploadingState()
+
+    data object Hashing : UploadingState()
+
+    sealed class UploadingFinalState : UploadingState()
+
+    class Finished(
+        val result: UploadOrchestrator.OrchestratorResult,
+    ) : UploadingFinalState()
+
+    class Error(
+        val errorResource: Int,
+        val params: Array<out String>,
+    ) : UploadingFinalState()
+}
+
+class UploadOrchestrator {
+    val progress = MutableStateFlow(0.0)
+    val progressState = MutableStateFlow<UploadingState>(UploadingState.Ready)
+
+    val isUploading =
+        progressState.map {
+            progressState.value !is UploadingState.Ready && progressState.value !is UploadingState.Error && progressState.value !is UploadingState.Finished
+        }
+
+    fun error(
+        resId: Int,
+        vararg params: String,
+    ) = UploadingState.Error(resId, params).also { updateState(0.0, it) }
+
+    fun finish(result: OrchestratorResult) =
+        UploadingState
+            .Finished(result)
+            .also { updateState(1.0, it) }
+
+    fun updateState(
+        newProgress: Double,
+        newState: UploadingState,
+    ) {
+        progress.value = newProgress
+        progressState.value = newState
+    }
+
+    private fun uploadNIP95(
+        fileUri: Uri,
+        contentType: String?,
+        originalContentType: String?,
+        originalHash: String?,
+        context: Context,
+    ): UploadingFinalState {
+        updateState(0.4, UploadingState.Uploading)
+
+        val bytes =
+            context.contentResolver.openInputStream(fileUri)?.use {
+                it.readBytes()
+            }
+
+        if (bytes != null) {
+            if (bytes.size > 80000) {
+                return error(R.string.media_too_big_for_nip95)
+            }
+
+            updateState(0.8, UploadingState.Hashing)
+
+            val result =
+                FileHeader.prepare(
+                    bytes,
+                    contentType,
+                    null,
+                )
+
+            result.fold(
+                onSuccess = {
+                    return finish(OrchestratorResult.NIP95Result(it, bytes, originalContentType, originalHash))
+                },
+                onFailure = {
+                    return error(R.string.could_not_check_downloaded_file, it.message ?: it.javaClass.simpleName)
+                },
+            )
+        } else {
+            return error(R.string.could_not_open_the_compressed_file)
+        }
+    }
+
+    private suspend fun uploadNIP96(
+        fileUri: Uri,
+        contentType: String?,
+        size: Long?,
+        alt: String?,
+        sensitiveContent: Boolean,
+        serverBaseUrl: String,
+        contentTypeForResult: String?,
+        originalHash: String?,
+        account: Account,
+        context: Context,
+    ): UploadingFinalState {
+        updateState(0.2, UploadingState.Uploading)
+        return try {
+            val result =
+                Nip96Uploader().uploadImage(
+                    uri = fileUri,
+                    contentType = contentType,
+                    size = size,
+                    alt = alt,
+                    sensitiveContent = if (sensitiveContent) "" else null,
+                    serverBaseUrl = serverBaseUrl,
+                    forceProxy = account::shouldUseTorForNIP96,
+                    onProgress = { percent: Float ->
+                        updateState(0.2 + (0.2 * percent), UploadingState.Uploading)
+                    },
+                    httpAuth = account::createHTTPAuthorization,
+                    context = context,
+                )
+
+            verifyHeader(
+                uploadResult = result,
+                localContentType = contentType,
+                originalContentType = contentTypeForResult,
+                originalHash = originalHash,
+                forceProxy = account::shouldUseTorForNIP96,
+            )
+        } catch (e: Exception) {
+            if (e is CancellationException) throw e
+            error(R.string.failed_to_upload_media, e.message ?: e.javaClass.simpleName)
+        }
+    }
+
+    private suspend fun uploadBlossom(
+        fileUri: Uri,
+        contentType: String?,
+        size: Long?,
+        alt: String?,
+        sensitiveContent: Boolean,
+        serverBaseUrl: String,
+        contentTypeForResult: String?,
+        originalHash: String?,
+        account: Account,
+        context: Context,
+    ): UploadingFinalState {
+        updateState(0.2, UploadingState.Uploading)
+        return try {
+            val result =
+                BlossomUploader()
+                    .uploadImage(
+                        uri = fileUri,
+                        contentType = contentType,
+                        size = size,
+                        alt = alt,
+                        sensitiveContent = if (sensitiveContent) "" else null,
+                        serverBaseUrl = serverBaseUrl,
+                        forceProxy = account::shouldUseTorForNIP96,
+                        httpAuth = account::createBlossomUploadAuth,
+                        context = context,
+                    )
+
+            verifyHeader(
+                uploadResult = result,
+                localContentType = contentType,
+                forceProxy = account::shouldUseTorForNIP96,
+                originalHash = originalHash,
+                originalContentType = contentTypeForResult,
+            )
+        } catch (e: Exception) {
+            if (e is CancellationException) throw e
+            error(R.string.failed_to_upload_media, e.message ?: e.javaClass.simpleName)
+        }
+    }
+
+    private suspend fun verifyHeader(
+        uploadResult: MediaUploadResult,
+        localContentType: String?,
+        originalContentType: String?,
+        originalHash: String?,
+        forceProxy: (String) -> Boolean,
+    ): UploadingFinalState {
+        if (uploadResult.url.isNullOrBlank()) {
+            return error(R.string.server_did_not_provide_a_url_after_uploading)
+        }
+
+        updateState(0.6, UploadingState.Downloading)
+
+        val imageData: ByteArray? = ImageDownloader().waitAndGetImage(uploadResult.url, forceProxy(uploadResult.url))
+
+        if (imageData != null) {
+            updateState(0.8, UploadingState.Hashing)
+
+            val result =
+                FileHeader.prepare(
+                    imageData,
+                    uploadResult.type ?: localContentType,
+                    uploadResult.dimension,
+                )
+
+            result.fold(
+                onSuccess = {
+                    return finish(
+                        OrchestratorResult.ServerResult(
+                            it,
+                            uploadResult.url,
+                            uploadResult.magnet,
+                            uploadResult.sha256,
+                            originalContentType,
+                            originalHash,
+                        ),
+                    )
+                },
+                onFailure = {
+                    return error(R.string.could_not_prepare_local_file_to_upload, it.message ?: it.javaClass.simpleName)
+                },
+            )
+        } else {
+            return error(R.string.could_not_download_from_the_server)
+        }
+    }
+
+    sealed class OrchestratorResult {
+        class NIP95Result(
+            val fileHeader: FileHeader,
+            val bytes: ByteArray,
+            val mimeTypeBeforeEncryption: String?,
+            val hashBeforeEncryption: String?,
+        ) : OrchestratorResult()
+
+        class ServerResult(
+            val fileHeader: FileHeader,
+            val url: String,
+            val magnet: String?,
+            val uploadedHash: String?,
+            val mimeTypeBeforeEncryption: String?,
+            val hashBeforeEncryption: String?,
+        ) : OrchestratorResult()
+    }
+
+    suspend fun compressIfNeeded(
+        uri: Uri,
+        mimeType: String?,
+        compressionQuality: CompressorQuality,
+        context: Context,
+    ) = if (compressionQuality != CompressorQuality.UNCOMPRESSED) {
+        updateState(0.02, UploadingState.Compressing)
+        MediaCompressor().compress(uri, mimeType, compressionQuality, context.applicationContext)
+    } else {
+        MediaCompressorResult(uri, mimeType, null)
+    }
+
+    suspend fun upload(
+        uri: Uri,
+        mimeType: String?,
+        alt: String?,
+        sensitiveContent: Boolean,
+        compressionQuality: CompressorQuality,
+        server: ServerName,
+        account: Account,
+        context: Context,
+    ): UploadingFinalState {
+        val compressed = compressIfNeeded(uri, mimeType, compressionQuality, context)
+
+        return when (server.type) {
+            ServerType.NIP95 -> uploadNIP95(compressed.uri, compressed.contentType, null, null, context)
+            ServerType.NIP96 -> uploadNIP96(compressed.uri, compressed.contentType, compressed.size, alt, sensitiveContent, server.baseUrl, null, null, account, context)
+            ServerType.Blossom -> uploadBlossom(compressed.uri, compressed.contentType, compressed.size, alt, sensitiveContent, server.baseUrl, null, null, account, context)
+        }
+    }
+
+    suspend fun uploadEncrypted(
+        uri: Uri,
+        mimeType: String?,
+        alt: String?,
+        sensitiveContent: Boolean,
+        compressionQuality: CompressorQuality,
+        encrypt: NostrCipher,
+        server: ServerName,
+        account: Account,
+        context: Context,
+    ): UploadingFinalState {
+        val compressed = compressIfNeeded(uri, mimeType, compressionQuality, context)
+        val encrypted = EncryptFiles().encryptFile(context, compressed.uri, encrypt)
+
+        return when (server.type) {
+            ServerType.NIP95 -> uploadNIP95(encrypted.uri, encrypted.contentType, compressed.contentType, encrypted.originalHash, context)
+            ServerType.NIP96 -> uploadNIP96(encrypted.uri, encrypted.contentType, encrypted.size, alt, sensitiveContent, server.baseUrl, compressed.contentType, encrypted.originalHash, account, context)
+            ServerType.Blossom -> uploadBlossom(encrypted.uri, encrypted.contentType, encrypted.size, alt, sensitiveContent, server.baseUrl, compressed.contentType, encrypted.originalHash, account, context)
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/blossom/BlossomUploader.kt

@@ -0,0 +1,234 @@
+/**
+ * Copyright (c) 2024 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.amethyst.service.uploads.blossom
+
+import android.content.ContentResolver
+import android.content.Context
+import android.net.Uri
+import android.provider.OpenableColumns
+import android.webkit.MimeTypeMap
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.vitorpamplona.amethyst.BuildConfig
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.service.HttpStatusMessages
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
+import com.vitorpamplona.amethyst.service.uploads.MediaUploadResult
+import com.vitorpamplona.amethyst.service.uploads.nip96.randomChars
+import com.vitorpamplona.amethyst.ui.stringRes
+import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.events.BlossomAuthorizationEvent
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.Request
+import okhttp3.RequestBody
+import okio.BufferedSink
+import okio.source
+import java.io.File
+import java.io.InputStream
+import java.util.Base64
+
+class BlossomUploader {
+    fun Context.getFileName(uri: Uri): String? =
+        when (uri.scheme) {
+            ContentResolver.SCHEME_CONTENT -> getContentFileName(uri)
+            else -> uri.path?.let(::File)?.name
+        }
+
+    private fun Context.getContentFileName(uri: Uri): String? =
+        runCatching {
+            contentResolver.query(uri, null, null, null, null)?.use { cursor ->
+                cursor.moveToFirst()
+                return@use cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME).let(cursor::getString)
+            }
+        }.getOrNull()
+
+    suspend fun uploadImage(
+        uri: Uri,
+        contentType: String?,
+        size: Long?,
+        alt: String?,
+        sensitiveContent: String?,
+        serverBaseUrl: String,
+        forceProxy: (String) -> Boolean,
+        httpAuth: suspend (hash: HexKey, size: Long, alt: String) -> BlossomAuthorizationEvent?,
+        context: Context,
+    ): MediaUploadResult {
+        checkNotInMainThread()
+
+        val contentResolver = context.contentResolver
+        val myContentType = contentType ?: contentResolver.getType(uri)
+        val fileName = context.getFileName(uri)
+
+        val imageInputStreamForHash = contentResolver.openInputStream(uri)
+        val payload =
+            imageInputStreamForHash?.use {
+                it.readBytes()
+            }
+
+        checkNotNull(payload) { "Can't open the image input stream" }
+
+        val hash = CryptoUtils.sha256(payload).toHexKey()
+
+        val imageInputStream = contentResolver.openInputStream(uri)
+
+        checkNotNull(imageInputStream) { "Can't open the image input stream" }
+
+        return uploadImage(
+            imageInputStream,
+            hash,
+            payload.size,
+            fileName,
+            myContentType,
+            alt,
+            sensitiveContent,
+            serverBaseUrl,
+            forceProxy,
+            httpAuth,
+            context,
+        )
+    }
+
+    fun encodeAuth(event: BlossomAuthorizationEvent): String {
+        val encodedNIP98Event = Base64.getEncoder().encodeToString(event.toJson().toByteArray())
+        return "Nostr $encodedNIP98Event"
+    }
+
+    suspend fun uploadImage(
+        inputStream: InputStream,
+        hash: HexKey,
+        length: Int,
+        baseFileName: String?,
+        contentType: String?,
+        alt: String?,
+        sensitiveContent: String?,
+        serverBaseUrl: String,
+        forceProxy: (String) -> Boolean,
+        httpAuth: suspend (hash: HexKey, size: Long, alt: String) -> BlossomAuthorizationEvent?,
+        context: Context,
+    ): MediaUploadResult {
+        checkNotInMainThread()
+
+        val fileName = baseFileName ?: randomChars()
+        val extension =
+            contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
+
+        val apiUrl = serverBaseUrl.removeSuffix("/") + "/upload"
+
+        val client = HttpClientManager.getHttpClient(forceProxy(apiUrl))
+        val requestBuilder = Request.Builder()
+
+        val requestBody: RequestBody =
+            object : RequestBody() {
+                override fun contentType() = contentType?.toMediaType()
+
+                override fun contentLength() = length.toLong()
+
+                override fun writeTo(sink: BufferedSink) {
+                    inputStream.source().use(sink::writeAll)
+                }
+            }
+
+        httpAuth(hash, length.toLong(), alt?.let { "Uploading $it" } ?: "Uploading $fileName")?.let {
+            requestBuilder.addHeader("Authorization", encodeAuth(it))
+        }
+
+        contentType?.let { requestBuilder.addHeader("Content-Type", it) }
+
+        requestBuilder
+            .addHeader("Content-Length", length.toString())
+            .addHeader("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+            .url(apiUrl)
+            .put(requestBody)
+
+        val request = requestBuilder.build()
+
+        client.newCall(request).execute().use { response ->
+            if (response.isSuccessful) {
+                response.body.use { body ->
+                    val str = body.string()
+                    val result = parseResults(str)
+                    return result
+                }
+            } else {
+                val errorMessage = response.headers.get("X-Reason")
+
+                val explanation = HttpStatusMessages.resourceIdFor(response.code)
+                if (errorMessage != null) {
+                    throw RuntimeException(stringRes(context, R.string.failed_to_upload_to_server_with_message, serverBaseUrl.displayUrl(), errorMessage))
+                } else if (explanation != null) {
+                    throw RuntimeException(stringRes(context, R.string.failed_to_upload_to_server_with_message, serverBaseUrl.displayUrl(), stringRes(context, explanation)))
+                } else {
+                    throw RuntimeException(stringRes(context, R.string.failed_to_upload_to_server_with_message, serverBaseUrl.displayUrl(), response.code.toString()))
+                }
+            }
+        }
+    }
+
+    fun String.displayUrl() = this.removeSuffix("/").removePrefix("https://")
+
+    suspend fun delete(
+        hash: String,
+        contentType: String?,
+        serverBaseUrl: String,
+        forceProxy: (String) -> Boolean,
+        httpAuth: (hash: HexKey, alt: String) -> BlossomAuthorizationEvent?,
+        context: Context,
+    ): Boolean {
+        val extension =
+            contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
+
+        val apiUrl = serverBaseUrl
+
+        val requestBuilder = Request.Builder()
+
+        httpAuth(hash, "Deleting $hash")?.let {
+            requestBuilder.addHeader("Authorization", encodeAuth(it))
+        }
+
+        val request =
+            requestBuilder
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                .url(apiUrl.removeSuffix("/") + "/$hash.$extension")
+                .delete()
+                .build()
+
+        HttpClientManager.getHttpClient(forceProxy(apiUrl)).newCall(request).execute().use { response ->
+            if (response.isSuccessful) {
+                return true
+            } else {
+                val explanation = HttpStatusMessages.resourceIdFor(response.code)
+                if (explanation != null) {
+                    throw RuntimeException(stringRes(context, R.string.failed_to_delete_with_message, stringRes(context, explanation)))
+                } else {
+                    throw RuntimeException(stringRes(context, R.string.failed_to_delete_with_message, response.code))
+                }
+            }
+        }
+    }
+
+    private fun parseResults(body: String): MediaUploadResult {
+        val mapper = jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+        return mapper.readValue(body, MediaUploadResult::class.java)
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/nip96/Nip96Result.kt

@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2024 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.amethyst.service.uploads.nip96
+
+import com.fasterxml.jackson.annotation.JsonProperty
+
+data class Nip96Result(
+    val status: String? = null,
+    val message: String? = null,
+    @JsonProperty("processing_url")
+    val processingUrl: String? = null,
+    val percentage: Int? = null,
+    @JsonProperty("nip94_event")
+    val nip94Event: PartialEvent? = null,
+)
+
+class PartialEvent(
+    val tags: Array<Array<String>>? = null,
+    val content: String? = null,
+)
+
+data class DeleteResult(
+    val status: String?,
+    val message: String?,
+)

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/nip96/Nip96Uploader.kt

@@ -18,7 +18,7 @@
  * 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.amethyst.service
+package com.vitorpamplona.amethyst.service.uploads.nip96
 
 import android.content.ContentResolver
 import android.content.Context
@@ -26,17 +26,18 @@ import android.net.Uri
 import android.provider.OpenableColumns
 import android.webkit.MimeTypeMap
 import androidx.core.net.toFile
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.service.HttpStatusMessages
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
+import com.vitorpamplona.amethyst.service.uploads.MediaUploadResult
 import com.vitorpamplona.amethyst.ui.stringRes
-import com.vitorpamplona.ammolite.service.HttpClientManager
+import com.vitorpamplona.quartz.encoders.Dimension
+import com.vitorpamplona.quartz.events.HTTPAuthorizationEvent
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.coroutines.withTimeoutOrNull
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.MultipartBody
 import okhttp3.Request
@@ -45,47 +46,44 @@ import okio.BufferedSink
 import okio.source
 import java.io.InputStream
 import java.util.Base64
-import kotlin.coroutines.resume
 
 val charPool: List<Char> = ('a'..'z') + ('A'..'Z') + ('0'..'9')
 
 fun randomChars() = List(16) { charPool.random() }.joinToString("")
 
-class Nip96Uploader(
-    val account: Account?,
-) {
+class Nip96Uploader {
     suspend fun uploadImage(
         uri: Uri,
         contentType: String?,
         size: Long?,
         alt: String?,
         sensitiveContent: String?,
-        server: Nip96MediaServers.ServerName,
-        contentResolver: ContentResolver,
+        serverBaseUrl: String,
         forceProxy: (String) -> Boolean,
         onProgress: (percentage: Float) -> Unit,
+        httpAuth: suspend (String, String, ByteArray?) -> HTTPAuthorizationEvent?,
         context: Context,
-    ): PartialEvent {
-        val serverInfo =
-            Nip96Retriever()
-                .loadInfo(
-                    server.baseUrl,
-                    forceProxy(server.baseUrl),
-                )
+    ) = uploadImage(
+        uri,
+        contentType,
+        size,
+        alt,
+        sensitiveContent,
+        ServerInfoRetriever().loadInfo(serverBaseUrl, forceProxy(serverBaseUrl)),
+        forceProxy,
+        onProgress,
+        httpAuth,
+        context,
+    )
 
-        return uploadImage(
-            uri,
-            contentType,
-            size,
-            alt,
-            sensitiveContent,
-            serverInfo,
-            contentResolver,
-            forceProxy,
-            onProgress,
-            context,
-        )
-    }
+    fun ContentResolver.querySize(uri: Uri) =
+        query(uri, null, null, null, null)?.use {
+            it.moveToFirst()
+            val sizeIndex = it.getColumnIndex(OpenableColumns.SIZE)
+            it.getLong(sizeIndex)
+        }
+
+    fun fileSize(uri: Uri) = runCatching { uri.toFile().length() }.getOrNull()
 
     suspend fun uploadImage(
         uri: Uri,
@@ -93,25 +91,19 @@ class Nip96Uploader(
         size: Long?,
         alt: String?,
         sensitiveContent: String?,
-        server: Nip96Retriever.ServerInfo,
-        contentResolver: ContentResolver,
+        server: ServerInfo,
         forceProxy: (String) -> Boolean,
         onProgress: (percentage: Float) -> Unit,
+        httpAuth: suspend (String, String, ByteArray?) -> HTTPAuthorizationEvent?,
         context: Context,
-    ): PartialEvent {
+    ): MediaUploadResult {
         checkNotInMainThread()
 
+        val contentResolver = context.contentResolver
         val myContentType = contentType ?: contentResolver.getType(uri)
-        val imageInputStream = contentResolver.openInputStream(uri)
+        val length = size ?: contentResolver.querySize(uri) ?: fileSize(uri) ?: 0
 
-        val length =
-            size
-                ?: contentResolver.query(uri, null, null, null, null)?.use {
-                    it.moveToFirst()
-                    val sizeIndex = it.getColumnIndex(OpenableColumns.SIZE)
-                    it.getLong(sizeIndex)
-                }
-                ?: kotlin.runCatching { uri.toFile().length() }.getOrNull() ?: 0
+        val imageInputStream = contentResolver.openInputStream(uri)
 
         checkNotNull(imageInputStream) { "Can't open the image input stream" }
 
@@ -124,6 +116,7 @@ class Nip96Uploader(
             server,
             forceProxy,
             onProgress,
+            httpAuth,
             context,
         )
     }
@@ -134,16 +127,16 @@ class Nip96Uploader(
         contentType: String?,
         alt: String?,
         sensitiveContent: String?,
-        server: Nip96Retriever.ServerInfo,
+        server: ServerInfo,
         forceProxy: (String) -> Boolean,
         onProgress: (percentage: Float) -> Unit,
+        httpAuth: suspend (String, String, ByteArray?) -> HTTPAuthorizationEvent?,
         context: Context,
-    ): PartialEvent {
+    ): MediaUploadResult {
         checkNotInMainThread()
 
         val fileName = randomChars()
-        val extension =
-            contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
+        val extension = contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
 
         val client = HttpClientManager.getHttpClient(forceProxy(server.apiUrl))
         val requestBuilder = Request.Builder()
@@ -172,7 +165,7 @@ class Nip96Uploader(
                     },
                 ).build()
 
-        nip98Header(server.apiUrl)?.let { requestBuilder.addHeader("Authorization", it) }
+        httpAuth(server.apiUrl, "POST", null)?.let { requestBuilder.addHeader("Authorization", encodeAuth(it)) }
 
         requestBuilder
             .addHeader("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
@@ -190,9 +183,9 @@ class Nip96Uploader(
                     if (!result.processingUrl.isNullOrBlank()) {
                         return waitProcessing(result, server, forceProxy, onProgress)
                     } else if (result.status == "success" && result.nip94Event != null) {
-                        return result.nip94Event
+                        return convertToMediaResult(result.nip94Event)
                     } else {
-                        throw RuntimeException(stringRes(context, R.string.failed_to_upload_with_message, result.message))
+                        throw RuntimeException(stringRes(context, R.string.failed_to_upload_to_server_with_message, server.apiUrl.displayUrl(), result.message))
                     }
                 }
             } else {
@@ -214,21 +207,63 @@ class Nip96Uploader(
 
                 val explanation = HttpStatusMessages.resourceIdFor(response.code)
                 if (errorMessage != null) {
-                    throw RuntimeException(stringRes(context, R.string.failed_to_upload_with_message, errorMessage))
+                    throw RuntimeException(stringRes(context, R.string.failed_to_upload_to_server_with_message, server.apiUrl.displayUrl(), errorMessage))
                 } else if (explanation != null) {
-                    throw RuntimeException(stringRes(context, R.string.failed_to_upload_with_message, stringRes(context, explanation)))
+                    throw RuntimeException(stringRes(context, R.string.failed_to_upload_to_server_with_message, server.apiUrl.displayUrl(), stringRes(context, explanation)))
                 } else {
-                    throw RuntimeException(stringRes(context, R.string.failed_to_upload_with_message, response.code))
+                    throw RuntimeException(stringRes(context, R.string.failed_to_upload_to_server_with_message, server.apiUrl.displayUrl(), response.code.toString()))
                 }
             }
         }
     }
 
+    fun String.displayUrl() = this.removeSuffix("/").removePrefix("https://")
+
+    fun convertToMediaResult(nip96: PartialEvent): MediaUploadResult {
+        // Images don't seem to be ready immediately after upload
+        val imageUrl = nip96.tags?.firstOrNull { it.size > 1 && it[0] == "url" }?.get(1)
+        val remoteMimeType =
+            nip96.tags
+                ?.firstOrNull { it.size > 1 && it[0] == "m" }
+                ?.get(1)
+                ?.ifBlank { null }
+        val hash =
+            nip96.tags
+                ?.firstOrNull { it.size > 1 && it[0] == "x" }
+                ?.get(1)
+                ?.ifBlank { null }
+        val dim =
+            nip96.tags
+                ?.firstOrNull { it.size > 1 && it[0] == "dim" }
+                ?.get(1)
+                ?.ifBlank { null }
+                ?.let { Dimension.parse(it) }
+        val magnet =
+            nip96.tags
+                ?.firstOrNull { it.size > 1 && it[0] == "magnet" }
+                ?.get(1)
+                ?.ifBlank { null }
+
+        return MediaUploadResult(
+            url = imageUrl,
+            type = remoteMimeType,
+            sha256 = hash,
+            dimension = dim,
+            magnet = magnet,
+        )
+    }
+
+    fun encodeAuth(event: HTTPAuthorizationEvent): String {
+        val encodedNIP98Event = Base64.getEncoder().encodeToString(event.toJson().toByteArray())
+        return "Nostr $encodedNIP98Event"
+    }
+
     suspend fun delete(
         hash: String,
         contentType: String?,
-        server: Nip96Retriever.ServerInfo,
+        server: ServerInfo,
         forceProxy: (String) -> Boolean,
+        httpAuth: (String, String, ByteArray?) -> HTTPAuthorizationEvent,
         context: Context,
     ): Boolean {
         val extension =
@@ -238,7 +273,7 @@ class Nip96Uploader(
 
         val requestBuilder = Request.Builder()
 
-        nip98Header(server.apiUrl)?.let { requestBuilder.addHeader("Authorization", it) }
+        httpAuth(server.apiUrl, "DELETE", null)?.let { requestBuilder.addHeader("Authorization", encodeAuth(it)) }
 
         val request =
             requestBuilder
@@ -267,10 +302,10 @@ class Nip96Uploader(
 
     private suspend fun waitProcessing(
         result: Nip96Result,
-        server: Nip96Retriever.ServerInfo,
+        server: ServerInfo,
         forceProxy: (String) -> Boolean,
         onProgress: (percentage: Float) -> Unit,
-    ): PartialEvent {
+    ): MediaUploadResult {
         var currentResult = result
 
         while (!result.processingUrl.isNullOrBlank() && (currentResult.percentage ?: 100) < 100) {
@@ -297,65 +332,19 @@ class Nip96Uploader(
         val nip94 = currentResult.nip94Event
 
         if (nip94 != null) {
-            return nip94
+            return convertToMediaResult(nip94)
         } else {
             throw RuntimeException("Error waiting for processing. Final result is unavailable")
         }
     }
 
-    suspend fun nip98Header(url: String): String? =
-        withTimeoutOrNull(5000) {
-            suspendCancellableCoroutine { continuation ->
-                nip98Header(url, "POST") { authorizationToken -> continuation.resume(authorizationToken) }
-            }
-        }
-
-    fun nip98Header(
-        url: String,
-        method: String,
-        file: ByteArray? = null,
-        onReady: (String?) -> Unit,
-    ) {
-        val myAccount = account
-
-        if (myAccount == null) {
-            onReady(null)
-            return
-        }
-
-        myAccount.createHTTPAuthorization(url, method, file) {
-            val encodedNIP98Event = Base64.getEncoder().encodeToString(it.toJson().toByteArray())
-            onReady("Nostr $encodedNIP98Event")
-        }
-    }
-
-    data class DeleteResult(
-        val status: String?,
-        val message: String?,
-    )
-
     private fun parseDeleteResults(body: String): DeleteResult {
-        val mapper =
-            jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+        val mapper = jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
         return mapper.readValue(body, DeleteResult::class.java)
     }
 
-    data class Nip96Result(
-        val status: String? = null,
-        val message: String? = null,
-        @JsonProperty("processing_url") val processingUrl: String? = null,
-        val percentage: Int? = null,
-        @JsonProperty("nip94_event") val nip94Event: PartialEvent? = null,
-    )
-
-    class PartialEvent(
-        val tags: Array<Array<String>>? = null,
-        val content: String? = null,
-    )
-
     private fun parseResults(body: String): Nip96Result {
-        val mapper =
-            jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+        val mapper = jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
         return mapper.readValue(body, Nip96Result::class.java)
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/nip96/ServerInfo.kt

@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2024 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.amethyst.service.uploads.nip96
+
+import com.fasterxml.jackson.annotation.JsonProperty
+
+typealias PlanName = String
+
+typealias MimeType = String
+
+data class ServerInfo(
+    @JsonProperty("api_url")
+    val apiUrl: String,
+    @JsonProperty("download_url")
+    val downloadUrl: String? = null,
+    @JsonProperty("delegated_to_url")
+    val delegatedToUrl: String? = null,
+    @JsonProperty("supported_nips")
+    val supportedNips: ArrayList<Int> = arrayListOf(),
+    @JsonProperty("tos_url") val
+    tosUrl: String? = null,
+    @JsonProperty("content_types") val
+    contentTypes: ArrayList<MimeType> = arrayListOf(),
+    @JsonProperty("plans") val
+    plans: Map<PlanName, Plan> = mapOf(),
+)
+
+data class Plan(
+    @JsonProperty("name") val
+    name: String? = null,
+    @JsonProperty("is_nip98_required") val
+    isNip98Required: Boolean? = null,
+    @JsonProperty("url") val
+    url: String? = null,
+    @JsonProperty("max_byte_size") val
+    maxByteSize: Long? = null,
+    @JsonProperty("file_expiration") val
+    fileExpiration: ArrayList<Int> = arrayListOf(),
+    @JsonProperty("media_transformations")
+    val mediaTransformations: Map<MimeType, Array<String>> = emptyMap(),
+)

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/nip96/ServerInfoRetriever.kt

@@ -18,69 +18,19 @@
  * 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.amethyst.service
+package com.vitorpamplona.amethyst.service.uploads.nip96
 
 import android.util.Log
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.vitorpamplona.ammolite.service.HttpClientManager
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 import kotlinx.coroutines.CancellationException
 import okhttp3.Request
 import java.net.URI
 import java.net.URL
 
-object Nip96MediaServers {
-    val DEFAULT =
-        listOf(
-            ServerName("Nostr.Build", "https://nostr.build"),
-            ServerName("NostrCheck.me", "https://nostrcheck.me"),
-            ServerName("NostPic", "https://nostpic.com"),
-            ServerName("Sovbit", "https://files.sovbit.host"),
-            ServerName("Void.cat", "https://void.cat"),
-        )
-
-    data class ServerName(
-        val name: String,
-        val baseUrl: String,
-    )
-
-    val cache: MutableMap<String, Nip96Retriever.ServerInfo> = mutableMapOf()
-
-    suspend fun load(
-        url: String,
-        forceProxy: Boolean,
-    ): Nip96Retriever.ServerInfo {
-        val cached = cache[url]
-        if (cached != null) return cached
-
-        val fetched = Nip96Retriever().loadInfo(url, forceProxy)
-        cache[url] = fetched
-        return fetched
-    }
-}
-
-class Nip96Retriever {
-    data class ServerInfo(
-        @JsonProperty("api_url") val apiUrl: String,
-        @JsonProperty("download_url") val downloadUrl: String? = null,
-        @JsonProperty("delegated_to_url") val delegatedToUrl: String? = null,
-        @JsonProperty("supported_nips") val supportedNips: ArrayList<Int> = arrayListOf(),
-        @JsonProperty("tos_url") val tosUrl: String? = null,
-        @JsonProperty("content_types") val contentTypes: ArrayList<MimeType> = arrayListOf(),
-        @JsonProperty("plans") val plans: Map<PlanName, Plan> = mapOf(),
-    )
-
-    data class Plan(
-        @JsonProperty("name") val name: String? = null,
-        @JsonProperty("is_nip98_required") val isNip98Required: Boolean? = null,
-        @JsonProperty("url") val url: String? = null,
-        @JsonProperty("max_byte_size") val maxByteSize: Long? = null,
-        @JsonProperty("file_expiration") val fileExpiration: ArrayList<Int> = arrayListOf(),
-        @JsonProperty("media_transformations")
-        val mediaTransformations: Map<MimeType, Array<String>> = emptyMap(),
-    )
-
+class ServerInfoRetriever {
     fun parse(
         baseUrl: String,
         body: String,
@@ -136,23 +86,19 @@ class Nip96Retriever {
             }
         }
     }
-}
 
-typealias PlanName = String
-
-typealias MimeType = String
-
-fun makeAbsoluteIfRelativeUrl(
-    baseUrl: String,
-    potentialyRelativeUrl: String,
-): String =
-    try {
-        val apiUrl = URI(potentialyRelativeUrl)
-        if (apiUrl.isAbsolute) {
+    fun makeAbsoluteIfRelativeUrl(
+        baseUrl: String,
+        potentialyRelativeUrl: String,
+    ): String =
+        try {
+            val apiUrl = URI(potentialyRelativeUrl)
+            if (apiUrl.isAbsolute) {
+                potentialyRelativeUrl
+            } else {
+                URL(URL(baseUrl), potentialyRelativeUrl).toString()
+            }
+        } catch (e: Exception) {
             potentialyRelativeUrl
-        } else {
-            URL(URL(baseUrl), potentialyRelativeUrl).toString()
         }
-    } catch (e: Exception) {
-        potentialyRelativeUrl
-    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt

@@ -20,9 +20,6 @@
  */
 package com.vitorpamplona.amethyst.ui
 
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.Intent
 import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkCapabilities
@@ -31,7 +28,6 @@ import android.os.Bundle
 import android.util.Log
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.LaunchedEffect
@@ -43,6 +39,7 @@ import com.vitorpamplona.amethyst.debugState
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.lang.LanguageTranslatorService
 import com.vitorpamplona.amethyst.service.notifications.PushNotificationUtils
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 import com.vitorpamplona.amethyst.ui.components.DEFAULT_MUTED_SETTING
 import com.vitorpamplona.amethyst.ui.components.keepPlayingMutex
 import com.vitorpamplona.amethyst.ui.navigation.Route
@@ -50,7 +47,6 @@ import com.vitorpamplona.amethyst.ui.screen.AccountScreen
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.theme.AmethystTheme
 import com.vitorpamplona.amethyst.ui.tor.TorManager
-import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.encoders.Nip19Bech32
 import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
 import com.vitorpamplona.quartz.events.ChannelCreateEvent
@@ -259,30 +255,12 @@ class MainActivity : AppCompatActivity() {
         }
 }
 
-class GetMediaActivityResultContract : ActivityResultContracts.GetContent() {
-    @SuppressLint("MissingSuperCall")
-    override fun createIntent(
-        context: Context,
-        input: String,
-    ): Intent {
-        // Force only images and videos to be selectable
-        // Force OPEN Document because of the resulting URI must be passed to the
-        // Playback service and the picker's permissions only allow the activity to read the URI
-        return Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
-            addCategory(Intent.CATEGORY_OPENABLE)
-            // Force only images and videos to be selectable
-            type = "*/*"
-            putExtra(Intent.EXTRA_MIME_TYPES, arrayOf("image/*", "video/*"))
-        }
-    }
-}
-
 fun uriToRoute(uri: String?): String? =
-    if (uri.equals("nostr:Notifications", true)) {
+    if (uri?.startsWith("notifications", true) == true || uri?.startsWith("nostr:notifications", true) == true) {
         Route.Notification.route.replace("{scrollToTop}", "true")
     } else {
-        if (uri?.startsWith("nostr:Hashtag?id=") == true) {
-            Route.Hashtag.route.replace("{id}", uri.removePrefix("nostr:Hashtag?id="))
+        if (uri?.startsWith("hashtag?id=") == true || uri?.startsWith("nostr:hashtag?id=") == true) {
+            Route.Hashtag.route.replace("{id}", uri.removePrefix("nostr:").removePrefix("hashtag?id="))
         } else {
             val nip19 = Nip19Bech32.uriToRoute(uri)?.entity
             when (nip19) {
@@ -302,6 +280,7 @@ fun uriToRoute(uri: String?): String? =
                         "Event/${nip19.hex}"
                     }
                 }
+
                 is Nip19Bech32.NAddress -> {
                     if (nip19.kind == CommunityDefinitionEvent.KIND) {
                         "Community/${nip19.atag}"
@@ -311,12 +290,14 @@ fun uriToRoute(uri: String?): String? =
                         "Event/${nip19.atag}"
                     }
                 }
+
                 is Nip19Bech32.NEmbed -> {
                     if (LocalCache.getNoteIfExists(nip19.event.id) == null) {
                         LocalCache.verifyAndConsume(nip19.event, null)
                     }
                     "Event/${nip19.event.id}"
                 }
+
                 else -> null
             }
         }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostView.kt

@@ -26,7 +26,6 @@ import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
@@ -37,8 +36,6 @@ import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
@@ -46,7 +43,6 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.CurrencyBitcoin
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.LocalTextStyle
@@ -85,25 +81,26 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
-import coil.compose.AsyncImage
+import coil3.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.commons.richtext.RichTextParser
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerType
+import com.vitorpamplona.amethyst.ui.actions.uploads.SelectFromGallery
 import com.vitorpamplona.amethyst.ui.components.BechLink
 import com.vitorpamplona.amethyst.ui.components.InvoiceRequest
 import com.vitorpamplona.amethyst.ui.components.LoadUrlPreview
 import com.vitorpamplona.amethyst.ui.components.VideoView
 import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
+import com.vitorpamplona.amethyst.ui.note.ShowUserSuggestionList
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.CloseButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ImageVideoDescription
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.PostButton
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.search.UserLine
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
-import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
 import com.vitorpamplona.amethyst.ui.theme.Size10dp
 import com.vitorpamplona.amethyst.ui.theme.Size5dp
@@ -301,7 +298,7 @@ fun EditPostView(
                                                     myUrlPreview,
                                                     mimeType = null,
                                                     roundedCorner = true,
-                                                    isFiniteHeight = false,
+                                                    contentScale = ContentScale.FillWidth,
                                                     accountViewModel = accountViewModel,
                                                 )
                                             } else {
@@ -325,22 +322,22 @@ fun EditPostView(
                                     }
                                 }
 
-                                val url = postViewModel.contentToAddUrl
-                                if (url != null) {
+                                postViewModel.multiOrchestrator?.let {
                                     Row(
                                         verticalAlignment = Alignment.CenterVertically,
                                         modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp),
                                     ) {
                                         ImageVideoDescription(
-                                            url,
+                                            it,
                                             accountViewModel.account.settings.defaultFileServer,
                                             onAdd = { alt, server, sensitiveContent, mediaQuality ->
-                                                postViewModel.upload(url, alt, sensitiveContent, mediaQuality, false, server, accountViewModel::toast, context)
-                                                if (!server.isNip95) {
-                                                    accountViewModel.account.settings.changeDefaultFileServer(server.server)
+                                                postViewModel.upload(alt, sensitiveContent, mediaQuality, false, server, accountViewModel::toast, context)
+                                                if (server.type != ServerType.NIP95) {
+                                                    accountViewModel.account.settings.changeDefaultFileServer(server)
                                                 }
                                             },
-                                            onCancel = { postViewModel.contentToAddUrl = null },
+                                            onDelete = postViewModel::deleteMediaToUpload,
+                                            onCancel = { postViewModel.multiOrchestrator = null },
                                             onError = { scope.launch { Toast.makeText(context, context.resources.getText(it), Toast.LENGTH_SHORT).show() } },
                                             accountViewModel = accountViewModel,
                                         )
@@ -413,8 +410,9 @@ fun EditPostView(
                             }
                         }
 
-                        ShowUserSuggestionListForEdit(
-                            postViewModel,
+                        ShowUserSuggestionList(
+                            postViewModel.userSuggestions,
+                            postViewModel::autocompleteWithUser,
                             accountViewModel,
                             modifier = Modifier.heightIn(0.dp, 300.dp),
                         )
@@ -427,34 +425,6 @@ fun EditPostView(
     }
 }
 
-@Composable
-fun ShowUserSuggestionListForEdit(
-    editPostViewModel: EditPostViewModel,
-    accountViewModel: AccountViewModel,
-    modifier: Modifier = Modifier.heightIn(0.dp, 200.dp),
-) {
-    val userSuggestions = editPostViewModel.userSuggestions
-    if (userSuggestions.isNotEmpty()) {
-        LazyColumn(
-            contentPadding =
-                PaddingValues(
-                    top = 10.dp,
-                ),
-            modifier = modifier,
-        ) {
-            itemsIndexed(
-                userSuggestions,
-                key = { _, item -> item.pubkeyHex },
-            ) { _, item ->
-                UserLine(item, accountViewModel) { editPostViewModel.autocompleteWithUser(item) }
-                HorizontalDivider(
-                    thickness = DividerThickness,
-                )
-            }
-        }
-    }
-}
-
 @Composable
 private fun BottomRowActions(postViewModel: EditPostViewModel) {
     val scrollState = rememberScrollState()
@@ -467,7 +437,7 @@ private fun BottomRowActions(postViewModel: EditPostViewModel) {
                 .height(50.dp),
         verticalAlignment = CenterVertically,
     ) {
-        UploadFromGallery(
+        SelectFromGallery(
             isUploading = postViewModel.isUploadingImage,
             tint = MaterialTheme.colorScheme.onBackground,
             modifier = Modifier,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/EditPostViewModel.kt

@@ -21,8 +21,6 @@
 package com.vitorpamplona.amethyst.ui.actions
 
 import android.content.Context
-import android.net.Uri
-import android.util.Log
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -38,17 +36,21 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.service.FileHeader
-import com.vitorpamplona.amethyst.service.Nip96Uploader
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
-import com.vitorpamplona.amethyst.ui.components.MediaCompressor
+import com.vitorpamplona.amethyst.service.uploads.MediaCompressor
+import com.vitorpamplona.amethyst.service.uploads.MultiOrchestrator
+import com.vitorpamplona.amethyst.service.uploads.UploadOrchestrator
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerName
+import com.vitorpamplona.amethyst.ui.actions.uploads.SelectedMedia
+import com.vitorpamplona.amethyst.ui.actions.uploads.SelectedMediaProcessing
 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.FileHeaderEvent
+import com.vitorpamplona.quartz.encoders.IMetaTag
+import com.vitorpamplona.quartz.encoders.IMetaTagBuilder
 import com.vitorpamplona.quartz.events.FileStorageEvent
 import com.vitorpamplona.quartz.events.FileStorageHeaderEvent
-import kotlinx.coroutines.CancellationException
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
@@ -61,7 +63,7 @@ open class EditPostViewModel : ViewModel() {
 
     var subject by mutableStateOf(TextFieldValue(""))
 
-    var nip94attachments by mutableStateOf<List<FileHeaderEvent>>(emptyList())
+    var iMetaAttachments by mutableStateOf<List<IMetaTag>>(emptyList())
     var nip95attachments by
         mutableStateOf<List<Pair<FileStorageEvent, FileStorageHeaderEvent>>>(emptyList())
 
@@ -74,7 +76,7 @@ open class EditPostViewModel : ViewModel() {
     var userSuggestionsMainMessage: UserSuggestionAnchor? = null
 
     // Images and Videos
-    var contentToAddUrl by mutableStateOf<Uri?>(null)
+    var multiOrchestrator by mutableStateOf<MultiOrchestrator?>(null)
 
     // Invoices
     var canAddInvoice by mutableStateOf(false)
@@ -99,7 +101,7 @@ open class EditPostViewModel : ViewModel() {
         this.account = accountViewModel.account
 
         canAddInvoice = accountViewModel.userProfile().info?.lnAddress() != null
-        contentToAddUrl = null
+        multiOrchestrator = null
 
         message = TextFieldValue(versionLookingAt?.event?.content() ?: edit.event?.content() ?: "")
         urlPreview = findUrlInMessage()
@@ -145,89 +147,77 @@ open class EditPostViewModel : ViewModel() {
     }
 
     fun upload(
-        galleryUri: Uri,
         alt: String?,
         sensitiveContent: Boolean,
         mediaQuality: Int,
         isPrivate: Boolean = false,
-        server: ServerOption,
+        server: ServerName,
         onError: (String, String) -> Unit,
         context: Context,
     ) {
-        isUploadingImage = true
-        contentToAddUrl = null
+        viewModelScope.launch {
+            val myAccount = account ?: return@launch
+            val myMultiOrchestrator = multiOrchestrator ?: return@launch
 
-        val contentResolver = context.contentResolver
-        val contentType = contentResolver.getType(galleryUri)
+            isUploadingImage = true
 
-        viewModelScope.launch(Dispatchers.IO) {
-            MediaCompressor()
-                .compress(
-                    galleryUri,
-                    contentType,
-                    context.applicationContext,
-                    onReady = { fileUri, contentType, size ->
-                        if (server.isNip95) {
-                            contentResolver.openInputStream(fileUri)?.use {
-                                createNIP95Record(
-                                    it.readBytes(),
-                                    contentType,
-                                    alt,
-                                    sensitiveContent,
-                                    onError = {
-                                        onError(stringRes(context, R.string.failed_to_upload_media_no_details), it)
-                                    },
-                                    context,
-                                )
-                            }
-                        } else {
-                            viewModelScope.launch(Dispatchers.IO) {
-                                try {
-                                    val result =
-                                        Nip96Uploader(account)
-                                            .uploadImage(
-                                                uri = fileUri,
-                                                contentType = contentType,
-                                                size = size,
-                                                alt = alt,
-                                                sensitiveContent = if (sensitiveContent) "" else null,
-                                                server = server.server,
-                                                contentResolver = contentResolver,
-                                                forceProxy = account?.let { it::shouldUseTorForNIP96 } ?: { false },
-                                                onProgress = {},
-                                                context = context,
-                                            )
-
-                                    createNIP94Record(
-                                        uploadingResult = result,
-                                        localContentType = contentType,
-                                        alt = alt,
-                                        sensitiveContent = sensitiveContent,
-                                        forceProxy = account?.let { it::shouldUseTorForNIP96 } ?: { false },
-                                        onError = {
-                                            onError(stringRes(context, R.string.failed_to_upload_media_no_details), it)
-                                        },
-                                        context = context,
-                                    )
-                                } catch (e: Exception) {
-                                    if (e is CancellationException) throw e
-                                    Log.e(
-                                        "ImageUploader",
-                                        "Failed to upload ${e.message}",
-                                        e,
-                                    )
-                                    isUploadingImage = false
-                                    onError(stringRes(context, R.string.failed_to_upload_media_no_details), e.message ?: e.javaClass.simpleName)
-                                }
-                            }
-                        }
-                    },
-                    onError = {
-                        isUploadingImage = false
-                        onError(stringRes(context, R.string.failed_to_upload_media_no_details), stringRes(context, it))
-                    },
-                    mediaQuality = MediaCompressor().intToCompressorQuality(mediaQuality),
+            val results =
+                myMultiOrchestrator.upload(
+                    viewModelScope,
+                    alt,
+                    sensitiveContent,
+                    MediaCompressor.intToCompressorQuality(mediaQuality),
+                    server,
+                    myAccount,
+                    context,
                 )
+
+            if (results.allGood) {
+                results.successful.forEach { state ->
+                    if (state.result is UploadOrchestrator.OrchestratorResult.NIP95Result) {
+                        account?.createNip95(state.result.bytes, headerInfo = state.result.fileHeader, alt, sensitiveContent) { nip95 ->
+                            nip95attachments = nip95attachments + nip95
+                            val note = nip95.let { it1 -> account?.consumeNip95(it1.first, it1.second) }
+
+                            note?.let {
+                                message = message.insertUrlAtCursor("nostr:" + it.toNEvent())
+                            }
+
+                            urlPreview = findUrlInMessage()
+                        }
+                    } else if (state.result is UploadOrchestrator.OrchestratorResult.ServerResult) {
+                        val iMeta =
+                            IMetaTagBuilder(state.result.url)
+                                .apply {
+                                    hash(state.result.fileHeader.hash)
+                                    size(state.result.fileHeader.size)
+                                    state.result.fileHeader.mimeType
+                                        ?.let { mimeType(it) }
+                                    state.result.fileHeader.dim
+                                        ?.let { dims(it) }
+                                    state.result.fileHeader.blurHash
+                                        ?.let { blurhash(it.blurhash) }
+                                    state.result.magnet?.let { magnet(it) }
+                                    state.result.uploadedHash?.let { originalHash(it) }
+                                    alt?.let { alt(it) }
+                                    if (sensitiveContent) sensitiveContent("")
+                                }.build()
+
+                        iMetaAttachments = iMetaAttachments.filter { it.url != iMeta.url } + iMeta
+
+                        message = message.insertUrlAtCursor(state.result.url)
+                        urlPreview = findUrlInMessage()
+                    }
+                }
+
+                this@EditPostViewModel.multiOrchestrator = null
+            } else {
+                val errorMessages = results.errors.map { stringRes(context, it.errorResource, *it.params) }.distinct()
+
+                onError(stringRes(context, R.string.failed_to_upload_media_no_details), errorMessages.joinToString(".\n"))
+            }
+
+            isUploadingImage = false
         }
     }
 
@@ -237,7 +227,7 @@ open class EditPostViewModel : ViewModel() {
 
         editedFromNote = null
 
-        contentToAddUrl = null
+        multiOrchestrator = null
         urlPreview = null
         isUploadingImage = false
 
@@ -272,11 +262,7 @@ open class EditPostViewModel : ViewModel() {
             if (lastWord.startsWith("@") && lastWord.length > 2) {
                 NostrSearchEventOrUserDataSource.search(lastWord.removePrefix("@"))
                 viewModelScope.launch(Dispatchers.IO) {
-                    userSuggestions =
-                        LocalCache
-                            .findUsersStartingWith(lastWord.removePrefix("@"))
-                            .sortedWith(compareBy({ account?.isFollowing(it) }, { it.toBestDisplayName() }, { it.pubkeyHex }))
-                            .reversed()
+                    userSuggestions = LocalCache.findUsersStartingWith(lastWord.removePrefix("@"), account)
                 }
             } else {
                 NostrSearchEventOrUserDataSource.clear()
@@ -309,117 +295,13 @@ open class EditPostViewModel : ViewModel() {
         }
     }
 
-    fun canPost(): Boolean =
-        message.text.isNotBlank() &&
-            !isUploadingImage &&
-            !wantsInvoice &&
-            contentToAddUrl == null
+    fun canPost() = message.text.isNotBlank() && !isUploadingImage && !wantsInvoice && multiOrchestrator == null
 
-    suspend fun createNIP94Record(
-        uploadingResult: Nip96Uploader.PartialEvent,
-        localContentType: String?,
-        alt: String?,
-        sensitiveContent: Boolean,
-        forceProxy: (String) -> Boolean,
-        onError: (String) -> Unit = {},
-        context: Context,
-    ) {
-        // Images don't seem to be ready immediately after upload
-        val imageUrl = uploadingResult.tags?.firstOrNull { it.size > 1 && it[0] == "url" }?.get(1)
-        val remoteMimeType =
-            uploadingResult.tags
-                ?.firstOrNull { it.size > 1 && it[0] == "m" }
-                ?.get(1)
-                ?.ifBlank { null }
-        val originalHash =
-            uploadingResult.tags
-                ?.firstOrNull { it.size > 1 && it[0] == "ox" }
-                ?.get(1)
-                ?.ifBlank { null }
-        val dim =
-            uploadingResult.tags
-                ?.firstOrNull { it.size > 1 && it[0] == "dim" }
-                ?.get(1)
-                ?.ifBlank { null }
-        val magnet =
-            uploadingResult.tags
-                ?.firstOrNull { it.size > 1 && it[0] == "magnet" }
-                ?.get(1)
-                ?.ifBlank { null }
-
-        if (imageUrl.isNullOrBlank()) {
-            Log.e("ImageDownload", "Couldn't download image from server")
-            cancel()
-            isUploadingImage = false
-            onError(stringRes(context, R.string.server_did_not_provide_a_url_after_uploading))
-            return
-        }
-
-        FileHeader.prepare(
-            fileUrl = imageUrl,
-            mimeType = remoteMimeType ?: localContentType,
-            dimPrecomputed = dim,
-            forceProxy = forceProxy(imageUrl),
-            onReady = { header: FileHeader ->
-                account?.createHeader(imageUrl, magnet, header, alt, sensitiveContent, originalHash) { event ->
-                    isUploadingImage = false
-                    nip94attachments = nip94attachments + event
-
-                    message = message.insertUrlAtCursor(imageUrl)
-                    urlPreview = findUrlInMessage()
-                }
-            },
-            onError = {
-                isUploadingImage = false
-                onError(stringRes(context, R.string.could_not_prepare_header, it))
-            },
-        )
+    fun selectImage(uris: ImmutableList<SelectedMedia>) {
+        multiOrchestrator = MultiOrchestrator(uris)
     }
 
-    fun createNIP95Record(
-        bytes: ByteArray,
-        mimeType: String?,
-        alt: String?,
-        sensitiveContent: Boolean,
-        onError: (String) -> Unit = {},
-        context: Context,
-    ) {
-        if (bytes.size > 80000) {
-            viewModelScope.launch {
-                onError(stringRes(context, id = R.string.media_too_big_for_nip95))
-                isUploadingImage = false
-            }
-            return
-        }
-
-        viewModelScope.launch(Dispatchers.IO) {
-            FileHeader.prepare(
-                bytes,
-                mimeType,
-                null,
-                onReady = {
-                    account?.createNip95(bytes, headerInfo = it, alt, sensitiveContent) { nip95 ->
-                        nip95attachments = nip95attachments + nip95
-                        val note = nip95.let { it1 -> account?.consumeNip95(it1.first, it1.second) }
-
-                        isUploadingImage = false
-
-                        note?.let {
-                            message = message.insertUrlAtCursor("nostr:" + it.toNEvent())
-                        }
-
-                        urlPreview = findUrlInMessage()
-                    }
-                },
-                onError = {
-                    isUploadingImage = false
-                    onError(stringRes(context, R.string.could_not_prepare_header, it))
-                },
-            )
-        }
-    }
-
-    fun selectImage(uri: Uri) {
-        contentToAddUrl = uri
+    fun deleteMediaToUpload(selected: SelectedMediaProcessing) {
+        this.multiOrchestrator?.remove(selected)
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageDownloader.kt

@@ -1,85 +0,0 @@
-/**
- * Copyright (c) 2024 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.amethyst.ui.actions
-
-import com.vitorpamplona.ammolite.service.HttpClientManager
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.delay
-import java.net.HttpURLConnection
-import java.net.URL
-
-class ImageDownloader {
-    suspend fun waitAndGetImage(
-        imageUrl: String,
-        forceProxy: Boolean,
-    ): ByteArray? {
-        var imageData: ByteArray? = null
-        var tentatives = 0
-
-        // Servers are usually not ready.. so tries to download it for 15 times/seconds.
-        while (imageData == null && tentatives < 15) {
-            imageData =
-                try {
-                    // TODO: Migrate to OkHttp
-                    HttpURLConnection.setFollowRedirects(true)
-                    var url = URL(imageUrl)
-                    var huc =
-                        if (forceProxy) {
-                            url.openConnection(HttpClientManager.getCurrentProxy()) as HttpURLConnection
-                        } else {
-                            url.openConnection() as HttpURLConnection
-                        }
-                    huc.instanceFollowRedirects = true
-                    var responseCode = huc.responseCode
-
-                    if (responseCode in 300..400) {
-                        val newUrl: String = huc.getHeaderField("Location")
-
-                        // open the new connnection again
-                        url = URL(newUrl)
-                        huc =
-                            if (forceProxy) {
-                                url.openConnection(HttpClientManager.getCurrentProxy()) as HttpURLConnection
-                            } else {
-                                url.openConnection() as HttpURLConnection
-                            }
-                        responseCode = huc.responseCode
-                    }
-
-                    if (responseCode in 200..300) {
-                        huc.inputStream.use { it.readBytes() }
-                    } else {
-                        tentatives++
-                        delay(1000)
-
-                        null
-                    }
-                } catch (e: Exception) {
-                    if (e is CancellationException) throw e
-                    tentatives++
-                    delay(1000)
-                    null
-                }
-        }
-
-        return imageData
-    }
-}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/MediaSaverToDisk.kt

@@ -32,7 +32,7 @@ import androidx.annotation.RequiresApi
 import androidx.core.net.toFile
 import androidx.core.net.toUri
 import com.vitorpamplona.amethyst.BuildConfig
-import com.vitorpamplona.ammolite.service.HttpClientManager
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
 import kotlinx.coroutines.CancellationException
 import okhttp3.Call
 import okhttp3.Callback

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt

@@ -21,324 +21,201 @@
 package com.vitorpamplona.amethyst.ui.actions
 
 import android.content.Context
-import android.net.Uri
-import android.util.Log
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.commons.richtext.RichTextParser
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.service.FileHeader
-import com.vitorpamplona.amethyst.service.Nip96MediaServers
-import com.vitorpamplona.amethyst.service.Nip96Uploader
-import com.vitorpamplona.amethyst.ui.components.MediaCompressor
+import com.vitorpamplona.amethyst.service.uploads.MediaCompressor
+import com.vitorpamplona.amethyst.service.uploads.MultiOrchestrator
+import com.vitorpamplona.amethyst.service.uploads.UploadOrchestrator
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.DEFAULT_MEDIA_SERVERS
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerName
+import com.vitorpamplona.amethyst.ui.actions.uploads.SelectedMedia
+import com.vitorpamplona.amethyst.ui.actions.uploads.SelectedMediaProcessing
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.ammolite.relays.RelaySetupInfo
-import kotlinx.coroutines.CancellationException
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.joinAll
 import kotlinx.coroutines.launch
-
-data class ServerOption(
-    val server: Nip96MediaServers.ServerName,
-    val isNip95: Boolean,
-)
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withTimeoutOrNull
+import kotlin.coroutines.resume
 
 @Stable
 open class NewMediaModel : ViewModel() {
     var account: Account? = null
 
     var isUploadingImage by mutableStateOf(false)
-    var mediaType by mutableStateOf<String?>(null)
 
-    var selectedServer by mutableStateOf<ServerOption?>(null)
-    var alt by mutableStateOf("")
+    var selectedServer by mutableStateOf<ServerName?>(null)
+    var caption by mutableStateOf("")
     var sensitiveContent by mutableStateOf(false)
 
     // Images and Videos
-    var galleryUri by mutableStateOf<Uri?>(null)
-
-    var uploadingPercentage = mutableStateOf(0.0f)
-    var uploadingDescription = mutableStateOf<String?>(null)
-
+    var multiOrchestrator by mutableStateOf<MultiOrchestrator?>(null)
     var onceUploaded: () -> Unit = {}
 
+    // 0 = Low, 1 = Medium, 2 = High, 3=UNCOMPRESSED
+    var mediaQualitySlider by mutableIntStateOf(1)
+
     open fun load(
         account: Account,
-        uri: Uri,
-        contentType: String?,
+        uris: ImmutableList<SelectedMedia>,
     ) {
+        this.caption = ""
         this.account = account
-        this.galleryUri = uri
-        this.mediaType = contentType
-        this.selectedServer = ServerOption(defaultServer(), false)
+        this.multiOrchestrator = MultiOrchestrator(uris)
+        this.selectedServer = defaultServer()
     }
 
+    fun isImage(
+        url: String,
+        mimeType: String?,
+    ): Boolean = mimeType?.startsWith("image/") == true || RichTextParser.isImageUrl(url)
+
     fun upload(
         context: Context,
         relayList: List<RelaySetupInfo>,
-        mediaQuality: Int,
-        onError: (String) -> Unit = {},
+        onError: (String, String) -> Unit,
     ) {
-        isUploadingImage = true
+        viewModelScope.launch {
+            val myAccount = account ?: return@launch
+            if (relayList.isEmpty()) return@launch
+            val serverToUse = selectedServer ?: return@launch
 
-        val contentResolver = context.contentResolver
-        val myGalleryUri = galleryUri ?: return
-        val serverToUse = selectedServer ?: return
+            val myMultiOrchestrator = multiOrchestrator ?: return@launch
 
-        val contentType = contentResolver.getType(myGalleryUri)
+            isUploadingImage = true
 
-        viewModelScope.launch(Dispatchers.IO) {
-            uploadingPercentage.value = 0.1f
-            uploadingDescription.value = "Compress"
-            MediaCompressor()
-                .compress(
-                    myGalleryUri,
-                    contentType,
-                    context.applicationContext,
-                    onReady = { fileUri, contentType, size ->
-                        if (serverToUse.isNip95) {
-                            uploadingPercentage.value = 0.2f
-                            uploadingDescription.value = "Loading"
-                            contentResolver.openInputStream(fileUri)?.use {
-                                createNIP95Record(
-                                    it.readBytes(),
-                                    contentType,
-                                    alt,
-                                    sensitiveContent,
-                                    relayList = relayList,
-                                    onError = onError,
-                                    context,
-                                )
-                            }
-                                ?: run {
-                                    viewModelScope.launch {
-                                        onError(stringRes(context, R.string.could_not_open_the_compressed_file))
-                                        isUploadingImage = false
-                                        uploadingPercentage.value = 0.00f
-                                        uploadingDescription.value = null
-                                    }
-                                }
+            val results =
+                myMultiOrchestrator.upload(
+                    viewModelScope,
+                    caption,
+                    sensitiveContent,
+                    MediaCompressor.intToCompressorQuality(mediaQualitySlider),
+                    serverToUse,
+                    myAccount,
+                    context,
+                )
+
+            if (results.allGood) {
+                // It all finished successfully
+                val nip95s =
+                    results.successful.mapNotNull {
+                        it.result as? UploadOrchestrator.OrchestratorResult.NIP95Result
+                    }
+
+                val videosAndOthers =
+                    results.successful.mapNotNull {
+                        val map = it.result as? UploadOrchestrator.OrchestratorResult.ServerResult
+                        if (map != null && !isImage(map.url, map.fileHeader.mimeType)) {
+                            map
                         } else {
-                            uploadingPercentage.value = 0.2f
-                            uploadingDescription.value = "Uploading"
-                            viewModelScope.launch(Dispatchers.IO) {
-                                try {
-                                    val result =
-                                        Nip96Uploader(account)
-                                            .uploadImage(
-                                                uri = fileUri,
-                                                contentType = contentType,
-                                                size = size,
-                                                alt = alt,
-                                                sensitiveContent = if (sensitiveContent) "" else null,
-                                                server = serverToUse.server,
-                                                contentResolver = contentResolver,
-                                                forceProxy = account?.let { it::shouldUseTorForNIP96 } ?: { false },
-                                                onProgress = { percent: Float ->
-                                                    uploadingPercentage.value = 0.2f + (0.2f * percent)
-                                                },
-                                                context = context,
-                                            )
+                            null
+                        }
+                    }
 
-                                    createNIP94Record(
-                                        uploadingResult = result,
-                                        localContentType = contentType,
-                                        alt = alt,
-                                        sensitiveContent = sensitiveContent,
-                                        relayList = relayList,
-                                        forceProxy = account?.let { it::shouldUseTorForNIP96 } ?: { false },
-                                        onError = onError,
-                                        context,
-                                    )
-                                } catch (e: Exception) {
-                                    if (e is CancellationException) throw e
-                                    isUploadingImage = false
-                                    uploadingPercentage.value = 0.00f
-                                    uploadingDescription.value = null
-                                    onError(stringRes(context, R.string.failed_to_upload_media, e.message))
+                val imageUrls =
+                    results.successful
+                        .mapNotNull {
+                            val map = it.result as? UploadOrchestrator.OrchestratorResult.ServerResult
+                            if (map != null && isImage(map.url, map.fileHeader.mimeType)) {
+                                Pair(map.url, map.fileHeader)
+                            } else {
+                                null
+                            }
+                        }.toMap()
+
+                val nip95jobs =
+                    nip95s.map {
+                        // upload each file as an individual nip95 event.
+                        viewModelScope.launch(Dispatchers.IO) {
+                            withTimeoutOrNull(30000) {
+                                suspendCancellableCoroutine { continuation ->
+                                    account?.createNip95(it.bytes, headerInfo = it.fileHeader, caption, sensitiveContent) { nip95 ->
+                                        account?.consumeAndSendNip95(nip95.first, nip95.second, relayList)
+                                        continuation.resume(true)
+                                    }
                                 }
                             }
                         }
-                    },
-                    onError = {
-                        isUploadingImage = false
-                        uploadingPercentage.value = 0.00f
-                        uploadingDescription.value = null
-                        onError(stringRes(context, R.string.error_when_compressing_media, it))
-                    },
-                    mediaQuality = MediaCompressor().intToCompressorQuality(mediaQuality),
-                )
-        }
-    }
-
-    open fun cancel() {
-        galleryUri = null
-        isUploadingImage = false
-        mediaType = null
-        uploadingDescription.value = null
-        uploadingPercentage.value = 0.0f
-
-        alt = ""
-        selectedServer = ServerOption(defaultServer(), false)
-    }
-
-    fun canPost(): Boolean = !isUploadingImage && galleryUri != null && selectedServer != null
-
-    suspend fun createNIP94Record(
-        uploadingResult: Nip96Uploader.PartialEvent,
-        localContentType: String?,
-        alt: String,
-        sensitiveContent: Boolean,
-        relayList: List<RelaySetupInfo>,
-        forceProxy: (String) -> Boolean,
-        onError: (String) -> Unit = {},
-        context: Context,
-    ) {
-        uploadingPercentage.value = 0.40f
-        uploadingDescription.value = "Server Processing"
-        // Images don't seem to be ready immediately after upload
-
-        val imageUrl = uploadingResult.tags?.firstOrNull { it.size > 1 && it[0] == "url" }?.get(1)
-        val remoteMimeType =
-            uploadingResult.tags
-                ?.firstOrNull { it.size > 1 && it[0] == "m" }
-                ?.get(1)
-                ?.ifBlank { null }
-        val originalHash =
-            uploadingResult.tags
-                ?.firstOrNull { it.size > 1 && it[0] == "ox" }
-                ?.get(1)
-                ?.ifBlank { null }
-        val dim =
-            uploadingResult.tags
-                ?.firstOrNull { it.size > 1 && it[0] == "dim" }
-                ?.get(1)
-                ?.ifBlank { null }
-        val magnet =
-            uploadingResult.tags
-                ?.firstOrNull { it.size > 1 && it[0] == "magnet" }
-                ?.get(1)
-                ?.ifBlank { null }
-
-        if (imageUrl.isNullOrBlank()) {
-            Log.e("ImageDownload", "Couldn't download image from server")
-            cancel()
-            uploadingPercentage.value = 0.00f
-            uploadingDescription.value = null
-            isUploadingImage = false
-            onError(stringRes(context, R.string.server_did_not_provide_a_url_after_uploading))
-            return
-        }
-
-        uploadingDescription.value = "Downloading"
-        uploadingPercentage.value = 0.60f
-
-        val imageData: ByteArray? = ImageDownloader().waitAndGetImage(imageUrl, forceProxy(imageUrl))
-
-        if (imageData != null) {
-            uploadingPercentage.value = 0.80f
-            uploadingDescription.value = "Hashing"
-
-            FileHeader.prepare(
-                data = imageData,
-                mimeType = remoteMimeType ?: localContentType,
-                dimPrecomputed = dim,
-                onReady = {
-                    uploadingPercentage.value = 0.90f
-                    uploadingDescription.value = "Sending"
-                    account?.sendHeader(
-                        imageUrl,
-                        magnet,
-                        it,
-                        alt,
-                        sensitiveContent,
-                        originalHash,
-                        relayList,
-                    ) {
-                        uploadingPercentage.value = 1.00f
-                        isUploadingImage = false
-                        onceUploaded()
-                        cancel()
                     }
-                },
-                onError = {
-                    cancel()
-                    uploadingPercentage.value = 0.00f
-                    uploadingDescription.value = null
-                    isUploadingImage = false
-                    onError(stringRes(context, R.string.could_not_prepare_local_file_to_upload, it))
-                },
-            )
-        } else {
-            Log.e("ImageDownload", "Couldn't download image from server")
-            cancel()
-            uploadingPercentage.value = 0.00f
-            uploadingDescription.value = null
-            isUploadingImage = false
-            onError(stringRes(context, R.string.could_not_download_from_the_server))
-        }
-    }
 
-    fun createNIP95Record(
-        bytes: ByteArray,
-        mimeType: String?,
-        alt: String,
-        sensitiveContent: Boolean,
-        relayList: List<RelaySetupInfo>,
-        onError: (String) -> Unit = {},
-        context: Context,
-    ) {
-        if (bytes.size > 80000) {
-            viewModelScope.launch {
-                onError(stringRes(context, id = R.string.media_too_big_for_nip95))
-                isUploadingImage = false
-                uploadingPercentage.value = 0.00f
-                uploadingDescription.value = null
+                val videoJobs =
+                    videosAndOthers.map {
+                        // upload each file as an individual nip95 event.
+                        viewModelScope.launch(Dispatchers.IO) {
+                            withTimeoutOrNull(30000) {
+                                suspendCancellableCoroutine { continuation ->
+                                    account?.sendHeader(
+                                        it.url,
+                                        it.magnet,
+                                        it.fileHeader,
+                                        caption,
+                                        sensitiveContent,
+                                        it.uploadedHash,
+                                        relayList,
+                                    ) {
+                                        continuation.resume(true)
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                val imageJobs =
+                    listOf(
+                        viewModelScope.launch(Dispatchers.IO) {
+                            withTimeoutOrNull(30000) {
+                                suspendCancellableCoroutine { continuation ->
+                                    account?.sendAllAsOnePictureEvent(
+                                        imageUrls,
+                                        caption,
+                                        sensitiveContent,
+                                        relayList,
+                                    ) {
+                                        continuation.resume(true)
+                                    }
+                                }
+                            }
+                        },
+                    )
+
+                nip95jobs.joinAll()
+                videoJobs.joinAll()
+                imageJobs.joinAll()
+
+                onceUploaded()
+                cancelModel()
+            } else {
+                val errorMessages = results.errors.map { stringRes(context, it.errorResource, *it.params) }.distinct()
+
+                onError(stringRes(context, R.string.failed_to_upload_media_no_details), errorMessages.joinToString(".\n"))
             }
-            return
-        }
-
-        uploadingPercentage.value = 0.30f
-        uploadingDescription.value = "Hashing"
-
-        viewModelScope.launch(Dispatchers.IO) {
-            FileHeader.prepare(
-                bytes,
-                mimeType,
-                null,
-                onReady = {
-                    uploadingDescription.value = "Signing"
-                    uploadingPercentage.value = 0.40f
-                    account?.createNip95(bytes, headerInfo = it, alt, sensitiveContent) { nip95 ->
-                        uploadingDescription.value = "Sending"
-                        uploadingPercentage.value = 0.60f
-                        account?.consumeAndSendNip95(nip95.first, nip95.second, relayList)
-
-                        uploadingPercentage.value = 1.00f
-                        isUploadingImage = false
-                        onceUploaded()
-                        cancel()
-                    }
-                },
-                onError = {
-                    uploadingDescription.value = null
-                    uploadingPercentage.value = 0.00f
-                    isUploadingImage = false
-                    cancel()
-                    onError(stringRes(context, R.string.could_not_prepare_local_file_to_upload, it))
-                },
-            )
         }
     }
 
-    fun isImage() = mediaType?.startsWith("image")
+    open fun cancelModel() {
+        multiOrchestrator = null
+        isUploadingImage = false
+        caption = ""
+        selectedServer = defaultServer()
+    }
 
-    fun isVideo() = mediaType?.startsWith("video")
+    fun deleteMediaToUpload(selected: SelectedMediaProcessing) {
+        multiOrchestrator?.remove(selected)
+    }
 
-    fun defaultServer() = account?.settings?.defaultFileServer ?: Nip96MediaServers.DEFAULT[0]
+    fun canPost(): Boolean = !isUploadingImage && multiOrchestrator != null && selectedServer != null
+
+    fun defaultServer() = account?.settings?.defaultFileServer ?: DEFAULT_MEDIA_SERVERS[0]
 
     fun onceUploaded(onceUploaded: () -> Unit) {
         this.onceUploaded = onceUploaded

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt

@@ -20,25 +20,17 @@
  */
 package com.vitorpamplona.amethyst.ui.actions
 
-import android.graphics.Bitmap
-import android.net.Uri
-import android.os.Build
-import android.util.Log
-import android.util.Size
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
@@ -55,17 +47,14 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.input.KeyboardCapitalization
@@ -73,11 +62,11 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
-import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.service.Nip96MediaServers
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerType
+import com.vitorpamplona.amethyst.ui.actions.uploads.SelectedMedia
+import com.vitorpamplona.amethyst.ui.actions.uploads.ShowImageUploadGallery
 import com.vitorpamplona.amethyst.ui.components.SetDialogToEdgeToEdge
-import com.vitorpamplona.amethyst.ui.components.VideoView
 import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.CloseButton
@@ -85,42 +74,35 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.PostButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SettingSwitchItem
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TitleExplainer
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.settings.SettingsRow
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.Size5dp
 import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
-import com.vitorpamplona.quartz.events.FileServersEvent
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun NewMediaView(
-    uri: Uri,
+    uris: ImmutableList<SelectedMedia>,
     onClose: () -> Unit,
     postViewModel: NewMediaModel,
     accountViewModel: AccountViewModel,
     nav: INav,
 ) {
     val account = accountViewModel.account
-    val resolver = LocalContext.current.contentResolver
     val context = LocalContext.current
 
     val scrollState = rememberScrollState()
 
-    LaunchedEffect(uri) {
-        val mediaType = resolver.getType(uri) ?: ""
-        postViewModel.load(account, uri, mediaType)
+    LaunchedEffect(uris) {
+        postViewModel.load(account, uris)
     }
 
     var showRelaysDialog by remember { mutableStateOf(false) }
     var relayList = remember { accountViewModel.account.activeWriteRelays().toImmutableList() }
 
-    // 0 = Low, 1 = Medium, 2 = High, 3=UNCOMPRESSED
-    var mediaQualitySlider by remember { mutableIntStateOf(1) }
-
     Dialog(
         onDismissRequest = { onClose() },
         properties =
@@ -149,7 +131,7 @@ fun NewMediaView(
                                 ) {
                                     Icon(
                                         painter = painterResource(R.drawable.relays),
-                                        contentDescription = null,
+                                        contentDescription = stringRes(id = R.string.relay_list_selector),
                                         modifier = Modifier.height(25.dp),
                                         tint = MaterialTheme.colorScheme.onBackground,
                                     )
@@ -159,12 +141,10 @@ fun NewMediaView(
                             PostButton(
                                 onPost = {
                                     onClose()
-                                    postViewModel.upload(context, relayList, mediaQualitySlider) {
-                                        accountViewModel.toast(stringRes(context, R.string.failed_to_upload_media_no_details), it)
-                                    }
+                                    postViewModel.upload(context, relayList, onError = accountViewModel::toast)
                                     postViewModel.selectedServer?.let {
-                                        if (!it.isNip95) {
-                                            account.settings.changeDefaultFileServer(it.server)
+                                        if (it.type != ServerType.NIP95) {
+                                            account.settings.changeDefaultFileServer(it)
                                         }
                                     }
                                 },
@@ -177,7 +157,7 @@ fun NewMediaView(
                             Spacer(modifier = StdHorzSpacer)
                             CloseButton(
                                 onPress = {
-                                    postViewModel.cancel()
+                                    postViewModel.cancelModel()
                                     onClose()
                                 },
                             )
@@ -207,69 +187,9 @@ fun NewMediaView(
                         .consumeWindowInsets(pad)
                         .imePadding(),
             ) {
-                Column(
-                    modifier =
-                        Modifier
-                            .fillMaxSize()
-                            .padding(start = 10.dp, end = 10.dp, bottom = 10.dp),
-                ) {
-                    Column(
-                        modifier = Modifier.fillMaxWidth().weight(1f).verticalScroll(scrollState),
-                    ) {
+                Column(Modifier.fillMaxSize().padding(start = 10.dp, end = 10.dp, bottom = 10.dp)) {
+                    Column(Modifier.fillMaxWidth().verticalScroll(scrollState)) {
                         ImageVideoPost(postViewModel, accountViewModel)
-
-                        Row(
-                            verticalAlignment = Alignment.CenterVertically,
-                            modifier =
-                                Modifier
-                                    .fillMaxWidth()
-                                    .padding(vertical = 8.dp),
-                        ) {
-                            Column(
-                                modifier = Modifier.weight(1.0f),
-                                verticalArrangement = Arrangement.spacedBy(Size5dp),
-                            ) {
-                                Text(
-                                    text = stringRes(context, R.string.media_compression_quality_label),
-                                    maxLines = 1,
-                                    overflow = TextOverflow.Ellipsis,
-                                )
-                                Text(
-                                    text = stringRes(context, R.string.media_compression_quality_explainer),
-                                    style = MaterialTheme.typography.bodySmall,
-                                    color = Color.Gray,
-                                    maxLines = 5,
-                                    overflow = TextOverflow.Ellipsis,
-                                )
-                            }
-                        }
-                        Row(
-                            verticalAlignment = Alignment.CenterVertically,
-                            modifier = Modifier.fillMaxWidth(),
-                        ) {
-                            Column(horizontalAlignment = Alignment.CenterHorizontally) {
-                                Box(modifier = Modifier.fillMaxWidth()) {
-                                    Text(
-                                        text =
-                                            when (mediaQualitySlider) {
-                                                0 -> stringRes(R.string.media_compression_quality_low)
-                                                1 -> stringRes(R.string.media_compression_quality_medium)
-                                                2 -> stringRes(R.string.media_compression_quality_high)
-                                                3 -> stringRes(R.string.media_compression_quality_uncompressed)
-                                                else -> stringRes(R.string.media_compression_quality_medium)
-                                            },
-                                        modifier = Modifier.align(Alignment.Center),
-                                    )
-                                }
-
-                                Slider(
-                                    value = mediaQualitySlider.toFloat(),
-                                    onValueChange = { mediaQualitySlider = it.toInt() },
-                                    valueRange = 0f..3f,
-                                    steps = 2,
-                                )
-                            }
-                        }
                     }
                 }
             }
@@ -282,147 +202,106 @@ fun ImageVideoPost(
     postViewModel: NewMediaModel,
     accountViewModel: AccountViewModel,
 ) {
-    val listOfNip96ServersNote =
-        accountViewModel.account
-            .getFileServersNote()
-            .live()
-            .metadata
-            .observeAsState()
-
-    val fileServers =
-        (
-            (listOfNip96ServersNote.value?.note?.event as? FileServersEvent)?.servers()?.map {
-                ServerOption(
-                    Nip96MediaServers.ServerName(
-                        it,
-                        it,
-                    ),
-                    false,
-                )
-            } ?: Nip96MediaServers.DEFAULT.map { ServerOption(it, false) }
-        ) +
-            listOf(
-                ServerOption(
-                    Nip96MediaServers.ServerName(
-                        "NIP95",
-                        stringRes(id = R.string.upload_server_relays_nip95),
-                    ),
-                    true,
-                ),
-            )
+    val nip95description = stringRes(id = R.string.upload_server_relays_nip95)
+    val fileServers by accountViewModel.account.liveServerList.collectAsState()
 
     val fileServerOptions =
-        remember {
-            fileServers.map { TitleExplainer(it.server.name, it.server.baseUrl) }.toImmutableList()
-        }
-    val resolver = LocalContext.current.contentResolver
-
-    Row(
-        verticalAlignment = Alignment.CenterVertically,
-        modifier =
-            Modifier
-                .fillMaxWidth()
-                .padding(bottom = 10.dp)
-                .windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)),
-    ) {
-        if (postViewModel.isImage() == true) {
-            AsyncImage(
-                model = postViewModel.galleryUri.toString(),
-                contentDescription = postViewModel.galleryUri.toString(),
-                contentScale = ContentScale.FillWidth,
-                modifier =
-                    Modifier
-                        .padding(top = 4.dp)
-                        .fillMaxWidth()
-                        .windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)),
-            )
-        } else if (postViewModel.isVideo() == true && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            var bitmap by remember { mutableStateOf<Bitmap?>(null) }
-
-            LaunchedEffect(key1 = postViewModel.galleryUri) {
-                launch(Dispatchers.IO) {
-                    postViewModel.galleryUri?.let {
-                        try {
-                            bitmap = resolver.loadThumbnail(it, Size(1200, 1000), null)
-                        } catch (e: Exception) {
-                            if (e is CancellationException) throw e
-                            Log.w("NewPostView", "Couldn't create thumbnail, but the video can be uploaded", e)
-                        }
+        remember(fileServers) {
+            fileServers
+                .map {
+                    if (it.type == ServerType.NIP95) {
+                        TitleExplainer(it.name, nip95description)
+                    } else {
+                        TitleExplainer(it.name, it.baseUrl)
                     }
-                }
-            }
-
-            bitmap?.let {
-                Image(
-                    bitmap = it.asImageBitmap(),
-                    contentDescription = "some useful description",
-                    contentScale = ContentScale.FillWidth,
-                    modifier = Modifier.padding(top = 4.dp).fillMaxWidth(),
-                )
-            }
-        } else {
-            postViewModel.galleryUri?.let {
-                VideoView(
-                    videoUri = it.toString(),
-                    mimeType = postViewModel.mediaType,
-                    roundedCorner = false,
-                    isFiniteHeight = false,
-                    accountViewModel = accountViewModel,
-                )
-            }
+                }.toImmutableList()
         }
+
+    postViewModel.multiOrchestrator?.let {
+        ShowImageUploadGallery(
+            it,
+            postViewModel::deleteMediaToUpload,
+            accountViewModel,
+        )
     }
 
-    Row(
-        verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier.fillMaxWidth(),
-    ) {
+    OutlinedTextField(
+        label = { Text(text = stringRes(R.string.add_caption)) },
+        modifier = Modifier.fillMaxWidth().padding(top = 3.dp).height(150.dp),
+        maxLines = 10,
+        value = postViewModel.caption,
+        onValueChange = { postViewModel.caption = it },
+        placeholder = {
+            Text(
+                text = stringRes(R.string.add_caption_example),
+                color = MaterialTheme.colorScheme.placeholderText,
+            )
+        },
+        keyboardOptions =
+            KeyboardOptions.Default.copy(
+                capitalization = KeyboardCapitalization.Sentences,
+            ),
+    )
+
+    SettingSwitchItem(
+        title = R.string.add_sensitive_content_label,
+        description = R.string.add_sensitive_content_description,
+        modifier = Modifier.fillMaxWidth().padding(top = 8.dp),
+        checked = postViewModel.sensitiveContent,
+        onCheckedChange = { postViewModel.sensitiveContent = it },
+    )
+
+    SettingsRow(R.string.file_server, R.string.file_server_description) {
         TextSpinner(
-            label = stringRes(id = R.string.file_server),
+            label = "",
             placeholder =
                 fileServers
-                    .firstOrNull { it.server == accountViewModel.account.settings.defaultFileServer }
-                    ?.server
+                    .firstOrNull { it == accountViewModel.account.settings.defaultFileServer }
                     ?.name
-                    ?: fileServers[0].server.name,
+                    ?: fileServers[0].name,
             options = fileServerOptions,
             onSelect = { postViewModel.selectedServer = fileServers[it] },
-            modifier = Modifier.windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)).weight(1f),
         )
     }
 
-    Row(
-        verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier.fillMaxWidth(),
+    Column(
+        modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp),
+        verticalArrangement = Arrangement.spacedBy(Size5dp),
     ) {
-        SettingSwitchItem(
-            modifier = Modifier.fillMaxWidth().padding(8.dp),
-            checked = postViewModel.sensitiveContent,
-            onCheckedChange = { postViewModel.sensitiveContent = it },
-            title = R.string.add_sensitive_content_label,
-            description = R.string.add_sensitive_content_description,
+        Text(
+            text = stringRes(R.string.media_compression_quality_label),
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+        Text(
+            text = stringRes(R.string.media_compression_quality_explainer),
+            style = MaterialTheme.typography.bodySmall,
+            color = Color.Gray,
+            maxLines = 5,
+            overflow = TextOverflow.Ellipsis,
         )
     }
 
-    Row(
-        verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier.fillMaxWidth().windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)),
-    ) {
-        OutlinedTextField(
-            label = { Text(text = stringRes(R.string.content_description)) },
-            modifier = Modifier.fillMaxWidth().windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)),
-            value = postViewModel.alt,
-            onValueChange = { postViewModel.alt = it },
-            placeholder = {
-                Text(
-                    text = stringRes(R.string.content_description_example),
-                    color = MaterialTheme.colorScheme.placeholderText,
-                )
-            },
-            keyboardOptions =
-                KeyboardOptions.Default.copy(
-                    capitalization = KeyboardCapitalization.Sentences,
-                ),
+    Column(horizontalAlignment = Alignment.CenterHorizontally) {
+        Box(modifier = Modifier.fillMaxWidth()) {
+            Text(
+                text =
+                    when (postViewModel.mediaQualitySlider) {
+                        0 -> stringRes(R.string.media_compression_quality_low)
+                        1 -> stringRes(R.string.media_compression_quality_medium)
+                        2 -> stringRes(R.string.media_compression_quality_high)
+                        3 -> stringRes(R.string.media_compression_quality_uncompressed)
+                        else -> stringRes(R.string.media_compression_quality_medium)
+                    },
+                modifier = Modifier.align(Alignment.Center),
+            )
+        }
+
+        Slider(
+            value = postViewModel.mediaQualitySlider.toFloat(),
+            onValueChange = { postViewModel.mediaQualitySlider = it.toInt() },
+            valueRange = 0f..3f,
+            steps = 2,
         )
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMessageTagger.kt

@@ -39,29 +39,23 @@ class NewMessageTagger(
     var dao: Dao,
 ) {
     val directMentions = mutableSetOf<HexKey>()
+    val directMentionsNotes = mutableSetOf<Note>()
+    val directMentionsUsers = mutableSetOf<User>()
 
     fun addUserToMentions(user: User) {
+        directMentionsUsers.add(user)
         directMentions.add(user.pubkeyHex)
         pTags = if (pTags?.contains(user) == true) pTags else pTags?.plus(user) ?: listOf(user)
     }
 
     fun addNoteToReplyTos(note: Note) {
+        directMentionsNotes.add(note)
         directMentions.add(note.idHex)
 
         note.author?.let { addUserToMentions(it) }
         eTags = if (eTags?.contains(note) == true) eTags else eTags?.plus(note) ?: listOf(note)
     }
 
-    fun tagIndex(user: User): Int {
-        // Postr Events assembles replies before mentions in the tag order
-        return (if (channelHex != null) 1 else 0) + (eTags?.size ?: 0) + (pTags?.indexOf(user) ?: 0)
-    }
-
-    fun tagIndex(note: Note): Int {
-        // Postr Events assembles replies before mentions in the tag order
-        return (if (channelHex != null) 1 else 0) + (eTags?.indexOf(note) ?: 0)
-    }
-
     suspend fun run() {
         // adds all references to mentions and reply tos
         message.split('\n').forEach { paragraph: String ->

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt

@@ -21,7 +21,6 @@
 package com.vitorpamplona.amethyst.ui.actions
 
 import android.content.Context
-import android.net.Uri
 import android.util.Log
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
@@ -34,7 +33,7 @@ import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.fonfon.kgeohash.toGeoHash
+import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.commons.compose.insertUrlAtCursor
 import com.vitorpamplona.amethyst.commons.richtext.RichTextParser
@@ -42,43 +41,55 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.service.FileHeader
-import com.vitorpamplona.amethyst.service.LocationUtil
-import com.vitorpamplona.amethyst.service.Nip96Uploader
+import com.vitorpamplona.amethyst.service.LocationState
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
-import com.vitorpamplona.amethyst.ui.components.MediaCompressor
+import com.vitorpamplona.amethyst.service.uploads.MediaCompressor
+import com.vitorpamplona.amethyst.service.uploads.MultiOrchestrator
+import com.vitorpamplona.amethyst.service.uploads.UploadOrchestrator
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerName
+import com.vitorpamplona.amethyst.ui.actions.uploads.SelectedMedia
+import com.vitorpamplona.amethyst.ui.actions.uploads.SelectedMediaProcessing
 import com.vitorpamplona.amethyst.ui.components.Split
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.ammolite.relays.RelaySetupInfo
 import com.vitorpamplona.quartz.encoders.Hex
 import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.IMetaTag
+import com.vitorpamplona.quartz.encoders.IMetaTagBuilder
+import com.vitorpamplona.quartz.encoders.Nip30CustomEmoji
 import com.vitorpamplona.quartz.encoders.toNpub
 import com.vitorpamplona.quartz.events.AddressableEvent
 import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.events.BaseTextNoteEvent
-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.DraftEvent
+import com.vitorpamplona.quartz.events.EmojiUrl
 import com.vitorpamplona.quartz.events.Event
-import com.vitorpamplona.quartz.events.FileHeaderEvent
 import com.vitorpamplona.quartz.events.FileStorageEvent
 import com.vitorpamplona.quartz.events.FileStorageHeaderEvent
 import com.vitorpamplona.quartz.events.GitIssueEvent
+import com.vitorpamplona.quartz.events.NIP17Group
 import com.vitorpamplona.quartz.events.Price
 import com.vitorpamplona.quartz.events.PrivateDmEvent
+import com.vitorpamplona.quartz.events.RootScope
 import com.vitorpamplona.quartz.events.TextNoteEvent
 import com.vitorpamplona.quartz.events.TorrentCommentEvent
 import com.vitorpamplona.quartz.events.TorrentEvent
 import com.vitorpamplona.quartz.events.ZapSplitSetup
 import com.vitorpamplona.quartz.events.findURLs
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.util.UUID
@@ -104,7 +115,7 @@ open class NewPostViewModel : ViewModel() {
     var pTags by mutableStateOf<List<User>?>(null)
     var eTags by mutableStateOf<List<Note>?>(null)
 
-    var nip94attachments by mutableStateOf<List<FileHeaderEvent>>(emptyList())
+    var iMetaAttachments by mutableStateOf<List<IMetaTag>>(emptyList())
     var nip95attachments by
         mutableStateOf<List<Pair<FileStorageEvent, FileStorageHeaderEvent>>>(emptyList())
 
@@ -116,13 +127,34 @@ open class NewPostViewModel : ViewModel() {
     var userSuggestionAnchor: TextRange? = null
     var userSuggestionsMainMessage: UserSuggestionAnchor? = null
 
+    val emojiSearch: MutableStateFlow<String> = MutableStateFlow("")
+    val emojiSuggestions: StateFlow<List<Account.EmojiMedia>> by lazy {
+        account!!
+            .myEmojis
+            .combine(emojiSearch) { list, search ->
+                if (search.length == 1) {
+                    list
+                } else if (search.isNotEmpty()) {
+                    val code = search.removePrefix(":")
+                    list.filter { it.code.startsWith(code) }
+                } else {
+                    emptyList()
+                }
+            }.flowOn(Dispatchers.Default)
+            .stateIn(
+                viewModelScope,
+                SharingStarted.WhileSubscribed(5000),
+                emptyList(),
+            )
+    }
+
     // DMs
     var wantsDirectMessage by mutableStateOf(false)
     var toUsers by mutableStateOf(TextFieldValue(""))
     var subject by mutableStateOf(TextFieldValue(""))
 
     // Images and Videos
-    var contentToAddUrl by mutableStateOf<Uri?>(null)
+    var multiOrchestrator by mutableStateOf<MultiOrchestrator?>(null)
 
     // Polls
     var canUsePoll by mutableStateOf(false)
@@ -163,8 +195,8 @@ open class NewPostViewModel : ViewModel() {
 
     // GeoHash
     var wantsToAddGeoHash by mutableStateOf(false)
-    var locUtil: LocationUtil? = null
-    var location: Flow<String>? = null
+    var location: StateFlow<LocationState.LocationResult>? = null
+    var wantsExclusiveGeoPost by mutableStateOf(false)
 
     // ZapRaiser
     var canAddZapRaiser by mutableStateOf(false)
@@ -220,7 +252,10 @@ open class NewPostViewModel : ViewModel() {
                 if (replyNote.event !is CommunityDefinitionEvent) {
                     replyNote.author?.let { replyUser ->
                         val currentMentions =
-                            (replyNote.event as? TextNoteEvent)?.mentions()?.map { LocalCache.getOrCreateUser(it) }
+                            (replyNote.event as? TextNoteEvent)
+                                ?.mentions()
+                                ?.filter { it.isNotEmpty() }
+                                ?.map { LocalCache.getOrCreateUser(it) }
                                 ?: emptyList()
 
                         if (currentMentions.contains(replyUser)) {
@@ -239,7 +274,7 @@ open class NewPostViewModel : ViewModel() {
             canAddInvoice = accountViewModel.userProfile().info?.lnAddress() != null
             canAddZapRaiser = accountViewModel.userProfile().info?.lnAddress() != null
             canUsePoll = originalNote?.event !is PrivateDmEvent && originalNote?.channelHex() == null
-            contentToAddUrl = null
+            multiOrchestrator = null
 
             quote?.let {
                 message = TextFieldValue(message.text + "\nnostr:${it.toNEvent()}")
@@ -323,7 +358,7 @@ open class NewPostViewModel : ViewModel() {
 
         canAddInvoice = accountViewModel.userProfile().info?.lnAddress() != null
         canAddZapRaiser = accountViewModel.userProfile().info?.lnAddress() != null
-        contentToAddUrl = null
+        multiOrchestrator = null
 
         val localfowardZapTo = draftEvent.tags().filter { it.size > 1 && it[0] == "zap" }
         forwardZapTo = Split()
@@ -336,7 +371,13 @@ open class NewPostViewModel : ViewModel() {
         wantsForwardZapTo = localfowardZapTo.isNotEmpty()
 
         wantsToMarkAsSensitive = draftEvent.tags().any { it.size > 1 && it[0] == "content-warning" }
-        wantsToAddGeoHash = draftEvent.tags().any { it.size > 1 && it[0] == "g" }
+
+        val geohash = draftEvent.getGeoHash()
+        wantsToAddGeoHash = geohash != null
+        if (geohash != null) {
+            wantsExclusiveGeoPost = draftEvent.kind() == CommentEvent.KIND
+        }
+
         val zapraiser = draftEvent.tags().filter { it.size > 1 && it[0] == "zapraiser" }
         wantsZapraiser = zapraiser.isNotEmpty()
         zapRaiserAmount = null
@@ -350,7 +391,7 @@ open class NewPostViewModel : ViewModel() {
                 note
             }
 
-        if (draftEvent !is PrivateDmEvent && draftEvent !is ChatMessageEvent) {
+        if (draftEvent !is PrivateDmEvent && draftEvent !is NIP17Group) {
             pTags =
                 draftEvent.tags().filter { it.size > 1 && it[0] == "p" }.map {
                     LocalCache.getOrCreateUser(it[1])
@@ -445,7 +486,7 @@ open class NewPostViewModel : ViewModel() {
                     .firstOrNull()
         } ?: ClassifiedsEvent.CONDITION.USED_LIKE_NEW
 
-        wantsDirectMessage = draftEvent is PrivateDmEvent || draftEvent is ChatMessageEvent
+        wantsDirectMessage = draftEvent is PrivateDmEvent || draftEvent is NIP17Group
 
         draftEvent.subject()?.let {
             subject = TextFieldValue()
@@ -460,13 +501,13 @@ open class NewPostViewModel : ViewModel() {
                 TextFieldValue(draftEvent.content())
             }
 
-        requiresNIP17 = draftEvent is ChatMessageEvent
-        nip17 = draftEvent is ChatMessageEvent
+        requiresNIP17 = draftEvent is NIP17Group
+        nip17 = draftEvent is NIP17Group
 
-        if (draftEvent is ChatMessageEvent) {
+        if (draftEvent is NIP17Group) {
             toUsers =
                 TextFieldValue(
-                    draftEvent.recipientsPubKey().mapNotNull { runCatching { Hex.decode(it).toNpub() }.getOrNull() }.joinToString(", ") { "@$it" },
+                    draftEvent.groupMembers().mapNotNull { runCatching { Hex.decode(it).toNpub() }.getOrNull() }.joinToString(", ") { "@$it" },
                 )
         }
 
@@ -530,14 +571,7 @@ open class NewPostViewModel : ViewModel() {
                 null
             }
 
-        val geoLocation = locUtil?.locationStateFlow?.value
-        val geoHash =
-            if (wantsToAddGeoHash && geoLocation != null) {
-                geoLocation.toGeoHash(GeohashPrecision.KM_5_X_5.digits).toString()
-            } else {
-                null
-            }
-
+        val geoHash = (location?.value as? LocationState.LocationResult.Success)?.geoHash?.toString()
         val localZapRaiserAmount = if (wantsZapraiser) zapRaiserAmount else null
 
         nip95attachments.forEach {
@@ -546,12 +580,43 @@ open class NewPostViewModel : ViewModel() {
             }
         }
 
+        val emojis = findEmoji(tagger.message, account?.myEmojis?.value)
         val urls = findURLs(tagger.message)
-        val usedAttachments = nip94attachments.filter { it.urls().intersect(urls.toSet()).isNotEmpty() }
-        // Doesn't send as nip94 yet because we don't know if it makes sense.
-        // usedAttachments.forEach { account?.sendHeader(it, relayList, {}) }
+        val usedAttachments = iMetaAttachments.filter { it.url in urls.toSet() }
 
-        if (originalNote?.channelHex() != null) {
+        val replyingTo = originalNote
+
+        if (replyingTo?.event is CommentEvent || (replyingTo?.event is Event && replyingTo.event is RootScope)) {
+            account?.sendReplyComment(
+                message = tagger.message,
+                replyingTo = replyingTo,
+                directMentionsUsers = tagger.directMentionsUsers,
+                directMentionsNotes = tagger.directMentionsNotes,
+                imetas = usedAttachments,
+                geohash = geoHash,
+                zapReceiver = zapReceiver,
+                wantsToMarkAsSensitive = wantsToMarkAsSensitive,
+                zapRaiserAmount = localZapRaiserAmount,
+                relayList = relayList,
+                emojis = emojis,
+                draftTag = localDraft,
+            )
+        } else if (wantsExclusiveGeoPost && geoHash != null && (originalNote == null || originalNote?.event is CommentEvent)) {
+            account?.sendGeoComment(
+                message = tagger.message,
+                geohash = geoHash,
+                replyingTo = originalNote,
+                directMentionsUsers = tagger.directMentionsUsers,
+                directMentionsNotes = tagger.directMentionsNotes,
+                imetas = usedAttachments,
+                zapReceiver = zapReceiver,
+                wantsToMarkAsSensitive = wantsToMarkAsSensitive,
+                zapRaiserAmount = localZapRaiserAmount,
+                relayList = relayList,
+                emojis = emojis,
+                draftTag = localDraft,
+            )
+        } else if (originalNote?.channelHex() != null) {
             if (originalNote is AddressableEvent && originalNote?.address() != null) {
                 account?.sendLiveMessage(
                     message = tagger.message,
@@ -562,7 +627,8 @@ open class NewPostViewModel : ViewModel() {
                     wantsToMarkAsSensitive = wantsToMarkAsSensitive,
                     zapRaiserAmount = localZapRaiserAmount,
                     geohash = geoHash,
-                    nip94attachments = usedAttachments,
+                    imetas = usedAttachments,
+                    emojis = emojis,
                     draftTag = localDraft,
                 )
             } else {
@@ -574,8 +640,10 @@ open class NewPostViewModel : ViewModel() {
                     zapReceiver = zapReceiver,
                     wantsToMarkAsSensitive = wantsToMarkAsSensitive,
                     zapRaiserAmount = localZapRaiserAmount,
+                    directMentions = tagger.directMentions,
                     geohash = geoHash,
-                    nip94attachments = usedAttachments,
+                    imetas = usedAttachments,
+                    emojis = emojis,
                     draftTag = localDraft,
                 )
             }
@@ -589,21 +657,13 @@ open class NewPostViewModel : ViewModel() {
                 wantsToMarkAsSensitive = wantsToMarkAsSensitive,
                 zapRaiserAmount = localZapRaiserAmount,
                 geohash = geoHash,
-                nip94attachments = usedAttachments,
+                imetas = usedAttachments,
                 draftTag = localDraft,
             )
-        } else if (originalNote?.event is ChatMessageEvent) {
-            val receivers =
-                (originalNote?.event as ChatMessageEvent)
-                    .recipientsPubKey()
-                    .plus(originalNote?.author?.pubkeyHex)
-                    .filterNotNull()
-                    .toSet()
-                    .toList()
-
+        } else if (originalNote?.event is NIP17Group) {
             account?.sendNIP17PrivateMessage(
                 message = tagger.message,
-                toUsers = receivers,
+                toUsers = (originalNote?.event as NIP17Group).groupMembers().toList(),
                 subject = subject.text.ifBlank { null },
                 replyingTo = originalNote!!,
                 mentions = tagger.pTags,
@@ -611,7 +671,8 @@ open class NewPostViewModel : ViewModel() {
                 zapReceiver = zapReceiver,
                 zapRaiserAmount = localZapRaiserAmount,
                 geohash = geoHash,
-                nip94attachments = usedAttachments,
+                imetas = usedAttachments,
+                emojis = emojis,
                 draftTag = localDraft,
             )
         } else if (!dmUsers.isNullOrEmpty()) {
@@ -626,7 +687,8 @@ open class NewPostViewModel : ViewModel() {
                     zapReceiver = zapReceiver,
                     zapRaiserAmount = localZapRaiserAmount,
                     geohash = geoHash,
-                    nip94attachments = usedAttachments,
+                    imetas = usedAttachments,
+                    emojis = emojis,
                     draftTag = localDraft,
                 )
             } else {
@@ -639,7 +701,7 @@ open class NewPostViewModel : ViewModel() {
                     zapReceiver = zapReceiver,
                     zapRaiserAmount = localZapRaiserAmount,
                     geohash = geoHash,
-                    nip94attachments = usedAttachments,
+                    imetas = usedAttachments,
                     draftTag = localDraft,
                 )
             }
@@ -680,7 +742,8 @@ open class NewPostViewModel : ViewModel() {
                 forkedFrom = forkedFromNote?.event as? Event,
                 relayList = relayList,
                 geohash = geoHash,
-                nip94attachments = usedAttachments,
+                imetas = usedAttachments,
+                emojis = emojis,
                 draftTag = localDraft,
             )
         } else if (originalNote?.event is TorrentCommentEvent) {
@@ -719,7 +782,8 @@ open class NewPostViewModel : ViewModel() {
                     forkedFrom = forkedFromNote?.event as? Event,
                     relayList = relayList,
                     geohash = geoHash,
-                    nip94attachments = usedAttachments,
+                    imetas = usedAttachments,
+                    emojis = emojis,
                     draftTag = localDraft,
                 )
             }
@@ -748,7 +812,8 @@ open class NewPostViewModel : ViewModel() {
                 forkedFrom = forkedFromNote?.event as? Event,
                 relayList = relayList,
                 geohash = geoHash,
-                nip94attachments = usedAttachments,
+                imetas = usedAttachments,
+                emojis = emojis,
                 draftTag = localDraft,
             )
         } else {
@@ -767,7 +832,8 @@ open class NewPostViewModel : ViewModel() {
                     zapRaiserAmount = localZapRaiserAmount,
                     relayList = relayList,
                     geohash = geoHash,
-                    nip94attachments = usedAttachments,
+                    imetas = usedAttachments,
+                    emojis = emojis,
                     draftTag = localDraft,
                 )
             } else if (wantsProduct) {
@@ -786,7 +852,8 @@ open class NewPostViewModel : ViewModel() {
                     zapRaiserAmount = localZapRaiserAmount,
                     relayList = relayList,
                     geohash = geoHash,
-                    nip94attachments = usedAttachments,
+                    imetas = usedAttachments,
+                    emojis = emojis,
                     draftTag = localDraft,
                 )
             } else {
@@ -823,97 +890,98 @@ open class NewPostViewModel : ViewModel() {
                     forkedFrom = forkedFromNote?.event as? Event,
                     relayList = relayList,
                     geohash = geoHash,
-                    nip94attachments = usedAttachments,
+                    imetas = usedAttachments,
+                    emojis = emojis,
                     draftTag = localDraft,
                 )
             }
         }
     }
 
+    fun findEmoji(
+        message: String,
+        myEmojiSet: List<Account.EmojiMedia>?,
+    ): List<EmojiUrl> {
+        if (myEmojiSet == null) return emptyList()
+        return Nip30CustomEmoji.findAllEmojiCodes(message).mapNotNull { possibleEmoji ->
+            myEmojiSet.firstOrNull { it.code == possibleEmoji }?.let { EmojiUrl(it.code, it.url.url) }
+        }
+    }
+
     fun upload(
-        galleryUri: Uri,
         alt: String?,
         sensitiveContent: Boolean,
         mediaQuality: Int,
         isPrivate: Boolean = false,
-        server: ServerOption,
+        server: ServerName,
         onError: (title: String, message: String) -> Unit,
         context: Context,
     ) {
-        isUploadingImage = true
-        contentToAddUrl = null
+        viewModelScope.launch(Dispatchers.Default) {
+            val myAccount = account ?: return@launch
 
-        val contentResolver = context.contentResolver
-        val contentType = contentResolver.getType(galleryUri)
+            val myMultiOrchestrator = multiOrchestrator ?: return@launch
 
-        viewModelScope.launch(Dispatchers.IO) {
-            MediaCompressor()
-                .compress(
-                    galleryUri,
-                    contentType,
-                    context.applicationContext,
-                    onReady = { fileUri, contentType, size ->
-                        if (server.isNip95) {
-                            contentResolver.openInputStream(fileUri)?.use {
-                                createNIP95Record(
-                                    it.readBytes(),
-                                    contentType,
-                                    alt,
-                                    sensitiveContent,
-                                    onError = {
-                                        onError(stringRes(context, R.string.failed_to_upload_media_no_details), it)
-                                    },
-                                    context,
-                                )
-                            }
-                        } else {
-                            viewModelScope.launch(Dispatchers.IO) {
-                                try {
-                                    val result =
-                                        Nip96Uploader(account)
-                                            .uploadImage(
-                                                uri = fileUri,
-                                                contentType = contentType,
-                                                size = size,
-                                                alt = alt,
-                                                sensitiveContent = if (sensitiveContent) "" else null,
-                                                server = server.server,
-                                                contentResolver = contentResolver,
-                                                forceProxy = account?.let { it::shouldUseTorForNIP96 } ?: { false },
-                                                onProgress = {},
-                                                context = context,
-                                            )
+            isUploadingImage = true
 
-                                    createNIP94Record(
-                                        uploadingResult = result,
-                                        localContentType = contentType,
-                                        alt = alt,
-                                        sensitiveContent = sensitiveContent,
-                                        forceProxy = account?.let { it::shouldUseTorForNIP96 } ?: { false },
-                                        onError = {
-                                            onError(stringRes(context, R.string.failed_to_upload_media_no_details), it)
-                                        },
-                                        context = context,
-                                    )
-                                } catch (e: Exception) {
-                                    if (e is CancellationException) throw e
-                                    Log.e(
-                                        "ImageUploader",
-                                        "Failed to upload ${e.message}",
-                                        e,
-                                    )
-                                    isUploadingImage = false
-                                    onError(stringRes(context, R.string.failed_to_upload_media_no_details), e.message ?: e.javaClass.simpleName)
-                                }
-                            }
-                        }
-                    },
-                    onError = {
-                        isUploadingImage = false
-                        onError(stringRes(context, R.string.failed_to_upload_media_no_details), stringRes(context, it))
-                    },
-                    mediaQuality = MediaCompressor().intToCompressorQuality(mediaQuality),
+            val results =
+                myMultiOrchestrator.upload(
+                    viewModelScope,
+                    alt,
+                    sensitiveContent,
+                    MediaCompressor.intToCompressorQuality(mediaQuality),
+                    server,
+                    myAccount,
+                    context,
                 )
+
+            if (results.allGood) {
+                results.successful.forEach {
+                    if (it.result is UploadOrchestrator.OrchestratorResult.NIP95Result) {
+                        account?.createNip95(it.result.bytes, headerInfo = it.result.fileHeader, alt, sensitiveContent) { nip95 ->
+                            nip95attachments = nip95attachments + nip95
+                            val note = nip95.let { it1 -> account?.consumeNip95(it1.first, it1.second) }
+
+                            note?.let {
+                                message = message.insertUrlAtCursor("nostr:" + it.toNEvent())
+                            }
+
+                            urlPreview = findUrlInMessage()
+                        }
+                    } else if (it.result is UploadOrchestrator.OrchestratorResult.ServerResult) {
+                        val iMeta =
+                            IMetaTagBuilder(it.result.url)
+                                .apply {
+                                    hash(it.result.fileHeader.hash)
+                                    size(it.result.fileHeader.size)
+                                    it.result.fileHeader.mimeType
+                                        ?.let { mimeType(it) }
+                                    it.result.fileHeader.dim
+                                        ?.let { dims(it) }
+                                    it.result.fileHeader.blurHash
+                                        ?.let { blurhash(it.blurhash) }
+                                    it.result.magnet?.let { magnet(it) }
+                                    it.result.uploadedHash?.let { originalHash(it) }
+                                    alt?.let { alt(it) }
+                                    // TODO: Support Reasons on images
+                                    if (sensitiveContent) sensitiveContent("")
+                                }.build()
+
+                        iMetaAttachments = iMetaAttachments.filter { it.url != iMeta.url } + iMeta
+
+                        message = message.insertUrlAtCursor(it.result.url)
+                        urlPreview = findUrlInMessage()
+                    }
+                }
+
+                multiOrchestrator = null
+            } else {
+                val errorMessages = results.errors.map { stringRes(context, it.errorResource, *it.params) }.distinct()
+
+                onError(stringRes(context, R.string.failed_to_upload_media_no_details), errorMessages.joinToString(".\n"))
+            }
+
+            isUploadingImage = false
         }
     }
 
@@ -924,7 +992,7 @@ open class NewPostViewModel : ViewModel() {
 
         forkedFromNote = null
 
-        contentToAddUrl = null
+        multiOrchestrator = null
         urlPreview = null
         isUploadingImage = false
         pTags = null
@@ -953,6 +1021,7 @@ open class NewPostViewModel : ViewModel() {
         wantsForwardZapTo = false
         wantsToMarkAsSensitive = false
         wantsToAddGeoHash = false
+        wantsExclusiveGeoPost = false
         forwardZapTo = Split()
         forwardZapToEditting = TextFieldValue("")
 
@@ -960,6 +1029,10 @@ open class NewPostViewModel : ViewModel() {
         userSuggestionAnchor = null
         userSuggestionsMainMessage = null
 
+        if (emojiSearch.value.isNotEmpty()) {
+            emojiSearch.tryEmit("")
+        }
+
         draftTag = UUID.randomUUID().toString()
 
         NostrSearchEventOrUserDataSource.clear()
@@ -971,6 +1044,10 @@ open class NewPostViewModel : ViewModel() {
         }
     }
 
+    fun deleteMediaToUpload(selected: SelectedMediaProcessing) {
+        this.multiOrchestrator?.remove(selected)
+    }
+
     open fun findUrlInMessage(): String? = RichTextParser().parseValidUrls(message.text).firstOrNull()
 
     open fun removeFromReplyList(userToRemove: User) {
@@ -981,6 +1058,10 @@ open class NewPostViewModel : ViewModel() {
         draftTextChanges.trySend("")
     }
 
+    open fun addToMessage(it: String) {
+        updateMessage(TextFieldValue(message.text + " " + it))
+    }
+
     open fun updateMessage(it: TextFieldValue) {
         message = it
         urlPreview = findUrlInMessage()
@@ -994,18 +1075,23 @@ open class NewPostViewModel : ViewModel() {
             userSuggestionAnchor = it.selection
             userSuggestionsMainMessage = UserSuggestionAnchor.MAIN_MESSAGE
             if (lastWord.startsWith("@") && lastWord.length > 2) {
-                NostrSearchEventOrUserDataSource.search(lastWord.removePrefix("@"))
+                val prefix = lastWord.removePrefix("@")
+                NostrSearchEventOrUserDataSource.search(prefix)
                 viewModelScope.launch(Dispatchers.IO) {
-                    userSuggestions =
-                        LocalCache
-                            .findUsersStartingWith(lastWord.removePrefix("@"))
-                            .sortedWith(compareBy({ account?.isFollowing(it) }, { it.toBestDisplayName() }, { it.pubkeyHex }))
-                            .reversed()
+                    userSuggestions = LocalCache.findUsersStartingWith(prefix, account)
                 }
             } else {
                 NostrSearchEventOrUserDataSource.clear()
                 userSuggestions = emptyList()
             }
+
+            if (lastWord.startsWith(":")) {
+                emojiSearch.tryEmit(lastWord)
+            } else {
+                if (emojiSearch.value.isNotBlank()) {
+                    emojiSearch.tryEmit("")
+                }
+            }
         }
 
         saveDraft()
@@ -1023,13 +1109,12 @@ open class NewPostViewModel : ViewModel() {
             userSuggestionAnchor = it.selection
             userSuggestionsMainMessage = UserSuggestionAnchor.TO_USERS
             if (lastWord.startsWith("@") && lastWord.length > 2) {
-                NostrSearchEventOrUserDataSource.search(lastWord.removePrefix("@"))
+                val prefix = lastWord.removePrefix("@")
+                NostrSearchEventOrUserDataSource.search(prefix)
                 viewModelScope.launch(Dispatchers.IO) {
                     userSuggestions =
                         LocalCache
-                            .findUsersStartingWith(lastWord.removePrefix("@"))
-                            .sortedWith(compareBy({ account?.isFollowing(it) }, { it.toBestDisplayName() }, { it.pubkeyHex }))
-                            .reversed()
+                            .findUsersStartingWith(prefix, account)
                 }
             } else {
                 NostrSearchEventOrUserDataSource.clear()
@@ -1051,18 +1136,11 @@ open class NewPostViewModel : ViewModel() {
             userSuggestionAnchor = it.selection
             userSuggestionsMainMessage = UserSuggestionAnchor.FORWARD_ZAPS
             if (lastWord.length > 2) {
-                NostrSearchEventOrUserDataSource.search(lastWord.removePrefix("@"))
+                val prefix = lastWord.removePrefix("@")
+                NostrSearchEventOrUserDataSource.search(prefix)
                 viewModelScope.launch(Dispatchers.IO) {
                     userSuggestions =
-                        LocalCache
-                            .findUsersStartingWith(lastWord.removePrefix("@"))
-                            .sortedWith(
-                                compareBy(
-                                    { account?.isFollowing(it) },
-                                    { it.toBestDisplayName() },
-                                    { it.pubkeyHex },
-                                ),
-                            ).reversed()
+                        LocalCache.findUsersStartingWith(prefix, account)
                 }
             } else {
                 NostrSearchEventOrUserDataSource.clear()
@@ -1117,6 +1195,54 @@ open class NewPostViewModel : ViewModel() {
         saveDraft()
     }
 
+    open fun autocompleteWithEmoji(item: Account.EmojiMedia) {
+        userSuggestionAnchor?.let {
+            val lastWord =
+                message.text
+                    .substring(0, it.end)
+                    .substringAfterLast("\n")
+                    .substringAfterLast(" ")
+            val lastWordStart = it.end - lastWord.length
+            val wordToInsert = ":${item.code}:"
+
+            message =
+                TextFieldValue(
+                    message.text.replaceRange(lastWordStart, it.end, wordToInsert),
+                    TextRange(lastWordStart + wordToInsert.length, lastWordStart + wordToInsert.length),
+                )
+
+            userSuggestionAnchor = null
+            emojiSearch.tryEmit("")
+        }
+
+        saveDraft()
+    }
+
+    open fun autocompleteWithEmojiUrl(item: Account.EmojiMedia) {
+        userSuggestionAnchor?.let {
+            val lastWord =
+                message.text
+                    .substring(0, it.end)
+                    .substringAfterLast("\n")
+                    .substringAfterLast(" ")
+            val lastWordStart = it.end - lastWord.length
+            val wordToInsert = item.url.url + " "
+
+            message =
+                TextFieldValue(
+                    message.text.replaceRange(lastWordStart, it.end, wordToInsert),
+                    TextRange(lastWordStart + wordToInsert.length, lastWordStart + wordToInsert.length),
+                )
+
+            userSuggestionAnchor = null
+            emojiSearch.tryEmit("")
+        }
+
+        urlPreview = findUrlInMessage()
+
+        saveDraft()
+    }
+
     private fun newStateMapPollOptions(): SnapshotStateMap<Int, String> = mutableStateMapOf(Pair(0, ""), Pair(1, ""))
 
     fun canPost(): Boolean =
@@ -1141,145 +1267,27 @@ open class NewPostViewModel : ViewModel() {
                             !category.text.isNullOrBlank()
                     )
             ) &&
-            contentToAddUrl == null
-
-    suspend fun createNIP94Record(
-        uploadingResult: Nip96Uploader.PartialEvent,
-        localContentType: String?,
-        alt: String?,
-        sensitiveContent: Boolean,
-        forceProxy: (String) -> Boolean,
-        onError: (message: String) -> Unit,
-        context: Context,
-    ) {
-        // Images don't seem to be ready immediately after upload
-        val imageUrl = uploadingResult.tags?.firstOrNull { it.size > 1 && it[0] == "url" }?.get(1)
-        val remoteMimeType =
-            uploadingResult.tags
-                ?.firstOrNull { it.size > 1 && it[0] == "m" }
-                ?.get(1)
-                ?.ifBlank { null }
-        val originalHash =
-            uploadingResult.tags
-                ?.firstOrNull { it.size > 1 && it[0] == "ox" }
-                ?.get(1)
-                ?.ifBlank { null }
-        val dim =
-            uploadingResult.tags
-                ?.firstOrNull { it.size > 1 && it[0] == "dim" }
-                ?.get(1)
-                ?.ifBlank { null }
-        val magnet =
-            uploadingResult.tags
-                ?.firstOrNull { it.size > 1 && it[0] == "magnet" }
-                ?.get(1)
-                ?.ifBlank { null }
-
-        if (imageUrl.isNullOrBlank()) {
-            Log.e("ImageDownload", "Couldn't download image from server")
-            cancel()
-            isUploadingImage = false
-            onError(stringRes(context, R.string.server_did_not_provide_a_url_after_uploading))
-            return
-        }
-
-        FileHeader.prepare(
-            fileUrl = imageUrl,
-            mimeType = remoteMimeType ?: localContentType,
-            dimPrecomputed = dim,
-            forceProxy = forceProxy(imageUrl),
-            onReady = { header: FileHeader ->
-                account?.createHeader(imageUrl, magnet, header, alt, sensitiveContent, originalHash) { event ->
-                    isUploadingImage = false
-                    nip94attachments = nip94attachments.filter { it.url() != event.url() } + event
-
-                    message = message.insertUrlAtCursor(imageUrl)
-                    urlPreview = findUrlInMessage()
-                    saveDraft()
-                }
-            },
-            onError = {
-                isUploadingImage = false
-                onError(stringRes(context, R.string.could_not_prepare_header, it))
-            },
-        )
-    }
+            multiOrchestrator == null
 
     fun insertAtCursor(newElement: String) {
         message = message.insertUrlAtCursor(newElement)
     }
 
-    fun createNIP95Record(
-        bytes: ByteArray,
-        mimeType: String?,
-        alt: String?,
-        sensitiveContent: Boolean,
-        onError: (message: String) -> Unit,
-        context: Context,
-    ) {
-        if (bytes.size > 80000) {
-            viewModelScope.launch {
-                onError(stringRes(context, id = R.string.media_too_big_for_nip95))
-                isUploadingImage = false
-            }
-            return
-        }
-
-        viewModelScope.launch(Dispatchers.IO) {
-            FileHeader.prepare(
-                bytes,
-                mimeType,
-                null,
-                onReady = {
-                    account?.createNip95(bytes, headerInfo = it, alt, sensitiveContent) { nip95 ->
-                        nip95attachments = nip95attachments + nip95
-                        val note = nip95.let { it1 -> account?.consumeNip95(it1.first, it1.second) }
-
-                        isUploadingImage = false
-
-                        note?.let {
-                            message = message.insertUrlAtCursor("nostr:" + it.toNEvent())
-                        }
-
-                        urlPreview = findUrlInMessage()
-                        saveDraft()
-                    }
-                },
-                onError = {
-                    isUploadingImage = false
-                    onError(stringRes(context, R.string.could_not_prepare_header, it))
-                },
-            )
-        }
+    fun selectImage(uris: ImmutableList<SelectedMedia>) {
+        multiOrchestrator = MultiOrchestrator(uris)
     }
 
-    fun selectImage(uri: Uri) {
-        contentToAddUrl = uri
-    }
-
-    @OptIn(ExperimentalCoroutinesApi::class)
-    fun startLocation(context: Context) {
-        locUtil = LocationUtil(context)
-        locUtil?.let {
-            location =
-                it.locationStateFlow.mapLatest { it.toGeoHash(GeohashPrecision.KM_5_X_5.digits).toString() }
-            saveDraft()
+    fun locationFlow(): StateFlow<LocationState.LocationResult> {
+        if (location == null) {
+            location = Amethyst.instance.locationManager.geohashStateFlow
         }
-        viewModelScope.launch(Dispatchers.IO) { locUtil?.start() }
-    }
 
-    fun stopLocation() {
-        viewModelScope.launch(Dispatchers.IO) { locUtil?.stop() }
-        location = null
-        locUtil = null
+        return location!!
     }
 
     override fun onCleared() {
         super.onCleared()
         Log.d("Init", "OnCleared: ${this.javaClass.simpleName}")
-        viewModelScope.launch(Dispatchers.IO) { locUtil?.stop() }
-        location = null
-        locUtil = null
     }
 
     fun toggleNIP04And24() {
@@ -1382,7 +1390,7 @@ open class NewPostViewModel : ViewModel() {
                 elementList[i] = elementList[nextIndex].also { elementList[nextIndex] = "null" }
             }
         }
-        elementList.removeLast()
+        elementList.removeAt(elementList.size - 1)
         val newEntries = keyList.zip(elementList) { key, content -> Pair(key, content) }
         this.clear()
         this.putAll(newEntries)

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataView.kt

@@ -45,6 +45,7 @@ import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.actions.uploads.SelectSingleFromGallery
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.CloseButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SaveButton
@@ -151,7 +152,7 @@ fun NewUserMetadataView(
                             )
                         },
                         leadingIcon = {
-                            UploadFromGallery(
+                            SelectSingleFromGallery(
                                 isUploading = postViewModel.isUploadingImageForPicture,
                                 tint = MaterialTheme.colorScheme.placeholderText,
                                 modifier = Modifier.padding(start = 5.dp),
@@ -176,7 +177,7 @@ fun NewUserMetadataView(
                             )
                         },
                         leadingIcon = {
-                            UploadFromGallery(
+                            SelectSingleFromGallery(
                                 isUploading = postViewModel.isUploadingImageForBanner,
                                 tint = MaterialTheme.colorScheme.placeholderText,
                                 modifier = Modifier.padding(start = 5.dp),
@@ -189,6 +190,22 @@ fun NewUserMetadataView(
 
                     Spacer(modifier = Modifier.height(10.dp))
 
+                    OutlinedTextField(
+                        label = { Text(text = stringRes(R.string.pronouns)) },
+                        modifier = Modifier.fillMaxWidth(),
+                        value = postViewModel.pronouns.value,
+                        onValueChange = { postViewModel.pronouns.value = it },
+                        placeholder = {
+                            Text(
+                                text = "they/them, ...",
+                                color = MaterialTheme.colorScheme.placeholderText,
+                            )
+                        },
+                        singleLine = true,
+                    )
+
+                    Spacer(modifier = Modifier.height(10.dp))
+
                     OutlinedTextField(
                         label = { Text(text = stringRes(R.string.website_url)) },
                         modifier = Modifier.fillMaxWidth(),

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataViewModel.kt

@@ -21,7 +21,6 @@
 package com.vitorpamplona.amethyst.ui.actions
 
 import android.content.Context
-import android.net.Uri
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -29,9 +28,12 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.service.Nip96Uploader
-import com.vitorpamplona.amethyst.ui.components.CompressorQuality
-import com.vitorpamplona.amethyst.ui.components.MediaCompressor
+import com.vitorpamplona.amethyst.service.uploads.CompressorQuality
+import com.vitorpamplona.amethyst.service.uploads.MediaCompressor
+import com.vitorpamplona.amethyst.service.uploads.blossom.BlossomUploader
+import com.vitorpamplona.amethyst.service.uploads.nip96.Nip96Uploader
+import com.vitorpamplona.amethyst.ui.actions.mediaServers.ServerType
+import com.vitorpamplona.amethyst.ui.actions.uploads.SelectedMedia
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.quartz.events.GitHubIdentity
 import com.vitorpamplona.quartz.events.MastodonIdentity
@@ -51,6 +53,7 @@ class NewUserMetadataViewModel : ViewModel() {
     val banner = mutableStateOf("")
 
     val website = mutableStateOf("")
+    val pronouns = mutableStateOf("")
     val nip05 = mutableStateOf("")
     val lnAddress = mutableStateOf("")
     val lnURL = mutableStateOf("")
@@ -72,6 +75,7 @@ class NewUserMetadataViewModel : ViewModel() {
             picture.value = it.info?.picture ?: ""
             banner.value = it.info?.banner ?: ""
             website.value = it.info?.website ?: ""
+            pronouns.value = it.info?.pronouns ?: ""
             nip05.value = it.info?.nip05 ?: ""
             lnAddress.value = it.info?.lud16 ?: ""
             lnURL.value = it.info?.lud06 ?: ""
@@ -99,6 +103,7 @@ class NewUserMetadataViewModel : ViewModel() {
                 picture = picture.value,
                 banner = banner.value,
                 website = website.value,
+                pronouns = pronouns.value,
                 about = about.value,
                 nip05 = nip05.value,
                 lnAddress = lnAddress.value,
@@ -127,7 +132,7 @@ class NewUserMetadataViewModel : ViewModel() {
     }
 
     fun uploadForPicture(
-        uri: Uri,
+        uri: SelectedMedia,
         context: Context,
         onError: (String, String) -> Unit,
     ) {
@@ -143,7 +148,7 @@ class NewUserMetadataViewModel : ViewModel() {
     }
 
     fun uploadForBanner(
-        uri: Uri,
+        uri: SelectedMedia,
         context: Context,
         onError: (String, String) -> Unit,
     ) {
@@ -159,7 +164,7 @@ class NewUserMetadataViewModel : ViewModel() {
     }
 
     private suspend fun upload(
-        galleryUri: Uri,
+        galleryUri: SelectedMedia,
         context: Context,
         onUploading: (Boolean) -> Unit,
         onUploaded: (String) -> Unit,
@@ -167,54 +172,48 @@ class NewUserMetadataViewModel : ViewModel() {
     ) {
         onUploading(true)
 
-        val contentResolver = context.contentResolver
+        val compResult = MediaCompressor().compress(galleryUri.uri, galleryUri.mimeType, CompressorQuality.MEDIUM, context.applicationContext)
 
-        MediaCompressor()
-            .compress(
-                galleryUri,
-                contentResolver.getType(galleryUri),
-                context.applicationContext,
-                onReady = { fileUri, contentType, size ->
-                    viewModelScope.launch(Dispatchers.IO) {
-                        try {
-                            val result =
-                                Nip96Uploader(account)
-                                    .uploadImage(
-                                        uri = fileUri,
-                                        contentType = contentType,
-                                        size = size,
-                                        alt = null,
-                                        sensitiveContent = null,
-                                        server = account.settings.defaultFileServer,
-                                        contentResolver = contentResolver,
-                                        forceProxy = account::shouldUseTorForNIP96,
-                                        onProgress = {},
-                                        context = context,
-                                    )
+        try {
+            val result =
+                if (account.settings.defaultFileServer.type == ServerType.NIP96) {
+                    Nip96Uploader().uploadImage(
+                        uri = compResult.uri,
+                        contentType = compResult.contentType,
+                        size = compResult.size,
+                        alt = null,
+                        sensitiveContent = null,
+                        serverBaseUrl = account.settings.defaultFileServer.baseUrl,
+                        forceProxy = account::shouldUseTorForNIP96,
+                        onProgress = {},
+                        httpAuth = account::createHTTPAuthorization,
+                        context = context,
+                    )
+                } else {
+                    BlossomUploader().uploadImage(
+                        uri = compResult.uri,
+                        contentType = compResult.contentType,
+                        size = compResult.size,
+                        alt = null,
+                        sensitiveContent = null,
+                        serverBaseUrl = account.settings.defaultFileServer.baseUrl,
+                        forceProxy = account::shouldUseTorForNIP96,
+                        httpAuth = account::createBlossomUploadAuth,
+                        context = context,
+                    )
+                }
 
-                            val url = result.tags?.firstOrNull { it.size > 1 && it[0] == "url" }?.get(1)
-
-                            if (url != null) {
-                                onUploading(false)
-                                onUploaded(url)
-                            } else {
-                                onUploading(false)
-                                onError(stringRes(context, R.string.failed_to_upload_media_no_details), stringRes(context, R.string.server_did_not_provide_a_url_after_uploading))
-                            }
-                        } catch (e: Exception) {
-                            if (e is CancellationException) throw e
-                            onUploading(false)
-                            onError(stringRes(context, R.string.failed_to_upload_media_no_details), e.message ?: e.javaClass.simpleName)
-                        }
-                    }
-                },
-                onError = {
-                    onUploading(false)
-
-                    onError(stringRes(context, R.string.error_when_compressing_media), stringRes(context, it))
-                },
-                // Use MEDIUM quality as default
-                mediaQuality = CompressorQuality.MEDIUM,
-            )
+            if (result.url != null) {
+                onUploading(false)
+                onUploaded(result.url)
+            } else {
+                onUploading(false)
+                onError(stringRes(context, R.string.failed_to_upload_media_no_details), stringRes(context, R.string.server_did_not_provide_a_url_after_uploading))
+            }
+        } catch (e: Exception) {
+            if (e is CancellationException) throw e
+            onUploading(false)
+            onError(stringRes(context, R.string.failed_to_upload_media_no_details), e.message ?: e.javaClass.simpleName)
+        }
     }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/UploadFromGallery.kt

@@ -1,226 +0,0 @@
-/**
- * Copyright (c) 2024 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.amethyst.ui.actions
-
-import android.content.Context
-import android.net.Uri
-import android.os.Build
-import android.os.Environment
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.compose.animation.core.LinearEasing
-import androidx.compose.animation.core.animateFloat
-import androidx.compose.animation.core.infiniteRepeatable
-import androidx.compose.animation.core.rememberInfiniteTransition
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.AddPhotoAlternate
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.rotate
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import androidx.core.content.FileProvider
-import com.google.accompanist.permissions.ExperimentalPermissionsApi
-import com.google.accompanist.permissions.isGranted
-import com.google.accompanist.permissions.rememberPermissionState
-import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.ui.GetMediaActivityResultContract
-import com.vitorpamplona.amethyst.ui.stringRes
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toImmutableList
-import java.io.File
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-import java.util.concurrent.atomic.AtomicBoolean
-
-@OptIn(ExperimentalPermissionsApi::class)
-@Composable
-fun UploadFromGallery(
-    isUploading: Boolean,
-    tint: Color,
-    modifier: Modifier,
-    onImageChosen: (Uri) -> Unit,
-) {
-    val cameraPermissionState =
-        rememberPermissionState(
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                android.Manifest.permission.READ_MEDIA_IMAGES
-            } else {
-                android.Manifest.permission.READ_EXTERNAL_STORAGE
-            },
-        )
-
-    if (cameraPermissionState.status.isGranted) {
-        var showGallerySelect by remember { mutableStateOf(false) }
-        if (showGallerySelect) {
-            GallerySelect(
-                onImageUri = { uri ->
-                    showGallerySelect = false
-                    if (uri != null) {
-                        onImageChosen(uri)
-                    }
-                },
-            )
-        }
-
-        UploadBoxButton(isUploading, tint, modifier) { showGallerySelect = true }
-    } else {
-        UploadBoxButton(isUploading, tint, modifier) { cameraPermissionState.launchPermissionRequest() }
-    }
-}
-
-@Composable
-private fun UploadBoxButton(
-    isUploading: Boolean,
-    tint: Color,
-    modifier: Modifier,
-    onClick: () -> Unit,
-) {
-    Box {
-        IconButton(
-            modifier = modifier.align(Alignment.Center),
-            enabled = !isUploading,
-            onClick = { onClick() },
-        ) {
-            if (!isUploading) {
-                Icon(
-                    imageVector = Icons.Default.AddPhotoAlternate,
-                    contentDescription = stringRes(id = R.string.upload_image),
-                    modifier = Modifier.height(25.dp),
-                    tint = tint,
-                )
-            } else {
-                LoadingAnimation()
-            }
-        }
-    }
-}
-
-fun getPhotoUri(context: Context): Uri {
-    val timeStamp: String = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date())
-    val storageDir: File? = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES)
-    return File
-        .createTempFile(
-            "JPEG_${timeStamp}_",
-            ".jpg",
-            storageDir,
-        ).let {
-            FileProvider.getUriForFile(
-                context,
-                "${context.packageName}.provider",
-                it,
-            )
-        }
-}
-
-val DefaultAnimationColors =
-    listOf(
-        Color(0xFF5851D8),
-        Color(0xFF833AB4),
-        Color(0xFFC13584),
-        Color(0xFFE1306C),
-        Color(0xFFFD1D1D),
-        Color(0xFFF56040),
-        Color(0xFFF77737),
-        Color(0xFFFCAF45),
-        Color(0xFFFFDC80),
-        Color(0xFF5851D8),
-    ).toImmutableList()
-
-@Composable
-fun LoadingAnimation(
-    indicatorSize: Dp = 20.dp,
-    circleColors: ImmutableList<Color> = DefaultAnimationColors,
-    animationDuration: Int = 1000,
-) {
-    val infiniteTransition = rememberInfiniteTransition()
-
-    val rotateAnimation by
-        infiniteTransition.animateFloat(
-            initialValue = 0f,
-            targetValue = 360f,
-            animationSpec =
-                infiniteRepeatable(
-                    animation =
-                        tween(
-                            durationMillis = animationDuration,
-                            easing = LinearEasing,
-                        ),
-                ),
-        )
-
-    CircularProgressIndicator(
-        modifier =
-            Modifier
-                .size(size = indicatorSize)
-                .rotate(degrees = rotateAnimation)
-                .border(
-                    width = 4.dp,
-                    brush = Brush.sweepGradient(circleColors),
-                    shape = CircleShape,
-                ),
-        progress = 1f,
-        strokeWidth = 1.dp,
-        color = MaterialTheme.colorScheme.background,
-    )
-}
-
-@Composable
-fun GallerySelect(onImageUri: (Uri?) -> Unit = {}) {
-    var hasLaunched by remember { mutableStateOf(AtomicBoolean(false)) }
-    val launcher =
-        rememberLauncherForActivityResult(
-            contract = GetMediaActivityResultContract(),
-            onResult = { uri: Uri? ->
-                onImageUri(uri)
-                hasLaunched.set(false)
-            },
-        )
-
-    @Composable
-    fun LaunchGallery() {
-        SideEffect {
-            if (!hasLaunched.getAndSet(true)) {
-                launcher.launch("*/*")
-            }
-        }
-    }
-
-    LaunchGallery()
-}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/mediaServers/AllMediaServersLIstView.kt

@@ -0,0 +1,365 @@
+/**
+ * Copyright (c) 2024 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.amethyst.ui.actions.mediaServers
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.consumeWindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Add
+import androidx.compose.material.icons.rounded.Delete
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.actions.relays.SettingsCategory
+import com.vitorpamplona.amethyst.ui.actions.relays.SettingsCategoryWithButton
+import com.vitorpamplona.amethyst.ui.components.SetDialogToEdgeToEdge
+import com.vitorpamplona.amethyst.ui.navigation.INav
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.CloseButton
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.SaveButton
+import com.vitorpamplona.amethyst.ui.stringRes
+import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.DoubleVertPadding
+import com.vitorpamplona.amethyst.ui.theme.FeedPadding
+import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
+import com.vitorpamplona.amethyst.ui.theme.grayText
+
+@Composable
+fun MediaServersListView(
+    onClose: () -> Unit,
+    accountViewModel: AccountViewModel,
+    nav: INav,
+) {
+    val nip96ServersViewModel: NIP96ServersViewModel = viewModel()
+    val blossomServersViewModel: BlossomServersViewModel = viewModel()
+
+    LaunchedEffect(key1 = Unit) {
+        nip96ServersViewModel.load(accountViewModel.account)
+        blossomServersViewModel.load(accountViewModel.account)
+    }
+
+    Dialog(
+        onDismissRequest = onClose,
+        properties = DialogProperties(usePlatformDefaultWidth = false, decorFitsSystemWindows = false),
+    ) {
+        SetDialogToEdgeToEdge()
+        DialogContent(nip96ServersViewModel, blossomServersViewModel, onClose)
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun DialogContent(
+    nip96ServersViewModel: NIP96ServersViewModel,
+    blossomServersViewModel: BlossomServersViewModel,
+    onClose: () -> Unit,
+) {
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.SpaceAround,
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        Text(
+                            text = stringRes(id = R.string.media_servers),
+                            style = MaterialTheme.typography.titleLarge,
+                        )
+                    }
+                },
+                navigationIcon = {
+                    CloseButton(
+                        onPress = {
+                            nip96ServersViewModel.refresh()
+                            blossomServersViewModel.refresh()
+                            onClose()
+                        },
+                    )
+                },
+                actions = {
+                    SaveButton(
+                        onPost = {
+                            nip96ServersViewModel.saveFileServers()
+                            blossomServersViewModel.saveFileServers()
+                            onClose()
+                        },
+                        isActive = true,
+                    )
+                },
+                colors =
+                    TopAppBarDefaults.topAppBarColors(
+                        containerColor = MaterialTheme.colorScheme.surface,
+                    ),
+            )
+        },
+    ) { padding ->
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .padding(
+                        start = 16.dp,
+                        top = padding.calculateTopPadding(),
+                        end = 16.dp,
+                        bottom = padding.calculateBottomPadding(),
+                    ).consumeWindowInsets(padding)
+                    .imePadding(),
+            verticalArrangement = Arrangement.spacedBy(10.dp, alignment = Alignment.Top),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            Text(
+                stringRes(id = R.string.set_preferred_media_servers),
+                textAlign = TextAlign.Center,
+                style = MaterialTheme.typography.bodyLarge,
+                color = MaterialTheme.colorScheme.grayText,
+            )
+
+            AllMediaBody(nip96ServersViewModel, blossomServersViewModel)
+        }
+    }
+}
+
+@Composable
+fun AllMediaBody(
+    nip96ServersViewModel: NIP96ServersViewModel,
+    blossomServersViewModel: BlossomServersViewModel,
+) {
+    val nip96ServersState by nip96ServersViewModel.fileServers.collectAsStateWithLifecycle()
+    val blossomServersState by blossomServersViewModel.fileServers.collectAsStateWithLifecycle()
+
+    LazyColumn(
+        verticalArrangement = Arrangement.SpaceAround,
+        horizontalAlignment = Alignment.CenterHorizontally,
+        contentPadding = FeedPadding,
+    ) {
+        item {
+            SettingsCategory(
+                stringRes(R.string.media_servers_nip96_section),
+                stringRes(R.string.media_servers_nip96_explainer),
+                Modifier.padding(bottom = 8.dp),
+            )
+        }
+
+        renderMediaServerList(
+            mediaServersState = nip96ServersState,
+            keyType = "nip96",
+            editLabel = R.string.add_a_nip96_server,
+            emptyLabel = R.string.no_nip96_server_message,
+            onAddServer = { server ->
+                nip96ServersViewModel.addServer(server)
+            },
+            onDeleteServer = {
+                nip96ServersViewModel.removeServer(serverUrl = it)
+            },
+        )
+
+        item {
+            SettingsCategory(
+                stringRes(R.string.media_servers_blossom_section),
+                stringRes(R.string.media_servers_blossom_explainer),
+            )
+        }
+
+        renderMediaServerList(
+            mediaServersState = blossomServersState,
+            keyType = "blossom",
+            editLabel = R.string.add_a_blossom_server,
+            emptyLabel = R.string.no_blossom_server_message,
+            onAddServer = { server ->
+                blossomServersViewModel.addServer(server)
+            },
+            onDeleteServer = {
+                blossomServersViewModel.removeServer(serverUrl = it)
+            },
+        )
+
+        DEFAULT_MEDIA_SERVERS.let {
+            item {
+                SettingsCategoryWithButton(
+                    title = stringRes(id = R.string.built_in_media_servers_title),
+                    description = stringRes(id = R.string.built_in_servers_description),
+                    action = {
+                        OutlinedButton(
+                            onClick = {
+                                nip96ServersViewModel.addServerList(
+                                    it.mapNotNull { s -> if (s.type == ServerType.NIP96) s.baseUrl else null },
+                                )
+
+                                blossomServersViewModel.addServerList(
+                                    it.mapNotNull { s -> if (s.type == ServerType.Blossom) s.baseUrl else null },
+                                )
+                            },
+                        ) {
+                            Text(text = stringRes(id = R.string.use_default_servers))
+                        }
+                    },
+                )
+            }
+            itemsIndexed(
+                it,
+                key = { index: Int, server: ServerName ->
+                    "Proposed" + server.baseUrl
+                },
+            ) { index, server ->
+                MediaServerEntry(
+                    serverEntry = server,
+                    isAmethystDefault = true,
+                    onAddOrDelete = { serverUrl ->
+                        if (server.type == ServerType.NIP96) {
+                            nip96ServersViewModel.addServer(serverUrl)
+                        } else if (server.type == ServerType.Blossom) {
+                            blossomServersViewModel.addServer(serverUrl)
+                        }
+                    },
+                )
+            }
+        }
+
+        item {
+            Spacer(DoubleHorzSpacer)
+        }
+    }
+}
+
+fun LazyListScope.renderMediaServerList(
+    mediaServersState: List<ServerName>,
+    keyType: String,
+    editLabel: Int,
+    emptyLabel: Int,
+    onAddServer: (String) -> Unit,
+    onDeleteServer: (String) -> Unit,
+) {
+    if (mediaServersState.isEmpty()) {
+        item {
+            Text(
+                text = stringRes(id = emptyLabel),
+                modifier = DoubleVertPadding,
+            )
+        }
+    } else {
+        itemsIndexed(
+            mediaServersState,
+            key = { index: Int, server: ServerName ->
+                keyType + server.baseUrl
+            },
+        ) { index, entry ->
+            MediaServerEntry(
+                serverEntry = entry,
+                onAddOrDelete = {
+                    onDeleteServer(it)
+                },
+            )
+        }
+    }
+
+    item {
+        Spacer(modifier = StdVertSpacer)
+        MediaServerEditField(editLabel) {
+            onAddServer(it)
+        }
+    }
+}
+
+@Composable
+fun MediaServerEntry(
+    modifier: Modifier = Modifier,
+    serverEntry: ServerName,
+    isAmethystDefault: Boolean = false,
+    onAddOrDelete: (serverUrl: String) -> Unit,
+) {
+    Row(
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .padding(vertical = 10.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.SpaceAround,
+    ) {
+        Column(
+            modifier =
+                Modifier
+                    .weight(1f),
+        ) {
+            serverEntry.let {
+                Text(
+                    text = it.name.replaceFirstChar(Char::titlecase),
+                    style = MaterialTheme.typography.bodyLarge,
+                )
+                Spacer(modifier = StdVertSpacer)
+                Text(
+                    text = it.baseUrl,
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.grayText,
+                )
+            }
+        }
+
+        Row(
+            horizontalArrangement = Arrangement.End,
+        ) {
+            IconButton(
+                onClick = {
+                    onAddOrDelete(serverEntry.baseUrl)
+                },
+            ) {
+                Icon(
+                    imageVector = if (isAmethystDefault) Icons.Rounded.Add else Icons.Rounded.Delete,
+                    contentDescription =
+                        if (isAmethystDefault) {
+                            stringRes(id = R.string.add_media_server)
+                        } else {
+                            stringRes(id = R.string.delete_media_server)
+                        },
+                )
+            }
+        }
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/mediaServers/BlossomServersViewModel.kt

@@ -0,0 +1,131 @@
+/**
+ * Copyright (c) 2024 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.amethyst.ui.actions.mediaServers
+
+import android.util.Log
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.vitorpamplona.amethyst.model.Account
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import org.czeal.rfc3986.URIReference
+
+class BlossomServersViewModel : ViewModel() {
+    lateinit var account: Account
+
+    private val _fileServers = MutableStateFlow<List<ServerName>>(emptyList())
+    val fileServers = _fileServers.asStateFlow()
+    private var isModified = false
+
+    fun load(account: Account) {
+        this.account = account
+        refresh()
+    }
+
+    fun refresh() {
+        isModified = false
+        _fileServers.update {
+            val obtainedFileServers = obtainFileServers() ?: emptyList()
+            obtainedFileServers.mapNotNull { serverUrl ->
+                try {
+                    ServerName(
+                        URIReference.parse(serverUrl).host.value,
+                        serverUrl,
+                        ServerType.Blossom,
+                    )
+                } catch (e: Exception) {
+                    Log.d("MediaServersViewModel", "Invalid URL in Blossom server list")
+                    null
+                }
+            }
+        }
+    }
+
+    fun addServerList(serverList: List<String>) {
+        serverList.forEach { serverUrl ->
+            addServer(serverUrl)
+        }
+    }
+
+    fun addServer(serverUrl: String) {
+        val normalizedUrl =
+            try {
+                URIReference.parse(serverUrl.trim()).normalize().toString()
+            } catch (e: Exception) {
+                serverUrl
+            }
+        val serverNameReference =
+            try {
+                URIReference.parse(normalizedUrl).host.value
+            } catch (e: Exception) {
+                normalizedUrl
+            }
+        val serverRef =
+            ServerName(
+                serverNameReference,
+                normalizedUrl,
+                ServerType.Blossom,
+            )
+        if (_fileServers.value.contains(serverRef)) {
+            return
+        } else {
+            _fileServers.update {
+                it.plus(serverRef)
+            }
+        }
+        isModified = true
+    }
+
+    fun removeServer(
+        name: String = "",
+        serverUrl: String,
+    ) {
+        viewModelScope.launch {
+            val serverName = if (name.isNotBlank()) name else URIReference.parse(serverUrl).host.value
+            _fileServers.update {
+                it.minus(
+                    ServerName(serverName, serverUrl, ServerType.Blossom),
+                )
+            }
+            isModified = true
+        }
+    }
+
+    fun removeAllServers() {
+        _fileServers.update { emptyList() }
+        isModified = true
+    }
+
+    fun saveFileServers() {
+        if (isModified) {
+            viewModelScope.launch(Dispatchers.IO) {
+                val serverList = _fileServers.value.map { it.baseUrl }
+                account.sendBlossomServersList(serverList)
+                refresh()
+            }
+        }
+    }
+
+    private fun obtainFileServers(): List<String>? = account.getBlossomServersList()?.servers()
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/mediaServers/MediaServerEditField.kt

@@ -44,6 +44,7 @@ import com.vitorpamplona.quartz.encoders.HttpUrlFormatter
 
 @Composable
 fun MediaServerEditField(
+    label: Int = R.string.add_a_nip96_server,
     modifier: Modifier = Modifier,
     onAddServer: (String) -> Unit,
 ) {
@@ -63,7 +64,7 @@ fun MediaServerEditField(
             ),
     ) {
         OutlinedTextField(
-            label = { Text(text = stringRes(R.string.add_a_nip96_server)) },
+            label = { Text(text = stringRes(label)) },
             modifier = Modifier.weight(1f),
             value = url,
             onValueChange = { url = it },

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/mediaServers/MediaServersLIstView.kt

@@ -1,288 +0,0 @@
-/**
- * Copyright (c) 2024 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.amethyst.ui.actions.mediaServers
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.Add
-import androidx.compose.material.icons.rounded.Delete
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.viewmodel.compose.viewModel
-import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.service.Nip96MediaServers
-import com.vitorpamplona.amethyst.ui.actions.relays.SettingsCategoryWithButton
-import com.vitorpamplona.amethyst.ui.navigation.INav
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.CloseButton
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.SaveButton
-import com.vitorpamplona.amethyst.ui.stringRes
-import com.vitorpamplona.amethyst.ui.theme.DoubleVertPadding
-import com.vitorpamplona.amethyst.ui.theme.FeedPadding
-import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
-import com.vitorpamplona.amethyst.ui.theme.grayText
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun MediaServersListView(
-    onClose: () -> Unit,
-    accountViewModel: AccountViewModel,
-    nav: INav,
-) {
-    val mediaServersViewModel: MediaServersViewModel = viewModel()
-    val mediaServersState by mediaServersViewModel.fileServers.collectAsStateWithLifecycle()
-
-    LaunchedEffect(key1 = Unit) {
-        mediaServersViewModel.load(accountViewModel.account)
-    }
-
-    Dialog(
-        onDismissRequest = onClose,
-        properties = DialogProperties(usePlatformDefaultWidth = false),
-    ) {
-        Scaffold(
-            topBar = {
-                TopAppBar(
-                    title = {
-                        Row(
-                            modifier = Modifier.fillMaxWidth(),
-                            horizontalArrangement = Arrangement.SpaceAround,
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            Text(
-                                text = stringRes(id = R.string.media_servers),
-                                style = MaterialTheme.typography.titleLarge,
-                            )
-                        }
-                    },
-                    navigationIcon = {
-                        CloseButton(
-                            onPress = {
-                                mediaServersViewModel.refresh()
-                                onClose()
-                            },
-                        )
-                    },
-                    actions = {
-                        SaveButton(
-                            onPost = {
-                                mediaServersViewModel.saveFileServers()
-                                onClose()
-                            },
-                            isActive = true,
-                        )
-                    },
-                    colors =
-                        TopAppBarDefaults.topAppBarColors(
-                            containerColor = MaterialTheme.colorScheme.surface,
-                        ),
-                )
-            },
-        ) { padding ->
-            Column(
-                modifier =
-                    Modifier
-                        .fillMaxSize()
-                        .padding(
-                            start = 16.dp,
-                            top = padding.calculateTopPadding(),
-                            end = 16.dp,
-                            bottom = padding.calculateBottomPadding(),
-                        ),
-                verticalArrangement = Arrangement.spacedBy(5.dp, alignment = Alignment.Top),
-                horizontalAlignment = Alignment.CenterHorizontally,
-            ) {
-                Text(
-                    stringRes(id = R.string.set_preferred_media_servers),
-                    textAlign = TextAlign.Center,
-                    style = MaterialTheme.typography.bodyLarge,
-                    color = MaterialTheme.colorScheme.grayText,
-                )
-
-                LazyColumn(
-                    verticalArrangement = Arrangement.SpaceAround,
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    contentPadding = FeedPadding,
-                ) {
-                    renderMediaServerList(
-                        mediaServersState = mediaServersState,
-                        onAddServer = { server ->
-                            mediaServersViewModel.addServer(server)
-                        },
-                        onDeleteServer = {
-                            mediaServersViewModel.removeServer(serverUrl = it)
-                        },
-                    )
-
-                    Nip96MediaServers.DEFAULT.let {
-                        item {
-                            SettingsCategoryWithButton(
-                                title = stringRes(id = R.string.built_in_media_servers_title),
-                                description = stringRes(id = R.string.built_in_servers_description),
-                                action = {
-                                    OutlinedButton(
-                                        onClick = {
-                                            mediaServersViewModel.addServerList(it.map { s -> s.baseUrl })
-                                        },
-                                    ) {
-                                        Text(text = stringRes(id = R.string.use_default_servers))
-                                    }
-                                },
-                            )
-                        }
-                        itemsIndexed(
-                            it,
-                            key = { index: Int, server: Nip96MediaServers.ServerName ->
-                                server.baseUrl
-                            },
-                        ) { index, server ->
-                            MediaServerEntry(
-                                serverEntry = server,
-                                isAmethystDefault = true,
-                                onAddOrDelete = { serverUrl ->
-                                    mediaServersViewModel.addServer(serverUrl)
-                                },
-                            )
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-fun LazyListScope.renderMediaServerList(
-    mediaServersState: List<Nip96MediaServers.ServerName>,
-    onAddServer: (String) -> Unit,
-    onDeleteServer: (String) -> Unit,
-) {
-    if (mediaServersState.isEmpty()) {
-        item {
-            Text(
-                text = stringRes(id = R.string.no_media_server_message),
-                modifier = DoubleVertPadding,
-            )
-        }
-    } else {
-        itemsIndexed(
-            mediaServersState,
-            key = { index: Int, server: Nip96MediaServers.ServerName ->
-                server.baseUrl
-            },
-        ) { index, entry ->
-            MediaServerEntry(
-                serverEntry = entry,
-                onAddOrDelete = {
-                    onDeleteServer(it)
-                },
-            )
-        }
-    }
-
-    item {
-        Spacer(modifier = StdVertSpacer)
-        MediaServerEditField {
-            onAddServer(it)
-        }
-    }
-}
-
-@Composable
-fun MediaServerEntry(
-    modifier: Modifier = Modifier,
-    serverEntry: Nip96MediaServers.ServerName,
-    isAmethystDefault: Boolean = false,
-    onAddOrDelete: (serverUrl: String) -> Unit,
-) {
-    Row(
-        modifier =
-            modifier
-                .fillMaxWidth()
-                .padding(vertical = 10.dp),
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.SpaceAround,
-    ) {
-        Column(
-            modifier =
-                Modifier
-                    .weight(1f),
-        ) {
-            serverEntry.let {
-                Text(
-                    text = it.name.replaceFirstChar(Char::titlecase),
-                    style = MaterialTheme.typography.bodyLarge,
-                )
-                Spacer(modifier = StdVertSpacer)
-                Text(
-                    text = it.baseUrl,
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.grayText,
-                )
-            }
-        }
-
-        Row(
-            horizontalArrangement = Arrangement.End,
-        ) {
-            IconButton(
-                onClick = {
-                    onAddOrDelete(serverEntry.baseUrl)
-                },
-            ) {
-                Icon(
-                    imageVector = if (isAmethystDefault) Icons.Rounded.Add else Icons.Rounded.Delete,
-                    contentDescription =
-                        if (isAmethystDefault) {
-                            stringRes(id = R.string.add_media_server)
-                        } else {
-                            stringRes(id = R.string.delete_media_server)
-                        },
-                )
-            }
-        }
-    }
-}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/mediaServers/NIP96ServersViewModel.kt

@@ -24,7 +24,6 @@ import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.service.Nip96MediaServers
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -32,10 +31,10 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import org.czeal.rfc3986.URIReference
 
-class MediaServersViewModel : ViewModel() {
+class NIP96ServersViewModel : ViewModel() {
     lateinit var account: Account
 
-    private val _fileServers = MutableStateFlow<List<Nip96MediaServers.ServerName>>(emptyList())
+    private val _fileServers = MutableStateFlow<List<ServerName>>(emptyList())
     val fileServers = _fileServers.asStateFlow()
     private var isModified = false
 
@@ -50,11 +49,11 @@ class MediaServersViewModel : ViewModel() {
             val obtainedFileServers = obtainFileServers() ?: emptyList()
             obtainedFileServers.mapNotNull { serverUrl ->
                 try {
-                    Nip96MediaServers
-                        .ServerName(
-                            URIReference.parse(serverUrl).host.value,
-                            serverUrl,
-                        )
+                    ServerName(
+                        URIReference.parse(serverUrl).host.value,
+                        serverUrl,
+                        ServerType.NIP96,
+                    )
                 } catch (e: Exception) {
                     Log.d("MediaServersViewModel", "Invalid URL in NIP-96 server list")
                     null
@@ -82,7 +81,7 @@ class MediaServersViewModel : ViewModel() {
             } catch (e: Exception) {
                 normalizedUrl
             }
-        val serverRef = Nip96MediaServers.ServerName(serverNameReference, normalizedUrl)
+        val serverRef = ServerName(serverNameReference, normalizedUrl, ServerType.NIP96)
         if (_fileServers.value.contains(serverRef)) {
             return
         } else {
@@ -101,7 +100,7 @@ class MediaServersViewModel : ViewModel() {
             val serverName = if (name.isNotBlank()) name else URIReference.parse(serverUrl).host.value
             _fileServers.update {
                 it.minus(
-                    Nip96MediaServers.ServerName(serverName, serverUrl),
+                    ServerName(serverName, serverUrl, ServerType.NIP96),
                 )
             }
             isModified = true

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/mediaServers/ServerName.kt

@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2024 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.amethyst.ui.actions.mediaServers
+
+data class ServerName(
+    val name: String,
+    val baseUrl: String,
+    val type: ServerType = ServerType.NIP96,
+)
+
+enum class ServerType {
+    NIP96,
+    NIP95,
+    Blossom,
+}
+
+val DEFAULT_MEDIA_SERVERS: List<ServerName> =
+    listOf(
+        ServerName("Nostr.Build", "https://nostr.build", ServerType.NIP96),
+        ServerName("NostrCheck.me (NIP-96)", "https://nostrcheck.me", ServerType.NIP96),
+        ServerName("Sovbit", "https://files.sovbit.host", ServerType.NIP96),
+        ServerName("Void.cat", "https://void.cat", ServerType.NIP96),
+        ServerName("Satellite (Paid)", "https://cdn.satellite.earth", ServerType.Blossom),
+        ServerName("NostrCheck.me (Blossom)", "https://cdn.nostrcheck.me", ServerType.Blossom),
+        ServerName("Nostr.Download", "https://nostr.download", ServerType.Blossom),
+    )

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AddDMRelayListDialog.kt

@@ -29,6 +29,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Card
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
@@ -42,6 +43,8 @@ import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.DefaultDMRelayList
+import com.vitorpamplona.amethyst.ui.components.SetDialogToEdgeToEdge
 import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.CloseButton
@@ -50,6 +53,7 @@ import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.imageModifier
+import com.vitorpamplona.ammolite.relays.RelayStat
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -66,6 +70,7 @@ fun AddDMRelayListDialog(
         onDismissRequest = onClose,
         properties = DialogProperties(usePlatformDefaultWidth = false),
     ) {
+        SetDialogToEdgeToEdge()
         Scaffold(
             topBar = {
                 TopAppBar(
@@ -114,7 +119,7 @@ fun AddDMRelayListDialog(
                     ),
                 verticalArrangement = Arrangement.SpaceAround,
             ) {
-                Explanation()
+                Explanation(postViewModel)
 
                 DMRelayList(postViewModel, accountViewModel, onClose, nav)
             }
@@ -123,7 +128,7 @@ fun AddDMRelayListDialog(
 }
 
 @Composable
-private fun Explanation() {
+private fun Explanation(postViewModel: DMRelayListViewModel) {
     Card(modifier = MaterialTheme.colorScheme.imageModifier) {
         Column(modifier = Modifier.padding(16.dp)) {
             Text(
@@ -133,8 +138,25 @@ private fun Explanation() {
             Spacer(modifier = StdVertSpacer)
 
             Text(
-                text = stringRes(id = R.string.dm_relays_not_found_examples),
+                text = stringRes(id = R.string.dm_relays_not_found_examples2),
             )
+
+            Spacer(modifier = StdVertSpacer)
+
+            ResetDMRelaysLonger(postViewModel)
         }
     }
 }
+
+@Composable
+fun ResetDMRelaysLonger(postViewModel: DMRelayListViewModel) {
+    OutlinedButton(
+        onClick = {
+            postViewModel.deleteAll()
+            DefaultDMRelayList.forEach { postViewModel.addRelay(BasicRelaySetupInfo(it, RelayStat())) }
+            postViewModel.loadRelayDocuments()
+        },
+    ) {
+        Text(stringRes(R.string.default_relays_longer))
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AddSearchRelayListDialog.kt

@@ -29,6 +29,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Card
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
@@ -42,6 +43,8 @@ import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.DefaultSearchRelayList
+import com.vitorpamplona.amethyst.ui.components.SetDialogToEdgeToEdge
 import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.CloseButton
@@ -50,6 +53,7 @@ import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.imageModifier
+import com.vitorpamplona.ammolite.relays.RelayStat
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -66,6 +70,7 @@ fun AddSearchRelayListDialog(
         onDismissRequest = onClose,
         properties = DialogProperties(usePlatformDefaultWidth = false),
     ) {
+        SetDialogToEdgeToEdge()
         Scaffold(
             topBar = {
                 TopAppBar(
@@ -114,7 +119,7 @@ fun AddSearchRelayListDialog(
                     ),
                 verticalArrangement = Arrangement.SpaceAround,
             ) {
-                Explanation()
+                Explanation(postViewModel)
 
                 SearchRelayList(postViewModel, accountViewModel, onClose, nav)
             }
@@ -123,7 +128,7 @@ fun AddSearchRelayListDialog(
 }
 
 @Composable
-private fun Explanation() {
+private fun Explanation(postViewModel: SearchRelayListViewModel) {
     Card(modifier = MaterialTheme.colorScheme.imageModifier) {
         Column(modifier = Modifier.padding(16.dp)) {
             Text(
@@ -135,6 +140,23 @@ private fun Explanation() {
             Text(
                 text = stringRes(id = R.string.search_relays_not_found_examples),
             )
+
+            Spacer(modifier = StdVertSpacer)
+
+            ResetSearchRelaysLonger(postViewModel)
         }
     }
 }
+
+@Composable
+fun ResetSearchRelaysLonger(postViewModel: SearchRelayListViewModel) {
+    OutlinedButton(
+        onClick = {
+            postViewModel.deleteAll()
+            DefaultSearchRelayList.forEach { postViewModel.addRelay(BasicRelaySetupInfo(it, RelayStat())) }
+            postViewModel.loadRelayDocuments()
+        },
+    ) {
+        Text(stringRes(R.string.default_relays_longer))
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/AllRelayListView.kt

@@ -24,8 +24,10 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -38,19 +40,17 @@ import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.DefaultDMRelayList
+import com.vitorpamplona.amethyst.model.DefaultSearchRelayList
 import com.vitorpamplona.amethyst.ui.navigation.INav
-import com.vitorpamplona.amethyst.ui.navigation.rememberExtendedNav
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.CloseButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SaveButton
@@ -65,18 +65,16 @@ import com.vitorpamplona.ammolite.relays.RelayStat
 
 @Composable
 fun AllRelayListView(
-    onClose: () -> Unit,
-    relayToAdd: String = "",
+    relayToAdd: String? = null,
     accountViewModel: AccountViewModel,
     nav: INav,
 ) {
-    MappedAllRelayListView(onClose, relayToAdd, accountViewModel, rememberExtendedNav(nav, onClose))
+    MappedAllRelayListView(relayToAdd ?: "", accountViewModel, nav)
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MappedAllRelayListView(
-    onClose: () -> Unit,
     relayToAdd: String = "",
     accountViewModel: AccountViewModel,
     newNav: INav,
@@ -110,153 +108,150 @@ fun MappedAllRelayListView(
         privateOutboxViewModel.load(accountViewModel.account)
     }
 
-    Dialog(
-        onDismissRequest = onClose,
-        properties = DialogProperties(usePlatformDefaultWidth = false),
-    ) {
-        Scaffold(
-            topBar = {
-                TopAppBar(
-                    title = {
-                        Row(
-                            modifier = Modifier.fillMaxWidth(),
-                            horizontalArrangement = Arrangement.SpaceBetween,
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            Spacer(modifier = MinHorzSpacer)
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        Spacer(modifier = MinHorzSpacer)
 
-                            Text(
-                                text = stringRes(R.string.relay_settings),
-                                modifier = Modifier.weight(1f),
-                                textAlign = TextAlign.Center,
-                                style = MaterialTheme.typography.titleLarge,
-                                overflow = TextOverflow.Ellipsis,
-                                maxLines = 1,
-                            )
+                        Text(
+                            text = stringRes(R.string.relay_settings),
+                            modifier = Modifier.weight(1f),
+                            textAlign = TextAlign.Center,
+                            style = MaterialTheme.typography.titleLarge,
+                            overflow = TextOverflow.Ellipsis,
+                            maxLines = 1,
+                        )
 
-                            SaveButton(
-                                onPost = {
-                                    kind3ViewModel.create()
-                                    dmViewModel.create()
-                                    nip65ViewModel.create()
-                                    searchViewModel.create()
-                                    localViewModel.create()
-                                    privateOutboxViewModel.create()
-                                    onClose()
-                                },
-                                true,
-                            )
-                        }
-                    },
-                    navigationIcon = {
-                        Row {
-                            Spacer(modifier = StdHorzSpacer)
-                            CloseButton(
-                                onPress = {
-                                    kind3ViewModel.clear()
-                                    dmViewModel.clear()
-                                    nip65ViewModel.clear()
-                                    searchViewModel.clear()
-                                    localViewModel.clear()
-                                    privateOutboxViewModel.clear()
-                                    onClose()
-                                },
-                            )
-                        }
-                    },
-                    colors =
-                        TopAppBarDefaults.topAppBarColors(
-                            containerColor = MaterialTheme.colorScheme.surface,
-                        ),
+                        SaveButton(
+                            onPost = {
+                                kind3ViewModel.create()
+                                dmViewModel.create()
+                                nip65ViewModel.create()
+                                searchViewModel.create()
+                                localViewModel.create()
+                                privateOutboxViewModel.create()
+                                newNav.popBack()
+                            },
+                            true,
+                        )
+                    }
+                },
+                navigationIcon = {
+                    Row {
+                        Spacer(modifier = StdHorzSpacer)
+                        CloseButton(
+                            onPress = {
+                                kind3ViewModel.clear()
+                                dmViewModel.clear()
+                                nip65ViewModel.clear()
+                                searchViewModel.clear()
+                                localViewModel.clear()
+                                privateOutboxViewModel.clear()
+                                newNav.popBack()
+                            },
+                        )
+                    }
+                },
+                colors =
+                    TopAppBarDefaults.topAppBarColors(
+                        containerColor = MaterialTheme.colorScheme.surface,
+                    ),
+            )
+        },
+    ) { pad ->
+        LazyColumn(
+            contentPadding = FeedPadding,
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .padding(
+                        start = 10.dp,
+                        end = 10.dp,
+                        top = pad.calculateTopPadding(),
+                        bottom = pad.calculateBottomPadding(),
+                    ).consumeWindowInsets(pad)
+                    .imePadding(),
+        ) {
+            item {
+                SettingsCategory(
+                    stringRes(R.string.public_home_section),
+                    stringRes(R.string.public_home_section_explainer),
+                    Modifier.padding(bottom = 8.dp),
                 )
-            },
-        ) { pad ->
-            Column(
-                modifier =
-                    Modifier
-                        .fillMaxSize()
-                        .padding(
-                            16.dp,
-                            pad.calculateTopPadding(),
-                            16.dp,
-                            pad.calculateBottomPadding(),
-                        ),
-                verticalArrangement = Arrangement.SpaceAround,
-            ) {
-                LazyColumn(contentPadding = FeedPadding) {
-                    item {
-                        SettingsCategory(
-                            stringRes(R.string.public_home_section),
-                            stringRes(R.string.public_home_section_explainer),
-                            Modifier.padding(bottom = 8.dp),
-                        )
-                    }
-                    renderNip65HomeItems(homeFeedState, nip65ViewModel, accountViewModel, newNav)
+            }
+            renderNip65HomeItems(homeFeedState, nip65ViewModel, accountViewModel, newNav)
 
-                    item {
-                        SettingsCategory(
-                            stringRes(R.string.public_notif_section),
-                            stringRes(R.string.public_notif_section_explainer),
-                        )
-                    }
-                    renderNip65NotifItems(notifFeedState, nip65ViewModel, accountViewModel, newNav)
+            item {
+                SettingsCategory(
+                    stringRes(R.string.public_notif_section),
+                    stringRes(R.string.public_notif_section_explainer),
+                )
+            }
+            renderNip65NotifItems(notifFeedState, nip65ViewModel, accountViewModel, newNav)
 
-                    item {
-                        SettingsCategory(
-                            stringRes(R.string.private_inbox_section),
-                            stringRes(R.string.private_inbox_section_explainer),
-                        )
-                    }
-                    renderDMItems(dmFeedState, dmViewModel, accountViewModel, newNav)
+            item {
+                SettingsCategoryWithButton(
+                    stringRes(R.string.private_inbox_section),
+                    stringRes(R.string.private_inbox_section_explainer),
+                    action = {
+                        ResetDMRelays(dmViewModel)
+                    },
+                )
+            }
+            renderDMItems(dmFeedState, dmViewModel, accountViewModel, newNav)
 
-                    item {
-                        SettingsCategory(
-                            stringRes(R.string.private_outbox_section),
-                            stringRes(R.string.private_outbox_section_explainer),
-                        )
-                    }
-                    renderPrivateOutboxItems(privateOutboxFeedState, privateOutboxViewModel, accountViewModel, newNav)
+            item {
+                SettingsCategory(
+                    stringRes(R.string.private_outbox_section),
+                    stringRes(R.string.private_outbox_section_explainer),
+                )
+            }
+            renderPrivateOutboxItems(privateOutboxFeedState, privateOutboxViewModel, accountViewModel, newNav)
 
-                    item {
-                        SettingsCategoryWithButton(
-                            stringRes(R.string.search_section),
-                            stringRes(R.string.search_section_explainer),
-                            action = {
-                                ResetSearchRelays(searchViewModel)
-                            },
-                        )
-                    }
-                    renderSearchItems(searchFeedState, searchViewModel, accountViewModel, newNav)
+            item {
+                SettingsCategoryWithButton(
+                    stringRes(R.string.search_section),
+                    stringRes(R.string.search_section_explainer),
+                    action = {
+                        ResetSearchRelays(searchViewModel)
+                    },
+                )
+            }
+            renderSearchItems(searchFeedState, searchViewModel, accountViewModel, newNav)
 
-                    item {
-                        SettingsCategory(
-                            stringRes(R.string.local_section),
-                            stringRes(R.string.local_section_explainer),
-                        )
-                    }
-                    renderLocalItems(localFeedState, localViewModel, accountViewModel, newNav)
+            item {
+                SettingsCategory(
+                    stringRes(R.string.local_section),
+                    stringRes(R.string.local_section_explainer),
+                )
+            }
+            renderLocalItems(localFeedState, localViewModel, accountViewModel, newNav)
 
-                    item {
-                        SettingsCategoryWithButton(
-                            stringRes(R.string.kind_3_section),
-                            stringRes(R.string.kind_3_section_description),
-                            action = {
-                                ResetKind3Relays(kind3ViewModel)
-                            },
-                        )
-                    }
-                    renderKind3Items(kind3FeedState, kind3ViewModel, accountViewModel, newNav, relayToAdd)
+            item {
+                SettingsCategoryWithButton(
+                    stringRes(R.string.kind_3_section),
+                    stringRes(R.string.kind_3_section_description),
+                    action = {
+                        ResetKind3Relays(kind3ViewModel)
+                    },
+                )
+            }
+            renderKind3Items(kind3FeedState, kind3ViewModel, accountViewModel, newNav, relayToAdd)
 
-                    if (kind3Proposals.isNotEmpty()) {
-                        item {
-                            SettingsCategory(
-                                stringRes(R.string.kind_3_recommended_section),
-                                stringRes(R.string.kind_3_recommended_section_description),
-                            )
-                        }
-                        renderKind3ProposalItems(kind3Proposals, kind3ViewModel, accountViewModel, newNav)
-                    }
+            if (kind3Proposals.isNotEmpty()) {
+                item {
+                    SettingsCategory(
+                        stringRes(R.string.kind_3_recommended_section),
+                        stringRes(R.string.kind_3_recommended_section_description),
+                    )
                 }
+                renderKind3ProposalItems(kind3Proposals, kind3ViewModel, accountViewModel, newNav)
             }
         }
     }
@@ -280,7 +275,20 @@ fun ResetSearchRelays(postViewModel: SearchRelayListViewModel) {
     OutlinedButton(
         onClick = {
             postViewModel.deleteAll()
-            Constants.defaultSearchRelaySet.forEach { postViewModel.addRelay(BasicRelaySetupInfo(it, RelayStat())) }
+            DefaultSearchRelayList.forEach { postViewModel.addRelay(BasicRelaySetupInfo(it, RelayStat())) }
+            postViewModel.loadRelayDocuments()
+        },
+    ) {
+        Text(stringRes(R.string.default_relays))
+    }
+}
+
+@Composable
+fun ResetDMRelays(postViewModel: DMRelayListViewModel) {
+    OutlinedButton(
+        onClick = {
+            postViewModel.deleteAll()
+            DefaultDMRelayList.forEach { postViewModel.addRelay(BasicRelaySetupInfo(it, RelayStat())) }
             postViewModel.loadRelayDocuments()
         },
     ) {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/Kind3RelayListViewModel.kt

@@ -143,7 +143,7 @@ class Kind3RelayListViewModel : ViewModel() {
             val proposed =
                 RelayListRecommendationProcessor
                     .reliableRelaySetFor(
-                        account.liveKind3Follows.value.users.mapNotNull {
+                        account.liveKind3Follows.value.authors.mapNotNull {
                             account.getNIP65RelayList(it)
                         },
                         relayUrlsToIgnore =

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayInformationDialog.kt

@@ -53,6 +53,7 @@ import com.vitorpamplona.amethyst.model.FeatureSetType
 import com.vitorpamplona.amethyst.ui.actions.CrossfadeIfEnabled
 import com.vitorpamplona.amethyst.ui.components.ClickableEmail
 import com.vitorpamplona.amethyst.ui.components.ClickableUrl
+import com.vitorpamplona.amethyst.ui.components.SetDialogToEdgeToEdge
 import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
 import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.navigation.rememberExtendedNav
@@ -104,6 +105,7 @@ fun RelayInformationDialog(
                 dismissOnClickOutside = false,
             ),
     ) {
+        SetDialogToEdgeToEdge()
         Surface {
             val color =
                 remember {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/uploads/SelectFromGallery.kt

@@ -0,0 +1,193 @@
+/**
+ * Copyright (c) 2024 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.amethyst.ui.actions.uploads
+
+import android.net.Uri
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.PickVisualMediaRequest
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.height
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AddPhotoAlternate
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.components.LoadingAnimation
+import com.vitorpamplona.amethyst.ui.stringRes
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+import java.util.concurrent.atomic.AtomicBoolean
+
+@Stable
+class SelectedMedia(
+    val uri: Uri,
+    val mimeType: String?,
+) {
+    fun isImage() = mimeType?.startsWith("image")
+
+    fun isVideo() = mimeType?.startsWith("video")
+}
+
+@Composable
+fun SelectFromGallery(
+    isUploading: Boolean,
+    tint: Color,
+    modifier: Modifier,
+    onImageChosen: (ImmutableList<SelectedMedia>) -> Unit,
+) {
+    var showGallerySelect by remember { mutableStateOf(false) }
+    if (showGallerySelect) {
+        GallerySelect(
+            onImageUri = { uri ->
+                showGallerySelect = false
+                if (uri.isNotEmpty()) {
+                    onImageChosen(uri)
+                }
+            },
+        )
+    }
+
+    GallerySelectButton(isUploading, tint, modifier) { showGallerySelect = true }
+}
+
+@Composable
+fun SelectSingleFromGallery(
+    isUploading: Boolean,
+    tint: Color,
+    modifier: Modifier,
+    onImageChosen: (SelectedMedia) -> Unit,
+) {
+    var showGallerySelect by remember { mutableStateOf(false) }
+    if (showGallerySelect) {
+        GallerySelectSingle(
+            onImageUri = { media ->
+                showGallerySelect = false
+                if (media != null) {
+                    onImageChosen(media)
+                }
+            },
+        )
+    }
+
+    GallerySelectButton(isUploading, tint, modifier) { showGallerySelect = true }
+}
+
+@Composable
+private fun GallerySelectButton(
+    isUploading: Boolean,
+    tint: Color,
+    modifier: Modifier,
+    onClick: () -> Unit,
+) {
+    Box {
+        IconButton(
+            modifier = modifier.align(Alignment.Center),
+            enabled = !isUploading,
+            onClick = { onClick() },
+        ) {
+            if (!isUploading) {
+                Icon(
+                    imageVector = Icons.Default.AddPhotoAlternate,
+                    contentDescription = stringRes(id = R.string.upload_image),
+                    modifier = Modifier.height(25.dp),
+                    tint = tint,
+                )
+            } else {
+                LoadingAnimation()
+            }
+        }
+    }
+}
+
+@Composable
+fun GallerySelect(onImageUri: (ImmutableList<SelectedMedia>) -> Unit = {}) {
+    val hasLaunched by remember { mutableStateOf(AtomicBoolean(false)) }
+    val resolver = LocalContext.current.contentResolver
+
+    val launcher =
+        rememberLauncherForActivityResult(
+            contract = ActivityResultContracts.PickMultipleVisualMedia(10),
+            onResult = { uris: List<Uri> ->
+                onImageUri(
+                    uris
+                        .map {
+                            SelectedMedia(it, resolver.getType(it))
+                        }.toImmutableList(),
+                )
+                hasLaunched.set(false)
+            },
+        )
+
+    @Composable
+    fun LaunchGallery() {
+        SideEffect {
+            if (!hasLaunched.getAndSet(true)) {
+                launcher.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageAndVideo))
+            }
+        }
+    }
+
+    LaunchGallery()
+}
+
+@Composable
+fun GallerySelectSingle(onImageUri: (SelectedMedia?) -> Unit = {}) {
+    val hasLaunched by remember { mutableStateOf(AtomicBoolean(false)) }
+    val resolver = LocalContext.current.contentResolver
+
+    val launcher =
+        rememberLauncherForActivityResult(
+            contract = ActivityResultContracts.PickVisualMedia(),
+            onResult = { uri: Uri? ->
+                if (uri != null) {
+                    onImageUri(SelectedMedia(uri, resolver.getType(uri)))
+                } else {
+                    onImageUri(null)
+                }
+
+                hasLaunched.set(false)
+            },
+        )
+
+    @Composable
+    fun LaunchGallery() {
+        SideEffect {
+            if (!hasLaunched.getAndSet(true)) {
+                launcher.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageAndVideo))
+            }
+        }
+    }
+
+    LaunchGallery()
+}