v0.94.2

New Crowdin Translations

.github/ISSUE_TEMPLATE/bug_report.md

@@ -24,9 +24,12 @@ A clear and concise description of what you expected to happen.
 If applicable, add a video and/or screenshots to help explain your problem.
 
 **Device (please complete the following information):**
- - Phone Brand/Model [e.g. Pixel 7 Pro]: 
- - Android Version [e.g. 33]: 
- - App Version [e.g. v0.20.3]: 
+ - Phone Brand/Model [e.g. Pixel 7 Pro]:
+ - Android Version [e.g. 33]:
+ - App Version [e.g. v0.20.3]:
+ - 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
-        uses: actions/upload-artifact@v2
+      - 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@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: Build Reports
+          name: Test Reports
           path: amethyst/build/reports
 

.gitignore

@@ -13,6 +13,7 @@
 /.idea/ktfmt.xml
 /.idea/studiobot.xml
 /.idea/other.xml
+/.idea/runConfigurations.xml
 .DS_Store
 /build
 /captures

.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +1,34 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
@@ -9,6 +37,10 @@
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
+    <inspection_tool class="PreviewDeviceShouldUseNewSpec" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />

.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

@@ -5,6 +5,7 @@ plugins {
     alias(libs.plugins.jetbrainsKotlinAndroid)
     alias(libs.plugins.googleServices)
     alias(libs.plugins.jetbrainsComposeCompiler)
+    alias(libs.plugins.serialization)
 }
 
 android {
@@ -15,9 +16,9 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk libs.versions.android.minSdk.get().toInteger()
         targetSdk libs.versions.android.targetSdk.get().toInteger()
-        versionCode 390
-        versionName "0.89.4"
-        buildConfigField "String", "RELEASE_NOTES_ID", "\"1130badb252bdf62aaf93cb65bfa2bb09e7600c7d6764894f2954555b3b73018\""
+        versionCode 417
+        versionName "0.94.2"
+        buildConfigField "String", "RELEASE_NOTES_ID", "\"fd42b23b9ef792059b1c1a89555443abbb11578f4b3c8430b452559eec7325f3\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -163,6 +164,7 @@ kotlin {
 
 composeCompiler {
     reportsDestination = layout.buildDirectory.dir("compose_compiler")
+    metricsDestination = layout.buildDirectory.dir("compose_compiler")
 }
 
 dependencies {
@@ -228,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
@@ -251,6 +252,7 @@ dependencies {
 
     // Language picker and Theme chooser
     implementation libs.androidx.appcompat
+    implementation libs.androidx.window.core.android
 
     // Local model for language identification
     playImplementation libs.google.mlkit.language.id
@@ -282,8 +284,15 @@ dependencies {
     // Image compression lib
     implementation libs.zelory.video.compressor
 
+    // Cbor for cashuB format
+    implementation libs.kotlinx.serialization.cbor
+
+    implementation libs.tor.android
+    implementation libs.jtorctl
+
     testImplementation libs.junit
     testImplementation libs.mockk
+    testImplementation libs.kotlinx.coroutines.test
 
     androidTestImplementation platform(libs.androidx.compose.bom)
     androidTestImplementation libs.androidx.junit
@@ -293,5 +302,11 @@ dependencies {
     debugImplementation platform(libs.androidx.compose.bom)
     debugImplementation libs.androidx.ui.tooling
     debugImplementation libs.androidx.ui.test.manifest
+
+    implementation libs.androidx.camera.core
+    implementation libs.androidx.camera.camera2
+    implementation libs.androidx.camera.lifecycle
+    implementation libs.androidx.camera.view
+    implementation libs.androidx.camera.extensions
 }
 

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

@@ -0,0 +1,102 @@
+/**
+ * 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 androidx.test.ext.junit.runners.AndroidJUnit4
+import com.vitorpamplona.amethyst.service.CashuProcessor
+import com.vitorpamplona.amethyst.service.CashuToken
+import com.vitorpamplona.amethyst.ui.components.GenericLoadable
+import junit.framework.TestCase.assertEquals
+import kotlinx.coroutines.runBlocking
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class CashuBTest {
+    val cashuTokenA = "cashuAeyJ0b2tlbiI6W3sibWludCI6Imh0dHBzOi8vODMzMy5zcGFjZTozMzM4IiwicHJvb2ZzIjpbeyJhbW91bnQiOjIsImlkIjoiMDA5YTFmMjkzMjUzZTQxZSIsInNlY3JldCI6IjQwNzkxNWJjMjEyYmU2MWE3N2UzZTZkMmFlYjRjNzI3OTgwYmRhNTFjZDA2YTZhZmMyOWUyODYxNzY4YTc4MzciLCJDIjoiMDJiYzkwOTc5OTdkODFhZmIyY2M3MzQ2YjVlNDM0NWE5MzQ2YmQyYTUwNmViNzk1ODU5OGE3MmYwY2Y4NTE2M2VhIn0seyJhbW91bnQiOjgsImlkIjoiMDA5YTFmMjkzMjUzZTQxZSIsInNlY3JldCI6ImZlMTUxMDkzMTRlNjFkNzc1NmIwZjhlZTBmMjNhNjI0YWNhYTNmNGUwNDJmNjE0MzNjNzI4YzcwNTdiOTMxYmUiLCJDIjoiMDI5ZThlNTA1MGI4OTBhN2Q2YzA5NjhkYjE2YmMxZDVkNWZhMDQwZWExZGUyODRmNmVjNjlkNjEyOTlmNjcxMDU5In1dfV0sInVuaXQiOiJzYXQiLCJtZW1vIjoiVGhhbmsgeW91LiJ9"
+    val cashuTokenB1 = "cashuBo2F0gqJhaUgA_9SLj17PgGFwgaNhYQFhc3hAYWNjMTI0MzVlN2I4NDg0YzNjZjE4NTAxNDkyMThhZjkwZjcxNmE1MmJmNGE1ZWQzNDdlNDhlY2MxM2Y3NzM4OGFjWCECRFODGd5IXVW-07KaZCvuWHk3WrnnpiDhHki6SCQh88-iYWlIAK0mjE0fWCZhcIKjYWECYXN4QDEzMjNkM2Q0NzA3YTU4YWQyZTIzYWRhNGU5ZjFmNDlmNWE1YjRhYzdiNzA4ZWIwZDYxZjczOGY0ODMwN2U4ZWVhY1ghAjRWqhENhLSsdHrr2Cw7AFrKUL9Ffr1XN6RBT6w659lNo2FhAWFzeEA1NmJjYmNiYjdjYzY0MDZiM2ZhNWQ1N2QyMTc0ZjRlZmY4YjQ0MDJiMTc2OTI2ZDNhNTdkM2MzZGNiYjU5ZDU3YWNYIQJzEpxXGeWZN5qXSmJjY8MzxWyvwObQGr5G1YCCgHicY2FtdWh0dHA6Ly9sb2NhbGhvc3Q6MzMzOGF1Y3NhdA"
+    val cashuTokenB2 = "cashuBpGFkb01pbmliaXRzIHJ1bGVzIWFteEpodHRwOi8vbGJ1dGxoNWxmZ2dxNXI3eHBpd2hyYWpkbDdzeHB1cGdhZ2F6eGw2NXc0YzVjZzcyd3RvZmFzYWQub25pb246MzMzOGF0gaJhaUgAm7I9OpEuTmFwg6NhYRhAYWNYIQPfWR0mG80XbGnj6DO8q1NIyjHSGGIEkoWTA6H16HTpx2FzeEA3YThkY2Y5YjNlOGEyNDdjZTMzOWU3MzY5ZTliNGExOWYzMWVhY2I2OWQ4YjBjNjVkYWFlYjcyZDFhY2I5YWQzo2FhGCBhY1ghA55SwCFBc46dwnjbkb87Mzo30T2EE9Ws_nemuFneDegGYXN4QDlkODFjMWEyNjE2ODUzYWQ4MDQ5Y2JjZDFjN2MyNDdhZGQ4M2IzNzM4Mjg2MjBiYWMyZmQ3ZjNlNWE1OGFjZWKjYWEEYWNYIQM-yAQQTR2t6pIAmfmGM8Wxy7ajKVLOaUg7TrV8o-EdVWFzeEBmNmViMTI4ZmJlMDM3MTEzZTkzZjM3NjllYTYwMTk1NmY1N2NkZWNhNTYwOGY0NWUzMDhhZDU0ZmQ4YTQxNWVhYXVjc2F0"
+
+    @Test()
+    fun parseCashuA() {
+        runBlocking {
+            val parsed = (CashuProcessor().parse(cashuTokenA) as GenericLoadable.Loaded<List<CashuToken>>).loaded[0]
+
+            assertEquals(cashuTokenA, parsed.token)
+            assertEquals("https://8333.space:3338", parsed.mint)
+            assertEquals(10, parsed.totalAmount)
+
+            assertEquals(2, parsed.proofs[0].amount)
+            assertEquals("407915bc212be61a77e3e6d2aeb4c727980bda51cd06a6afc29e2861768a7837", parsed.proofs[0].secret)
+            assertEquals("009a1f293253e41e", parsed.proofs[0].id)
+            assertEquals("02bc9097997d81afb2cc7346b5e4345a9346bd2a506eb7958598a72f0cf85163ea", parsed.proofs[0].C)
+
+            assertEquals(8, parsed.proofs[1].amount)
+            assertEquals("fe15109314e61d7756b0f8ee0f23a624acaa3f4e042f61433c728c7057b931be", parsed.proofs[1].secret)
+            assertEquals("009a1f293253e41e", parsed.proofs[1].id)
+            assertEquals("029e8e5050b890a7d6c0968db16bc1d5d5fa040ea1de284f6ec69d61299f671059", parsed.proofs[1].C)
+        }
+    }
+
+    @Test()
+    fun parseCashuB() =
+        runBlocking {
+            val parsed = (CashuProcessor().parse(cashuTokenB1) as GenericLoadable.Loaded<List<CashuToken>>).loaded
+
+            assertEquals(cashuTokenB1, parsed[0].token)
+            assertEquals("http://localhost:3338", parsed[0].mint)
+            assertEquals(1, parsed[0].totalAmount)
+            assertEquals(1, parsed[0].proofs[0].amount)
+            assertEquals("acc12435e7b8484c3cf1850149218af90f716a52bf4a5ed347e48ecc13f77388", parsed[0].proofs[0].secret)
+            assertEquals("00ffd48b8f5ecf80", parsed[0].proofs[0].id)
+            assertEquals("0244538319de485d55bed3b29a642bee5879375ab9e7a620e11e48ba482421f3cf", parsed[0].proofs[0].C)
+
+            assertEquals(3, parsed[1].totalAmount)
+            assertEquals(2, parsed[1].proofs[0].amount)
+            assertEquals("1323d3d4707a58ad2e23ada4e9f1f49f5a5b4ac7b708eb0d61f738f48307e8ee", parsed[1].proofs[0].secret)
+            assertEquals("00ad268c4d1f5826", parsed[1].proofs[0].id)
+            assertEquals("023456aa110d84b4ac747aebd82c3b005aca50bf457ebd5737a4414fac3ae7d94d", parsed[1].proofs[0].C)
+
+            assertEquals(1, parsed[1].proofs[1].amount)
+            assertEquals("56bcbcbb7cc6406b3fa5d57d2174f4eff8b4402b176926d3a57d3c3dcbb59d57", parsed[1].proofs[1].secret)
+            assertEquals("00ad268c4d1f5826", parsed[1].proofs[1].id)
+            assertEquals("0273129c5719e599379a974a626363c333c56cafc0e6d01abe46d5808280789c63", parsed[1].proofs[1].C)
+        }
+
+    @Test()
+    fun parseCashuB2() =
+        runBlocking {
+            val parsed = (CashuProcessor().parse(cashuTokenB2) as GenericLoadable.Loaded<List<CashuToken>>).loaded
+
+            assertEquals(cashuTokenB2, parsed[0].token)
+            assertEquals("http://lbutlh5lfggq5r7xpiwhrajdl7sxpupgagazxl65w4c5cg72wtofasad.onion:3338", parsed[0].mint)
+            assertEquals(100, parsed[0].totalAmount)
+            assertEquals(64, parsed[0].proofs[0].amount)
+            assertEquals("7a8dcf9b3e8a247ce339e7369e9b4a19f31eacb69d8b0c65daaeb72d1acb9ad3", parsed[0].proofs[0].secret)
+            assertEquals("009bb23d3a912e4e", parsed[0].proofs[0].id)
+            assertEquals("03df591d261bcd176c69e3e833bcab5348ca31d218620492859303a1f5e874e9c7", parsed[0].proofs[0].C)
+
+            assertEquals(32, parsed[0].proofs[1].amount)
+            assertEquals("9d81c1a2616853ad8049cbcd1c7c247add83b373828620bac2fd7f3e5a58aceb", parsed[0].proofs[1].secret)
+            assertEquals("009bb23d3a912e4e", parsed[0].proofs[1].id)
+            assertEquals("039e52c02141738e9dc278db91bf3b333a37d13d8413d5acfe77a6b859de0de806", parsed[0].proofs[1].C)
+        }
+}

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

@@ -23,15 +23,25 @@ package com.vitorpamplona.amethyst
 import android.graphics.Bitmap
 import android.graphics.Color
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
 import com.vitorpamplona.amethyst.model.Account
-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.model.AccountSettings
+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
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert
 import org.junit.Ignore
@@ -42,82 +52,125 @@ import kotlin.random.Random
 
 @RunWith(AndroidJUnit4::class)
 class ImageUploadTesting {
-    private suspend fun testBase(server: Nip96MediaServers.ServerName) {
-        val serverInfo =
-            Nip96Retriever()
-                .loadInfo(
-                    server.baseUrl,
-                )
+    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(KeyPair())
+    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,
-                    onProgress = {},
+                    serverBaseUrl = server.baseUrl,
+                    forceProxy = { false },
+                    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)
-
-        Assert.assertTrue("${server.name}: Invalid result url", url.startsWith("http"))
+        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(url)
+            ImageDownloader().waitAndGetImage(result.url!!, false)
                 ?: run {
                     fail("${server.name}: Should not be null")
                     return
                 }
 
-        FileHeader.prepare(
-            imageData,
-            "image/png",
-            null,
-            onReady = {
+        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"))
+
+        val imageData: ByteArray =
+            ImageDownloader().waitAndGetImage(url, false)
+                ?: run {
+                    fail("${server.name}: Should not be null")
+                    return
+                }
+
+        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)
@@ -128,60 +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(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/OkHttpOtsTest.kt

@@ -46,7 +46,7 @@ class OkHttpOtsTest {
 
     @Before
     fun setup() {
-        OtsEvent.otsInstance = OpenTimestamps(OkHttpBlockstreamExplorer(), OkHttpCalendarBuilder())
+        OtsEvent.otsInstance = OpenTimestamps(OkHttpBlockstreamExplorer(forceProxy = { false }), OkHttpCalendarBuilder(forceProxy = { false }))
     }
 
     @Test

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

@@ -23,6 +23,7 @@ package com.vitorpamplona.amethyst
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.AccountSettings
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.ui.dal.ThreadFeedFilter
 import com.vitorpamplona.quartz.crypto.KeyPair
@@ -30,7 +31,9 @@ import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.events.Event
 import junit.framework.TestCase
 import junit.framework.TestCase.assertEquals
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import org.junit.Test
@@ -133,7 +136,7 @@ class ThreadAssemblerTest {
                     null,
                 )
 
-            val account = Account(KeyPair())
+            val account = Account(AccountSettings(KeyPair()), scope = CoroutineScope(Dispatchers.IO + SupervisorJob()))
             withContext(Dispatchers.Main) {
                 val user = account.userProfile().live()
             }

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/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt

@@ -38,13 +38,11 @@ interface PushDistributorActions {
 }
 
 object PushDistributorHandler : PushDistributorActions {
-    private val appContext = Amethyst.instance.applicationContext
     private val unifiedPush: UnifiedPush = UnifiedPush
 
     private var endpointInternal = ""
-    val endpoint = endpointInternal
 
-    fun getSavedEndpoint() = endpoint
+    fun getSavedEndpoint() = endpointInternal
 
     fun setEndpoint(newEndpoint: String) {
         endpointInternal = newEndpoint
@@ -55,11 +53,13 @@ object PushDistributorHandler : PushDistributorActions {
         endpointInternal = ""
     }
 
-    override fun getSavedDistributor(): String = unifiedPush.getSavedDistributor(appContext) ?: ""
+    fun appContext(): Context = Amethyst.instance.applicationContext
+
+    override fun getSavedDistributor(): String = unifiedPush.getSavedDistributor(appContext()) ?: ""
 
     fun savedDistributorExists(): Boolean = getSavedDistributor().isNotEmpty()
 
-    override fun getInstalledDistributors(): List<String> = unifiedPush.getDistributors(appContext)
+    override fun getInstalledDistributors(): List<String> = unifiedPush.getDistributors(appContext())
 
     fun formattedDistributorNames(): List<String> {
         val distributorsArray = getInstalledDistributors().toTypedArray()
@@ -69,16 +69,16 @@ object PushDistributorHandler : PushDistributorActions {
                     try {
                         val ai =
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                                appContext.packageManager.getApplicationInfo(
+                                appContext().packageManager.getApplicationInfo(
                                     it,
                                     PackageManager.ApplicationInfoFlags.of(
                                         PackageManager.GET_META_DATA.toLong(),
                                     ),
                                 )
                             } else {
-                                appContext.packageManager.getApplicationInfo(it, 0)
+                                appContext().packageManager.getApplicationInfo(it, 0)
                             }
-                        appContext.packageManager.getApplicationLabel(ai)
+                        appContext().packageManager.getApplicationLabel(ai)
                     } catch (e: PackageManager.NameNotFoundException) {
                         it
                     }
@@ -88,12 +88,12 @@ object PushDistributorHandler : PushDistributorActions {
     }
 
     override fun saveDistributor(distributor: String) {
-        unifiedPush.saveDistributor(appContext, distributor)
-        unifiedPush.registerApp(appContext)
+        unifiedPush.saveDistributor(appContext(), distributor)
+        unifiedPush.registerApp(appContext())
     }
 
     override fun removeSavedDistributor() {
-        unifiedPush.safeRemoveDistributor(appContext)
+        unifiedPush.safeRemoveDistributor(appContext())
     }
 
     fun forceRemoveDistributor(context: Context) {

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt

@@ -22,7 +22,6 @@ package com.vitorpamplona.amethyst.service.notifications
 
 import android.app.NotificationManager
 import android.content.Context
-import android.content.Intent
 import android.util.Log
 import android.util.LruCache
 import androidx.core.content.ContextCompat
@@ -33,10 +32,7 @@ import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.getOrC
 import com.vitorpamplona.quartz.events.Event
 import com.vitorpamplona.quartz.events.GiftWrapEvent
 import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import org.unifiedpush.android.connector.MessagingReceiver
 
@@ -46,7 +42,7 @@ class PushMessageReceiver : MessagingReceiver() {
     }
 
     private val appContext = Amethyst.instance.applicationContext
-    private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+    private val scope = Amethyst.instance.applicationIOScope
     private val eventCache = LruCache<String, String>(100)
     private val pushHandler = PushDistributorHandler
 
@@ -55,11 +51,13 @@ class PushMessageReceiver : MessagingReceiver() {
         message: ByteArray,
         instance: String,
     ) {
-        val messageStr = String(message)
-        Log.d(TAG, "New message ${message.decodeToString()} for Instance: $instance")
+        val messageStr = message.decodeToString()
+        Log.d(TAG, "New message $messageStr for Instance: $instance")
         scope.launch {
             try {
-                parseMessage(messageStr)?.let { receiveIfNew(it) }
+                parseMessage(messageStr)?.let {
+                    receiveIfNew(it)
+                }
             } catch (e: Exception) {
                 if (e is CancellationException) throw e
                 Log.d(TAG, "Message could not be parsed: ${e.message}")
@@ -86,32 +84,25 @@ class PushMessageReceiver : MessagingReceiver() {
         endpoint: String,
         instance: String,
     ) {
-        Log.d(TAG, "New endpoint provided:- $endpoint for Instance: $instance")
-        val sanitizedEndpoint = endpoint.dropLast(5)
-        pushHandler.setEndpoint(sanitizedEndpoint)
-        scope.launch(Dispatchers.IO) {
-            RegisterAccounts(LocalPreferences.allSavedAccounts()).go(sanitizedEndpoint)
-            notificationManager().getOrCreateZapChannel(appContext)
-            notificationManager().getOrCreateDMChannel(appContext)
+        val sanitizedEndpoint = if (endpoint.endsWith("?up=1")) endpoint.dropLast(5) else endpoint
+        if (sanitizedEndpoint != pushHandler.getSavedEndpoint()) {
+            Log.d(TAG, "New endpoint provided:- $endpoint for Instance: $instance ${pushHandler.getSavedEndpoint()} $sanitizedEndpoint")
+            pushHandler.setEndpoint(sanitizedEndpoint)
+            scope.launch(Dispatchers.IO) {
+                RegisterAccounts(LocalPreferences.allSavedAccounts()).go(sanitizedEndpoint)
+                notificationManager().getOrCreateZapChannel(appContext)
+                notificationManager().getOrCreateDMChannel(appContext)
+            }
+        } else {
+            Log.d(TAG, "Same endpoint provided:- $endpoint for Instance: $instance $sanitizedEndpoint")
         }
     }
 
-    override fun onReceive(
-        context: Context,
-        intent: Intent,
-    ) {
-        val intentData = intent.dataString
-        val intentAction = intent.action.toString()
-        Log.d(TAG, "Intent Data:- $intentData Intent Action: $intentAction")
-        super.onReceive(context, intent)
-    }
-
     override fun onRegistrationFailed(
         context: Context,
         instance: String,
     ) {
         Log.d(TAG, "Registration failed for Instance: $instance")
-        scope.cancel()
         pushHandler.forceRemoveDistributor(context)
     }
 
@@ -119,7 +110,7 @@ class PushMessageReceiver : MessagingReceiver() {
         context: Context,
         instance: String,
     ) {
-        val removedEndpoint = pushHandler.endpoint
+        val removedEndpoint = pushHandler.getSavedEndpoint()
         Log.d(TAG, "Endpoint: $removedEndpoint removed for Instance: $instance")
         Log.d(TAG, "App is unregistered. ")
         pushHandler.forceRemoveDistributor(context)

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationUtils.kt

@@ -29,11 +29,14 @@ object PushNotificationUtils {
     private val pushHandler = PushDistributorHandler
 
     suspend fun init(accounts: List<AccountInfo>) {
-        if (hasInit || pushHandler.savedDistributorExists()) {
+        if (hasInit) {
             return
         }
         try {
             if (pushHandler.savedDistributorExists()) {
+                val currentDistributor = PushDistributorHandler.getSavedDistributor()
+                PushDistributorHandler.saveDistributor(currentDistributor)
+
                 RegisterAccounts(accounts).go(pushHandler.getSavedEndpoint())
             }
         } catch (e: Exception) {

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/SelectNotificationProvider.kt

@@ -55,10 +55,10 @@ import com.halilibo.richtext.ui.resolveDefaults
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.service.notifications.PushDistributorHandler
 import com.vitorpamplona.amethyst.ui.screen.SharedPreferencesViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.CheckifItNeedsToRequestNotificationPermission
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.SettingsRow
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SpinnerSelectionDialog
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TitleExplainer
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.checkifItNeedsToRequestNotificationPermission
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.settings.SettingsRow
 import com.vitorpamplona.amethyst.ui.stringRes
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
@@ -67,7 +67,7 @@ import kotlinx.collections.immutable.toImmutableList
 @Composable
 fun SelectNotificationProvider(sharedPreferencesViewModel: SharedPreferencesViewModel) {
     val notificationPermissionState =
-        CheckifItNeedsToRequestNotificationPermission(sharedPreferencesViewModel)
+        checkifItNeedsToRequestNotificationPermission(sharedPreferencesViewModel)
 
     if (notificationPermissionState.status.isGranted) {
         if (!sharedPreferencesViewModel.sharedPrefs.dontShowPushNotificationSelector) {
@@ -150,9 +150,6 @@ fun SelectNotificationProvider(sharedPreferencesViewModel: SharedPreferencesView
                         )
                     }
                 }
-            } else {
-                val currentDistributor = PushDistributorHandler.getSavedDistributor()
-                PushDistributorHandler.saveDistributor(currentDistributor)
             }
         }
     }

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt

@@ -24,6 +24,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.quartz.events.ImmutableListOfLists
 
@@ -38,7 +39,7 @@ fun TranslatableRichTextViewer(
     id: String,
     callbackUri: String? = null,
     accountViewModel: AccountViewModel,
-    nav: (String) -> Unit,
+    nav: INav,
 ) = ExpandableRichTextViewer(
     content,
     canPreview,

amethyst/src/main/AndroidManifest.xml

@@ -16,12 +16,11 @@
     <!-- To connect with relays -->
     <uses-permission android:name="android.permission.INTERNET"/>
 
-    <!-- To Upload media (newer devices) -->
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
-    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
+    <!-- To take pictures -->
+    <uses-permission android:name="android.permission.CAMERA" />
 
     <!-- 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" />
@@ -100,9 +99,23 @@
                 <data android:scheme="nostr+walletconnect" />
             </intent-filter>
 
-            <meta-data
-                android:name="android.app.lib_name"
-                android:value="" />
+            <intent-filter android:label="New Post">
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+
+            <intent-filter android:label="New Post">
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="video/*" />
+            </intent-filter>
+
+            <intent-filter android:label="New Post">
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
         </activity>
 
         <activity
@@ -121,6 +134,25 @@
             </intent-filter>
         </service>
 
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                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/androidx/compose/material3/adaptive/Posture.kt

@@ -0,0 +1,182 @@
+/**
+ * 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 androidx.compose.material3.adaptive
+
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.graphics.toComposeRect
+import androidx.window.layout.FoldingFeature
+
+/**
+ * Calculates the [Posture] for a given list of [FoldingFeature]s. This methods converts framework
+ * folding info into the Material-opinionated posture info.
+ */
+fun calculatePosture(foldingFeatures: List<FoldingFeature>): Posture {
+    var isTableTop = false
+    val hingeList = mutableListOf<HingeInfo>()
+    @Suppress("ListIterator")
+    foldingFeatures.forEach {
+        if (it.orientation == FoldingFeature.Orientation.HORIZONTAL &&
+            it.state == FoldingFeature.State.HALF_OPENED
+        ) {
+            isTableTop = true
+        }
+        hingeList.add(
+            HingeInfo(
+                bounds = it.bounds.toComposeRect(),
+                isFlat = it.state == FoldingFeature.State.FLAT,
+                isVertical = it.orientation == FoldingFeature.Orientation.VERTICAL,
+                isSeparating = it.isSeparating,
+                isOccluding = it.occlusionType == FoldingFeature.OcclusionType.FULL,
+            ),
+        )
+    }
+    return Posture(isTableTop, hingeList)
+}
+
+/**
+ * Posture info that can help make layout adaptation decisions. For example when
+ * [Posture.separatingVerticalHingeBounds] is not empty, the layout may want to avoid putting any
+ * content over those hinge area. We suggest to use [calculatePosture] to retrieve instances of this
+ * class in applications, unless you have a strong need of customization that cannot be fulfilled by
+ * the default implementation.
+ *
+ * Note that the hinge bounds will be represent as [Rect] with window coordinates, instead of layout
+ * coordinate.
+ *
+ * @constructor create an instance of [Posture]
+ * @property isTabletop `true` if the current window is considered as in the table top mode, i.e.
+ *           there is one half-opened horizontal hinge in the middle of the current window. When
+ *           this is `true` it usually means it's hard for users to interact with the window area
+ *           around the hinge and developers may consider separating the layout along the hinge and
+ *           show software keyboard or other controls in the bottom half of the window.
+ * @property hingeList a list of all hinges that are relevant to the posture.
+ */
+@Immutable
+class Posture(
+    val isTabletop: Boolean = false,
+    val hingeList: List<HingeInfo> = emptyList(),
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is Posture) return false
+        if (isTabletop != other.isTabletop) return false
+        if (hingeList != other.hingeList) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = isTabletop.hashCode()
+        result = 31 * result + hingeList.hashCode()
+        return result
+    }
+
+    override fun toString(): String {
+        @Suppress("ListIterator")
+        return "Posture(isTabletop=$isTabletop, " +
+            "hinges=[${hingeList.joinToString(", ")}])"
+    }
+}
+
+/**
+ * Returns the list of vertical hinge bounds that are separating.
+ */
+val Posture.separatingVerticalHingeBounds get() = hingeList.getBounds { isVertical && isSeparating }
+
+/**
+ *  Returns the list of vertical hinge bounds that are occluding.
+ */
+val Posture.occludingVerticalHingeBounds get() = hingeList.getBounds { isVertical && isOccluding }
+
+/**
+ *  Returns the list of all vertical hinge bounds.
+ */
+val Posture.allVerticalHingeBounds get() = hingeList.getBounds { isVertical }
+
+/**
+ * Returns the list of horizontal hinge bounds that are separating.
+ */
+val Posture.separatingHorizontalHingeBounds
+    get() = hingeList.getBounds { !isVertical && isSeparating }
+
+/**
+ * Returns the list of horizontal hinge bounds that are occluding.
+ */
+val Posture.occludingHorizontalHingeBounds
+    get() = hingeList.getBounds { !isVertical && isOccluding }
+
+/**
+ *  Returns the list of all horizontal hinge bounds.
+ */
+val Posture.allHorizontalHingeBounds
+    get() = hingeList.getBounds { !isVertical }
+
+/**
+ * A class that contains the info of a hinge relevant to a [Posture].
+ *
+ * @param bounds the bounds of the hinge in the relevant viewport.
+ * @param isFlat `true` if the hinge is fully open and the relevant window space presented to the
+ *        user is flat.
+ * @param isVertical `true` if the hinge is a vertical one, i.e., it separates the viewport into
+ *        left and right; `false` if the hinge is horizontal, i.e., it separates the viewport
+ *        into top and bottom.
+ * @param isSeparating `true` if the hinge creates two logical display areas.
+ * @param isOccluding `true` if the hinge conceals part of the display.
+ */
+@Immutable
+class HingeInfo(
+    val bounds: Rect,
+    val isFlat: Boolean,
+    val isVertical: Boolean,
+    val isSeparating: Boolean,
+    val isOccluding: Boolean,
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is HingeInfo) return false
+        if (bounds != other.bounds) return false
+        if (isFlat != other.isFlat) return false
+        if (isVertical != other.isVertical) return false
+        if (isSeparating != other.isSeparating) return false
+        if (isOccluding != other.isOccluding) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = bounds.hashCode()
+        result = 31 * result + isFlat.hashCode()
+        result = 31 * result + isVertical.hashCode()
+        result = 31 * result + isSeparating.hashCode()
+        result = 31 * result + isOccluding.hashCode()
+        return result
+    }
+
+    override fun toString(): String =
+        "HingeInfo(bounds=$bounds, " +
+            "isFlat=$isFlat, " +
+            "isVertical=$isVertical, " +
+            "isSeparating=$isSeparating, " +
+            "isOccluding=$isOccluding)"
+}
+
+private inline fun List<HingeInfo>.getBounds(predicate: HingeInfo.() -> Boolean): List<Rect> =
+    @Suppress("ListIterator")
+    mapNotNull { if (it.predicate()) it.bounds else null }

amethyst/src/main/java/androidx/compose/material3/adaptive/WindowAdaptiveInfo.kt

@@ -0,0 +1,122 @@
+/**
+ * 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 androidx.compose.material3.adaptive
+
+import android.app.Activity
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.toSize
+import androidx.window.core.layout.WindowSizeClass
+import androidx.window.layout.FoldingFeature
+import androidx.window.layout.WindowInfoTracker
+import androidx.window.layout.WindowMetricsCalculator
+import kotlinx.coroutines.flow.map
+
+@Composable
+fun currentWindowAdaptiveInfo(): WindowAdaptiveInfo {
+    val windowSize =
+        with(LocalDensity.current) {
+            currentWindowSize().toSize().toDpSize()
+        }
+    return WindowAdaptiveInfo(
+        WindowSizeClass.compute(windowSize.width.value, windowSize.height.value),
+        calculatePosture(collectFoldingFeaturesAsState().value),
+    )
+}
+
+/**
+ * Returns and automatically update the current window size from [WindowMetricsCalculator].
+ *
+ * @return an [IntSize] that represents the current window size.
+ */
+@Composable
+fun currentWindowSize(): IntSize {
+    // Observe view configuration changes and recalculate the size class on each change. We can't
+    // use Activity#onConfigurationChanged as this will sometimes fail to be called on different
+    // API levels, hence why this function needs to be @Composable so we can observe the
+    // ComposeView's configuration changes.
+    LocalConfiguration.current
+    val windowBounds =
+        WindowMetricsCalculator
+            .getOrCreate()
+            .computeCurrentWindowMetrics(LocalContext.current)
+            .bounds
+    return IntSize(windowBounds.width(), windowBounds.height())
+}
+
+/**
+ * Collects the current window folding features from [WindowInfoTracker] in to a [State].
+ *
+ * @return a [State] of a [FoldingFeature] list.
+ */
+@Composable
+fun collectFoldingFeaturesAsState(): State<List<FoldingFeature>> {
+    val context = LocalContext.current
+    return remember(context) {
+        if (context is Activity) {
+            // TODO(b/284347941) remove the instance check after the test bug is fixed.
+            WindowInfoTracker
+                .getOrCreate(context)
+                .windowLayoutInfo(context)
+        } else {
+            WindowInfoTracker
+                .getOrCreate(context)
+                .windowLayoutInfo(context)
+        }.map { it.displayFeatures.filterIsInstance<FoldingFeature>() }
+    }.collectAsState(emptyList())
+}
+
+/**
+ * This class collects window info that affects adaptation decisions. An adaptive layout is supposed
+ * to use the info from this class to decide how the layout is supposed to be adapted.
+ *
+ * @constructor create an instance of [WindowAdaptiveInfo]
+ * @param windowSizeClass [WindowSizeClass] of the current window.
+ * @param windowPosture [Posture] of the current window.
+ */
+@Immutable
+class WindowAdaptiveInfo(
+    val windowSizeClass: WindowSizeClass,
+    val windowPosture: Posture,
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is WindowAdaptiveInfo) return false
+        if (windowSizeClass != other.windowSizeClass) return false
+        if (windowPosture != other.windowPosture) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = windowSizeClass.hashCode()
+        result = 31 * result + windowPosture.hashCode()
+        return result
+    }
+
+    override fun toString(): String = "WindowAdaptiveInfo(windowSizeClass=$windowSizeClass, windowPosture=$windowPosture)"
+}

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

@@ -21,42 +21,63 @@
 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 com.vitorpamplona.amethyst.service.ots.OkHttpBlockstreamExplorer
-import com.vitorpamplona.amethyst.service.ots.OkHttpCalendarBuilder
+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.quartz.events.OtsEvent
-import com.vitorpamplona.quartz.ots.OpenTimestamps
+import com.vitorpamplona.ammolite.relays.NostrClient
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 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(client, applicationIOScope)
+    val locationManager = LocationState(this, applicationIOScope)
+
+    val pokeyReceiver = PokeyReceiver()
+
     override fun onTerminate() {
         super.onTerminate()
+        unregisterReceiver(pokeyReceiver)
         applicationIOScope.cancel()
     }
 
+    fun nip95cache() = safeCacheDir.resolve("NIP95")
+
     val videoCache: VideoCache by lazy {
         val newCache = VideoCache()
         runBlocking {
-            newCache.initFileCache(this@Amethyst)
+            newCache.initFileCache(
+                this@Amethyst,
+                safeCacheDir.resolve("exoplayer"),
+            )
         }
         newCache
     }
@@ -64,18 +85,27 @@ class Amethyst : Application() {
     val coilCache: DiskCache by lazy {
         DiskCache
             .Builder()
-            .directory(applicationContext.safeCacheDir.resolve("image_cache"))
+            .directory(safeCacheDir.resolve("image_cache").toOkioPath())
             .maxSizePercent(0.2)
-            .maximumMaxSizeBytes(500L * 1024 * 1024) // 250MB
+            .maximumMaxSizeBytes(1024 * 1024 * 1024) // 1GB
             .build()
     }
 
+    val memoryCache: MemoryCache by lazy {
+        MemoryCache
+            .Builder()
+            .maxSizePercent(this)
+            .build()
+    }
+
+    fun contentResolverFn(): ContentResolver = contentResolver
+
     override fun onCreate() {
         super.onCreate()
 
         instance = this
 
-        OtsEvent.otsInstance = OpenTimestamps(OkHttpBlockstreamExplorer(), OkHttpCalendarBuilder())
+        HttpClientManager.setDefaultUserAgent("Amethyst/${BuildConfig.VERSION_NAME}")
 
         if (BuildConfig.DEBUG || BuildConfig.BUILD_TYPE == "benchmark") {
             StrictMode.setThreadPolicy(
@@ -104,12 +134,44 @@ 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(applicationContext).diskCache { coilCache }
+    fun imageLoaderBuilder(): ImageLoader.Builder =
+        ImageLoader
+            .Builder(this)
+            .diskCache { coilCache }
+            .memoryCache { memoryCache }
 
     fun encryptedStorage(npub: String? = null): EncryptedSharedPreferences = EncryptedStorage.preferences(instance, npub)
 
+    /**
+     * Release memory when the UI becomes hidden or when system resources become low.
+     *
+     * @param level the memory-related event that was raised.
+     */
+    @OptIn(DelicateCoroutinesApi::class)
+    override fun onTrimMemory(level: Int) {
+        super.onTrimMemory(level)
+        println("Trim Memory $level")
+        GlobalScope.launch(Dispatchers.Default) {
+            println("Trim Memory Inside $level")
+            serviceManager.trimMemory()
+        }
+    }
+
     companion object {
         lateinit var instance: Amethyst
             private set

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

@@ -0,0 +1,176 @@
+/**
+ * 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 android.app.ActivityManager
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.os.Debug
+import android.util.Log
+import androidx.core.content.getSystemService
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.service.NostrAccountDataSource
+import com.vitorpamplona.amethyst.service.NostrChannelDataSource
+import com.vitorpamplona.amethyst.service.NostrChatroomDataSource
+import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
+import com.vitorpamplona.amethyst.service.NostrCommunityDataSource
+import com.vitorpamplona.amethyst.service.NostrDiscoveryDataSource
+import com.vitorpamplona.amethyst.service.NostrGeohashDataSource
+import com.vitorpamplona.amethyst.service.NostrHashtagDataSource
+import com.vitorpamplona.amethyst.service.NostrHomeDataSource
+import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
+import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
+import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
+import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
+import com.vitorpamplona.amethyst.service.NostrThreadDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
+import com.vitorpamplona.amethyst.service.NostrVideoDataSource
+
+fun debugState(context: Context) {
+    Amethyst.instance.client
+        .allSubscriptions()
+        .forEach { Log.d("STATE DUMP", "${it.key} ${it.value.joinToString { it.filter.toDebugJson() }}") }
+
+    NostrAccountDataSource.printCounter()
+    NostrChannelDataSource.printCounter()
+    NostrChatroomDataSource.printCounter()
+    NostrChatroomListDataSource.printCounter()
+    NostrCommunityDataSource.printCounter()
+    NostrDiscoveryDataSource.printCounter()
+    NostrHashtagDataSource.printCounter()
+    NostrGeohashDataSource.printCounter()
+    NostrHomeDataSource.printCounter()
+    NostrSearchEventOrUserDataSource.printCounter()
+    NostrSingleChannelDataSource.printCounter()
+    NostrSingleEventDataSource.printCounter()
+    NostrSingleUserDataSource.printCounter()
+    NostrThreadDataSource.printCounter()
+    NostrUserProfileDataSource.printCounter()
+    NostrVideoDataSource.printCounter()
+
+    val totalMemoryMb = Runtime.getRuntime().totalMemory() / (1024 * 1024)
+    val freeMemoryMb = Runtime.getRuntime().freeMemory() / (1024 * 1024)
+    val maxMemoryMb = Runtime.getRuntime().maxMemory() / (1024 * 1024)
+
+    val jvmHeapAllocatedMb = totalMemoryMb - freeMemoryMb
+
+    Log.d("STATE DUMP", "Total Heap Allocated: " + jvmHeapAllocatedMb + "/" + maxMemoryMb + " MB")
+
+    val nativeHeap = Debug.getNativeHeapAllocatedSize() / (1024 * 1024)
+    val maxNative = Debug.getNativeHeapSize() / (1024 * 1024)
+
+    Log.d("STATE DUMP", "Total Native Heap Allocated: " + nativeHeap + "/" + maxNative + " MB")
+
+    val activityManager: ActivityManager? = context.getSystemService()
+    if (activityManager != null) {
+        val isLargeHeap = (context.applicationInfo.flags and ApplicationInfo.FLAG_LARGE_HEAP) != 0
+        val memClass = if (isLargeHeap) activityManager.largeMemoryClass else activityManager.memoryClass
+
+        Log.d("STATE DUMP", "Memory Class " + memClass + " MB (largeHeap $isLargeHeap)")
+    }
+
+    Log.d("STATE DUMP", "Connected Relays: " + Amethyst.instance.client.connectedRelays())
+
+    Log.d(
+        "STATE DUMP",
+        "Image Disk Cache ${(Amethyst.instance.coilCache.size) / (1024 * 1024)}/${(Amethyst.instance.coilCache.maxSize) / (1024 * 1024)} MB",
+    )
+    Log.d(
+        "STATE DUMP",
+        "Image Memory Cache ${(Amethyst.instance.memoryCache.size) / (1024 * 1024)}/${(Amethyst.instance.memoryCache.size) / (1024 * 1024)} MB",
+    )
+
+    Log.d(
+        "STATE DUMP",
+        "Notes: " +
+            LocalCache.notes.filter { _, it -> it.liveSet != null }.size +
+            " / " +
+            LocalCache.notes.filter { _, it -> it.flowSet != null }.size +
+            " / " +
+            LocalCache.notes.filter { _, it -> it.event != null }.size +
+            " / " +
+            LocalCache.notes.size(),
+    )
+    Log.d(
+        "STATE DUMP",
+        "Addressables: " +
+            LocalCache.addressables.filter { _, it -> it.liveSet != null }.size +
+            " / " +
+            LocalCache.addressables.filter { _, it -> it.flowSet != null }.size +
+            " / " +
+            LocalCache.addressables.filter { _, it -> it.event != null }.size +
+            " / " +
+            LocalCache.addressables.size(),
+    )
+    Log.d(
+        "STATE DUMP",
+        "Users: " +
+            LocalCache.users.filter { _, it -> it.liveSet != null }.size +
+            " / " +
+            LocalCache.users.filter { _, it -> it.flowSet != null }.size +
+            " / " +
+            LocalCache.users.filter { _, it -> it.latestMetadata != null }.size +
+            " / " +
+            LocalCache.users.size(),
+    )
+    Log.d(
+        "STATE DUMP",
+        "Deletion Events: " +
+            LocalCache.deletionIndex.size(),
+    )
+    Log.d(
+        "STATE DUMP",
+        "Observable Events: " +
+            LocalCache.observablesByKindAndETag.size +
+            " / " +
+            LocalCache.observablesByKindAndAuthor.size,
+    )
+
+    Log.d(
+        "STATE DUMP",
+        "Spam: " +
+            LocalCache.antiSpam.spamMessages.size() + " / " + LocalCache.antiSpam.recentMessages.size(),
+    )
+
+    Log.d(
+        "STATE DUMP",
+        "Memory used by Events: " +
+            LocalCache.notes.sumOfLong { _, note -> note.event?.countMemory() ?: 0L } / (1024 * 1024) +
+            " MB",
+    )
+
+    val qttNotes = LocalCache.notes.countByGroup { _, it -> it.event?.kind() }
+    val qttAddressables = LocalCache.addressables.countByGroup { _, it -> it.event?.kind() }
+
+    val bytesNotes =
+        LocalCache.notes
+            .sumByGroup(groupMap = { _, it -> it.event?.kind() }, sumOf = { _, it -> it.event?.countMemory() ?: 0L })
+    val bytesAddressables =
+        LocalCache.addressables
+            .sumByGroup(groupMap = { _, it -> it.event?.kind() }, sumOf = { _, it -> it.event?.countMemory() ?: 0L })
+
+    qttNotes.toList().sortedByDescending { bytesNotes.get(it.first) }.forEach { (kind, qtt) ->
+        Log.d("STATE DUMP", "Kind ${kind.toString().padStart(5,' ')}:\t${qtt.toString().padStart(6,' ')} elements\t${bytesNotes.get(kind)?.div((1024 * 1024))}MB ")
+    }
+    qttAddressables.toList().sortedByDescending { bytesNotes.get(it.first) }.forEach { (kind, qtt) ->
+        Log.d("STATE DUMP", "Kind ${kind.toString().padStart(5,' ')}:\t${qtt.toString().padStart(6,' ')} elements\t${bytesAddressables.get(kind)?.div((1024 * 1024))}MB ")
+    }
+}

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

@@ -26,16 +26,24 @@ 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.Account
+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
 import com.vitorpamplona.ammolite.relays.RelaySetupInfo
-import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
@@ -43,13 +51,15 @@ 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
 import com.vitorpamplona.quartz.events.LnZapEvent
-import com.vitorpamplona.quartz.signers.ExternalSignerLauncher
-import com.vitorpamplona.quartz.signers.NostrSignerExternal
-import com.vitorpamplona.quartz.signers.NostrSignerInternal
+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.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -70,6 +80,7 @@ data class AccountInfo(
     val npub: String,
     val hasPrivKey: Boolean,
     val loggedInWithExternalSigner: Boolean,
+    val isTransient: Boolean,
 )
 
 private object PrefKeys {
@@ -91,12 +102,18 @@ private object PrefKeys {
     const val DEFAULT_NOTIFICATION_FOLLOW_LIST = "defaultNotificationFollowList"
     const val DEFAULT_DISCOVERY_FOLLOW_LIST = "defaultDiscoveryFollowList"
     const val ZAP_PAYMENT_REQUEST_SERVER = "zapPaymentServer"
+    const val LATEST_USER_METADATA = "latestUserMetadata"
     const val LATEST_CONTACT_LIST = "latestContactList"
     const val LATEST_DM_RELAY_LIST = "latestDMRelayList"
     const val LATEST_NIP65_RELAY_LIST = "latestNIP65RelayList"
+    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
+    const val TOR_SETTINGS = "tor_settings"
     const val USE_PROXY = "use_proxy"
     const val PROXY_PORT = "proxy_port"
     const val SHOW_SENSITIVE_CONTENT = "show_sensitive_content"
@@ -116,68 +133,85 @@ object LocalPreferences {
     private const val COMMA = ","
 
     private var currentAccount: String? = null
-    private var savedAccounts: List<AccountInfo>? = null
-    private var cachedAccounts: MutableMap<String, Account?> = mutableMapOf()
+    private var savedAccounts: MutableStateFlow<List<AccountInfo>?> = MutableStateFlow(null)
+    private var cachedAccounts: MutableMap<String, AccountSettings?> = mutableMapOf()
 
     suspend fun currentAccount(): String? {
         if (currentAccount == null) {
-            currentAccount = encryptedPreferences().getString(PrefKeys.CURRENT_ACCOUNT, null)
+            currentAccount =
+                withContext(Dispatchers.IO) {
+                    encryptedPreferences().getString(PrefKeys.CURRENT_ACCOUNT, null)
+                }
         }
         return currentAccount
     }
 
-    private fun updateCurrentAccount(npub: String?) {
-        if (npub == null) {
+    private suspend fun updateCurrentAccount(info: AccountInfo?) {
+        if (info == null) {
             currentAccount = null
-            encryptedPreferences().edit().clear().apply()
-        } else if (currentAccount != npub) {
-            currentAccount = npub
-
-            encryptedPreferences().edit().apply { putString(PrefKeys.CURRENT_ACCOUNT, npub) }.apply()
-        }
-    }
-
-    private fun savedAccounts(): List<AccountInfo> {
-        if (savedAccounts == null) {
-            with(encryptedPreferences()) {
-                val newSystemOfAccounts =
-                    getString(PrefKeys.ALL_ACCOUNT_INFO, "[]")?.let {
-                        Event.mapper.readValue<List<AccountInfo>>(it)
-                    }
-
-                if (!newSystemOfAccounts.isNullOrEmpty()) {
-                    savedAccounts = newSystemOfAccounts
-                } else {
-                    val oldAccounts = getString(PrefKeys.SAVED_ACCOUNTS, null)?.split(COMMA) ?: listOf()
-
-                    val migrated =
-                        oldAccounts.map { npub ->
-                            AccountInfo(
-                                npub,
-                                encryptedPreferences(npub).getBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, false),
-                                (encryptedPreferences(npub).getString(PrefKeys.NOSTR_PRIVKEY, "") ?: "")
-                                    .isNotBlank(),
-                            )
-                        }
-
-                    savedAccounts = migrated
-
-                    edit().apply { putString(PrefKeys.ALL_ACCOUNT_INFO, Event.mapper.writeValueAsString(savedAccounts)) }.apply()
+            withContext(Dispatchers.IO) {
+                encryptedPreferences().edit().clear().apply()
+            }
+        } else if (currentAccount != info.npub) {
+            currentAccount = info.npub
+            if (!info.isTransient) {
+                withContext(Dispatchers.IO) {
+                    encryptedPreferences().edit().apply { putString(PrefKeys.CURRENT_ACCOUNT, info.npub) }.apply()
                 }
             }
         }
-        return savedAccounts!!
     }
 
+    private suspend fun savedAccounts(): List<AccountInfo> {
+        if (savedAccounts.value == null) {
+            withContext(Dispatchers.IO) {
+                with(encryptedPreferences()) {
+                    val newSystemOfAccounts =
+                        getString(PrefKeys.ALL_ACCOUNT_INFO, "[]")?.let {
+                            Event.mapper.readValue<List<AccountInfo>>(it)
+                        }
+
+                    if (!newSystemOfAccounts.isNullOrEmpty()) {
+                        savedAccounts.emit(newSystemOfAccounts)
+                    } else {
+                        val oldAccounts = getString(PrefKeys.SAVED_ACCOUNTS, null)?.split(COMMA) ?: listOf()
+
+                        val migrated =
+                            oldAccounts.map { npub ->
+                                AccountInfo(
+                                    npub,
+                                    encryptedPreferences(npub).getBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, false),
+                                    (encryptedPreferences(npub).getString(PrefKeys.NOSTR_PRIVKEY, "") ?: "").isNotBlank(),
+                                    false,
+                                )
+                            }
+
+                        savedAccounts.emit(migrated)
+
+                        edit().apply { putString(PrefKeys.ALL_ACCOUNT_INFO, Event.mapper.writeValueAsString(savedAccounts.value)) }.apply()
+                    }
+                }
+            }
+        }
+        // it's always not null when it gets here.
+        return savedAccounts.value!!
+    }
+
+    fun accountsFlow() = savedAccounts
+
     private suspend fun updateSavedAccounts(accounts: List<AccountInfo>) =
         withContext(Dispatchers.IO) {
             if (savedAccounts != accounts) {
-                savedAccounts = accounts
+                savedAccounts.emit(accounts)
 
                 encryptedPreferences()
                     .edit()
-                    .apply { putString(PrefKeys.ALL_ACCOUNT_INFO, Event.mapper.writeValueAsString(accounts)) }
-                    .apply()
+                    .apply {
+                        putString(
+                            PrefKeys.ALL_ACCOUNT_INFO,
+                            Event.mapper.writeValueAsString(accounts.filter { !it.isTransient }),
+                        )
+                    }.apply()
             }
         }
 
@@ -189,35 +223,34 @@ object LocalPreferences {
         updateSavedAccounts(accounts)
     }
 
-    private suspend fun setCurrentAccount(account: Account) =
-        withContext(Dispatchers.IO) {
-            val npub = account.userProfile().pubkeyNpub()
-            val accInfo =
-                AccountInfo(
-                    npub,
-                    account.isWriteable(),
-                    account.signer is NostrSignerExternal,
-                )
-            updateCurrentAccount(npub)
-            addAccount(accInfo)
-        }
+    private suspend fun setCurrentAccount(accountSettings: AccountSettings) {
+        val npub = accountSettings.keyPair.pubKey.toNpub()
+        val accInfo =
+            AccountInfo(
+                npub,
+                accountSettings.isWriteable(),
+                accountSettings.externalSignerPackageName != null,
+                accountSettings.transientAccount,
+            )
+        updateCurrentAccount(accInfo)
+        addAccount(accInfo)
+    }
 
-    suspend fun switchToAccount(accountInfo: AccountInfo) = withContext(Dispatchers.IO) { updateCurrentAccount(accountInfo.npub) }
+    suspend fun switchToAccount(accountInfo: AccountInfo) = updateCurrentAccount(accountInfo)
 
     /** Removes the account from the app level shared preferences */
     private suspend fun removeAccount(accountInfo: AccountInfo) {
-        val accounts = savedAccounts().filter { it.npub != accountInfo.npub }
-        updateSavedAccounts(accounts)
+        updateSavedAccounts(savedAccounts().filter { it.npub != accountInfo.npub })
     }
 
     /** Deletes the npub-specific shared preference file */
-    private fun deleteUserPreferenceFile(npub: String) {
-        checkNotInMainThread()
-
-        val prefsDir = File(prefsDirPath)
-        prefsDir.list()?.forEach {
-            if (it.contains(npub)) {
-                File(prefsDir, it).delete()
+    private suspend fun deleteUserPreferenceFile(npub: String) {
+        withContext(Dispatchers.IO) {
+            val prefsDir = File(prefsDirPath)
+            prefsDir.list()?.forEach {
+                if (it.contains(npub)) {
+                    File(prefsDir, it).delete()
+                }
             }
         }
     }
@@ -244,132 +277,174 @@ object LocalPreferences {
      */
     @SuppressLint("ApplySharedPref")
     suspend fun updatePrefsForLogout(accountInfo: AccountInfo) {
-        Log.d("LocalPreferences", "Saving to encrypted storage updatePrefsForLogout")
+        Log.d("LocalPreferences", "Saving to encrypted storage updatePrefsForLogout ${accountInfo.npub}")
         withContext(Dispatchers.IO) {
-            val userPrefs = encryptedPreferences(accountInfo.npub)
-            userPrefs.edit().clear().commit()
+            encryptedPreferences(accountInfo.npub).edit().clear().commit()
             removeAccount(accountInfo)
             deleteUserPreferenceFile(accountInfo.npub)
 
             if (savedAccounts().isEmpty()) {
                 updateCurrentAccount(null)
             } else if (currentAccount() == accountInfo.npub) {
-                updateCurrentAccount(savedAccounts().elementAt(0).npub)
+                updateCurrentAccount(savedAccounts().elementAt(0))
             }
         }
     }
 
-    suspend fun updatePrefsForLogin(account: Account) {
-        setCurrentAccount(account)
-        saveToEncryptedStorage(account)
+    suspend fun updatePrefsForLogin(accountSettings: AccountSettings) {
+        setCurrentAccount(accountSettings)
+        saveToEncryptedStorage(accountSettings)
     }
 
-    fun allSavedAccounts(): List<AccountInfo> = savedAccounts()
+    suspend fun allSavedAccounts(): List<AccountInfo> = savedAccounts()
 
-    suspend fun saveToEncryptedStorage(account: Account) {
+    suspend fun saveToEncryptedStorage(settings: AccountSettings) {
         Log.d("LocalPreferences", "Saving to encrypted storage")
-        withContext(Dispatchers.IO) {
-            checkNotInMainThread()
+        if (!settings.transientAccount) {
+            withContext(Dispatchers.IO) {
+                val prefs = encryptedPreferences(settings.keyPair.pubKey.toNpub())
+                prefs
+                    .edit()
+                    .apply {
+                        putBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, settings.externalSignerPackageName != null)
+                        if (settings.externalSignerPackageName != null) {
+                            remove(PrefKeys.NOSTR_PRIVKEY)
+                            putString(PrefKeys.SIGNER_PACKAGE_NAME, settings.externalSignerPackageName)
+                        } else {
+                            remove(PrefKeys.SIGNER_PACKAGE_NAME)
+                            settings.keyPair.privKey?.let { putString(PrefKeys.NOSTR_PRIVKEY, it.toHexKey()) }
+                        }
+                        settings.keyPair.pubKey.let { putString(PrefKeys.NOSTR_PUBKEY, it.toHexKey()) }
+                        putString(PrefKeys.RELAYS, Event.mapper.writeValueAsString(settings.localRelays))
 
-            val prefs = encryptedPreferences(account.userProfile().pubkeyNpub())
-            prefs
-                .edit()
-                .apply {
-                    putBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, account.signer is NostrSignerExternal)
-                    if (account.signer is NostrSignerExternal) {
-                        remove(PrefKeys.NOSTR_PRIVKEY)
-                        putString(PrefKeys.SIGNER_PACKAGE_NAME, account.signer.launcher.signerPackageName)
-                    } else {
-                        account.keyPair.privKey?.let { putString(PrefKeys.NOSTR_PRIVKEY, it.toHexKey()) }
-                    }
-                    account.keyPair.pubKey.let { putString(PrefKeys.NOSTR_PUBKEY, it.toHexKey()) }
-                    putString(PrefKeys.RELAYS, Event.mapper.writeValueAsString(account.localRelays))
-                    putStringSet(PrefKeys.DONT_TRANSLATE_FROM, account.dontTranslateFrom)
-                    putStringSet(PrefKeys.LOCAL_RELAY_SERVERS, account.localRelayServers)
-                    putString(
-                        PrefKeys.LANGUAGE_PREFS,
-                        Event.mapper.writeValueAsString(account.languagePreferences),
-                    )
-                    putString(PrefKeys.TRANSLATE_TO, account.translateTo)
-                    putString(PrefKeys.ZAP_AMOUNTS, Event.mapper.writeValueAsString(account.zapAmountChoices))
-                    putString(
-                        PrefKeys.REACTION_CHOICES,
-                        Event.mapper.writeValueAsString(account.reactionChoices),
-                    )
-                    putString(PrefKeys.DEFAULT_ZAPTYPE, account.defaultZapType.name)
-                    putString(
-                        PrefKeys.DEFAULT_FILE_SERVER,
-                        Event.mapper.writeValueAsString(account.defaultFileServer),
-                    )
-                    putString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, account.defaultHomeFollowList.value)
-                    putString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, account.defaultStoriesFollowList.value)
-                    putString(
-                        PrefKeys.DEFAULT_NOTIFICATION_FOLLOW_LIST,
-                        account.defaultNotificationFollowList.value,
-                    )
-                    putString(
-                        PrefKeys.DEFAULT_DISCOVERY_FOLLOW_LIST,
-                        account.defaultDiscoveryFollowList.value,
-                    )
-                    putString(
-                        PrefKeys.ZAP_PAYMENT_REQUEST_SERVER,
-                        Event.mapper.writeValueAsString(account.zapPaymentRequest),
-                    )
-                    if (account.backupContactList != null) {
                         putString(
-                            PrefKeys.LATEST_CONTACT_LIST,
-                            Event.mapper.writeValueAsString(account.backupContactList),
+                            PrefKeys.DEFAULT_FILE_SERVER,
+                            Event.mapper.writeValueAsString(settings.defaultFileServer),
                         )
-                    } else {
-                        remove(PrefKeys.LATEST_CONTACT_LIST)
-                    }
-
-                    if (account.backupDMRelayList != null) {
+                        putString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, settings.defaultHomeFollowList.value)
+                        putString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, settings.defaultStoriesFollowList.value)
                         putString(
-                            PrefKeys.LATEST_DM_RELAY_LIST,
-                            Event.mapper.writeValueAsString(account.backupDMRelayList),
+                            PrefKeys.DEFAULT_NOTIFICATION_FOLLOW_LIST,
+                            settings.defaultNotificationFollowList.value,
                         )
-                    } else {
-                        remove(PrefKeys.LATEST_DM_RELAY_LIST)
-                    }
-
-                    if (account.backupNIP65RelayList != null) {
                         putString(
-                            PrefKeys.LATEST_NIP65_RELAY_LIST,
-                            Event.mapper.writeValueAsString(account.backupNIP65RelayList),
+                            PrefKeys.DEFAULT_DISCOVERY_FOLLOW_LIST,
+                            settings.defaultDiscoveryFollowList.value,
                         )
-                    } else {
-                        remove(PrefKeys.LATEST_NIP65_RELAY_LIST)
-                    }
+                        putString(
+                            PrefKeys.ZAP_PAYMENT_REQUEST_SERVER,
+                            Event.mapper.writeValueAsString(settings.zapPaymentRequest),
+                        )
+                        if (settings.backupContactList != null) {
+                            putString(
+                                PrefKeys.LATEST_CONTACT_LIST,
+                                Event.mapper.writeValueAsString(settings.backupContactList),
+                            )
+                        } else {
+                            remove(PrefKeys.LATEST_CONTACT_LIST)
+                        }
 
-                    putBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, account.hideDeleteRequestDialog)
-                    putBoolean(PrefKeys.HIDE_NIP_17_WARNING_DIALOG, account.hideNIP17WarningDialog)
-                    putBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, account.hideBlockAlertDialog)
-                    putBoolean(PrefKeys.USE_PROXY, account.proxy != null)
-                    putInt(PrefKeys.PROXY_PORT, account.proxyPort)
-                    putBoolean(PrefKeys.WARN_ABOUT_REPORTS, account.warnAboutPostsWithReports)
-                    putBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, account.filterSpamFromStrangers)
-                    putString(
-                        PrefKeys.LAST_READ_PER_ROUTE,
-                        Event.mapper.writeValueAsString(account.lastReadPerRoute),
-                    )
-                    putStringSet(PrefKeys.HAS_DONATED_IN_VERSION, account.hasDonatedInVersion)
+                        if (settings.backupUserMetadata != null) {
+                            putString(
+                                PrefKeys.LATEST_USER_METADATA,
+                                Event.mapper.writeValueAsString(settings.backupUserMetadata),
+                            )
+                        } else {
+                            remove(PrefKeys.LATEST_USER_METADATA)
+                        }
 
-                    if (account.showSensitiveContent.value == null) {
-                        remove(PrefKeys.SHOW_SENSITIVE_CONTENT)
-                    } else {
-                        putBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, account.showSensitiveContent.value!!)
-                    }
+                        if (settings.backupDMRelayList != null) {
+                            putString(
+                                PrefKeys.LATEST_DM_RELAY_LIST,
+                                Event.mapper.writeValueAsString(settings.backupDMRelayList),
+                            )
+                        } else {
+                            remove(PrefKeys.LATEST_DM_RELAY_LIST)
+                        }
 
-                    putString(
-                        PrefKeys.PENDING_ATTESTATIONS,
-                        Event.mapper.writeValueAsString(account.pendingAttestations.value),
-                    )
-                }.apply()
+                        if (settings.backupNIP65RelayList != null) {
+                            putString(
+                                PrefKeys.LATEST_NIP65_RELAY_LIST,
+                                Event.mapper.writeValueAsString(settings.backupNIP65RelayList),
+                            )
+                        } else {
+                            remove(PrefKeys.LATEST_NIP65_RELAY_LIST)
+                        }
+
+                        if (settings.backupSearchRelayList != null) {
+                            putString(
+                                PrefKeys.LATEST_SEARCH_RELAY_LIST,
+                                Event.mapper.writeValueAsString(settings.backupSearchRelayList),
+                            )
+                        } else {
+                            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,
+                                Event.mapper.writeValueAsString(settings.backupMuteList),
+                            )
+                        } else {
+                            remove(PrefKeys.LATEST_MUTE_LIST)
+                        }
+
+                        if (settings.backupPrivateHomeRelayList != null) {
+                            putString(
+                                PrefKeys.LATEST_PRIVATE_HOME_RELAY_LIST,
+                                Event.mapper.writeValueAsString(settings.backupPrivateHomeRelayList),
+                            )
+                        } else {
+                            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)
+
+                        // migrating from previous design
+                        remove(PrefKeys.USE_PROXY)
+                        remove(PrefKeys.PROXY_PORT)
+
+                        putString(PrefKeys.TOR_SETTINGS, Event.mapper.writeValueAsString(settings.torSettings.toSettings()))
+
+                        val regularMap =
+                            settings.lastReadPerRoute.value.mapValues {
+                                it.value.value
+                            }
+
+                        putString(
+                            PrefKeys.LAST_READ_PER_ROUTE,
+                            Event.mapper.writeValueAsString(regularMap),
+                        )
+                        putStringSet(PrefKeys.HAS_DONATED_IN_VERSION, settings.hasDonatedInVersion.value)
+
+                        putString(
+                            PrefKeys.PENDING_ATTESTATIONS,
+                            Event.mapper.writeValueAsString(settings.pendingAttestations.value),
+                        )
+                    }.apply()
+            }
         }
+        Log.d("LocalPreferences", "Saved to encrypted storage")
     }
 
-    suspend fun loadCurrentAccountFromEncryptedStorage(): Account? = currentAccount()?.let { loadCurrentAccountFromEncryptedStorage(it) }
+    suspend fun loadCurrentAccountFromEncryptedStorage(): AccountSettings? = currentAccount()?.let { loadCurrentAccountFromEncryptedStorage(it) }
 
     suspend fun saveSharedSettings(
         sharedSettings: Settings,
@@ -402,43 +477,40 @@ object LocalPreferences {
 
     val mutex = Mutex()
 
-    suspend fun loadCurrentAccountFromEncryptedStorage(npub: String): Account? =
-        withContext(Dispatchers.IO) {
+    suspend fun loadCurrentAccountFromEncryptedStorage(npub: String): AccountSettings? {
+        // if already loaded, return right away
+        if (cachedAccounts.containsKey(npub)) {
+            return cachedAccounts[npub]
+        }
+
+        return withContext(Dispatchers.IO) {
             mutex.withLock {
                 if (cachedAccounts.containsKey(npub)) {
                     return@withContext cachedAccounts.get(npub)
                 }
 
-                val account = innerLoadCurrentAccountFromEncryptedStorage(npub)
-                account?.registerObservers()
+                val accountSettings = innerLoadCurrentAccountFromEncryptedStorage(npub)
 
-                cachedAccounts.put(npub, account)
+                cachedAccounts.put(npub, accountSettings)
 
-                return@withContext account
+                return@withContext accountSettings
             }
         }
+    }
 
-    suspend fun innerLoadCurrentAccountFromEncryptedStorage(npub: String?): Account? {
-        Log.d("LocalPreferences", "Load account from file")
+    private suspend fun innerLoadCurrentAccountFromEncryptedStorage(npub: String?): AccountSettings? {
+        Log.d("LocalPreferences", "Load account from file $npub")
 
         return withContext(Dispatchers.IO) {
             checkNotInMainThread()
 
             return@withContext with(encryptedPreferences(npub)) {
+                val privKey = getString(PrefKeys.NOSTR_PRIVKEY, null)
                 val pubKey = getString(PrefKeys.NOSTR_PUBKEY, null) ?: return@with null
-                val loginWithExternalSigner = getBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, false)
-                val privKey = if (loginWithExternalSigner) null else getString(PrefKeys.NOSTR_PRIVKEY, null)
+                val externalSignerPackageName =
+                    getString(PrefKeys.SIGNER_PACKAGE_NAME, null)
+                        ?: if (getBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, false)) "com.greenart7c3.nostrsigner" else null
 
-                val localRelays =
-                    getString(PrefKeys.RELAYS, "[]")?.let {
-                        println("LocalRelays: $it")
-                        Event.mapper.readValue<Set<RelaySetupInfo>?>(it)
-                    }
-                        ?: setOf<RelaySetupInfo>()
-
-                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 =
@@ -448,242 +520,174 @@ object LocalPreferences {
                 val defaultDiscoveryFollowList =
                     getString(PrefKeys.DEFAULT_DISCOVERY_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
 
-                val zapAmountChoices =
-                    getString(PrefKeys.ZAP_AMOUNTS, "[]")
-                        ?.let { Event.mapper.readValue<List<Long>?>(it) }
-                        ?.ifEmpty { DefaultZapAmounts }
-                        ?: DefaultZapAmounts
-
-                val reactionChoices =
-                    getString(PrefKeys.REACTION_CHOICES, "[]")
-                        ?.let { Event.mapper.readValue<List<String>?>(it) }
-                        ?.ifEmpty { DefaultReactions }
-                        ?: DefaultReactions
-
                 val defaultZapType =
                     getString(PrefKeys.DEFAULT_ZAPTYPE, "")?.let { serverName ->
-                        LnZapEvent.ZapType.values().firstOrNull { it.name == serverName }
-                    }
-                        ?: LnZapEvent.ZapType.PUBLIC
+                        LnZapEvent.ZapType.entries.firstOrNull { it.name == serverName }
+                    } ?: LnZapEvent.ZapType.PUBLIC
 
-                val defaultFileServer =
-                    try {
-                        getString(PrefKeys.DEFAULT_FILE_SERVER, "")?.let { serverName ->
-                            Event.mapper.readValue<Nip96MediaServers.ServerName>(serverName)
-                        }
-                            ?: Nip96MediaServers.DEFAULT[0]
-                    } catch (e: Exception) {
-                        if (e is CancellationException) throw e
-                        Log.w("LocalPreferences", "Failed to decode saved File Server", e)
-                        e.printStackTrace()
-                        Nip96MediaServers.DEFAULT[0]
-                    }
+                val localRelays = parseOrNull<Set<RelaySetupInfo>>(PrefKeys.RELAYS) ?: emptySet()
 
-                val zapPaymentRequestServer =
-                    try {
-                        getString(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, null)?.let {
-                            Event.mapper.readValue<Nip47WalletConnect.Nip47URI?>(it)
-                        }
-                    } catch (e: Throwable) {
-                        if (e is CancellationException) throw e
-                        Log.w(
-                            "LocalPreferences",
-                            "Error Decoding Zap Payment Request Server ${getString(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, null)}",
-                            e,
-                        )
-                        e.printStackTrace()
+                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 localRelayServers = getStringSet(PrefKeys.LOCAL_RELAY_SERVERS, null) ?: setOf()
+
+                val latestUserMetadata = parseEventOrNull<MetadataEvent>(PrefKeys.LATEST_USER_METADATA)
+                val latestContactList = parseEventOrNull<ContactListEvent>(PrefKeys.LATEST_CONTACT_LIST)
+                val latestDmRelayList = parseEventOrNull<ChatMessageRelayListEvent>(PrefKeys.LATEST_DM_RELAY_LIST)
+                val latestNip65RelayList = parseEventOrNull<AdvertisedRelayListEvent>(PrefKeys.LATEST_NIP65_RELAY_LIST)
+                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 latestContactList =
-                    try {
-                        getString(PrefKeys.LATEST_CONTACT_LIST, null)?.let {
-                            if (it != "null") {
-                                println("Decoding Contact List: $it")
-                                Event.fromJson(it) as ContactListEvent?
+                        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
                             }
-                        }
-                    } catch (e: Throwable) {
-                        if (e is CancellationException) throw e
-                        Log.w(
-                            "LocalPreferences",
-                            "Error Decoding Contact List ${getString(PrefKeys.LATEST_CONTACT_LIST, null)}",
-                            e,
-                        )
-                        null
-                    }
+                        val filterSpam = getBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, true)
+                        val warnAboutReports = getBoolean(PrefKeys.WARN_ABOUT_REPORTS, true)
 
-                val latestDmRelayList =
-                    try {
-                        getString(PrefKeys.LATEST_DM_RELAY_LIST, null)?.let {
-                            if (it != "null") {
-                                println("Decoding DM Relay List: $it")
-                                Event.fromJson(it) as ChatMessageRelayListEvent?
-                            } else {
-                                null
-                            }
-                        }
-                    } catch (e: Throwable) {
-                        if (e is CancellationException) throw e
-                        Log.w(
-                            "LocalPreferences",
-                            "Error Decoding DM Relay List ${getString(PrefKeys.LATEST_DM_RELAY_LIST, null)}",
-                            e,
-                        )
-                        null
-                    }
+                        val dontTranslateFrom = getStringSet(PrefKeys.DONT_TRANSLATE_FROM, null) ?: setOf()
+                        val translateTo = getString(PrefKeys.TRANSLATE_TO, null) ?: Locale.getDefault().language
 
-                val latestNip65RelayList =
-                    try {
-                        getString(PrefKeys.LATEST_NIP65_RELAY_LIST, null)?.let {
-                            if (it != "null") {
-                                println("Decoding NIP65 Relay List: $it")
-                                Event.fromJson(it) as AdvertisedRelayListEvent?
-                            } else {
-                                null
-                            }
-                        }
-                    } catch (e: Throwable) {
-                        if (e is CancellationException) throw e
-                        Log.w(
-                            "LocalPreferences",
-                            "Error Decoding NIP65 Relay List ${getString(PrefKeys.LATEST_NIP65_RELAY_LIST, null)}",
-                            e,
+                        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,
+                                ),
                         )
-                        null
-                    }
-
-                val pendingAttestations =
-                    try {
-                        getString(PrefKeys.PENDING_ATTESTATIONS, null)?.let {
-                            println("Decoding Attestation List: " + it)
-                            if (it != null) {
-                                Event.mapper.readValue<Map<HexKey, String>>(it)
-                            } else {
-                                null
-                            }
-                        }
-                    } catch (e: Throwable) {
-                        if (e is CancellationException) throw e
-                        Log.w(
-                            "LocalPreferences",
-                            "Error Decoding Contact List ${getString(PrefKeys.PENDING_ATTESTATIONS, null)}",
-                            e,
-                        )
-                        null
-                    }
-
-                val languagePreferences =
-                    try {
-                        getString(PrefKeys.LANGUAGE_PREFS, null)?.let {
-                            Event.mapper.readValue<Map<String, String>?>(it)
-                        }
-                            ?: mapOf()
-                    } catch (e: Throwable) {
-                        if (e is CancellationException) throw e
-                        Log.w(
-                            "LocalPreferences",
-                            "Error Decoding Language Preferences ${getString(PrefKeys.LANGUAGE_PREFS, null)}",
-                            e,
-                        )
-                        e.printStackTrace()
-                        mapOf()
                     }
 
                 val hideDeleteRequestDialog = getBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, false)
                 val hideBlockAlertDialog = getBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, false)
                 val hideNIP17WarningDialog = getBoolean(PrefKeys.HIDE_NIP_17_WARNING_DIALOG, false)
                 val useProxy = getBoolean(PrefKeys.USE_PROXY, false)
-                val proxyPort = getInt(PrefKeys.PROXY_PORT, 9050)
-                val proxy = HttpClientManager.initProxy(useProxy, "127.0.0.1", proxyPort)
 
-                val showSensitiveContent =
-                    if (contains(PrefKeys.SHOW_SENSITIVE_CONTENT)) {
-                        getBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, false)
+                val torSettings =
+                    if (useProxy) {
+                        // old settings, means Orbot
+                        TorSettings(
+                            TorType.EXTERNAL,
+                            getInt(PrefKeys.PROXY_PORT, 9050),
+                            true,
+                            true,
+                            true,
+                            true,
+                            true,
+                            true,
+                            true,
+                            true,
+                            true,
+                            true,
+                            true,
+                        )
                     } else {
-                        null
+                        parseOrNull<TorSettings>(PrefKeys.TOR_SETTINGS) ?: TorSettings()
                     }
-                val filterSpam = getBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, true)
-                val warnAboutReports = getBoolean(PrefKeys.WARN_ABOUT_REPORTS, true)
 
                 val lastReadPerRoute =
-                    try {
-                        getString(PrefKeys.LAST_READ_PER_ROUTE, null)?.let {
-                            Event.mapper.readValue<Map<String, Long>?>(it)
-                        }
-                            ?: mapOf()
-                    } catch (e: Throwable) {
-                        if (e is CancellationException) throw e
-                        Log.w(
-                            "LocalPreferences",
-                            "Error Decoding Last Read per route ${getString(PrefKeys.LAST_READ_PER_ROUTE, null)}",
-                            e,
-                        )
-                        e.printStackTrace()
-                        mapOf()
-                    }
+                    parseOrNull<Map<String, Long>>(PrefKeys.LAST_READ_PER_ROUTE)?.mapValues {
+                        MutableStateFlow(it.value)
+                    } ?: mapOf()
 
                 val keyPair = KeyPair(privKey = privKey?.hexToByteArray(), pubKey = pubKey.hexToByteArray())
-                val signer =
-                    if (loginWithExternalSigner) {
-                        val packageName =
-                            getString(PrefKeys.SIGNER_PACKAGE_NAME, null) ?: "com.greenart7c3.nostrsigner"
-                        NostrSignerExternal(
-                            pubKey,
-                            ExternalSignerLauncher(pubKey.hexToByteArray().toNpub(), packageName),
-                        )
-                    } else {
-                        NostrSignerInternal(keyPair)
-                    }
-
                 val hasDonatedInVersion = getStringSet(PrefKeys.HAS_DONATED_IN_VERSION, null) ?: setOf()
 
-                val account =
-                    Account(
-                        keyPair = keyPair,
-                        signer = signer,
-                        localRelays = localRelays,
-                        localRelayServers = localRelayServers,
-                        dontTranslateFrom = dontTranslateFrom,
-                        languagePreferences = languagePreferences,
-                        translateTo = translateTo,
-                        zapAmountChoices = zapAmountChoices,
-                        reactionChoices = reactionChoices,
-                        defaultZapType = defaultZapType,
-                        defaultFileServer = defaultFileServer,
-                        defaultHomeFollowList = MutableStateFlow(defaultHomeFollowList),
-                        defaultStoriesFollowList = MutableStateFlow(defaultStoriesFollowList),
-                        defaultNotificationFollowList = MutableStateFlow(defaultNotificationFollowList),
-                        defaultDiscoveryFollowList = MutableStateFlow(defaultDiscoveryFollowList),
-                        zapPaymentRequest = zapPaymentRequestServer,
-                        hideDeleteRequestDialog = hideDeleteRequestDialog,
-                        hideBlockAlertDialog = hideBlockAlertDialog,
-                        hideNIP17WarningDialog = hideNIP17WarningDialog,
-                        backupContactList = latestContactList,
-                        backupNIP65RelayList = latestNip65RelayList,
-                        backupDMRelayList = latestDmRelayList,
-                        proxy = proxy,
-                        proxyPort = proxyPort,
-                        showSensitiveContent = MutableStateFlow(showSensitiveContent),
-                        warnAboutPostsWithReports = warnAboutReports,
-                        filterSpamFromStrangers = filterSpam,
-                        lastReadPerRoute = lastReadPerRoute,
-                        hasDonatedInVersion = hasDonatedInVersion,
-                        pendingAttestations = MutableStateFlow(pendingAttestations ?: emptyMap()),
-                    )
-
-                // Loads from DB
-                account.userProfile()
-
-                withContext(Dispatchers.Main) {
-                    // Loads Live Objects
-                    account.userProfile().live()
-                }
-
-                return@with account
+                return@with AccountSettings(
+                    keyPair = keyPair,
+                    transientAccount = false,
+                    externalSignerPackageName = externalSignerPackageName,
+                    localRelays = localRelays,
+                    localRelayServers = localRelayServers,
+                    defaultFileServer = defaultFileServer,
+                    defaultHomeFollowList = MutableStateFlow(defaultHomeFollowList),
+                    defaultStoriesFollowList = MutableStateFlow(defaultStoriesFollowList),
+                    defaultNotificationFollowList = MutableStateFlow(defaultNotificationFollowList),
+                    defaultDiscoveryFollowList = MutableStateFlow(defaultDiscoveryFollowList),
+                    zapPaymentRequest = zapPaymentRequestServer,
+                    hideDeleteRequestDialog = hideDeleteRequestDialog,
+                    hideBlockAlertDialog = hideBlockAlertDialog,
+                    hideNIP17WarningDialog = hideNIP17WarningDialog,
+                    backupUserMetadata = latestUserMetadata,
+                    backupContactList = latestContactList,
+                    backupNIP65RelayList = latestNip65RelayList,
+                    backupDMRelayList = latestDmRelayList,
+                    backupSearchRelayList = latestSearchRelayList,
+                    backupPrivateHomeRelayList = latestPrivateHomeRelayList,
+                    backupMuteList = latestMuteList,
+                    backupAppSpecificData = latestAppSpecificData,
+                    backupSyncedSettings = syncedSettings,
+                    torSettings = TorSettingsFlow.build(torSettings),
+                    lastReadPerRoute = MutableStateFlow(lastReadPerRoute),
+                    hasDonatedInVersion = MutableStateFlow(hasDonatedInVersion),
+                    pendingAttestations = MutableStateFlow(pendingAttestations),
+                )
             }
         }
     }
+
+    private inline fun <reified T> SharedPreferences.parseOrNull(key: String): T? {
+        val value = getString(key, null)
+        if (value.isNullOrEmpty() || value == "null") {
+            return null
+        }
+        return try {
+            if (T::class.java.isInstance(Event::class.java)) {
+                Event.fromJson(value) as T?
+            } else {
+                Event.mapper.readValue<T?>(value)
+            }
+        } catch (e: Throwable) {
+            if (e is CancellationException) throw e
+            Log.w("LocalPreferences", "Error Decoding $key from Preferences with value $value", e)
+            e.printStackTrace()
+            null
+        }
+    }
+
+    private inline fun <reified T> SharedPreferences.parseEventOrNull(key: String): T? {
+        val value = getString(key, null)
+        if (value.isNullOrEmpty() || value == "null") {
+            return null
+        }
+        return try {
+            Event.fromJson(value) as T?
+        } catch (e: Throwable) {
+            if (e is CancellationException) throw e
+            Log.w("LocalPreferences", "Error Decoding $key from Preferences with value $value", e)
+            e.printStackTrace()
+            null
+        }
+    }
 }

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,13 +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 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
@@ -46,28 +51,37 @@ 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.service.HttpClientManager
+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.NostrClient
 import com.vitorpamplona.quartz.encoders.bechToBytes
 import com.vitorpamplona.quartz.encoders.decodePublicKeyAsHexOrNull
 import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.events.OtsEvent
+import com.vitorpamplona.quartz.ots.OpenTimestamps
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 
 @Stable
-class ServiceManager {
-    private var isStarted: Boolean =
-        false // to not open amber in a loop trying to use auth relays and registering for notifications
+class ServiceManager(
+    val client: NostrClient,
+    val scope: CoroutineScope,
+) {
+    // 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 val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
     private var collectorJob: Job? = null
 
     private fun start(account: Account) {
@@ -75,69 +89,110 @@ 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
 
         // Resets Proxy Use
-        HttpClientManager.setDefaultProxy(account?.proxy)
-        HttpClientManager.setDefaultUserAgent("Amethyst/${BuildConfig.VERSION_NAME}")
-        LocalCache.antiSpam.active = account?.filterSpamFromStrangers ?: true
-        Coil.setImageLoader {
+        if (myAccount != null) {
+            when (myAccount.settings.torSettings.torType.value) {
+                TorType.INTERNAL -> {
+                    Log.d("TorManager", "Relays Service Connected ${TorManager.socksPort()}")
+                    HttpClientManager.setDefaultProxyOnPort(TorManager.socksPort())
+                }
+                TorType.EXTERNAL -> HttpClientManager.setDefaultProxyOnPort(myAccount.settings.torSettings.externalSocksPort.value)
+                else -> HttpClientManager.setDefaultProxy(null)
+            }
+
+            OtsEvent.otsInstance =
+                OpenTimestamps(
+                    OkHttpBlockstreamExplorer(myAccount::shouldUseTorForMoneyOperations),
+                    OkHttpCalendarBuilder(myAccount::shouldUseTorForMoneyOperations),
+                )
+        } else {
+            OtsEvent.otsInstance = OpenTimestamps(OkHttpBlockstreamExplorer { false }, OkHttpCalendarBuilder { false })
+
+            HttpClientManager.setDefaultProxy(null)
+        }
+
+        // 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())
-                } // .logger(DebugLogger())
-                .okHttpClient { HttpClientManager.getHttpClient() }
-                .precision(Precision.INEXACT)
-                .respectCacheHeaders(false)
+                    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())
+                    }
+                }.precision(Precision.INEXACT)
                 .build()
         }
 
         if (myAccount != null) {
-            val relaySet = myAccount.connectToRelays.value
-            Log.d("Relay", "Service Manager Connect Connecting ${relaySet.size}")
-            Client.reconnect(relaySet)
+            val relaySet = myAccount.connectToRelaysWithProxy.value
+            client.reconnect(relaySet)
 
             collectorJob?.cancel()
             collectorJob = null
             collectorJob =
                 scope.launch {
-                    myAccount.connectToRelaysFlow.collectLatest {
+                    myAccount.connectToRelaysWithProxy.collectLatest {
                         delay(500)
                         if (isStarted) {
-                            Client.reconnect(it, onlyIfChanged = true)
+                            client.reconnect(it, onlyIfChanged = true)
                         }
                     }
                 }
 
             // start services
             NostrAccountDataSource.account = myAccount
-            NostrAccountDataSource.otherAccounts =
-                LocalPreferences.allSavedAccounts().mapNotNull {
-                    try {
-                        it.npub.bechToBytes().toHexKey()
-                    } catch (e: Exception) {
-                        if (e is CancellationException) throw e
-                        null
-                    }
-                }
             NostrHomeDataSource.account = myAccount
             NostrChatroomListDataSource.account = myAccount
             NostrVideoDataSource.account = myAccount
             NostrDiscoveryDataSource.account = myAccount
 
+            NostrAccountDataSource.otherAccounts =
+                runBlocking {
+                    LocalPreferences.allSavedAccounts().mapNotNull {
+                        try {
+                            it.npub.bechToBytes().toHexKey()
+                        } catch (e: Exception) {
+                            if (e is CancellationException) throw e
+                            null
+                        }
+                    }
+                }
+
             // Notification Elements
             NostrHomeDataSource.start()
             NostrAccountDataSource.start()
@@ -180,7 +235,7 @@ class ServiceManager {
         NostrUserProfileDataSource.stopSync()
         NostrVideoDataSource.stopSync()
 
-        Client.reconnect(null)
+        client.reconnect(null)
         isStarted = false
     }
 
@@ -188,7 +243,7 @@ class ServiceManager {
         LocalCache.cleanObservers()
     }
 
-    fun trimMemory() {
+    suspend fun trimMemory() {
         LocalCache.cleanObservers()
 
         val accounts =

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

@@ -0,0 +1,521 @@
+/**
+ * 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.util.Log
+import androidx.compose.runtime.Stable
+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
+import com.vitorpamplona.ammolite.relays.RelaySetupInfo
+import com.vitorpamplona.quartz.crypto.KeyPair
+import com.vitorpamplona.quartz.encoders.HexKey
+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
+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 com.vitorpamplona.quartz.signers.ExternalSignerLauncher
+import com.vitorpamplona.quartz.signers.NostrSignerExternal
+import com.vitorpamplona.quartz.signers.NostrSignerInternal
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.update
+import java.util.Locale
+
+val DefaultChannels =
+    setOf(
+        // Anigma's Nostr
+        "25e5c82273a271cb1a840d0060391a0bf4965cafeb029d5ab55350b418953fbb",
+        // Amethyst's Group
+        "42224859763652914db53052103f0b744df79dfc4efef7e950fc0802fc3df3c5",
+    )
+
+val DefaultNIP65List =
+    listOf(
+        AdvertisedRelayListEvent.AdvertisedRelayInfo(RelayUrlFormatter.normalize("wss://nostr.mom/"), AdvertisedRelayListEvent.AdvertisedRelayType.BOTH),
+        AdvertisedRelayListEvent.AdvertisedRelayInfo(RelayUrlFormatter.normalize("wss://nos.lol/"), AdvertisedRelayListEvent.AdvertisedRelayType.BOTH),
+        AdvertisedRelayListEvent.AdvertisedRelayInfo(RelayUrlFormatter.normalize("wss://nostr.bitcoiner.social/"), AdvertisedRelayListEvent.AdvertisedRelayType.BOTH),
+    )
+
+val DefaultDMRelayList =
+    listOf(
+        RelayUrlFormatter.normalize("wss://auth.nostr1.com"),
+        RelayUrlFormatter.normalize("wss://relay.0xchat.com"),
+        RelayUrlFormatter.normalize("wss://nos.lol"),
+    )
+
+val DefaultSearchRelayList =
+    listOf(
+        RelayUrlFormatter.normalize("wss://relay.nostr.band"),
+        RelayUrlFormatter.normalize("wss://nostr.wine"),
+        RelayUrlFormatter.normalize("wss://relay.noswhere.com"),
+        RelayUrlFormatter.normalize("wss://search.nos.today"),
+    )
+
+// 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,
+    val transientAccount: Boolean = false,
+    var externalSignerPackageName: String? = null,
+    var localRelays: Set<RelaySetupInfo> = Constants.defaultRelays.toSet(),
+    var localRelayServers: Set<String> = setOf(),
+    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),
+    val defaultDiscoveryFollowList: MutableStateFlow<String> = MutableStateFlow(GLOBAL_FOLLOWS),
+    var zapPaymentRequest: Nip47WalletConnect.Nip47URI? = null,
+    var hideDeleteRequestDialog: Boolean = false,
+    var hideBlockAlertDialog: Boolean = false,
+    var hideNIP17WarningDialog: Boolean = false,
+    var backupUserMetadata: MetadataEvent? = null,
+    var backupContactList: ContactListEvent? = null,
+    var backupDMRelayList: ChatMessageRelayListEvent? = null,
+    var backupNIP65RelayList: AdvertisedRelayListEvent? = null,
+    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 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,
+    )
+
+    fun saveAccountSettings() {
+        saveable.update { AccountSettingsUpdater(this) }
+    }
+
+    fun isWriteable(): Boolean = keyPair.privKey != null || externalSignerPackageName != null
+
+    fun createSigner() =
+        if (keyPair.privKey != null) {
+            NostrSignerInternal(keyPair)
+        } else {
+            when (val packageName = externalSignerPackageName) {
+                null -> NostrSignerInternal(keyPair)
+                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)
+                }
+            }
+        }
+
+    // ---
+    // Zaps and Reactions
+    // ---
+
+    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>): Boolean {
+        if (syncedSettings.zaps.zapAmountChoices.value != newAmounts) {
+            syncedSettings.zaps.zapAmountChoices.tryEmit(newAmounts.toImmutableList())
+            saveAccountSettings()
+            return true
+        }
+        return false
+    }
+
+    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
+        }
+        return false
+    }
+
+    // ---
+    // file servers
+    // ---
+
+    fun changeDefaultFileServer(server: ServerName) {
+        if (defaultFileServer != server) {
+            defaultFileServer = server
+            saveAccountSettings()
+        }
+    }
+
+    // ---
+    // list names
+    // ---
+
+    fun changeDefaultHomeFollowList(name: String) {
+        if (defaultHomeFollowList.value != name) {
+            defaultHomeFollowList.tryEmit(name)
+            saveAccountSettings()
+        }
+    }
+
+    fun changeDefaultStoriesFollowList(name: String) {
+        if (defaultStoriesFollowList.value != name) {
+            defaultStoriesFollowList.tryEmit(name)
+            saveAccountSettings()
+        }
+    }
+
+    fun changeDefaultNotificationFollowList(name: String) {
+        if (defaultNotificationFollowList.value != name) {
+            defaultNotificationFollowList.tryEmit(name)
+            saveAccountSettings()
+        }
+    }
+
+    fun changeDefaultDiscoveryFollowList(name: String) {
+        if (defaultDiscoveryFollowList.value != name) {
+            defaultDiscoveryFollowList.tryEmit(name)
+            saveAccountSettings()
+        }
+    }
+
+    // ---
+    // proxy settings
+    // ---
+    fun setTorSettings(newTorSettings: TorSettings): Boolean {
+        if (torSettings.update(newTorSettings)) {
+            saveAccountSettings()
+            return true
+        } else {
+            return false
+        }
+    }
+
+    // ---
+    // language services
+    // ---
+    fun toggleDontTranslateFrom(languageCode: String) {
+        syncedSettings.languages.toggleDontTranslateFrom(languageCode)
+        saveAccountSettings()
+    }
+
+    fun translateToContains(languageCode: Locale) = syncedSettings.languages.translateTo.contains(languageCode.language)
+
+    fun updateTranslateTo(languageCode: Locale): Boolean {
+        if (syncedSettings.languages.updateTranslateTo(languageCode)) {
+            saveAccountSettings()
+            return true
+        }
+        return false
+    }
+
+    fun prefer(
+        source: String,
+        target: String,
+        preference: String,
+    ) {
+        syncedSettings.languages.prefer(source, target, preference)
+        saveAccountSettings()
+    }
+
+    fun preferenceBetween(
+        source: String,
+        target: String,
+    ): String? = syncedSettings.languages.preferenceBetween(source, target)
+
+    // ----
+    // Backup Lists
+    // ----
+
+    fun updateLocalRelayServers(servers: Set<String>) {
+        if (localRelayServers != servers) {
+            localRelayServers = servers
+            saveAccountSettings()
+        }
+    }
+
+    fun updateUserMetadata(newMetadata: MetadataEvent?) {
+        if (newMetadata == null) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupUserMetadata?.id != newMetadata.id) {
+            backupUserMetadata = newMetadata
+            saveAccountSettings()
+        }
+    }
+
+    fun updateContactListTo(newContactList: ContactListEvent?) {
+        if (newContactList == null || newContactList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupContactList?.id != newContactList.id) {
+            backupContactList = newContactList
+            saveAccountSettings()
+        }
+    }
+
+    fun updateDMRelayList(newDMRelayList: ChatMessageRelayListEvent?) {
+        if (newDMRelayList == null || newDMRelayList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupDMRelayList?.id != newDMRelayList.id) {
+            backupDMRelayList = newDMRelayList
+            saveAccountSettings()
+        }
+    }
+
+    fun updateNIP65RelayList(newNIP65RelayList: AdvertisedRelayListEvent?) {
+        if (newNIP65RelayList == null || newNIP65RelayList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupNIP65RelayList?.id != newNIP65RelayList.id) {
+            backupNIP65RelayList = newNIP65RelayList
+            saveAccountSettings()
+        }
+    }
+
+    fun updateSearchRelayList(newSearchRelayList: SearchRelayListEvent?) {
+        if (newSearchRelayList == null || newSearchRelayList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupSearchRelayList?.id != newSearchRelayList.id) {
+            backupSearchRelayList = newSearchRelayList
+            saveAccountSettings()
+        }
+    }
+
+    fun updatePrivateHomeRelayList(newPrivateHomeRelayList: PrivateOutboxRelayListEvent?) {
+        if (newPrivateHomeRelayList == null || newPrivateHomeRelayList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupPrivateHomeRelayList?.id != newPrivateHomeRelayList.id) {
+            backupPrivateHomeRelayList = newPrivateHomeRelayList
+            saveAccountSettings()
+        }
+    }
+
+    fun updateMuteList(newMuteList: MuteListEvent?) {
+        if (newMuteList == null || newMuteList.tags.isEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupMuteList?.id != newMuteList.id) {
+            backupMuteList = newMuteList
+            saveAccountSettings()
+        }
+    }
+
+    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
+    // ----
+
+    fun setHideDeleteRequestDialog() {
+        if (!hideDeleteRequestDialog) {
+            hideDeleteRequestDialog = true
+            saveAccountSettings()
+        }
+    }
+
+    fun setHideNIP17WarningDialog() {
+        if (!hideNIP17WarningDialog) {
+            hideNIP17WarningDialog = true
+            saveAccountSettings()
+        }
+    }
+
+    fun setHideBlockAlertDialog() {
+        if (!hideBlockAlertDialog) {
+            hideBlockAlertDialog = true
+            saveAccountSettings()
+        }
+    }
+
+    // ---
+    // donations
+    // ---
+
+    fun hasDonatedInVersion(versionName: String) = hasDonatedInVersion.value.contains(versionName)
+
+    fun observeDonatedInVersion(versionName: String) =
+        hasDonatedInVersion
+            .map {
+                it.contains(versionName)
+            }
+
+    fun markDonatedInThisVersion(versionName: String): Boolean {
+        if (!hasDonatedInVersion.value.contains(versionName)) {
+            hasDonatedInVersion.update {
+                it + versionName
+            }
+            saveAccountSettings()
+            return true
+        }
+        return false
+    }
+
+    // ----
+    // last read flows
+    // ----
+
+    fun getLastReadFlow(route: String): StateFlow<Long> = lastReadPerRoute.value[route] ?: addLastRead(route, 0)
+
+    private fun addLastRead(
+        route: String,
+        timestampInSecs: Long,
+    ): MutableStateFlow<Long> =
+        MutableStateFlow<Long>(timestampInSecs).also { newFlow ->
+            lastReadPerRoute.update { it + Pair(route, newFlow) }
+            saveAccountSettings()
+        }
+
+    fun markAsRead(
+        route: String,
+        timestampInSecs: Long,
+    ): Boolean {
+        val lastTime = lastReadPerRoute.value[route]
+        return if (lastTime == null) {
+            addLastRead(route, timestampInSecs)
+            true
+        } else if (timestampInSecs > lastTime.value) {
+            lastTime.tryEmit(timestampInSecs)
+            saveAccountSettings()
+            true
+        } else {
+            false
+        }
+    }
+
+    // ----
+    // local relays
+    // ----
+
+    fun updateLocalRelays(newLocalRelays: Set<RelaySetupInfo>) {
+        if (!localRelays.equals(newLocalRelays)) {
+            localRelays = newLocalRelays
+            saveAccountSettings()
+        }
+    }
+
+    // ---
+    // attestations
+    // ---
+
+    fun addPendingAttestation(
+        id: HexKey,
+        stamp: String,
+    ) {
+        val current = pendingAttestations.value.get(id)
+        if (current == null) {
+            pendingAttestations.update {
+                it + Pair(id, stamp)
+            }
+            saveAccountSettings()
+        } else {
+            if (current != stamp) {
+                pendingAttestations.update {
+                    it + Pair(id, stamp)
+                }
+                saveAccountSettings()
+            }
+        }
+    }
+
+    // ---
+    // filters
+    // ---
+    fun updateShowSensitiveContent(show: Boolean?): Boolean {
+        if (syncedSettings.security.updateShowSensitiveContent(show)) {
+            saveAccountSettings()
+            return true
+        }
+        return false
+    }
+
+    fun updateOptOutOptions(
+        warnReports: Boolean,
+        filterSpam: Boolean,
+    ): Boolean =
+        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/AntiSpamFilter.kt

@@ -22,16 +22,14 @@ package com.vitorpamplona.amethyst.model
 
 import android.util.Log
 import android.util.LruCache
-import androidx.compose.runtime.Stable
-import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.ammolite.relays.BundledUpdate
+import com.vitorpamplona.amethyst.ui.note.njumpLink
 import com.vitorpamplona.ammolite.relays.Relay
 import com.vitorpamplona.ammolite.relays.RelayStats
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.encoders.Nip19Bech32
 import com.vitorpamplona.quartz.events.Event
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
 
 data class Spammer(
     val pubkeyHex: HexKey,
@@ -82,10 +80,10 @@ class AntiSpamFilter {
             logOffender(hash, event)
 
             if (relay != null) {
-                RelayStats.newSpam(relay.url, "https://njump.me/${Nip19Bech32.createNEvent(event.id, event.pubKey, event.kind, relay.url)}")
+                RelayStats.newSpam(relay.url, njumpLink(Nip19Bech32.createNEvent(event.id, event.pubKey, event.kind, relay.url)))
             }
 
-            liveSpam.invalidateData()
+            flowSpam.tryEmit(AntiSpamState(this))
 
             return true
         }
@@ -108,27 +106,7 @@ class AntiSpamFilter {
         }
     }
 
-    val liveSpam: AntiSpamLiveData = AntiSpamLiveData(this)
-}
-
-@Stable
-class AntiSpamLiveData(
-    val cache: AntiSpamFilter,
-) : LiveData<AntiSpamState>(AntiSpamState(cache)) {
-    // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.IO)
-
-    fun invalidateData() {
-        checkNotInMainThread()
-
-        bundler.invalidate {
-            checkNotInMainThread()
-
-            if (hasActiveObservers()) {
-                postValue(AntiSpamState(cache))
-            }
-        }
-    }
+    val flowSpam = MutableStateFlow<AntiSpamState>(AntiSpamState(this))
 }
 
 class AntiSpamState(

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/Chatroom.kt

@@ -22,7 +22,9 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.ui.dal.DefaultFeedOrder
 import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.events.PrivateDmEvent
 import com.vitorpamplona.quartz.utils.TimeUtils
 
 @Stable
@@ -75,7 +77,7 @@ class Chatroom {
     fun senderIntersects(keySet: Set<HexKey>): Boolean = authors.any { it.pubkeyHex in keySet }
 
     fun pruneMessagesToTheLatestOnly(): Set<Note> {
-        val sorted = roomMessages.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
+        val sorted = roomMessages.sortedWith(DefaultFeedOrder)
 
         val toKeep =
             if ((sorted.firstOrNull()?.createdAt() ?: 0) > TimeUtils.oneWeekAgo()) {
@@ -84,7 +86,7 @@ class Chatroom {
             } else {
                 // Old messages, keep the last one.
                 sorted.take(1).toSet()
-            } + sorted.filter { it.liveSet?.isInUse() ?: false }
+            } + sorted.filter { it.liveSet?.isInUse() ?: false } + sorted.filter { it.event !is PrivateDmEvent }
 
         val toRemove = roomMessages.minus(toKeep)
         roomMessages = toKeep

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
@@ -47,21 +48,20 @@ import com.vitorpamplona.amethyst.commons.richtext.HashTagSegment
 import com.vitorpamplona.amethyst.commons.richtext.RegularTextSegment
 import com.vitorpamplona.amethyst.ui.components.HashTag
 import com.vitorpamplona.amethyst.ui.components.RenderRegular
+import com.vitorpamplona.amethyst.ui.navigation.EmptyNav
 import com.vitorpamplona.amethyst.ui.theme.ThemeComparisonColumn
 import com.vitorpamplona.quartz.events.EmptyTagList
 
 @Preview
 @Composable
-fun RenderHashTagIcons() {
-    val nav: (String) -> Unit = {}
-
+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) {
-                is HashTagSegment -> HashTag(word, nav)
+                is HashTagSegment -> HashTag(word, EmptyNav)
                 is RegularTextSegment -> Text(word.segmentText)
             }
         }
@@ -84,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
     }
 
@@ -101,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/MiniFhir.kt

@@ -21,6 +21,7 @@
 package com.vitorpamplona.amethyst.model
 
 import android.util.Log
+import androidx.compose.runtime.Stable
 import com.fasterxml.jackson.annotation.JsonSubTypes
 import com.fasterxml.jackson.annotation.JsonTypeInfo
 import com.fasterxml.jackson.databind.DeserializationFeature
@@ -40,11 +41,13 @@ import kotlinx.collections.immutable.toImmutableMap
     JsonSubTypes.Type(value = Bundle::class, name = "Bundle"),
     JsonSubTypes.Type(value = VisionPrescription::class, name = "VisionPrescription"),
 )
+@Stable
 open class Resource(
     var resourceType: String? = null,
     var id: String = "",
 )
 
+@Stable
 class Practitioner(
     resourceType: String? = null,
     id: String = "",
@@ -53,6 +56,7 @@ class Practitioner(
     var gender: String? = null,
 ) : Resource(resourceType, id)
 
+@Stable
 class Patient(
     resourceType: String? = null,
     id: String = "",
@@ -61,6 +65,7 @@ class Patient(
     var gender: String? = null,
 ) : Resource(resourceType, id)
 
+@Stable
 class HumanName(
     var use: String? = null,
     var family: String? = null,
@@ -69,6 +74,7 @@ class HumanName(
     fun assembleName(): String = given.joinToString(" ") + " " + family
 }
 
+@Stable
 class Bundle(
     resourceType: String? = null,
     id: String = "",
@@ -77,6 +83,7 @@ class Bundle(
     var entry: List<Resource> = arrayListOf(),
 ) : Resource(resourceType, id)
 
+@Stable
 class VisionPrescription(
     resourceType: String? = null,
     id: String = "",
@@ -87,15 +94,31 @@ class VisionPrescription(
     var dateWritten: String? = null,
     var prescriber: Reference? = Reference(),
     var lensSpecification: List<LensSpecification> = arrayListOf(),
-) : Resource(resourceType, id)
+) : Resource(resourceType, id) {
+    fun glasses() = lensSpecification.filter { it.product == "lens" }
 
+    fun contacts() = lensSpecification.filter { it.product == "contacts" }
+
+    fun glassesRightEyes() = lensSpecification.filter { it.product == "lens" && it.eye == "right" }
+
+    fun glassesLeftEyes() = lensSpecification.filter { it.product == "lens" && it.eye == "left" }
+
+    fun contactsRightEyes() = lensSpecification.filter { it.product == "contacts" && it.eye == "right" }
+
+    fun contactsLeftEyes() = lensSpecification.filter { it.product == "contacts" && it.eye == "left" }
+}
+
+@Stable
 class LensSpecification(
+    var product: String? = null,
     var eye: String? = null,
     var sphere: Double? = null,
     var cylinder: Double? = null,
     var axis: Double? = null,
+    var pd: Double? = null,
+    var interAdd: Double? = null,
     var add: Double? = null,
-    var prism: List<Prism> = arrayListOf(),
+    var prism: Prism? = null,
     // contact lenses
     var power: Double? = null,
     var backCurve: Double? = null,
@@ -105,6 +128,7 @@ class LensSpecification(
     var note: String? = null,
 )
 
+@Stable
 class Prism(
     var amount: Double? = null,
     var base: String? = null,

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

@@ -25,22 +25,23 @@ 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
 import com.vitorpamplona.ammolite.relays.BundledUpdate
-import com.vitorpamplona.ammolite.relays.EOSETime
 import com.vitorpamplona.ammolite.relays.Relay
 import com.vitorpamplona.ammolite.relays.RelayBriefInfoCache
+import com.vitorpamplona.ammolite.relays.filters.EOSETime
 import com.vitorpamplona.quartz.encoders.ATag
 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
@@ -67,19 +68,20 @@ import com.vitorpamplona.quartz.utils.TimeUtils
 import com.vitorpamplona.quartz.utils.containsAny
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.coroutines.withTimeoutOrNull
+import kotlinx.coroutines.flow.flatMapLatest
 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()
 
@@ -94,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>,
@@ -139,13 +141,11 @@ open class Note(
     var relays = listOf<RelayBriefInfoCache.RelayBriefInfo>()
         private set
 
-    var associatedNote: Note? = null
-
     var lastReactionsDownloadTime: Map<String, EOSETime> = emptyMap()
 
     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,
         )
     }
@@ -766,10 +833,16 @@ open class Note(
             }
         }
 
-        if (thisEvent is BaseTextNoteEvent) {
-            if (accountChoices.hiddenWordsCase.isNotEmpty() && thisEvent.content.containsAny(accountChoices.hiddenWordsCase)) {
+        if (accountChoices.hiddenWordsCase.isNotEmpty()) {
+            if (thisEvent is BaseTextNoteEvent && thisEvent.content.containsAny(accountChoices.hiddenWordsCase)) {
                 return true
             }
+
+            if (thisEvent.anyHashTag { it.containsAny(accountChoices.hiddenWordsCase) }) {
+                return true
+            }
+
+            if (author?.containsAny(accountChoices.hiddenWordsCase) == true) return true
         }
 
         return false
@@ -850,6 +923,15 @@ class NoteFlowSet(
     val reports = NoteBundledRefresherFlow(u)
     val relays = NoteBundledRefresherFlow(u)
 
+    @OptIn(ExperimentalCoroutinesApi::class)
+    fun author() =
+        metadata.stateFlow.flatMapLatest {
+            it.note.author
+                ?.flow()
+                ?.metadata
+                ?.stateFlow ?: MutableStateFlow(null)
+        }
+
     fun isInUse(): Boolean =
         metadata.stateFlow.subscriptionCount.value > 0 ||
             reports.stateFlow.subscriptionCount.value > 0 ||

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/UrlCachedPreviewer.kt

@@ -22,9 +22,7 @@ package com.vitorpamplona.amethyst.model
 
 import android.util.LruCache
 import androidx.compose.runtime.Stable
-import com.vitorpamplona.amethyst.service.previews.BahaUrlPreview
-import com.vitorpamplona.amethyst.service.previews.IUrlPreviewCallback
-import com.vitorpamplona.amethyst.service.previews.UrlInfoItem
+import com.vitorpamplona.amethyst.service.previews.UrlPreview
 import com.vitorpamplona.amethyst.ui.components.UrlPreviewState
 
 @Stable
@@ -34,6 +32,7 @@ object UrlCachedPreviewer {
 
     suspend fun previewInfo(
         url: String,
+        forceProxy: Boolean,
         onReady: suspend (UrlPreviewState) -> Unit,
     ) {
         cache[url]?.let {
@@ -41,39 +40,37 @@ object UrlCachedPreviewer {
             return
         }
 
-        BahaUrlPreview(
+        UrlPreview().fetch(
             url,
-            object : IUrlPreviewCallback {
-                override suspend fun onComplete(urlInfo: UrlInfoItem) {
-                    cache[url]?.let {
-                        if (it is UrlPreviewState.Loaded || it is UrlPreviewState.Empty) {
-                            onReady(it)
-                            return
-                        }
-                    }
-
-                    val state =
-                        if (urlInfo.fetchComplete() && urlInfo.url == url) {
-                            UrlPreviewState.Loaded(urlInfo)
-                        } else {
-                            UrlPreviewState.Empty
-                        }
-
-                    cache.put(url, state)
-                    onReady(state)
-                }
-
-                override suspend fun onFailed(throwable: Throwable) {
-                    cache[url]?.let {
+            forceProxy,
+            onComplete = { urlInfo ->
+                cache[url]?.let {
+                    if (it is UrlPreviewState.Loaded || it is UrlPreviewState.Empty) {
                         onReady(it)
-                        return
+                        return@fetch
+                    }
+                }
+
+                val state =
+                    if (urlInfo.fetchComplete() && urlInfo.url == url) {
+                        UrlPreviewState.Loaded(urlInfo)
+                    } else {
+                        UrlPreviewState.Empty
                     }
 
-                    val state = UrlPreviewState.Error(throwable.message ?: "Error Loading url preview")
-                    cache.put(url, state)
-                    onReady(state)
-                }
+                cache.put(url, state)
+                onReady(state)
             },
-        ).fetchUrlPreview()
+            onFailed = { throwable ->
+                cache[url]?.let {
+                    onReady(it)
+                    return@fetch
+                }
+
+                val state = UrlPreviewState.Error(throwable.message ?: "Error Loading url preview")
+                cache.put(url, state)
+                onReady(state)
+            },
+        )
     }
 }

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

@@ -29,8 +29,8 @@ import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import com.vitorpamplona.ammolite.relays.BundledUpdate
-import com.vitorpamplona.ammolite.relays.EOSETime
 import com.vitorpamplona.ammolite.relays.Relay
+import com.vitorpamplona.ammolite.relays.filters.EOSETime
 import com.vitorpamplona.quartz.encoders.Hex
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.encoders.Lud06
@@ -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
@@ -331,57 +333,20 @@ class User(
             }
         }
 
+        flowSet?.metadata?.invalidateData()
         liveSet?.innerMetadata?.invalidateData()
     }
 
     fun isFollowing(user: User): Boolean = latestContactList?.isTaggedUser(user.pubkeyHex) ?: false
 
-    fun isFollowingHashtag(tag: String): Boolean = latestContactList?.isTaggedHash(tag) ?: false
+    fun isFollowingHashtag(tag: String) = latestContactList?.isTaggedHash(tag) ?: false
 
-    fun isFollowingHashtagCached(tag: String): Boolean {
-        return latestContactList?.verifiedFollowTagSet?.let {
-            return tag.lowercase() in it
-        }
-            ?: false
-    }
-
-    fun isFollowingGeohashCached(geoTag: String): Boolean {
-        return latestContactList?.verifiedFollowGeohashSet?.let {
-            return geoTag.lowercase() in it
-        }
-            ?: false
-    }
-
-    fun isFollowingCached(user: User): Boolean {
-        return latestContactList?.verifiedFollowKeySet?.let {
-            return user.pubkeyHex in it
-        }
-            ?: false
-    }
-
-    fun isFollowingCached(userHex: String): Boolean {
-        return latestContactList?.verifiedFollowKeySet?.let {
-            return userHex in it
-        }
-            ?: false
-    }
+    fun isFollowingGeohash(geoTag: String) = latestContactList?.isTaggedGeoHash(geoTag) ?: false
 
     fun transientFollowCount(): Int? = latestContactList?.unverifiedFollowKeySet()?.size
 
     suspend fun transientFollowerCount(): Int = LocalCache.users.count { _, it -> it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
 
-    fun cachedFollowingKeySet(): Set<HexKey> = latestContactList?.verifiedFollowKeySet ?: emptySet()
-
-    fun cachedFollowingTagSet(): Set<String> = latestContactList?.verifiedFollowTagSet ?: emptySet()
-
-    fun cachedFollowingGeohashSet(): Set<HexKey> = latestContactList?.verifiedFollowGeohashSet ?: emptySet()
-
-    fun cachedFollowingCommunitiesSet(): Set<HexKey> = latestContactList?.verifiedFollowCommunitySet ?: emptySet()
-
-    fun cachedFollowCount(): Int? = latestContactList?.verifiedFollowKeySet?.size
-
-    suspend fun cachedFollowerCount(): Int = LocalCache.users.count { _, it -> it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
-
     fun hasSentMessagesTo(key: ChatroomKey?): Boolean {
         val messagesToUser = privateChatrooms[key] ?: return false
 
@@ -397,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
@@ -462,12 +461,17 @@ class UserFlowSet(
     u: User,
 ) {
     // Observers line up here.
+    val metadata = UserBundledRefresherFlow(u)
     val follows = UserBundledRefresherFlow(u)
     val relays = UserBundledRefresherFlow(u)
 
-    fun isInUse(): Boolean = relays.stateFlow.subscriptionCount.value > 0 || follows.stateFlow.subscriptionCount.value > 0
+    fun isInUse(): Boolean =
+        metadata.stateFlow.subscriptionCount.value > 0 ||
+            relays.stateFlow.subscriptionCount.value > 0 ||
+            follows.stateFlow.subscriptionCount.value > 0
 
     fun destroy() {
+        metadata.destroy()
         relays.destroy()
         follows.destroy()
     }
@@ -488,7 +492,6 @@ class UserLiveSet(
     val innerRelayInfo = UserBundledRefresherLiveData(u)
     val innerZaps = UserBundledRefresherLiveData(u)
     val innerBookmarks = UserBundledRefresherLiveData(u)
-    val innerGallery = UserBundledRefresherLiveData(u)
     val innerStatuses = UserBundledRefresherLiveData(u)
 
     // UI Observers line up here.
@@ -501,7 +504,6 @@ class UserLiveSet(
     val relayInfo = innerRelayInfo.map { it }
     val zaps = innerZaps.map { it }
     val bookmarks = innerBookmarks.map { it }
-    val gallery = innerGallery.map { it }
     val statuses = innerStatuses.map { it }
 
     val profilePictureChanges = innerMetadata.map { it.user.profilePicture() }.distinctUntilChanged()
@@ -520,7 +522,6 @@ class UserLiveSet(
             relayInfo.hasObservers() ||
             zaps.hasObservers() ||
             bookmarks.hasObservers() ||
-            gallery.hasObservers() ||
             statuses.hasObservers() ||
             profilePictureChanges.hasObservers() ||
             nip05Changes.hasObservers() ||
@@ -536,7 +537,6 @@ class UserLiveSet(
         innerRelayInfo.destroy()
         innerZaps.destroy()
         innerBookmarks.destroy()
-        innerGallery.destroy()
         innerStatuses.destroy()
     }
 }

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

@@ -0,0 +1,103 @@
+/**
+ * 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.content.Context
+import android.graphics.BitmapFactory
+import androidx.compose.runtime.Stable
+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
+class Base64Fetcher(
+    private val options: Options,
+    private val data: Uri,
+) : Fetcher {
+    override suspend fun fetch(): FetchResult {
+        checkNotInMainThread()
+
+        val matcher = base64contentPattern.matcher(data.toString())
+
+        if (matcher.find()) {
+            val base64String = matcher.group(2)
+
+            val byteArray = Base64.getDecoder().decode(base64String)
+            val bitmap = BitmapFactory.decodeByteArray(byteArray, 0, byteArray.size) ?: throw Exception("Unable to load base64 $base64String")
+
+            return ImageFetchResult(
+                image = bitmap.asImage(true),
+                isSampled = false,
+                dataSource = DataSource.MEMORY,
+            )
+        } else {
+            throw Exception("Unable to load base64 $data")
+        }
+    }
+
+    object Factory : Fetcher.Factory<Uri> {
+        override fun create(
+            data: Uri,
+            options: Options,
+            imageLoader: ImageLoader,
+        ): 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
+            }
+    }
+}
+
+object Base64Requester {
+    fun imageRequest(
+        context: Context,
+        message: String,
+    ): ImageRequest =
+        ImageRequest
+            .Builder(context)
+            .data(message)
+            .fetcherFactory(Base64Fetcher.Factory)
+            .build()
+}

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/CachedRichTextParser.kt

@@ -26,21 +26,33 @@ import com.vitorpamplona.amethyst.commons.richtext.RichTextViewerState
 import com.vitorpamplona.quartz.events.ImmutableListOfLists
 
 object CachedRichTextParser {
-    val richTextCache = LruCache<String, RichTextViewerState>(50)
+    private val richTextCache = LruCache<Int, RichTextViewerState>(50)
 
-    fun getCached(content: String): RichTextViewerState? = richTextCache[content]
+    private fun hashCodeCache(
+        content: String,
+        tags: ImmutableListOfLists<String>,
+        callbackUri: String?,
+    ): Int {
+        var result = content.hashCode()
+        result = 31 * result + tags.lists.hashCode()
+        if (callbackUri != null) {
+            result = 31 * result + callbackUri.hashCode()
+        }
+        return result
+    }
 
     fun parseText(
         content: String,
         tags: ImmutableListOfLists<String>,
         callbackUri: String? = null,
     ): RichTextViewerState {
-        val cached = richTextCache[content]
+        val key = hashCodeCache(content, tags, callbackUri)
+        val cached = richTextCache[key]
         return if (cached != null) {
             cached
         } else {
             val newUrls = RichTextParser().parseText(content, tags, callbackUri)
-            richTextCache.put(content, newUrls)
+            richTextCache.put(key, newUrls)
             newUrls
         }
     }

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

@@ -23,14 +23,22 @@ package com.vitorpamplona.amethyst.service
 import android.content.Context
 import android.util.LruCache
 import androidx.compose.runtime.Immutable
-import com.fasterxml.jackson.databind.JsonNode
 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
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.cbor.ByteString
+import kotlinx.serialization.cbor.Cbor
+import kotlinx.serialization.decodeFromByteArray
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -42,16 +50,26 @@ data class CashuToken(
     val token: String,
     val mint: String,
     val totalAmount: Long,
-    val proofs: JsonNode,
+    val proofs: List<Proof>,
+)
+
+@Serializable
+@Immutable
+class Proof(
+    val amount: Int,
+    val id: String,
+    val secret: String,
+    val C: String,
 )
 
 object CachedCashuProcessor {
-    val cashuCache = LruCache<String, GenericLoadable<CashuToken>>(20)
+    val cashuCache = LruCache<String, GenericLoadable<ImmutableList<CashuToken>>>(20)
 
-    fun cached(token: String): GenericLoadable<CashuToken> = cashuCache[token] ?: GenericLoadable.Loading()
+    fun cached(token: String): GenericLoadable<ImmutableList<CashuToken>> = cashuCache[token] ?: GenericLoadable.Loading()
 
-    fun parse(token: String): GenericLoadable<CashuToken> {
+    fun parse(token: String): GenericLoadable<ImmutableList<CashuToken>> {
         if (cashuCache[token] !is GenericLoadable.Loaded) {
+            checkNotInMainThread()
             val newCachuData = CashuProcessor().parse(token)
 
             cashuCache.put(token, newCachuData)
@@ -62,31 +80,145 @@ object CachedCashuProcessor {
 }
 
 class CashuProcessor {
-    fun parse(cashuToken: String): GenericLoadable<CashuToken> {
+    @Serializable
+    class V3Token(
+        val unit: String?, // unit
+        val memo: String?, // memo
+        val token: List<V3T>?,
+    )
+
+    @Serializable
+    class V3T(
+        val mint: String,
+        val proofs: List<Proof>,
+    )
+
+    fun parse(cashuToken: String): GenericLoadable<ImmutableList<CashuToken>> {
+        checkNotInMainThread()
+
+        if (cashuToken.startsWith("cashuA")) {
+            return parseCashuA(cashuToken)
+        }
+
+        if (cashuToken.startsWith("cashuB")) {
+            return parseCashuB(cashuToken)
+        }
+
+        return GenericLoadable.Error("Could not parse this cashu token")
+    }
+
+    fun parseCashuA(cashuToken: String): GenericLoadable<ImmutableList<CashuToken>> {
         checkNotInMainThread()
 
         try {
             val base64token = cashuToken.replace("cashuA", "")
-            val cashu = jacksonObjectMapper().readTree(String(Base64.getDecoder().decode(base64token)))
-            val token = cashu.get("token").get(0)
-            val proofs = token.get("proofs")
-            val mint = token.get("mint").asText()
+            val cashu = jacksonObjectMapper().readValue<V3Token>(String(Base64.getDecoder().decode(base64token)))
 
-            var totalAmount = 0L
-            for (proof in proofs) {
-                totalAmount += proof.get("amount").asLong()
+            if (cashu.token == null) {
+                return GenericLoadable.Error("No token found")
             }
 
-            return GenericLoadable.Loaded(CashuToken(cashuToken, mint, totalAmount, proofs))
+            val converted =
+                cashu.token.map { token ->
+                    val proofs = token.proofs
+                    val mint = token.mint
+
+                    var totalAmount = 0L
+                    for (proof in proofs) {
+                        totalAmount += proof.amount
+                    }
+
+                    CashuToken(cashuToken, mint, totalAmount, proofs)
+                }
+
+            return GenericLoadable.Loaded(converted.toImmutableList())
         } catch (e: Exception) {
             if (e is CancellationException) throw e
-            return GenericLoadable.Error<CashuToken>("Could not parse this cashu token")
+            return GenericLoadable.Error("Could not parse this cashu token")
+        }
+    }
+
+    @Serializable
+    class V4Token(
+        val m: String, // mint
+        val u: String, // unit
+        val d: String? = null, // memo
+        val t: Array<V4T>?,
+    )
+
+    @Serializable
+    class V4T(
+        @ByteString
+        val i: ByteArray, // identifier
+        val p: Array<V4Proof>,
+    )
+
+    @Serializable
+    class V4Proof(
+        val a: Int, // amount
+        val s: String, // secret
+        @ByteString
+        val c: ByteArray, // signature
+        val d: V4DleqProof? = null, // no idea what this is
+        val w: String? = null, // witness
+    )
+
+    @Serializable
+    class V4DleqProof(
+        @ByteString
+        val e: ByteArray,
+        @ByteString
+        val s: ByteArray,
+        @ByteString
+        val r: ByteArray,
+    )
+
+    @OptIn(ExperimentalSerializationApi::class)
+    fun parseCashuB(cashuToken: String): GenericLoadable<ImmutableList<CashuToken>> {
+        checkNotInMainThread()
+
+        try {
+            val base64token = cashuToken.replace("cashuB", "")
+
+            val parser = Cbor { ignoreUnknownKeys = true }
+
+            val v4Token = parser.decodeFromByteArray<V4Token>(Base64.getUrlDecoder().decode(base64token))
+
+            val v4proofs = v4Token.t ?: return GenericLoadable.Error("No token found")
+
+            val converted =
+                v4proofs.map { id ->
+                    val proofs =
+                        id.p.map {
+                            Proof(
+                                it.a,
+                                id.i.toHexKey(),
+                                it.s,
+                                it.c.toHexKey(),
+                            )
+                        }
+                    val mint = v4Token.m
+
+                    var totalAmount = 0L
+                    for (proof in proofs) {
+                        totalAmount += proof.amount
+                    }
+
+                    CashuToken(cashuToken, mint, totalAmount, proofs)
+                }
+
+            return GenericLoadable.Loaded(converted.toImmutableList())
+        } catch (e: Exception) {
+            e.printStackTrace()
+            if (e is CancellationException) throw e
+            return GenericLoadable.Error("Could not parse this cashu token")
         }
     }
 
     suspend fun melt(
         token: CashuToken,
         lud16: String,
+        forceProxy: (url: String) -> Boolean,
         onSuccess: (String, String) -> Unit,
         onError: (String, String) -> Unit,
         context: Context,
@@ -100,10 +232,12 @@ class CashuProcessor {
                     // Make invoice and leave room for fees
                     milliSats = token.totalAmount * 1000,
                     message = "Calculate Fees for Cashu",
+                    forceProxy = forceProxy,
                     onSuccess = { baseInvoice ->
                         feeCalculator(
                             token.mint,
                             baseInvoice,
+                            forceProxy = forceProxy,
                             onSuccess = { fees ->
                                 LightningAddressResolver()
                                     .lnAddressInvoice(
@@ -111,8 +245,9 @@ class CashuProcessor {
                                         // Make invoice and leave room for fees
                                         milliSats = (token.totalAmount - fees) * 1000,
                                         message = "Redeem Cashu",
+                                        forceProxy = forceProxy,
                                         onSuccess = { invoice ->
-                                            meltInvoice(token, invoice, fees, onSuccess, onError, context)
+                                            meltInvoice(token, invoice, fees, forceProxy, onSuccess, onError, context)
                                         },
                                         onProgress = {},
                                         onError = onError,
@@ -133,6 +268,7 @@ class CashuProcessor {
     fun feeCalculator(
         mintAddress: String,
         invoice: String,
+        forceProxy: (String) -> Boolean,
         onSuccess: (Int) -> Unit,
         onError: (String, String) -> Unit,
         context: Context,
@@ -140,8 +276,8 @@ class CashuProcessor {
         checkNotInMainThread()
 
         try {
-            val client = HttpClientManager.getHttpClient()
             val url = "$mintAddress/checkfees" // Melt cashu tokens at Mint
+            val client = HttpClientManager.getHttpClient(forceProxy(url))
 
             val factory = Event.mapper.nodeFactory
 
@@ -198,18 +334,33 @@ class CashuProcessor {
         token: CashuToken,
         invoice: String,
         fees: Int,
+        forceProxy: (String) -> Boolean,
         onSuccess: (String, String) -> Unit,
         onError: (String, String) -> Unit,
         context: Context,
     ) {
         try {
-            val client = HttpClientManager.getHttpClient()
             val url = token.mint + "/melt" // Melt cashu tokens at Mint
+            val client = HttpClientManager.getHttpClient(forceProxy(url))
 
             val factory = Event.mapper.nodeFactory
 
             val jsonObject = factory.objectNode()
-            jsonObject.put("proofs", token.proofs)
+
+            jsonObject.replace(
+                "proofs",
+                factory.arrayNode(token.proofs.size).apply {
+                    token.proofs.forEach {
+                        addObject().apply {
+                            put("amount", it.amount)
+                            put("id", it.id)
+                            put("secret", it.secret)
+                            put("C", it.C)
+                        }
+                    }
+                },
+            )
+
             jsonObject.put("pr", invoice)
 
             val mediaType = "application/json; charset=utf-8".toMediaType()

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
@@ -44,6 +44,7 @@ class Nip05NostrAddressVerifier {
 
     suspend fun fetchNip05Json(
         nip05: String,
+        forceProxy: (String) -> Boolean,
         onSuccess: suspend (String) -> Unit,
         onError: (String) -> Unit,
     ) = withContext(Dispatchers.IO) {
@@ -65,7 +66,7 @@ class Nip05NostrAddressVerifier {
                     .build()
             // Fetchers MUST ignore any HTTP redirects given by the /.well-known/nostr.json endpoint.
             HttpClientManager
-                .getHttpClient()
+                .getHttpClient(forceProxy(url))
                 .newBuilder()
                 .followRedirects(false)
                 .build()
@@ -90,6 +91,7 @@ class Nip05NostrAddressVerifier {
 
     suspend fun verifyNip05(
         nip05: String,
+        forceProxy: (String) -> Boolean,
         onSuccess: suspend (String) -> Unit,
         onError: (String) -> Unit,
     ) {
@@ -100,6 +102,7 @@ class Nip05NostrAddressVerifier {
 
         fetchNip05Json(
             nip05,
+            forceProxy,
             onSuccess = {
                 checkNotInMainThread()
 
@@ -126,7 +129,7 @@ class Nip05NostrAddressVerifier {
                 val hexKey = nip05url?.get("names")?.get(user)?.asText()
 
                 if (hexKey == null) {
-                    onError("Username not found in the NIP05 JSON")
+                    onError("Username not found in the NIP05 JSON [$nip05]")
                 } else {
                     onSuccess(hexKey)
                 }

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
@@ -60,6 +60,7 @@ object Nip11CachedRetriever {
 
     suspend fun loadRelayInfo(
         dirtyUrl: String,
+        forceProxy: Boolean,
         onInfo: (Nip11RelayInformation) -> Unit,
         onError: (String, Nip11Retriever.ErrorCode, String?) -> Unit,
     ) {
@@ -74,23 +75,24 @@ object Nip11CachedRetriever {
                 if (TimeUtils.now() - doc.time < TimeUtils.ONE_MINUTE) {
                     // just wait.
                 } else {
-                    retrieve(url, dirtyUrl, onInfo, onError)
+                    retrieve(url, dirtyUrl, forceProxy, onInfo, onError)
                 }
             } else if (doc is RetrieveResultError) {
                 if (TimeUtils.now() - doc.time < TimeUtils.ONE_HOUR) {
                     onError(dirtyUrl, doc.error, null)
                 } else {
-                    retrieve(url, dirtyUrl, onInfo, onError)
+                    retrieve(url, dirtyUrl, forceProxy, onInfo, onError)
                 }
             }
         } else {
-            retrieve(url, dirtyUrl, onInfo, onError)
+            retrieve(url, dirtyUrl, forceProxy, onInfo, onError)
         }
     }
 
     private suspend fun retrieve(
         url: String,
         dirtyUrl: String,
+        forceProxy: Boolean,
         onInfo: (Nip11RelayInformation) -> Unit,
         onError: (String, Nip11Retriever.ErrorCode, String?) -> Unit,
     ) {
@@ -98,6 +100,7 @@ object Nip11CachedRetriever {
         retriever.loadRelayInfo(
             url = url,
             dirtyUrl = dirtyUrl,
+            forceProxy = forceProxy,
             onInfo = {
                 checkNotInMainThread()
                 relayInformationDocumentCache.put(url, RetrieveResultSuccess(it))
@@ -123,6 +126,7 @@ class Nip11Retriever {
     suspend fun loadRelayInfo(
         url: String,
         dirtyUrl: String,
+        forceProxy: Boolean,
         onInfo: (Nip11RelayInformation) -> Unit,
         onError: (String, ErrorCode, String?) -> Unit,
     ) {
@@ -136,7 +140,7 @@ class Nip11Retriever {
                     .build()
 
             HttpClientManager
-                .getHttpClientForUrl(dirtyUrl)
+                .getHttpClient(forceProxy)
                 .newCall(request)
                 .enqueue(
                     object : Callback {

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

@@ -25,22 +25,24 @@ 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.EOSETime
 import com.vitorpamplona.ammolite.relays.EVENT_FINDER_TYPES
-import com.vitorpamplona.ammolite.relays.Filter
 import com.vitorpamplona.ammolite.relays.Relay
 import com.vitorpamplona.ammolite.relays.TypedFilter
+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
@@ -77,44 +81,25 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
     val latestEOSEs = EOSEAccount()
     val hasLoadedTheBasics = mutableMapOf<User, Boolean>()
 
-    fun createAccountContactListFilter(): TypedFilter =
-        TypedFilter(
-            types = COMMON_FEED_TYPES,
-            filter =
-                Filter(
-                    kinds = listOf(ContactListEvent.KIND),
-                    authors = listOf(account.userProfile().pubkeyHex),
-                    limit = 1,
-                ),
-        )
-
     fun createAccountMetadataFilter(): TypedFilter =
         TypedFilter(
             types = COMMON_FEED_TYPES,
             filter =
-                Filter(
-                    kinds = listOf(MetadataEvent.KIND),
-                    authors = listOf(account.userProfile().pubkeyHex),
-                    limit = 1,
-                ),
-        )
-
-    fun createAccountRelayListFilter(): TypedFilter =
-        TypedFilter(
-            types = COMMON_FEED_TYPES,
-            filter =
-                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,
                 ),
         )
 
@@ -124,7 +109,7 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
         return TypedFilter(
             types = EVENT_FINDER_TYPES,
             filter =
-                Filter(
+                SincePerRelayFilter(
                     kinds =
                         listOf(
                             MetadataEvent.KIND,
@@ -133,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,
                 ),
         )
     }
@@ -146,24 +132,36 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
         TypedFilter(
             types = COMMON_FEED_TYPES,
             filter =
-                Filter(
+                SincePerRelayFilter(
                     kinds = listOf(BookmarkListEvent.KIND, PeopleListEvent.KIND, MuteListEvent.KIND, BadgeProfilesEvent.KIND, EmojiPackSelectionEvent.KIND),
                     authors = listOf(account.userProfile().pubkeyHex),
                     limit = 100,
                 ),
         )
 
+    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,
             filter =
-                Filter(
+                SincePerRelayFilter(
                     kinds = listOf(DraftEvent.KIND, ReportEvent.KIND),
                     authors = listOf(account.userProfile().pubkeyHex),
                     since =
                         latestEOSEs.users[account.userProfile()]
                             ?.followList
-                            ?.get(account.defaultNotificationFollowList.value)
+                            ?.get(account.settings.defaultNotificationFollowList.value)
                             ?.relayList,
                 ),
         )
@@ -172,24 +170,38 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
         TypedFilter(
             types = COMMON_FEED_TYPES,
             filter =
-                Filter(
+                SincePerRelayFilter(
                     authors = listOf(account.userProfile().pubkeyHex),
                     limit = 400,
                 ),
         )
 
     fun createNotificationFilter(): TypedFilter {
-        val since =
+        var since =
             latestEOSEs.users[account.userProfile()]
                 ?.followList
-                ?.get(account.defaultNotificationFollowList.value)
+                ?.get(account.settings.defaultNotificationFollowList.value)
                 ?.relayList
-                ?: account.connectToRelays.value.associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
+                ?.toMutableMap()
+
+        if (since == null) {
+            since =
+                account.connectToRelays.value
+                    .associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
+                    .toMutableMap()
+        } else {
+            account.connectToRelays.value.forEach {
+                val eose = since.get(it.url)
+                if (eose == null) {
+                    since.put(it.url, EOSETime(TimeUtils.oneWeekAgo()))
+                }
+            }
+        }
 
         return TypedFilter(
             types = COMMON_FEED_TYPES,
             filter =
-                Filter(
+                SincePerRelayFilter(
                     kinds =
                         listOf(
                             TextNoteEvent.KIND,
@@ -214,7 +226,7 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
         val since =
             latestEOSEs.users[account.userProfile()]
                 ?.followList
-                ?.get(account.defaultNotificationFollowList.value)
+                ?.get(account.settings.defaultNotificationFollowList.value)
                 ?.relayList
                 ?: account.connectToRelays.value.associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
                 ?: account.convertLocalRelays().associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
@@ -222,16 +234,19 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
         return TypedFilter(
             types = COMMON_FEED_TYPES,
             filter =
-                Filter(
+                SincePerRelayFilter(
                     kinds =
                         listOf(
                             GitReplyEvent.KIND,
                             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,
@@ -244,7 +259,7 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
         TypedFilter(
             types = COMMON_FEED_TYPES,
             filter =
-                Filter(
+                SincePerRelayFilter(
                     kinds = listOf(GiftWrapEvent.KIND),
                     tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
                     since =
@@ -263,7 +278,7 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
             if (hasLoadedTheBasics[account.userProfile()] != null) {
                 latestEOSEs.addOrUpdate(
                     account.userProfile(),
-                    account.defaultNotificationFollowList.value,
+                    account.settings.defaultNotificationFollowList.value,
                     relayUrl,
                     time,
                 )
@@ -284,99 +299,121 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
     override fun consume(
         event: Event,
         relay: Relay,
+    ) {
+        if (LocalCache.justVerify(event)) {
+            consumeAlreadyVerified(event, relay)
+        }
+    }
+
+    fun consumeAlreadyVerified(
+        event: Event,
+        relay: Relay,
     ) {
         checkNotInMainThread()
 
-        if (LocalCache.justVerify(event)) {
-            when (event) {
-                is PrivateOutboxRelayListEvent -> {
+        when (event) {
+            is PrivateOutboxRelayListEvent -> {
+                val note = LocalCache.getAddressableNoteIfExists(event.addressTag())
+                val noteEvent = note?.event
+                if (noteEvent == null || event.createdAt > noteEvent.createdAt()) {
+                    event.privateTags(account.signer) {
+                        LocalCache.justConsume(event, relay)
+                    }
+                }
+            }
+
+            is DraftEvent -> {
+                // Avoid decrypting over and over again if the event already exist.
+
+                if (!event.isDeleted()) {
                     val note = LocalCache.getAddressableNoteIfExists(event.addressTag())
                     val noteEvent = note?.event
-                    if (noteEvent == null || event.createdAt > noteEvent.createdAt()) {
-                        event.privateTags(account.signer) {
-                            LocalCache.justConsume(event, relay)
-                        }
-                    }
-                }
-
-                is DraftEvent -> {
-                    // Avoid decrypting over and over again if the event already exist.
-
-                    if (!event.isDeleted()) {
-                        val note = LocalCache.getAddressableNoteIfExists(event.addressTag())
-                        val noteEvent = note?.event
-                        if (noteEvent != null) {
-                            if (event.createdAt > noteEvent.createdAt() || relay.brief !in note.relays) {
-                                LocalCache.consume(event, relay)
-                            }
-                        } else {
-                            // decrypts
-                            event.cachedDraft(account.signer) {}
-
-                            LocalCache.justConsume(event, relay)
-                        }
-                    }
-                }
-
-                is GiftWrapEvent -> {
-                    // Avoid decrypting over and over again if the event already exist.
-                    val note = LocalCache.getNoteIfExists(event.id)
-                    val noteEvent = note?.event as? GiftWrapEvent
                     if (noteEvent != null) {
-                        if (relay.brief !in note.relays) {
-                            noteEvent.cachedGift(account.signer) {
-                                LocalCache.justConsume(noteEvent, relay)
-                                this.consume(it, relay)
-                            }
+                        if (event.createdAt > noteEvent.createdAt() || relay.brief !in note.relays) {
+                            LocalCache.consume(event, relay)
                         }
                     } else {
-                        // new event
-                        event.cachedGift(account.signer) {
-                            LocalCache.justConsume(event, relay)
-                            this.consume(it, relay)
-                        }
-                    }
-                }
-
-                is SealedGossipEvent -> {
-                    // Avoid decrypting over and over again if the event already exist.
-                    val note = LocalCache.getNoteIfExists(event.id)
-                    val noteEvent = note?.event as? SealedGossipEvent
-                    if (noteEvent != null) {
-                        if (relay.brief !in note.relays) {
-                            // adds the relay to seal and inner chat
-                            noteEvent.cachedGossip(account.signer) {
-                                LocalCache.consume(noteEvent, relay)
-                                LocalCache.justConsume(it, relay)
-                            }
-                        }
-                    } else {
-                        // new event
-                        event.cachedGossip(account.signer) {
-                            LocalCache.justConsume(event, relay)
-                            LocalCache.justConsume(it, relay)
-                        }
-                    }
-                }
-
-                is LnZapEvent -> {
-                    // Avoid decrypting over and over again if the event already exist.
-                    val note = LocalCache.getNoteIfExists(event.id)
-                    if (note?.event == null) {
-                        event.zapRequest?.let {
-                            if (it.isPrivateZap()) {
-                                it.decryptPrivateZap(account.signer) {}
-                            }
-                        }
+                        // decrypts
+                        event.cachedDraft(account.signer) {}
 
                         LocalCache.justConsume(event, relay)
                     }
                 }
+            }
+
+            is GiftWrapEvent -> {
+                // Avoid decrypting over and over again if the event already exist.
+                val note = LocalCache.getNoteIfExists(event.id)
+                val noteEvent = note?.event as? GiftWrapEvent
+                if (noteEvent != null) {
+                    if (relay.brief !in note.relays) {
+                        LocalCache.justConsume(noteEvent, relay)
+
+                        noteEvent.innerEventId?.let {
+                            (LocalCache.getNoteIfExists(it)?.event as? Event)?.let {
+                                this.consumeAlreadyVerified(it, relay)
+                            }
+                        } ?: run {
+                            event.unwrap(account.signer) {
+                                this.consume(it, relay)
+                                noteEvent.innerEventId = it.id
+                            }
+                        }
+                    }
+                } else {
+                    // new event
+                    event.unwrap(account.signer) {
+                        LocalCache.justConsume(event, relay)
+                        this.consume(it, relay)
+                    }
+                }
+            }
+
+            is SealedGossipEvent -> {
+                // Avoid decrypting over and over again if the event already exist.
+                val note = LocalCache.getNoteIfExists(event.id)
+                val noteEvent = note?.event as? SealedGossipEvent
+                if (noteEvent != null) {
+                    if (relay.brief !in note.relays) {
+                        LocalCache.justConsume(noteEvent, relay)
+
+                        noteEvent.innerEventId?.let {
+                            (LocalCache.getNoteIfExists(it)?.event as? Event)?.let {
+                                LocalCache.justConsume(it, relay)
+                            }
+                        } ?: run {
+                            event.unseal(account.signer) {
+                                LocalCache.justConsume(it, relay)
+                                noteEvent.innerEventId = it.id
+                            }
+                        }
+                    }
+                } else {
+                    // new event
+                    event.unseal(account.signer) {
+                        LocalCache.justConsume(event, relay)
+                        LocalCache.justConsume(it, relay)
+                    }
+                }
+            }
+
+            is LnZapEvent -> {
+                // Avoid decrypting over and over again if the event already exist.
+                val note = LocalCache.getNoteIfExists(event.id)
+                if (note?.event == null) {
+                    event.zapRequest?.let {
+                        if (it.isPrivateZap()) {
+                            it.decryptPrivateZap(account.signer) {}
+                        }
+                    }
 
-                else -> {
                     LocalCache.justConsume(event, relay)
                 }
             }
+
+            else -> {
+                LocalCache.justConsume(event, relay)
+            }
         }
     }
 
@@ -394,16 +431,30 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
     }
 
     private fun markInnerAsSeenOnRelay(
-        noteEvent: EventInterface,
+        newNoteEvent: EventInterface,
         relay: Relay,
     ) {
-        LocalCache.getNoteIfExists(noteEvent.id())?.addRelay(relay)
+        markInnerAsSeenOnRelay(newNoteEvent.id(), relay)
+    }
 
-        if (noteEvent is GiftWrapEvent) {
-            noteEvent.cachedGift(account.signer) { gift -> markInnerAsSeenOnRelay(gift, relay) }
-        } else if (noteEvent is SealedGossipEvent) {
-            noteEvent.cachedGossip(account.signer) { rumor ->
-                markInnerAsSeenOnRelay(rumor, relay)
+    private fun markInnerAsSeenOnRelay(
+        eventId: HexKey,
+        relay: Relay,
+    ) {
+        val note = LocalCache.getNoteIfExists(eventId)
+
+        if (note != null) {
+            note.addRelay(relay)
+
+            val noteEvent = note.event
+            if (noteEvent is GiftWrapEvent) {
+                noteEvent.innerEventId?.let {
+                    markInnerAsSeenOnRelay(it, relay)
+                }
+            } else if (noteEvent is SealedGossipEvent) {
+                noteEvent.innerEventId?.let {
+                    markInnerAsSeenOnRelay(it, relay)
+                }
             }
         }
     }
@@ -414,8 +465,7 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
             accountChannel.typedFilters =
                 listOfNotNull(
                     createAccountMetadataFilter(),
-                    createAccountContactListFilter(),
-                    createAccountRelayListFilter(),
+                    createAccountSettings2Filter(),
                     createNotificationFilter(),
                     createNotificationFilter2(),
                     createGiftWrapsToMeFilter(),
@@ -429,9 +479,8 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
             accountChannel.typedFilters =
                 listOf(
                     createAccountMetadataFilter(),
-                    createAccountContactListFilter(),
-                    createAccountRelayListFilter(),
                     createAccountSettingsFilter(),
+                    createAccountSettings2Filter(),
                 ).ifEmpty { null }
         }
 
@@ -442,12 +491,7 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
         super.auth(relay, challenge)
 
         if (this::account.isInitialized) {
-            account.createAuthEvent(relay, challenge) {
-                Client.send(
-                    it,
-                    relay.url,
-                )
-            }
+            account.sendAuthEvent(relay, challenge)
         }
     }
 

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

@@ -25,8 +25,8 @@ import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LiveActivitiesChannel
 import com.vitorpamplona.amethyst.model.PublicChatChannel
 import com.vitorpamplona.ammolite.relays.FeedType
-import com.vitorpamplona.ammolite.relays.Filter
 import com.vitorpamplona.ammolite.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
 
@@ -58,7 +58,7 @@ object NostrChannelDataSource : AmethystNostrDataSource("ChatroomFeed") {
             return TypedFilter(
                 types = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS, FeedType.GLOBAL, FeedType.SEARCH),
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         kinds = listOf(ChannelMessageEvent.KIND),
                         authors = listOf(myAccount.userProfile().pubkeyHex),
                         limit = 50,
@@ -71,7 +71,7 @@ object NostrChannelDataSource : AmethystNostrDataSource("ChatroomFeed") {
             return TypedFilter(
                 types = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS, FeedType.GLOBAL, FeedType.SEARCH),
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         kinds = listOf(LiveActivitiesChatMessageEvent.KIND),
                         authors = listOf(myAccount.userProfile().pubkeyHex),
                         limit = 50,
@@ -86,7 +86,7 @@ object NostrChannelDataSource : AmethystNostrDataSource("ChatroomFeed") {
             return TypedFilter(
                 types = setOf(FeedType.PUBLIC_CHATS),
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         kinds = listOf(ChannelMessageEvent.KIND),
                         tags = mapOf("e" to listOfNotNull(channel?.idHex)),
                         limit = 200,
@@ -96,7 +96,7 @@ object NostrChannelDataSource : AmethystNostrDataSource("ChatroomFeed") {
             return TypedFilter(
                 types = setOf(FeedType.PUBLIC_CHATS),
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         kinds = listOf(LiveActivitiesChatMessageEvent.KIND),
                         tags = mapOf("a" to listOfNotNull(channel?.idHex)),
                         limit = 200,

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

@@ -23,8 +23,8 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.ammolite.relays.FeedType
-import com.vitorpamplona.ammolite.relays.Filter
 import com.vitorpamplona.ammolite.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
 import com.vitorpamplona.quartz.events.ChatroomKey
 import com.vitorpamplona.quartz.events.PrivateDmEvent
 
@@ -50,7 +50,7 @@ object NostrChatroomDataSource : AmethystNostrDataSource("ChatroomFeed") {
             TypedFilter(
                 types = setOf(FeedType.PRIVATE_DMS),
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         kinds = listOf(PrivateDmEvent.KIND),
                         authors = myPeer.users.toList(),
                         tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
@@ -73,7 +73,7 @@ object NostrChatroomDataSource : AmethystNostrDataSource("ChatroomFeed") {
             TypedFilter(
                 types = setOf(FeedType.PRIVATE_DMS),
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         kinds = listOf(PrivateDmEvent.KIND),
                         authors = listOf(account.userProfile().pubkeyHex),
                         tags = mapOf("p" to myPeer.users.map { it }),

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

@@ -24,8 +24,8 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.ammolite.relays.EVENT_FINDER_TYPES
 import com.vitorpamplona.ammolite.relays.FeedType
-import com.vitorpamplona.ammolite.relays.Filter
 import com.vitorpamplona.ammolite.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
 import com.vitorpamplona.quartz.events.ChannelCreateEvent
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.ChannelMetadataEvent
@@ -41,7 +41,7 @@ object NostrChatroomListDataSource : AmethystNostrDataSource("MailBoxFeed") {
         TypedFilter(
             types = setOf(FeedType.PRIVATE_DMS),
             filter =
-                Filter(
+                SincePerRelayFilter(
                     kinds = listOf(PrivateDmEvent.KIND),
                     tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
                     since =
@@ -56,7 +56,7 @@ object NostrChatroomListDataSource : AmethystNostrDataSource("MailBoxFeed") {
         TypedFilter(
             types = setOf(FeedType.PRIVATE_DMS),
             filter =
-                Filter(
+                SincePerRelayFilter(
                     kinds = listOf(PrivateDmEvent.KIND),
                     authors = listOf(account.userProfile().pubkeyHex),
                     since =
@@ -71,7 +71,7 @@ object NostrChatroomListDataSource : AmethystNostrDataSource("MailBoxFeed") {
         TypedFilter(
             types = setOf(FeedType.PUBLIC_CHATS),
             filter =
-                Filter(
+                SincePerRelayFilter(
                     kinds = listOf(ChannelCreateEvent.KIND, ChannelMetadataEvent.KIND),
                     authors = listOf(account.userProfile().pubkeyHex),
                     since =
@@ -91,7 +91,7 @@ object NostrChatroomListDataSource : AmethystNostrDataSource("MailBoxFeed") {
             // Metadata comes from any relay
             types = EVENT_FINDER_TYPES,
             filter =
-                Filter(
+                SincePerRelayFilter(
                     kinds = listOf(ChannelCreateEvent.KIND),
                     ids = followingEvents.toList(),
                     since =
@@ -113,7 +113,7 @@ object NostrChatroomListDataSource : AmethystNostrDataSource("MailBoxFeed") {
                 // Metadata comes from any relay
                 types = EVENT_FINDER_TYPES,
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         kinds = listOf(ChannelMetadataEvent.KIND),
                         tags = mapOf("e" to listOf(it)),
                         limit = 1,
@@ -131,7 +131,7 @@ object NostrChatroomListDataSource : AmethystNostrDataSource("MailBoxFeed") {
             TypedFilter(
                 types = setOf(FeedType.PUBLIC_CHATS),
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         kinds = listOf(ChannelMessageEvent.KIND),
                         tags = mapOf("e" to listOf(it)),
                         since =

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

@@ -22,8 +22,8 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
-import com.vitorpamplona.ammolite.relays.Filter
 import com.vitorpamplona.ammolite.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
 import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
 import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
 
@@ -35,15 +35,19 @@ object NostrCommunityDataSource : AmethystNostrDataSource("SingleCommunityFeed")
 
         val community = myCommunityToWatch.event as? CommunityDefinitionEvent ?: return null
 
+        val authors =
+            community
+                .moderators()
+                .map { it.key }
+                .plus(listOfNotNull(myCommunityToWatch.author?.pubkeyHex))
+
+        if (authors.isEmpty()) return null
+
         return TypedFilter(
             types = COMMON_FEED_TYPES,
             filter =
-                Filter(
-                    authors =
-                        community
-                            .moderators()
-                            .map { it.key }
-                            .plus(listOfNotNull(myCommunityToWatch.author?.pubkeyHex)),
+                SincePerRelayFilter(
+                    authors = authors,
                     tags =
                         mapOf(
                             "a" to listOf(myCommunityToWatch.address.toTag()),

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

@@ -24,8 +24,9 @@ import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.ammolite.relays.FeedType
-import com.vitorpamplona.ammolite.relays.Filter
 import com.vitorpamplona.ammolite.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.filters.SinceAuthorPerRelayFilter
+import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
 import com.vitorpamplona.quartz.events.AppDefinitionEvent
 import com.vitorpamplona.quartz.events.ChannelCreateEvent
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
@@ -66,31 +67,30 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
     }
 
     fun createMarketplaceFilter(): List<TypedFilter> {
-        val follows =
-            account.liveDiscoveryFollowLists.value
-                ?.users
-                ?.toList()
+        val follows = account.liveDiscoveryListAuthorsPerRelay.value?.ifEmpty { null }
         val hashToLoad =
             account.liveDiscoveryFollowLists.value
                 ?.hashtags
                 ?.toList()
+                ?.ifEmpty { null }
         val geohashToLoad =
             account.liveDiscoveryFollowLists.value
                 ?.geotags
                 ?.toList()
+                ?.ifEmpty { null }
 
         return listOfNotNull(
             TypedFilter(
-                types = setOf(FeedType.GLOBAL),
+                types = if (follows == null) setOf(FeedType.GLOBAL) else setOf(FeedType.FOLLOWS),
                 filter =
-                    Filter(
+                    SinceAuthorPerRelayFilter(
                         authors = follows,
                         kinds = listOf(ClassifiedsEvent.KIND),
                         limit = 300,
                         since =
                             latestEOSEs.users[account.userProfile()]
                                 ?.followList
-                                ?.get(account.defaultDiscoveryFollowList.value)
+                                ?.get(account.settings.defaultDiscoveryFollowList.value)
                                 ?.relayList,
                     ),
             ),
@@ -98,7 +98,7 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
                 TypedFilter(
                     types = setOf(FeedType.GLOBAL),
                     filter =
-                        Filter(
+                        SincePerRelayFilter(
                             kinds = listOf(ClassifiedsEvent.KIND),
                             tags =
                                 mapOf(
@@ -111,7 +111,7 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
                             since =
                                 latestEOSEs.users[account.userProfile()]
                                     ?.followList
-                                    ?.get(account.defaultDiscoveryFollowList.value)
+                                    ?.get(account.settings.defaultDiscoveryFollowList.value)
                                     ?.relayList,
                         ),
                 )
@@ -120,20 +120,17 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
                 TypedFilter(
                     types = setOf(FeedType.GLOBAL),
                     filter =
-                        Filter(
+                        SincePerRelayFilter(
                             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 =
                                 latestEOSEs.users[account.userProfile()]
                                     ?.followList
-                                    ?.get(account.defaultDiscoveryFollowList.value)
+                                    ?.get(account.settings.defaultDiscoveryFollowList.value)
                                     ?.relayList,
                         ),
                 )
@@ -146,14 +143,14 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
             TypedFilter(
                 types = setOf(FeedType.GLOBAL),
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         kinds = listOf(AppDefinitionEvent.KIND),
                         limit = 300,
                         tags = mapOf("k" to kTags),
                         since =
                             latestEOSEs.users[account.userProfile()]
                                 ?.followList
-                                ?.get(account.defaultDiscoveryFollowList.value)
+                                ?.get(account.settings.defaultDiscoveryFollowList.value)
                                 ?.relayList,
                     ),
             ),
@@ -162,36 +159,39 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
     fun createLiveStreamFilter(): List<TypedFilter> {
         val follows =
             account.liveDiscoveryFollowLists.value
-                ?.users
+                ?.authors
                 ?.toList()
+                ?.ifEmpty { null }
+
+        val followsRelays = account.liveDiscoveryListAuthorsPerRelay.value
 
         return listOfNotNull(
             TypedFilter(
-                types = setOf(FeedType.GLOBAL),
+                types = if (follows == null) setOf(FeedType.GLOBAL) else setOf(FeedType.FOLLOWS),
                 filter =
-                    Filter(
-                        authors = follows,
+                    SinceAuthorPerRelayFilter(
+                        authors = followsRelays,
                         kinds = listOf(LiveActivitiesChatMessageEvent.KIND, LiveActivitiesEvent.KIND),
                         limit = 300,
                         since =
                             latestEOSEs.users[account.userProfile()]
                                 ?.followList
-                                ?.get(account.defaultDiscoveryFollowList.value)
+                                ?.get(account.settings.defaultDiscoveryFollowList.value)
                                 ?.relayList,
                     ),
             ),
             follows?.let {
                 TypedFilter(
-                    types = setOf(FeedType.GLOBAL),
+                    types = setOf(FeedType.FOLLOWS),
                     filter =
-                        Filter(
+                        SincePerRelayFilter(
                             tags = mapOf("p" to it),
                             kinds = listOf(LiveActivitiesEvent.KIND),
                             limit = 100,
                             since =
                                 latestEOSEs.users[account.userProfile()]
                                     ?.followList
-                                    ?.get(account.defaultDiscoveryFollowList.value)
+                                    ?.get(account.settings.defaultDiscoveryFollowList.value)
                                     ?.relayList,
                         ),
                 )
@@ -200,24 +200,21 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
     }
 
     fun createPublicChatFilter(): List<TypedFilter> {
-        val follows =
-            account.liveDiscoveryFollowLists.value
-                ?.users
-                ?.toList()
+        val follows = account.liveDiscoveryListAuthorsPerRelay.value?.ifEmpty { null }
         val followChats = account.selectedChatsFollowList().toList()
 
         return listOfNotNull(
             TypedFilter(
                 types = setOf(FeedType.PUBLIC_CHATS),
                 filter =
-                    Filter(
+                    SinceAuthorPerRelayFilter(
                         authors = follows,
                         kinds = listOf(ChannelMessageEvent.KIND),
                         limit = 500,
                         since =
                             latestEOSEs.users[account.userProfile()]
                                 ?.followList
-                                ?.get(account.defaultDiscoveryFollowList.value)
+                                ?.get(account.settings.defaultDiscoveryFollowList.value)
                                 ?.relayList,
                     ),
             ),
@@ -225,14 +222,14 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
                 TypedFilter(
                     types = setOf(FeedType.PUBLIC_CHATS),
                     filter =
-                        Filter(
+                        SincePerRelayFilter(
                             ids = followChats,
                             kinds = listOf(ChannelCreateEvent.KIND, ChannelMessageEvent.KIND),
                             limit = 300,
                             since =
                                 latestEOSEs.users[account.userProfile()]
                                     ?.followList
-                                    ?.get(account.defaultDiscoveryFollowList.value)
+                                    ?.get(account.settings.defaultDiscoveryFollowList.value)
                                     ?.relayList,
                         ),
                 )
@@ -243,22 +240,19 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
     }
 
     fun createCommunitiesFilter(): TypedFilter {
-        val follows =
-            account.liveDiscoveryFollowLists.value
-                ?.users
-                ?.toList()
+        val follows = account.liveDiscoveryListAuthorsPerRelay.value
 
         return TypedFilter(
-            types = setOf(FeedType.GLOBAL),
+            types = if (follows == null) setOf(FeedType.GLOBAL) else setOf(FeedType.FOLLOWS),
             filter =
-                Filter(
+                SinceAuthorPerRelayFilter(
                     authors = follows,
                     kinds = listOf(CommunityDefinitionEvent.KIND, CommunityPostApprovalEvent.KIND),
                     limit = 300,
                     since =
                         latestEOSEs.users[account.userProfile()]
                             ?.followList
-                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.get(account.settings.defaultDiscoveryFollowList.value)
                             ?.relayList,
                 ),
         )
@@ -275,7 +269,7 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
         return TypedFilter(
             types = setOf(FeedType.GLOBAL),
             filter =
-                Filter(
+                SincePerRelayFilter(
                     kinds = listOf(LiveActivitiesChatMessageEvent.KIND, LiveActivitiesEvent.KIND),
                     tags =
                         mapOf(
@@ -288,7 +282,7 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
                     since =
                         latestEOSEs.users[account.userProfile()]
                             ?.followList
-                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.get(account.settings.defaultDiscoveryFollowList.value)
                             ?.relayList,
                 ),
         )
@@ -305,20 +299,14 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
         return TypedFilter(
             types = setOf(FeedType.GLOBAL),
             filter =
-                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()]
                             ?.followList
-                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.get(account.settings.defaultDiscoveryFollowList.value)
                             ?.relayList,
                 ),
         )
@@ -335,7 +323,7 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
         return TypedFilter(
             types = setOf(FeedType.PUBLIC_CHATS),
             filter =
-                Filter(
+                SincePerRelayFilter(
                     kinds =
                         listOf(ChannelCreateEvent.KIND, ChannelMetadataEvent.KIND, ChannelMessageEvent.KIND),
                     tags =
@@ -349,7 +337,7 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
                     since =
                         latestEOSEs.users[account.userProfile()]
                             ?.followList
-                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.get(account.settings.defaultDiscoveryFollowList.value)
                             ?.relayList,
                 ),
         )
@@ -366,21 +354,16 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
         return TypedFilter(
             types = setOf(FeedType.PUBLIC_CHATS),
             filter =
-                Filter(
+                SincePerRelayFilter(
                     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()]
                             ?.followList
-                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.get(account.settings.defaultDiscoveryFollowList.value)
                             ?.relayList,
                 ),
         )
@@ -397,7 +380,7 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
         return TypedFilter(
             types = setOf(FeedType.GLOBAL),
             filter =
-                Filter(
+                SincePerRelayFilter(
                     kinds = listOf(CommunityDefinitionEvent.KIND, CommunityPostApprovalEvent.KIND),
                     tags =
                         mapOf(
@@ -410,7 +393,7 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
                     since =
                         latestEOSEs.users[account.userProfile()]
                             ?.followList
-                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.get(account.settings.defaultDiscoveryFollowList.value)
                             ?.relayList,
                 ),
         )
@@ -427,20 +410,14 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
         return TypedFilter(
             types = setOf(FeedType.GLOBAL),
             filter =
-                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()]
                             ?.followList
-                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.get(account.settings.defaultDiscoveryFollowList.value)
                             ?.relayList,
                 ),
         )
@@ -450,7 +427,7 @@ object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
         requestNewChannel { time, relayUrl ->
             latestEOSEs.addOrUpdate(
                 account.userProfile(),
-                account.defaultDiscoveryFollowList.value,
+                account.settings.defaultDiscoveryFollowList.value,
                 relayUrl,
                 time,
             )

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

@@ -21,14 +21,14 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
-import com.vitorpamplona.ammolite.relays.Filter
 import com.vitorpamplona.ammolite.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
 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
@@ -43,7 +43,7 @@ object NostrGeohashDataSource : AmethystNostrDataSource("SingleGeoHashFeed") {
         return TypedFilter(
             types = COMMON_FEED_TYPES,
             filter =
-                Filter(
+                SincePerRelayFilter(
                     tags =
                         mapOf(
                             "g" to
@@ -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

@@ -21,13 +21,15 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
-import com.vitorpamplona.ammolite.relays.Filter
 import com.vitorpamplona.ammolite.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
 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 =
-                Filter(
-                    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

@@ -24,15 +24,18 @@ import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.ammolite.relays.FeedType
-import com.vitorpamplona.ammolite.relays.Filter
 import com.vitorpamplona.ammolite.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.filters.SinceAuthorPerRelayFilter
+import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
 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
@@ -45,7 +48,6 @@ import com.vitorpamplona.quartz.events.WikiNoteEvent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 
 object NostrHomeDataSource : AmethystNostrDataSource("HomeFeed") {
     lateinit var account: Account
@@ -54,81 +56,109 @@ object NostrHomeDataSource : AmethystNostrDataSource("HomeFeed") {
     val latestEOSEs = EOSEAccount()
 
     var job: Job? = null
+    var job2: Job? = null
 
     override fun start() {
         job?.cancel()
         job =
             scope.launch(Dispatchers.IO) {
-                // creates cache on main
-                withContext(Dispatchers.Main) { account.userProfile().live() }
                 account.liveHomeFollowLists.collect {
                     if (this@NostrHomeDataSource::account.isInitialized) {
                         invalidateFilters()
                     }
                 }
             }
+
+        job2?.cancel()
+        job2 =
+            scope.launch(Dispatchers.IO) {
+                account.liveHomeListAuthorsPerRelay.collect {
+                    if (this@NostrHomeDataSource::account.isInitialized) {
+                        invalidateFilters()
+                    }
+                }
+            }
         super.start()
     }
 
     override fun stop() {
         super.stop()
         job?.cancel()
+        job2?.cancel()
     }
 
-    fun createFollowAccountsFilter(): TypedFilter {
-        val follows = account.liveHomeFollowLists.value?.users
-        val followSet = follows?.plus(account.userProfile().pubkeyHex)?.toList()?.ifEmpty { null }
+    fun createFollowAccountsFilter(): List<TypedFilter> {
+        val follows =
+            account.liveHomeListAuthorsPerRelay.value
 
-        return TypedFilter(
-            types = setOf(if (follows == null) FeedType.GLOBAL else FeedType.FOLLOWS),
-            filter =
-                Filter(
-                    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 = followSet,
-                    limit = 400,
-                    since =
-                        latestEOSEs.users[account.userProfile()]
-                            ?.followList
-                            ?.get(account.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,
+                    ),
+            ),
         )
     }
 
     fun createFollowMetadataAndReleaseFilter(): TypedFilter? {
-        val follows = account.liveHomeFollowLists.value?.users
-        val followSet = follows?.plus(account.userProfile().pubkeyHex)?.shuffled()?.ifEmpty { null }
+        val follows = account.liveHomeListAuthorsPerRelay.value
 
-        return if (followSet != null) {
+        return if (!follows.isNullOrEmpty()) {
             TypedFilter(
                 types = setOf(FeedType.FOLLOWS),
                 filter =
-                    Filter(
+                    SinceAuthorPerRelayFilter(
                         kinds =
                             listOf(
                                 MetadataEvent.KIND,
                                 AdvertisedRelayListEvent.KIND,
                             ),
-                        authors = followSet.take(500),
+                        authors = follows,
                         since =
                             latestEOSEs.users[account.userProfile()]
                                 ?.followList
-                                ?.get(account.defaultHomeFollowList.value)
+                                ?.get(account.settings.defaultHomeFollowList.value)
                                 ?.relayList,
                     ),
             )
@@ -145,7 +175,7 @@ object NostrHomeDataSource : AmethystNostrDataSource("HomeFeed") {
         return TypedFilter(
             types = setOf(FeedType.FOLLOWS),
             filter =
-                Filter(
+                SincePerRelayFilter(
                     kinds =
                         listOf(
                             TextNoteEvent.KIND,
@@ -155,8 +185,8 @@ object NostrHomeDataSource : AmethystNostrDataSource("HomeFeed") {
                             ClassifiedsEvent.KIND,
                             HighlightEvent.KIND,
                             AudioHeaderEvent.KIND,
-                            AudioTrackEvent.KIND,
-                            PinListEvent.KIND,
+                            InteractiveStoryPrologueEvent.KIND,
+                            CommentEvent.KIND,
                             WikiNoteEvent.KIND,
                         ),
                     tags =
@@ -170,7 +200,7 @@ object NostrHomeDataSource : AmethystNostrDataSource("HomeFeed") {
                     since =
                         latestEOSEs.users[account.userProfile()]
                             ?.followList
-                            ?.get(account.defaultHomeFollowList.value)
+                            ?.get(account.settings.defaultHomeFollowList.value)
                             ?.relayList,
                 ),
         )
@@ -184,7 +214,7 @@ object NostrHomeDataSource : AmethystNostrDataSource("HomeFeed") {
         return TypedFilter(
             types = setOf(FeedType.FOLLOWS),
             filter =
-                Filter(
+                SincePerRelayFilter(
                     kinds =
                         listOf(
                             TextNoteEvent.KIND,
@@ -193,48 +223,43 @@ 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 =
                         latestEOSEs.users[account.userProfile()]
                             ?.followList
-                            ?.get(account.defaultHomeFollowList.value)
+                            ?.get(account.settings.defaultHomeFollowList.value)
                             ?.relayList,
                 ),
         )
     }
 
     fun createFollowCommunitiesFilter(): TypedFilter? {
-        val communitiesToLoad = account.liveHomeFollowLists.value?.communities ?: return null
+        val communitiesToLoad = account.liveHomeFollowLists.value?.addresses ?: return null
 
         if (communitiesToLoad.isEmpty()) return null
 
         return TypedFilter(
             types = setOf(FeedType.FOLLOWS),
             filter =
-                Filter(
+                SincePerRelayFilter(
                     kinds =
                         listOf(
                             TextNoteEvent.KIND,
                             LongTextNoteEvent.KIND,
                             ClassifiedsEvent.KIND,
                             HighlightEvent.KIND,
-                            AudioHeaderEvent.KIND,
-                            AudioTrackEvent.KIND,
-                            PinListEvent.KIND,
                             WikiNoteEvent.KIND,
                             CommunityPostApprovalEvent.KIND,
+                            CommentEvent.KIND,
+                            InteractiveStoryPrologueEvent.KIND,
                         ),
                     tags =
                         mapOf(
@@ -244,7 +269,7 @@ object NostrHomeDataSource : AmethystNostrDataSource("HomeFeed") {
                     since =
                         latestEOSEs.users[account.userProfile()]
                             ?.followList
-                            ?.get(account.defaultHomeFollowList.value)
+                            ?.get(account.settings.defaultHomeFollowList.value)
                             ?.relayList,
                 ),
         )
@@ -254,7 +279,7 @@ object NostrHomeDataSource : AmethystNostrDataSource("HomeFeed") {
         requestNewChannel { time, relayUrl ->
             latestEOSEs.addOrUpdate(
                 account.userProfile(),
-                account.defaultHomeFollowList.value,
+                account.settings.defaultHomeFollowList.value,
                 relayUrl,
                 time,
             )
@@ -262,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/NostrLnZapPaymentResponseDataSource.kt

@@ -21,8 +21,8 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.ammolite.relays.FeedType
-import com.vitorpamplona.ammolite.relays.Filter
 import com.vitorpamplona.ammolite.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
 import com.vitorpamplona.quartz.events.LnZapPaymentResponseEvent
 import com.vitorpamplona.quartz.signers.NostrSigner
 
@@ -39,7 +39,7 @@ class NostrLnZapPaymentResponseDataSource(
         return TypedFilter(
             types = feedTypes,
             filter =
-                Filter(
+                SincePerRelayFilter(
                     kinds = listOf(LnZapPaymentResponseEvent.KIND),
                     authors = listOf(fromServiceHex),
                     tags =

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

@@ -20,10 +20,10 @@
  */
 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.Filter
 import com.vitorpamplona.ammolite.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
 import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.Hex
@@ -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,9 +96,9 @@ object NostrSearchEventOrUserDataSource : AmethystNostrDataSource("SearchEventFe
                     listOfNotNull(
                         ATag.parse(it, null)?.let { aTag ->
                             TypedFilter(
-                                types = COMMON_FEED_TYPES,
+                                types = ALL_FEED_TYPES,
                                 filter =
-                                    Filter(
+                                    SincePerRelayFilter(
                                         kinds = listOf(MetadataEvent.KIND, aTag.kind),
                                         authors = listOfNotNull(aTag.pubKeyHex),
                                         // just to be sure
@@ -108,19 +111,19 @@ object NostrSearchEventOrUserDataSource : AmethystNostrDataSource("SearchEventFe
                     // event ids
                     listOf(
                         TypedFilter(
-                            types = COMMON_FEED_TYPES,
+                            types = ALL_FEED_TYPES,
                             filter =
-                                Filter(
-                                    ids = listOfNotNull(hexToWatch),
+                                SincePerRelayFilter(
+                                    ids = listOfNotNull(it),
                                 ),
                         ),
                         // authors
                         TypedFilter(
-                            types = COMMON_FEED_TYPES,
+                            types = ALL_FEED_TYPES,
                             filter =
-                                Filter(
+                                SincePerRelayFilter(
                                     kinds = listOf(MetadataEvent.KIND),
-                                    authors = listOfNotNull(hexToWatch),
+                                    authors = listOfNotNull(it),
                                     // just to be sure
                                     limit = 5,
                                 ),
@@ -135,7 +138,7 @@ object NostrSearchEventOrUserDataSource : AmethystNostrDataSource("SearchEventFe
                 TypedFilter(
                     types = setOf(FeedType.SEARCH),
                     filter =
-                        Filter(
+                        SincePerRelayFilter(
                             kinds = listOf(MetadataEvent.KIND),
                             search = mySearchString,
                             limit = 1000,
@@ -144,7 +147,7 @@ object NostrSearchEventOrUserDataSource : AmethystNostrDataSource("SearchEventFe
                 TypedFilter(
                     types = setOf(FeedType.SEARCH),
                     filter =
-                        Filter(
+                        SincePerRelayFilter(
                             kinds =
                                 listOf(
                                     TextNoteEvent.KIND,
@@ -165,7 +168,7 @@ object NostrSearchEventOrUserDataSource : AmethystNostrDataSource("SearchEventFe
                 TypedFilter(
                     types = setOf(FeedType.SEARCH),
                     filter =
-                        Filter(
+                        SincePerRelayFilter(
                             kinds =
                                 listOf(
                                     ChannelMetadataEvent.KIND,
@@ -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/NostrSingleChannelDataSource.kt

@@ -25,8 +25,8 @@ import com.vitorpamplona.amethyst.model.LiveActivitiesChannel
 import com.vitorpamplona.amethyst.model.PublicChatChannel
 import com.vitorpamplona.ammolite.relays.EVENT_FINDER_TYPES
 import com.vitorpamplona.ammolite.relays.FeedType
-import com.vitorpamplona.ammolite.relays.Filter
 import com.vitorpamplona.ammolite.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
 import com.vitorpamplona.quartz.events.ChannelCreateEvent
 import com.vitorpamplona.quartz.events.ChannelMetadataEvent
 
@@ -44,7 +44,7 @@ object NostrSingleChannelDataSource : AmethystNostrDataSource("SingleChannelFeed
         return TypedFilter(
             types = setOf(FeedType.PUBLIC_CHATS),
             filter =
-                Filter(
+                SincePerRelayFilter(
                     kinds = listOf(ChannelMetadataEvent.KIND),
                     tags = mapOf("e" to reactionsToWatch),
                 ),
@@ -65,7 +65,7 @@ object NostrSingleChannelDataSource : AmethystNostrDataSource("SingleChannelFeed
         return TypedFilter(
             types = EVENT_FINDER_TYPES,
             filter =
-                Filter(
+                SincePerRelayFilter(
                     kinds = listOf(ChannelCreateEvent.KIND),
                     ids = interestedEvents.toList(),
                 ),
@@ -88,7 +88,7 @@ object NostrSingleChannelDataSource : AmethystNostrDataSource("SingleChannelFeed
                 TypedFilter(
                     types = EVENT_FINDER_TYPES,
                     filter =
-                        Filter(
+                        SincePerRelayFilter(
                             kinds = listOf(aTag.kind),
                             tags = mapOf("d" to listOf(aTag.dTag)),
                             authors = listOf(aTag.pubKeyHex),

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

@@ -23,10 +23,10 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.ammolite.relays.EOSETime
 import com.vitorpamplona.ammolite.relays.EVENT_FINDER_TYPES
-import com.vitorpamplona.ammolite.relays.Filter
 import com.vitorpamplona.ammolite.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.filters.EOSETime
+import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
 import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
 import com.vitorpamplona.quartz.events.DeletionEvent
 import com.vitorpamplona.quartz.events.GenericRepostEvent
@@ -42,6 +42,7 @@ import com.vitorpamplona.quartz.events.ReportEvent
 import com.vitorpamplona.quartz.events.RepostEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 import com.vitorpamplona.quartz.events.TextNoteModificationEvent
+import com.vitorpamplona.quartz.events.TorrentCommentEvent
 
 object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") {
     private var nextEventsToWatch = setOf<Note>()
@@ -67,7 +68,7 @@ object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") {
                     TypedFilter(
                         types = EVENT_FINDER_TYPES,
                         filter =
-                            Filter(
+                            SincePerRelayFilter(
                                 kinds =
                                     listOf(
                                         TextNoteEvent.KIND,
@@ -89,7 +90,7 @@ object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") {
                     TypedFilter(
                         types = EVENT_FINDER_TYPES,
                         filter =
-                            Filter(
+                            SincePerRelayFilter(
                                 kinds =
                                     listOf(
                                         DeletionEvent.KIND,
@@ -117,7 +118,7 @@ object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") {
                     TypedFilter(
                         types = EVENT_FINDER_TYPES,
                         filter =
-                            Filter(
+                            SincePerRelayFilter(
                                 kinds = listOf(aTag.kind),
                                 authors = listOf(aTag.pubKeyHex),
                                 limit = 5,
@@ -127,7 +128,7 @@ object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") {
                     TypedFilter(
                         types = EVENT_FINDER_TYPES,
                         filter =
-                            Filter(
+                            SincePerRelayFilter(
                                 kinds = listOf(aTag.kind),
                                 tags = mapOf("d" to listOf(aTag.dTag)),
                                 authors = listOf(aTag.pubKeyHex),
@@ -150,7 +151,7 @@ object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") {
                     TypedFilter(
                         types = EVENT_FINDER_TYPES,
                         filter =
-                            Filter(
+                            SincePerRelayFilter(
                                 kinds =
                                     listOf(
                                         TextNoteEvent.KIND,
@@ -173,12 +174,13 @@ object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") {
                     TypedFilter(
                         types = EVENT_FINDER_TYPES,
                         filter =
-                            Filter(
+                            SincePerRelayFilter(
                                 kinds =
                                     listOf(
                                         DeletionEvent.KIND,
                                         NIP90ContentDiscoveryResponseEvent.KIND,
                                         NIP90StatusEvent.KIND,
+                                        TorrentCommentEvent.KIND,
                                     ),
                                 tags = mapOf("e" to it.map { it.idHex }),
                                 since = findMinimumEOSEs(it),
@@ -200,7 +202,7 @@ object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") {
                     TypedFilter(
                         types = EVENT_FINDER_TYPES,
                         filter =
-                            Filter(
+                            SincePerRelayFilter(
                                 kinds = listOf(TextNoteEvent.KIND),
                                 tags = mapOf("q" to it.map { it.idHex }),
                                 since = findMinimumEOSEs(it),
@@ -232,7 +234,7 @@ object NostrSingleEventDataSource : AmethystNostrDataSource("SingleEventFeed") {
             TypedFilter(
                 types = EVENT_FINDER_TYPES,
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         ids = interestedEvents.toList(),
                     ),
             ),
@@ -319,6 +321,9 @@ fun groupByEOSEPresence(notes: Set<Note>): Collection<List<Note>> =
                 .sorted()
                 .joinToString(",")
         }.values
+        .map {
+            it.sortedBy { it.idHex } // important to keep in order otherwise the Relay thinks the filter has changed and we REQ again
+        }
 
 fun groupByEOSEPresence(users: Iterable<User>): Collection<List<User>> =
     users
@@ -327,6 +332,9 @@ fun groupByEOSEPresence(users: Iterable<User>): Collection<List<User>> =
                 .sorted()
                 .joinToString(",")
         }.values
+        .map {
+            it.sortedBy { it.pubkeyHex } // important to keep in order otherwise the Relay thinks the filter has changed and we REQ again
+        }
 
 fun findMinimumEOSEs(notes: List<Note>): Map<String, EOSETime> {
     val minLatestEOSEs = mutableMapOf<String, EOSETime>()

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

@@ -21,13 +21,14 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.ammolite.relays.EOSETime
 import com.vitorpamplona.ammolite.relays.EVENT_FINDER_TYPES
-import com.vitorpamplona.ammolite.relays.Filter
 import com.vitorpamplona.ammolite.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.filters.EOSETime
+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
 
@@ -45,7 +46,7 @@ object NostrSingleUserDataSource : AmethystNostrDataSource("SingleUserFeed") {
             TypedFilter(
                 types = EVENT_FINDER_TYPES,
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         kinds = listOf(MetadataEvent.KIND, AdvertisedRelayListEvent.KIND),
                         authors = firstTimers,
                     ),
@@ -64,26 +65,31 @@ object NostrSingleUserDataSource : AmethystNostrDataSource("SingleUserFeed") {
             .map { group ->
                 val groupIds = group.map { it.pubkeyHex }
                 val minEOSEs = findMinimumEOSEsForUsers(group)
-                listOf(
-                    TypedFilter(
-                        types = EVENT_FINDER_TYPES,
-                        filter =
-                            Filter(
-                                kinds = listOf(MetadataEvent.KIND, StatusEvent.KIND, AdvertisedRelayListEvent.KIND, ChatMessageRelayListEvent.KIND),
-                                authors = groupIds,
-                                since = minEOSEs,
-                            ),
-                    ),
-                    TypedFilter(
-                        types = EVENT_FINDER_TYPES,
-                        filter =
-                            Filter(
-                                kinds = listOf(ReportEvent.KIND),
-                                tags = mapOf("p" to groupIds),
-                                since = minEOSEs,
-                            ),
-                    ),
-                )
+
+                if (groupIds.isNotEmpty()) {
+                    listOf(
+                        TypedFilter(
+                            types = EVENT_FINDER_TYPES,
+                            filter =
+                                SincePerRelayFilter(
+                                    kinds = listOf(MetadataEvent.KIND, StatusEvent.KIND, RelationshipStatusEvent.KIND, AdvertisedRelayListEvent.KIND, ChatMessageRelayListEvent.KIND),
+                                    authors = groupIds,
+                                    since = minEOSEs,
+                                ),
+                        ),
+                        TypedFilter(
+                            types = EVENT_FINDER_TYPES,
+                            filter =
+                                SincePerRelayFilter(
+                                    kinds = listOf(ReportEvent.KIND),
+                                    tags = mapOf("p" to groupIds),
+                                    since = minEOSEs,
+                                ),
+                        ),
+                    )
+                } else {
+                    listOf()
+                }
             }.flatten()
     }
 
@@ -92,13 +98,11 @@ object NostrSingleUserDataSource : AmethystNostrDataSource("SingleUserFeed") {
             checkNotInMainThread()
 
             usersToWatch.forEach {
-                if (it.latestMetadata != null) {
-                    val eose = it.latestEOSEs[relayUrl]
-                    if (eose == null) {
-                        it.latestEOSEs = it.latestEOSEs + Pair(relayUrl, EOSETime(time))
-                    } else {
-                        eose.time = time
-                    }
+                val eose = it.latestEOSEs[relayUrl]
+                if (eose == null) {
+                    it.latestEOSEs = it.latestEOSEs + Pair(relayUrl, EOSETime(time))
+                } else {
+                    eose.time = time
                 }
             }
         }

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

@@ -20,34 +20,64 @@
  */
 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.Filter
 import com.vitorpamplona.ammolite.relays.TypedFilter
+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 =
-                Filter(
-                    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

@@ -22,26 +22,33 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
-import com.vitorpamplona.ammolite.relays.Filter
 import com.vitorpamplona.ammolite.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
 import com.vitorpamplona.quartz.events.AppRecommendationEvent
 import com.vitorpamplona.quartz.events.AudioHeaderEvent
 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
 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") {
@@ -56,7 +63,7 @@ object NostrUserProfileDataSource : AmethystNostrDataSource("UserProfileFeed") {
             TypedFilter(
                 types = COMMON_FEED_TYPES,
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         kinds = listOf(MetadataEvent.KIND),
                         authors = listOf(it.pubkeyHex),
                         limit = 1,
@@ -69,7 +76,7 @@ object NostrUserProfileDataSource : AmethystNostrDataSource("UserProfileFeed") {
             TypedFilter(
                 types = COMMON_FEED_TYPES,
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         kinds =
                             listOf(
                                 TextNoteEvent.KIND,
@@ -89,12 +96,31 @@ object NostrUserProfileDataSource : AmethystNostrDataSource("UserProfileFeed") {
             )
         }
 
+    fun createUserPostsFilter2() =
+        user?.let {
+            TypedFilter(
+                types = COMMON_FEED_TYPES,
+                filter =
+                    SincePerRelayFilter(
+                        kinds =
+                            listOf(
+                                TorrentEvent.KIND,
+                                TorrentCommentEvent.KIND,
+                                InteractiveStoryPrologueEvent.KIND,
+                                CommentEvent.KIND,
+                            ),
+                        authors = listOf(it.pubkeyHex),
+                        limit = 50,
+                    ),
+            )
+        }
+
     fun createUserReceivedZapsFilter() =
         user?.let {
             TypedFilter(
                 types = COMMON_FEED_TYPES,
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         kinds = listOf(LnZapEvent.KIND),
                         tags = mapOf("p" to listOf(it.pubkeyHex)),
                         limit = 200,
@@ -107,7 +133,7 @@ object NostrUserProfileDataSource : AmethystNostrDataSource("UserProfileFeed") {
             TypedFilter(
                 types = COMMON_FEED_TYPES,
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         kinds = listOf(ContactListEvent.KIND),
                         authors = listOf(it.pubkeyHex),
                         limit = 1,
@@ -120,7 +146,7 @@ object NostrUserProfileDataSource : AmethystNostrDataSource("UserProfileFeed") {
             TypedFilter(
                 types = COMMON_FEED_TYPES,
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         kinds = listOf(ContactListEvent.KIND),
                         tags = mapOf("p" to listOf(it.pubkeyHex)),
                     ),
@@ -132,7 +158,7 @@ object NostrUserProfileDataSource : AmethystNostrDataSource("UserProfileFeed") {
             TypedFilter(
                 types = COMMON_FEED_TYPES,
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         kinds = listOf(BadgeProfilesEvent.KIND),
                         authors = listOf(it.pubkeyHex),
                         limit = 1,
@@ -145,7 +171,7 @@ object NostrUserProfileDataSource : AmethystNostrDataSource("UserProfileFeed") {
             TypedFilter(
                 types = COMMON_FEED_TYPES,
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         kinds =
                             listOf(BookmarkListEvent.KIND, PeopleListEvent.KIND, AppRecommendationEvent.KIND),
                         authors = listOf(it.pubkeyHex),
@@ -159,9 +185,9 @@ object NostrUserProfileDataSource : AmethystNostrDataSource("UserProfileFeed") {
             TypedFilter(
                 types = COMMON_FEED_TYPES,
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         kinds =
-                            listOf(ProfileGalleryEntryEvent.KIND),
+                            listOf(ProfileGalleryEntryEvent.KIND, PictureEvent.KIND, VideoVerticalEvent.KIND, VideoHorizontalEvent.KIND),
                         authors = listOf(it.pubkeyHex),
                         limit = 1000,
                     ),
@@ -173,7 +199,7 @@ object NostrUserProfileDataSource : AmethystNostrDataSource("UserProfileFeed") {
             TypedFilter(
                 types = COMMON_FEED_TYPES,
                 filter =
-                    Filter(
+                    SincePerRelayFilter(
                         kinds = listOf(BadgeAwardEvent.KIND),
                         tags = mapOf("p" to listOf(it.pubkeyHex)),
                         limit = 20,
@@ -188,6 +214,7 @@ object NostrUserProfileDataSource : AmethystNostrDataSource("UserProfileFeed") {
             listOfNotNull(
                 createUserInfoFilter(),
                 createUserPostsFilter(),
+                createUserPostsFilter2(),
                 createProfileGalleryFilter(),
                 createFollowFilter(),
                 createFollowersFilter(),

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

@@ -24,10 +24,12 @@ import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.ammolite.relays.FeedType
-import com.vitorpamplona.ammolite.relays.Filter
 import com.vitorpamplona.ammolite.relays.TypedFilter
+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
@@ -63,88 +65,136 @@ object NostrVideoDataSource : AmethystNostrDataSource("VideoFeed") {
         job?.cancel()
     }
 
-    fun createContextualFilter(): TypedFilter {
-        val follows =
-            account.liveStoriesFollowLists.value
-                ?.users
-                ?.toList()
+    fun createContextualFilter(): List<TypedFilter> {
+        val follows = account.liveStoriesListAuthorsPerRelay.value
 
-        return TypedFilter(
-            types = setOf(FeedType.GLOBAL),
-            filter =
-                Filter(
-                    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.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 =
-                Filter(
-                    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.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 =
-                Filter(
-                    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.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,
+                    ),
+            ),
         )
     }
 
@@ -152,7 +202,7 @@ object NostrVideoDataSource : AmethystNostrDataSource("VideoFeed") {
         requestNewChannel { time, relayUrl ->
             latestEOSEs.addOrUpdate(
                 account.userProfile(),
-                account.defaultStoriesFollowList.value,
+                account.settings.defaultStoriesFollowList.value,
                 relayUrl,
                 time,
             )
@@ -164,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
@@ -49,7 +49,10 @@ object OnlineChecker {
         return false
     }
 
-    fun isOnline(url: String?): Boolean {
+    fun isOnline(
+        url: String?,
+        forceProxy: Boolean,
+    ): Boolean {
         checkNotInMainThread()
 
         if (url.isNullOrBlank()) return false
@@ -74,7 +77,7 @@ object OnlineChecker {
 
                     val client =
                         HttpClientManager
-                            .getHttpClient()
+                            .getHttpClient(forceProxy)
                             .newBuilder()
                             .eventListener(EventListener.NONE)
                             .protocols(listOf(Protocol.HTTP_1_1))
@@ -93,7 +96,7 @@ object OnlineChecker {
                             .get()
                             .build()
 
-                    HttpClientManager.getHttpClient().newCall(request).execute().use {
+                    HttpClientManager.getHttpClient(forceProxy).newCall(request).execute().use {
                         checkNotInMainThread()
                         it.isSuccessful
                     }

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

@@ -23,12 +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
@@ -60,7 +61,8 @@ class ZapPaymentHandler(
         message: String,
         context: Context,
         showErrorIfNoLnAddress: Boolean,
-        onError: (String, String) -> Unit,
+        forceProxy: (String) -> Boolean,
+        onError: (String, String, User?) -> Unit,
         onProgress: (percent: Float) -> Unit,
         onPayViaIntent: (ImmutableList<Payable>) -> Unit,
         zapType: LnZapEvent.ZapType,
@@ -81,13 +83,16 @@ class ZapPaymentHandler(
                     val lud16 = note.author?.info?.lnAddress()
 
                     if (lud16.isNullOrBlank()) {
-                        onError(
-                            stringRes(context, R.string.missing_lud16),
-                            stringRes(
-                                context,
-                                R.string.user_does_not_have_a_lightning_address_setup_to_receive_sats,
-                            ),
-                        )
+                        if (showErrorIfNoLnAddress) {
+                            onError(
+                                stringRes(context, R.string.missing_lud16),
+                                stringRes(
+                                    context,
+                                    R.string.user_does_not_have_a_lightning_address_setup_to_receive_sats,
+                                ),
+                                note.author,
+                            )
+                        }
                         return@withContext
                     }
 
@@ -97,13 +102,16 @@ class ZapPaymentHandler(
                 val lud16 = note.author?.info?.lnAddress()
 
                 if (lud16.isNullOrBlank()) {
-                    onError(
-                        stringRes(context, R.string.missing_lud16),
-                        stringRes(
-                            context,
-                            R.string.user_does_not_have_a_lightning_address_setup_to_receive_sats,
-                        ),
-                    )
+                    if (showErrorIfNoLnAddress) {
+                        onError(
+                            stringRes(context, R.string.missing_lud16),
+                            stringRes(
+                                context,
+                                R.string.user_does_not_have_a_lightning_address_setup_to_receive_sats,
+                            ),
+                            note.author,
+                        )
+                    }
                     return@withContext
                 }
 
@@ -119,10 +127,10 @@ class ZapPaymentHandler(
                 onProgress(0.05f)
             }
 
-            assembleAllInvoices(splitZapRequestPairs.toList(), amountMilliSats, message, showErrorIfNoLnAddress, 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 {
@@ -130,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)
@@ -164,8 +164,9 @@ class ZapPaymentHandler(
         return roundedZapValue
     }
 
-    class SignAllZapRequestsReturn(
-        val zapRequestJson: String,
+    class ZapRequestReady(
+        val inputSetup: ZapSplitSetup,
+        val zapRequestJson: String?,
         val user: User? = null,
     )
 
@@ -175,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
@@ -189,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 {
@@ -211,9 +212,7 @@ class ZapPaymentHandler(
                         ) + (authorRelayList ?: emptySet())
 
                     prepareZapRequestIfNeeded(note, pollOption, message, zapType, user, userRelayList) { zapRequestJson ->
-                        if (zapRequestJson != null) {
-                            onReady(SignAllZapRequestsReturn(zapRequestJson, user))
-                        }
+                        onReady(ZapRequestReady(next, zapRequestJson, user))
                     }
                 }
             },
@@ -222,30 +221,33 @@ class ZapPaymentHandler(
     }
 
     suspend fun assembleAllInvoices(
-        invoices: List<Pair<ZapSplitSetup, SignAllZapRequestsReturn>>,
+        requests: List<ZapRequestReady>,
         totalAmountMilliSats: Long,
         message: String,
         showErrorIfNoLnAddress: Boolean,
-        onError: (String, String) -> Unit,
+        forceProxy: (String) -> Boolean,
+        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,
@@ -256,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),
@@ -289,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)
                         }
                     },
@@ -301,31 +309,26 @@ class ZapPaymentHandler(
         )
     }
 
-    class AssembleInvoiceReturn(
-        val zapValue: Long,
-        val invoice: String,
-    )
-
     private fun assembleInvoice(
         splitSetup: ZapSplitSetup,
-        nostrZapRequest: String,
+        nostrZapRequest: String?,
+        toUser: User?,
         zapValue: Long,
         message: String,
         showErrorIfNoLnAddress: Boolean = true,
-        onError: (String, String) -> Unit,
+        forceProxy: (String) -> Boolean,
+        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) {
@@ -335,7 +338,10 @@ class ZapPaymentHandler(
                     milliSats = zapValue,
                     message = message,
                     nostrRequest = nostrZapRequest,
-                    onError = onError,
+                    forceProxy = forceProxy,
+                    onError = { title, msg ->
+                        onError(title, msg, toUser)
+                    },
                     onProgress = {
                         val step = it - progressThisPayment
                         progressThisPayment = it
@@ -344,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 {
@@ -359,6 +372,7 @@ class ZapPaymentHandler(
                         R.string.user_x_does_not_have_a_lightning_address_setup_to_receive_sats,
                         user?.toBestDisplayName() ?: splitSetup.lnAddressOrPubKeyHex,
                     ),
+                    null,
                 )
             }
         }
@@ -375,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,20 +24,20 @@ 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
 import kotlin.coroutines.cancellation.CancellationException
 
 class LightningAddressResolver {
-    val client = HttpClientManager.getHttpClient()
-
     fun assembleUrl(lnaddress: String): String? {
         val parts = lnaddress.split("@")
 
@@ -54,6 +54,7 @@ class LightningAddressResolver {
 
     private fun fetchLightningAddressJson(
         lnaddress: String,
+        forceProxy: (url: String) -> Boolean,
         onSuccess: (String) -> Unit,
         onError: (String, String) -> Unit,
         context: Context,
@@ -74,6 +75,8 @@ class LightningAddressResolver {
             return
         }
 
+        val client = HttpClientManager.getHttpClient(forceProxy(url))
+
         try {
             val request: Request =
                 Request
@@ -94,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),
                         ),
                     )
                 }
@@ -121,6 +124,7 @@ class LightningAddressResolver {
         milliSats: Long,
         message: String,
         nostrRequest: String? = null,
+        forceProxy: (url: String) -> Boolean,
         onSuccess: (String) -> Unit,
         onError: (String, String) -> Unit,
         context: Context,
@@ -137,6 +141,8 @@ class LightningAddressResolver {
             url += "&nostr=$encodedNostrRequest"
         }
 
+        val client = HttpClientManager.getHttpClient(forceProxy(url))
+
         val request: Request =
             Request
                 .Builder()
@@ -150,17 +156,42 @@ 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,
         message: String,
         nostrRequest: String? = null,
+        forceProxy: (url: String) -> Boolean,
         onSuccess: (String) -> Unit,
         onError: (String, String) -> Unit,
         onProgress: (percent: Float) -> Unit,
@@ -170,6 +201,7 @@ class LightningAddressResolver {
 
         fetchLightningAddressJson(
             lnaddress,
+            forceProxy,
             onSuccess = { lnAddressJson ->
                 onProgress(0.4f)
 
@@ -189,7 +221,7 @@ class LightningAddressResolver {
                         null
                     }
 
-                val callback = lnurlp?.get("callback")?.asText()
+                val callback = lnurlp?.get("callback")?.asText()?.ifBlank { null }
 
                 if (callback == null) {
                     onError(
@@ -210,6 +242,7 @@ class LightningAddressResolver {
                         milliSats,
                         message,
                         if (allowsNostr) nostrRequest else null,
+                        forceProxy,
                         onSuccess = {
                             onProgress(0.6f)
 

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

@@ -24,47 +24,56 @@ import android.app.NotificationManager
 import android.content.Context
 import android.util.Log
 import androidx.core.content.ContextCompat
+import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.AccountSettings
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendDMNotification
 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.toHexKey
+import com.vitorpamplona.quartz.encoders.toNpub
+import com.vitorpamplona.quartz.events.ChatMessageEncryptedFileHeaderEvent
 import com.vitorpamplona.quartz.events.ChatMessageEvent
-import com.vitorpamplona.quartz.events.ChatroomKey
+import com.vitorpamplona.quartz.events.DraftEvent
 import com.vitorpamplona.quartz.events.Event
 import com.vitorpamplona.quartz.events.GiftWrapEvent
 import com.vitorpamplona.quartz.events.LnZapEvent
 import com.vitorpamplona.quartz.events.LnZapRequestEvent
 import com.vitorpamplona.quartz.events.PrivateDmEvent
 import com.vitorpamplona.quartz.events.SealedGossipEvent
+import com.vitorpamplona.quartz.signers.NostrSigner
+import com.vitorpamplona.quartz.signers.NostrSignerExternal
 import com.vitorpamplona.quartz.utils.TimeUtils
-import kotlinx.collections.immutable.persistentSetOf
 import java.math.BigDecimal
+import kotlin.coroutines.cancellation.CancellationException
 
 class EventNotificationConsumer(
     private val applicationContext: Context,
 ) {
+    companion object {
+        const val TAG = "EventNotificationConsumer"
+    }
+
     suspend fun consume(event: GiftWrapEvent) {
-        Log.d("EventNotificationConsumer", "New Notification Arrived")
+        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
         var matchAccount = false
         LocalPreferences.allSavedAccounts().forEach {
-            if (!matchAccount && it.hasPrivKey || it.loggedInWithExternalSigner) {
+            if (!matchAccount && (it.hasPrivKey || it.loggedInWithExternalSigner)) {
                 LocalPreferences.loadCurrentAccountFromEncryptedStorage(it.npub)?.let { acc ->
-                    Log.d("EventNotificationConsumer", "New Notification Testing if for ${it.npub}")
+                    Log.d(TAG, "New Notification Testing if for ${it.npub}")
                     try {
                         consumeIfMatchesAccount(event, acc)
                         matchAccount = true
                     } catch (e: Exception) {
-                        // Not for this account.
+                        if (e is CancellationException) throw e
+                        Log.d(TAG, "Message was not for user ${it.npub}: ${e.message}")
                     }
                 }
             }
@@ -73,28 +82,84 @@ class EventNotificationConsumer(
 
     private suspend fun consumeIfMatchesAccount(
         pushWrappedEvent: GiftWrapEvent,
-        account: Account,
+        account: AccountSettings,
     ) {
-        pushWrappedEvent.cachedGift(account.signer) { notificationEvent ->
-            val consumed = LocalCache.hasConsumed(notificationEvent)
-            val verified = LocalCache.justVerify(notificationEvent)
-            Log.d("EventNotificationConsumer", "New Notification ${notificationEvent.kind} ${notificationEvent.id} Arrived for ${account.userProfile().toBestDisplayName()} consumed= $consumed && verified= $verified")
-            if (!consumed && verified) {
-                Log.d("EventNotificationConsumer", "New Notification was verified")
-                unwrapAndConsume(notificationEvent, account) { innerEvent ->
+        // TODO: Modify the external launcher to launch as different users.
+        // Right now it only registers if Amber has already approved this signature
+        val signer = account.createSigner()
+        if (signer is NostrSignerExternal) {
+            signer.launcher.registerLauncher(
+                launcher = { },
+                contentResolver = Amethyst.instance::contentResolverFn,
+            )
+        }
 
-                    Log.d("EventNotificationConsumer", "Unwrapped consume $consumed ${innerEvent.javaClass.simpleName}")
-                    if (!consumed) {
-                        if (innerEvent is PrivateDmEvent) {
-                            Log.d("EventNotificationConsumer", "New Nip-04 DM to Notify")
-                            notify(innerEvent, account)
-                        } else if (innerEvent is LnZapEvent) {
-                            Log.d("EventNotificationConsumer", "New Zap to Notify")
-                            notify(innerEvent, account)
-                        } else if (innerEvent is ChatMessageEvent) {
-                            Log.d("EventNotificationConsumer", "New ChatMessage to Notify")
-                            notify(innerEvent, account)
+        pushWrappedEvent.unwrapThrowing(signer) { notificationEvent ->
+            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}")
                     }
                 }
             }
@@ -103,7 +168,7 @@ class EventNotificationConsumer(
 
     private fun unwrapAndConsume(
         event: Event,
-        account: Account,
+        signer: NostrSigner,
         onReady: (Event) -> Unit,
     ) {
         if (!LocalCache.justVerify(event)) return
@@ -111,15 +176,19 @@ class EventNotificationConsumer(
 
         when (event) {
             is GiftWrapEvent -> {
-                event.cachedGift(account.signer) { unwrapAndConsume(it, account, onReady) }
+                event.unwrap(signer) {
+                    unwrapAndConsume(it, signer, onReady)
+                    LocalCache.justConsume(event, null)
+                }
             }
             is SealedGossipEvent -> {
-                event.cachedGossip(account.signer) {
+                event.unseal(signer) {
                     if (!LocalCache.hasConsumed(it)) {
                         // this is not verifiable
                         LocalCache.justConsume(it, null)
                         onReady(it)
                     }
+                    LocalCache.justConsume(event, null)
                 }
             }
             else -> {
@@ -130,32 +199,79 @@ class EventNotificationConsumer(
     }
 
     private fun notify(
-        event: ChatMessageEvent,
-        acc: Account,
+        event: ChatMessageEncryptedFileHeaderEvent,
+        signer: NostrSigner,
+        acc: AccountSettings,
     ) {
         if (
-            event.createdAt > TimeUtils.fifteenMinutesAgo() &&
             // old event being re-broadcasted
-            event.pubKey != acc.userProfile().pubkeyHex
+            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(acc.keyPair.pubKey.toHexKey())
+            val chatRoom = event.chatroomKey(signer.pubKey)
 
-            val followingKeySet = acc.followingKeySet()
+            val followingKeySet = acc.backupContactList?.unverifiedFollowKeySet()?.toSet() ?: return
 
             val isKnownRoom =
                 (
-                    acc.userProfile().privateChatrooms[chatRoom]?.senderIntersects(followingKeySet) == true ||
-                        acc.userProfile().hasSentMessagesTo(chatRoom)
-                ) &&
-                    !acc.isAllHidden(chatRoom.users)
+                    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()
+                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,
@@ -172,35 +288,30 @@ class EventNotificationConsumer(
 
     private fun notify(
         event: PrivateDmEvent,
-        acc: Account,
+        signer: NostrSigner,
+        acc: AccountSettings,
     ) {
         val note = LocalCache.getNoteIfExists(event.id) ?: return
+        val myUser = LocalCache.getUserIfExists(signer.pubKey) ?: return
 
         // old event being re-broadcast
         if (event.createdAt < TimeUtils.fifteenMinutesAgo()) return
 
-        if (acc.userProfile().pubkeyHex == event.verifiedRecipientPubKey()) {
-            val followingKeySet = acc.followingKeySet()
+        if (signer.pubKey == event.verifiedRecipientPubKey()) {
+            val followingKeySet = acc.backupContactList?.unverifiedFollowKeySet()?.toSet() ?: return
 
-            val knownChatrooms =
-                acc
-                    .userProfile()
-                    .privateChatrooms
-                    .keys
-                    .filter {
-                        (
-                            acc.userProfile().privateChatrooms[it]?.senderIntersects(followingKeySet) == true ||
-                                acc.userProfile().hasSentMessagesTo(it)
-                        ) &&
-                            !acc.isAllHidden(it.users)
-                    }.toSet()
+            val chatRoom = event.chatroomKey(signer.pubKey)
 
-            note.author?.let {
-                if (ChatroomKey(persistentSetOf(it.pubkeyHex)) in knownChatrooms) {
-                    acc.decryptContent(note) { content ->
+            val isKnownRoom =
+                myUser.privateChatrooms[chatRoom]?.senderIntersects(followingKeySet) == true ||
+                    myUser.hasSentMessagesTo(chatRoom)
+
+            if (isKnownRoom) {
+                note.author?.let {
+                    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)
                     }
@@ -209,45 +320,80 @@ class EventNotificationConsumer(
         }
     }
 
+    fun decryptZapContentAuthor(
+        note: Note,
+        signer: NostrSigner,
+        onReady: (Event) -> Unit,
+    ) {
+        val event = note.event
+        if (event is LnZapRequestEvent) {
+            if (event.isPrivateZap()) {
+                event.decryptPrivateZap(signer) { onReady(it) }
+            } else {
+                onReady(event)
+            }
+        }
+    }
+
+    fun decryptContent(
+        note: Note,
+        signer: NostrSigner,
+        onReady: (String) -> Unit,
+    ) {
+        val event = note.event
+        if (event is PrivateDmEvent) {
+            event.plainContent(signer, onReady)
+        } else if (event is LnZapRequestEvent) {
+            decryptZapContentAuthor(note, signer) { onReady(it.content) }
+        } else if (event is DraftEvent) {
+            event.cachedDraft(signer) {
+                onReady(it.content)
+            }
+        } else {
+            event?.content()?.let { onReady(it) }
+        }
+    }
+
     private fun notify(
         event: LnZapEvent,
-        acc: Account,
+        signer: NostrSigner,
+        acc: AccountSettings,
     ) {
-        Log.d("EventNotificationConsumer", "Notify Start ${event.toNostrUri()}")
+        Log.d(TAG, "Notify Start ${event.toNostrUri()}")
         val noteZapEvent = LocalCache.getNoteIfExists(event.id) ?: return
 
-        Log.d("EventNotificationConsumer", "Notify Not Notified Yet")
+        Log.d(TAG, "Notify Not Notified Yet")
 
         // old event being re-broadcast
         if (event.createdAt < TimeUtils.fifteenMinutesAgo()) return
 
-        Log.d("EventNotificationConsumer", "Notify Not an old event")
+        Log.d(TAG, "Notify Not an old event")
 
         val noteZapRequest = event.zapRequest?.id?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
         val noteZapped =
             event.zappedPost().firstOrNull()?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
 
-        Log.d("EventNotificationConsumer", "Notify ZapRequest $noteZapRequest zapped $noteZapped")
+        Log.d(TAG, "Notify ZapRequest $noteZapRequest zapped $noteZapped")
 
         if ((event.amount ?: BigDecimal.ZERO) < BigDecimal.TEN) return
 
-        Log.d("EventNotificationConsumer", "Notify Amount Bigger than 10")
+        Log.d(TAG, "Notify Amount Bigger than 10")
 
-        if (event.isTaggedUser(acc.userProfile().pubkeyHex)) {
+        if (event.isTaggedUser(signer.pubKey)) {
             val amount = showAmount(event.amount)
 
-            Log.d("EventNotificationConsumer", "Notify Amount $amount")
+            Log.d(TAG, "Notify Amount $amount")
 
             (noteZapRequest.event as? LnZapRequestEvent)?.let { event ->
-                acc.decryptZapContentAuthor(noteZapRequest) {
-                    Log.d("EventNotificationConsumer", "Notify Decrypted if Private Zap ${event.id}")
+                decryptZapContentAuthor(noteZapRequest, signer) {
+                    Log.d(TAG, "Notify Decrypted if Private Zap ${event.id}")
 
                     val author = LocalCache.getOrCreateUser(it.pubKey)
                     val senderInfo = Pair(author, it.content.ifBlank { null })
 
                     if (noteZapped.event?.content() != null) {
-                        acc.decryptContent(noteZapped) {
-                            Log.d("EventNotificationConsumer", "Notify Decrypted if Private Note")
+                        decryptContent(noteZapped, signer) {
+                            Log.d(TAG, "Notify Decrypted if Private Note")
 
                             val zappedContent = it.split("\n").get(0)
 
@@ -270,10 +416,10 @@ class EventNotificationConsumer(
                                         zappedContent,
                                     )
                             }
-                            val userPicture = senderInfo?.first?.profilePicture()
-                            val noteUri = "nostr:Notifications"
+                            val userPicture = senderInfo.first.profilePicture()
+                            val noteUri = "notifications?account=" + acc.keyPair.pubKey.toNpub()
 
-                            Log.d("EventNotificationConsumer", "Notify ${event.id} $content $title $noteUri")
+                            Log.d(TAG, "Notify ${event.id} $content $title $noteUri")
 
                             notificationManager()
                                 .sendZapNotification(
@@ -288,7 +434,7 @@ class EventNotificationConsumer(
                         }
                     } else {
                         // doesn't have a base note to refer to.
-                        Log.d("EventNotificationConsumer", "Notify Zapped note not available")
+                        Log.d(TAG, "Notify Zapped note not available")
 
                         val user = senderInfo.first.toBestDisplayName()
                         var title = stringRes(applicationContext, R.string.app_notification_zaps_channel_message, amount)
@@ -302,9 +448,9 @@ class EventNotificationConsumer(
                             )
 
                         val userPicture = senderInfo.first.profilePicture()
-                        val noteUri = "nostr:Notifications"
+                        val noteUri = "notifications?account=" + acc.keyPair.pubKey.toNpub()
 
-                        Log.d("EventNotificationConsumer", "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

@@ -22,22 +22,18 @@ package com.vitorpamplona.amethyst.service.notifications
 
 import android.util.Log
 import com.vitorpamplona.amethyst.AccountInfo
+import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.LocalPreferences
-import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.ammolite.service.HttpClientManager
-import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
-import com.vitorpamplona.quartz.events.ChatMessageRelayListEvent
+import com.vitorpamplona.amethyst.launchAndWaitAll
+import com.vitorpamplona.amethyst.model.AccountSettings
+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
@@ -55,7 +51,7 @@ class RegisterAccounts(
 
     private suspend fun signAllAuths(
         notificationToken: String,
-        remainingTos: List<Pair<Account, String>>,
+        remainingTos: List<Pair<AccountSettings, List<String>>>,
         output: MutableList<RelayAuthEvent>,
         onReady: (List<RelayAuthEvent>) -> Unit,
     ) {
@@ -64,28 +60,26 @@ class RegisterAccounts(
             return
         }
 
-        coroutineScope {
-            val jobs =
-                remainingTos.map { accountRelayPair ->
-                    async {
-                        val result =
-                            withTimeoutOrNull(10000) {
-                                suspendCancellableCoroutine { continuation ->
-                                    accountRelayPair.first.createAuthEvent(accountRelayPair.second, notificationToken) { result ->
-                                        continuation.resume(result)
-                                    }
-                                }
-                            }
+        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,
+                        )
+                    }
 
-                        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)
             }
         }
 
@@ -100,44 +94,34 @@ class RegisterAccounts(
     ) {
         val readyToSend =
             accounts
-                .map {
+                .mapNotNull {
                     Log.d(tag, "Register Account ${it.npub}")
 
                     val acc = LocalPreferences.loadCurrentAccountFromEncryptedStorage(it.npub)
-
                     if (acc != null && acc.isWriteable()) {
-                        val nip65Read =
-                            (
-                                LocalCache
-                                    .getAddressableNoteIfExists(
-                                        AdvertisedRelayListEvent.createAddressTag(acc.userProfile().pubkeyHex),
-                                    )?.event as? AdvertisedRelayListEvent
-                            )?.readRelays() ?: acc.backupNIP65RelayList?.readRelays() ?: emptyList<String>()
+                        val nip65Read = acc.backupNIP65RelayList?.readRelays() ?: emptyList()
 
-                        Log.d(tag, "Register Account ${acc.userProfile().toBestDisplayName()} NIP65 Reads ${nip65Read.joinToString(", ")}")
+                        Log.d(tag, "Register Account ${it.npub} NIP65 Reads ${nip65Read.joinToString(", ")}")
 
-                        val nip17Read =
-                            (
-                                LocalCache
-                                    .getAddressableNoteIfExists(
-                                        ChatMessageRelayListEvent.createAddressTag(acc.userProfile().pubkeyHex),
-                                    )?.event as? ChatMessageRelayListEvent
-                            )?.relays() ?: acc.backupDMRelayList?.relays() ?: emptyList<String>()
+                        val nip17Read = acc.backupDMRelayList?.relays() ?: emptyList<String>()
 
-                        Log.d(tag, "Register Account ${acc.userProfile().toBestDisplayName()} NIP17 Reads ${nip17Read.joinToString(", ")}")
+                        Log.d(tag, "Register Account ${it.npub} NIP17 Reads ${nip17Read.joinToString(", ")}")
 
-                        val kind3Relays = (acc.userProfile().latestContactList?.relays() ?: acc.backupContactList?.relays())
-                        val readKind3Relays = kind3Relays?.mapNotNull { if (it.value.read) it.key else null } ?: emptyList<String>()
+                        val readKind3Relays = acc.backupContactList?.relays()?.mapNotNull { if (it.value.read) it.key else null } ?: emptyList<String>()
 
-                        Log.d(tag, "Register Account ${acc.userProfile().toBestDisplayName()} Kind3 Reads ${readKind3Relays.joinToString(", ")}")
+                        Log.d(tag, "Register Account ${it.npub} Kind3 Reads ${readKind3Relays.joinToString(", ")}")
 
-                        (nip65Read + nip17Read + readKind3Relays).map {
-                            Pair(acc, it)
+                        val relays = (nip65Read + nip17Read + readKind3Relays)
+
+                        if (relays.isNotEmpty()) {
+                            Pair(acc, relays)
+                        } else {
+                            null
                         }
                     } else {
-                        emptyList<Pair<Account, String>>()
+                        null
                     }
-                }.flatten()
+                }
 
         val listOfAuthEvents = mutableListOf<RelayAuthEvent>()
         signAllAuths(
@@ -167,19 +151,22 @@ class RegisterAccounts(
                     .post(body)
                     .build()
 
-            val client = HttpClientManager.getHttpClient()
+            // Always try via Tor for Amethyst.
+            val client = HttpClientManager.getHttpClient(true)
 
             val isSucess = client.newCall(request).execute().use { it.isSuccessful }
+            Log.i(tag, "Server registration $isSucess")
         } catch (e: java.lang.Exception) {
             if (e is CancellationException) throw e
             Log.e(tag, "Unable to register with push server", e)
         }
     }
 
-    suspend fun go(notificationToken: String) =
-        withContext(Dispatchers.IO) {
-            signEventsToProveControlOfAccounts(accounts, notificationToken) { postRegistrationEvent(it) }
-
-            PushNotificationUtils.hasInit = true
+    suspend fun go(notificationToken: String) {
+        if (notificationToken.isNotEmpty()) {
+            withContext(Dispatchers.IO) {
+                signEventsToProveControlOfAccounts(accounts, notificationToken) { postRegistrationEvent(it) }
+            }
         }
+    }
 }

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

@@ -18,27 +18,22 @@
  * 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.previews
+package com.vitorpamplona.amethyst.service.okhttp
 
-import kotlinx.coroutines.CancellationException
+import okhttp3.Interceptor
+import okhttp3.Request
+import okhttp3.Response
 
-class BahaUrlPreview(
-    val url: String,
-    var callback: IUrlPreviewCallback?,
-) {
-    suspend fun fetchUrlPreview(timeOut: Int = 30000) =
-        try {
-            fetch(timeOut)
-        } catch (t: Throwable) {
-            if (t is CancellationException) throw t
-            callback?.onFailed(t)
-        }
-
-    private suspend fun fetch(timeOut: Int = 30000) {
-        callback?.onComplete(getDocument(url, timeOut))
-    }
-
-    fun cleanUp() {
-        callback = null
+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,126 +18,111 @@
  * 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 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
-import kotlin.properties.Delegates
 
 object HttpClientManager {
+    private val rootClient =
+        OkHttpClient
+            .Builder()
+            .followRedirects(true)
+            .followSslRedirects(true)
+            .build()
+
     val DEFAULT_TIMEOUT_ON_WIFI: Duration = Duration.ofSeconds(10L)
     val DEFAULT_TIMEOUT_ON_MOBILE: Duration = Duration.ofSeconds(30L)
 
-    var proxyChangeListeners = ArrayList<() -> Unit>()
     private var defaultTimeout = DEFAULT_TIMEOUT_ON_WIFI
     private var defaultHttpClient: OkHttpClient? = null
     private var defaultHttpClientWithoutProxy: OkHttpClient? = null
     private var userAgent: String = "Amethyst"
 
-    // fires off every time value of the property changes
-    private var internalProxy: Proxy? by
-        Delegates.observable(null) { _, oldValue, newValue ->
-            if (oldValue != newValue) {
-                proxyChangeListeners.forEach { it() }
-            }
-        }
+    private var currentProxy: Proxy? = null
+
+    private val cache = EncryptionKeyCache()
 
     fun setDefaultProxy(proxy: Proxy?) {
-        if (internalProxy != proxy) {
+        if (currentProxy != proxy) {
             Log.d("HttpClient", "Changing proxy to: ${proxy != null}")
-            this.internalProxy = proxy
+            currentProxy = proxy
 
             // recreates singleton
-            this.defaultHttpClient = buildHttpClient(internalProxy, defaultTimeout)
+            defaultHttpClient = buildHttpClient(currentProxy, defaultTimeout)
         }
     }
 
-    fun getDefaultProxy(): Proxy? = this.internalProxy
+    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(internalProxy, defaultTimeout)
+            defaultHttpClient = buildHttpClient(currentProxy, defaultTimeout)
+            defaultHttpClientWithoutProxy = buildHttpClient(null, defaultTimeout)
         }
     }
 
     fun setDefaultUserAgent(userAgentHeader: String) {
         Log.d("HttpClient", "Changing userAgent")
-        this.userAgent = userAgentHeader
-        this.defaultHttpClient = buildHttpClient(internalProxy, defaultTimeout)
+        if (userAgent != userAgentHeader) {
+            userAgent = userAgentHeader
+            defaultHttpClient = buildHttpClient(currentProxy, defaultTimeout)
+            defaultHttpClientWithoutProxy = buildHttpClient(null, defaultTimeout)
+        }
     }
 
-    fun getDefaultUserAgentHeader() = this.userAgent
-
     private fun buildHttpClient(
         proxy: Proxy?,
         timeout: Duration,
     ): OkHttpClient {
         val seconds = if (proxy != null) timeout.seconds * 3 else timeout.seconds
         val duration = Duration.ofSeconds(seconds)
-        return OkHttpClient
-            .Builder()
+        return rootClient
+            .newBuilder()
             .proxy(proxy)
             .readTimeout(duration)
             .connectTimeout(duration)
             .writeTimeout(duration)
             .addInterceptor(DefaultContentTypeInterceptor(userAgent))
-            .followRedirects(true)
-            .followSslRedirects(true)
+            .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 getHttpClientForUrl(url: String): OkHttpClient {
-        // TODO: How to identify relays on the local network?
-        val isLocalHost = url.startsWith("ws://127.0.0.1") || url.startsWith("ws://localhost")
-        return if (isLocalHost) {
-            getHttpClient(false)
-        } else {
-            getHttpClient()
-        }
-    }
-
-    fun getHttpClient(useProxy: Boolean = true): OkHttpClient =
+    fun getCurrentProxyPort(useProxy: Boolean): Int? =
         if (useProxy) {
-            if (this.defaultHttpClient == null) {
-                this.defaultHttpClient = buildHttpClient(internalProxy, defaultTimeout)
+            (currentProxy?.address() as? InetSocketAddress)?.port
+        } else {
+            null
+        }
+
+    fun getHttpClient(useProxy: Boolean): OkHttpClient =
+        if (useProxy) {
+            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!!
         }
 
-    fun initProxy(
-        useProxy: Boolean,
-        hostname: String,
-        port: Int,
-    ): Proxy? = if (useProxy) Proxy(Proxy.Type.SOCKS, InetSocketAddress(hostname, port)) else null
+    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

@@ -21,15 +21,21 @@
 package com.vitorpamplona.amethyst.service.ots
 
 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
 import okhttp3.Request
 
-class OkHttpBlockstreamExplorer : BitcoinExplorer {
+class OkHttpBlockstreamExplorer(
+    val forceProxy: (String) -> Boolean,
+) : BitcoinExplorer {
+    private val cacheHeaders = LruCache<String, BlockHeader>(100)
+    private val cacheHeights = LruCache<Int, String>(100)
+
     /**
      * Retrieve the block information from the block hash.
      *
@@ -38,8 +44,13 @@ class OkHttpBlockstreamExplorer : BitcoinExplorer {
      * @throws Exception desc
      */
     override fun block(hash: String): BlockHeader {
-        val client = HttpClientManager.getHttpClient()
-        val url = "$BLOCKSTREAM_API_URL/block/$hash"
+        cacheHeaders.get(hash)?.let {
+            return it
+        }
+
+        val usingTor = forceProxy(BLOCKSTREAM_API_URL)
+        val url = "${getAPI(usingTor)}/block/$hash"
+        val client = HttpClientManager.getHttpClient(forceProxy(url))
 
         val request =
             Request
@@ -59,6 +70,9 @@ class OkHttpBlockstreamExplorer : BitcoinExplorer {
                 blockHeader.setTime(jsonObject["timestamp"].asInt().toString())
                 blockHeader.blockHash = hash
                 Log.d("OkHttpBlockstreamExplorer", "$BLOCKSTREAM_API_URL/block/$hash")
+
+                cacheHeaders.put(hash, blockHeader)
+
                 return blockHeader
             } else {
                 throw UrlException("Couldn't open $url: " + it.message + " " + it.code)
@@ -75,9 +89,13 @@ class OkHttpBlockstreamExplorer : BitcoinExplorer {
      */
     @Throws(Exception::class)
     override fun blockHash(height: Int): String {
-        val client = HttpClientManager.getHttpClient()
+        cacheHeights[height]?.let {
+            return it
+        }
 
-        val url = "$BLOCKSTREAM_API_URL/block-height/$height"
+        val usingTor = forceProxy(BLOCKSTREAM_API_URL)
+        val url = "${getAPI(usingTor)}/block-height/$height"
+        val client = HttpClientManager.getHttpClient(usingTor)
 
         val request =
             Request
@@ -92,14 +110,24 @@ class OkHttpBlockstreamExplorer : BitcoinExplorer {
                 val blockHash = it.body.string()
 
                 Log.d("OkHttpBlockstreamExplorer", "$url $blockHash")
+
+                cacheHeights.put(height, blockHash)
                 return blockHash
             } else {
-                throw UrlException(it.message)
+                throw UrlException("Couldn't open $url: " + it.message + " " + it.code)
             }
         }
     }
 
     companion object {
         private const val BLOCKSTREAM_API_URL = "https://blockstream.info/api"
+        private const val MEMPOOL_API_URL = "https://mempool.space/api/"
+
+        fun getAPI(usingTor: Boolean) =
+            if (usingTor) {
+                MEMPOOL_API_URL
+            } else {
+                BLOCKSTREAM_API_URL
+            }
     }
 }

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
@@ -38,6 +38,7 @@ import okhttp3.RequestBody.Companion.toRequestBody
  */
 class OkHttpCalendar(
     val url: String,
+    val forceProxy: Boolean,
 ) : ICalendar {
     /**
      * Submitting a digest to remote calendar. Returns a com.eternitywall.ots.Timestamp committing to that digest.
@@ -51,7 +52,7 @@ class OkHttpCalendar(
     @Throws(ExceededSizeException::class, UrlException::class, DeserializationException::class)
     override fun submit(digest: ByteArray): Timestamp {
         try {
-            val client = HttpClientManager.getHttpClient()
+            val client = HttpClientManager.getHttpClient(forceProxy)
             val url = "$url/digest"
 
             val mediaType = "application/x-www-form-urlencoded; charset=utf-8".toMediaType()
@@ -102,7 +103,7 @@ class OkHttpCalendar(
     )
     override fun getTimestamp(commitment: ByteArray): Timestamp {
         try {
-            val client = HttpClientManager.getHttpClient()
+            val client = HttpClientManager.getHttpClient(forceProxy)
             val url = url + "/timestamp/" + Hex.encode(commitment)
 
             val request =

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
@@ -36,6 +36,7 @@ import java.util.concurrent.BlockingQueue
 class OkHttpCalendarAsyncSubmit(
     private val url: String,
     private val digest: ByteArray,
+    private val forceProxy: Boolean,
 ) : ICalendarAsyncSubmit {
     private var queue: BlockingQueue<Optional<Timestamp>>? = null
 
@@ -45,7 +46,7 @@ class OkHttpCalendarAsyncSubmit(
 
     @Throws(Exception::class)
     override fun call(): Optional<Timestamp> {
-        val client = HttpClientManager.getHttpClient()
+        val client = HttpClientManager.getHttpClient(forceProxy)
         val url = "$url/digest"
 
         val mediaType = "application/x-www-form-urlencoded; charset=utf-8".toMediaType()

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

@@ -24,11 +24,13 @@ import com.vitorpamplona.quartz.ots.CalendarBuilder
 import com.vitorpamplona.quartz.ots.ICalendar
 import com.vitorpamplona.quartz.ots.ICalendarAsyncSubmit
 
-class OkHttpCalendarBuilder : CalendarBuilder {
-    override fun newSyncCalendar(url: String): ICalendar = OkHttpCalendar(url)
+class OkHttpCalendarBuilder(
+    val forceProxy: (String) -> Boolean,
+) : CalendarBuilder {
+    override fun newSyncCalendar(url: String): ICalendar = OkHttpCalendar(url, forceProxy(url))
 
     override fun newAsyncCalendar(
         url: String,
         digest: ByteArray,
-    ): ICalendarAsyncSubmit = OkHttpCalendarAsyncSubmit(url, digest)
+    ): ICalendarAsyncSubmit = OkHttpCalendarAsyncSubmit(url, digest, forceProxy(url))
 }

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

@@ -28,17 +28,17 @@ import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
 import androidx.media3.exoplayer.source.MediaSource
 import androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy
 import com.vitorpamplona.amethyst.Amethyst
-import com.vitorpamplona.ammolite.service.HttpClientManager
+import okhttp3.OkHttpClient
 
 /**
  * HLS LiveStreams cannot use cache.
  */
 @UnstableApi
-class CustomMediaSourceFactory : MediaSource.Factory {
-    private var cachingFactory: MediaSource.Factory =
-        DefaultMediaSourceFactory(Amethyst.instance.videoCache.get(HttpClientManager.getHttpClient()))
-    private var nonCachingFactory: MediaSource.Factory =
-        DefaultMediaSourceFactory(OkHttpDataSource.Factory(HttpClientManager.getHttpClient()))
+class CustomMediaSourceFactory(
+    val okHttpClient: OkHttpClient,
+) : MediaSource.Factory {
+    private var cachingFactory: MediaSource.Factory = DefaultMediaSourceFactory(Amethyst.instance.videoCache.get(okHttpClient))
+    private var nonCachingFactory: MediaSource.Factory = DefaultMediaSourceFactory(OkHttpDataSource.Factory(okHttpClient))
 
     override fun setDrmSessionManagerProvider(drmSessionManagerProvider: DrmSessionManagerProvider): MediaSource.Factory {
         cachingFactory.setDrmSessionManagerProvider(drmSessionManagerProvider)

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

@@ -30,6 +30,7 @@ import androidx.media3.common.Player
 import androidx.media3.common.Player.PositionInfo
 import androidx.media3.common.Player.STATE_IDLE
 import androidx.media3.common.Player.STATE_READY
+import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.session.MediaSession
 import com.vitorpamplona.amethyst.ui.MainActivity
@@ -40,14 +41,15 @@ import kotlinx.coroutines.launch
 import kotlin.math.abs
 
 class MultiPlayerPlaybackManager(
-    private val dataSourceFactory: androidx.media3.exoplayer.source.MediaSource.Factory? = null,
+    @UnstableApi
+    val dataSourceFactory: CustomMediaSourceFactory,
     private val cachedPositions: VideoViewedPositionCache,
 ) {
     // protects from LruCache killing playing sessions
     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?,
@@ -89,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/PlaybackClientController.kt

@@ -38,6 +38,7 @@ object PlaybackClientController {
         controllerID: String,
         videoUri: String,
         callbackUri: String?,
+        proxyPort: Int? = 0,
         context: Context,
         onReady: (MediaController) -> Unit,
     ) {
@@ -48,6 +49,9 @@ object PlaybackClientController {
             bundle.putString("id", controllerID)
             bundle.putString("uri", videoUri)
             bundle.putString("callbackUri", callbackUri)
+            proxyPort?.let {
+                bundle.putInt("proxyPort", it)
+            }
 
             var session = cache.get(context.hashCode())
             if (session == null) {

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

@@ -26,22 +26,51 @@ 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()
-
-    private var managerAllInOne: MultiPlayerPlaybackManager? = null
+    private var managerAllInOneNoProxy: MultiPlayerPlaybackManager? = null
+    private var managerAllInOneProxy: MultiPlayerPlaybackManager? = null
 
     @OptIn(UnstableApi::class)
-    fun lazyDS(): MultiPlayerPlaybackManager {
-        managerAllInOne?.let {
-            return it
-        }
+    fun lazyDS(proxyPort: Int): MultiPlayerPlaybackManager {
+        if (proxyPort <= 0) {
+            // no proxy
+            managerAllInOneNoProxy?.let {
+                return it
+            }
 
-        val newInstance = MultiPlayerPlaybackManager(CustomMediaSourceFactory(), videoViewedPositionCache)
-        managerAllInOne = newInstance
-        return newInstance
+            // creates new
+            val okHttp = HttpClientManager.getHttpClient(false)
+            val newInstance = MultiPlayerPlaybackManager(CustomMediaSourceFactory(okHttp), videoViewedPositionCache)
+            managerAllInOneNoProxy = newInstance
+            return newInstance
+        } else {
+            // with proxy, check if the port is the same.
+            managerAllInOneProxy?.let {
+                val okHttp = HttpClientManager.getHttpClient(true)
+                if (okHttp == it.dataSourceFactory.okHttpClient.proxy) {
+                    return it
+                }
+
+                val toDestroyAllInOne = managerAllInOneProxy
+
+                val newInstance = MultiPlayerPlaybackManager(CustomMediaSourceFactory(okHttp), videoViewedPositionCache)
+
+                managerAllInOneProxy = newInstance
+
+                toDestroyAllInOne?.releaseAppPlayers()
+
+                return newInstance
+            }
+
+            // creates new
+            val okHttp = HttpClientManager.getHttpClient(true)
+            val newInstance = MultiPlayerPlaybackManager(CustomMediaSourceFactory(okHttp), videoViewedPositionCache)
+            managerAllInOneProxy = newInstance
+            return newInstance
+        }
     }
 
     // Create your Player and MediaSession in the onCreate lifecycle event
@@ -50,18 +79,6 @@ class PlaybackService : MediaSessionService() {
         super.onCreate()
 
         Log.d("Lifetime Event", "PlaybackService.onCreate")
-
-        // Stop all videos and recreates all managers when the proxy changes.
-        HttpClientManager.proxyChangeListeners.add(this@PlaybackService::onProxyUpdated)
-    }
-
-    @OptIn(UnstableApi::class)
-    private fun onProxyUpdated() {
-        val toDestroyAllInOne = managerAllInOne
-
-        managerAllInOne = MultiPlayerPlaybackManager(CustomMediaSourceFactory(), videoViewedPositionCache)
-
-        toDestroyAllInOne?.releaseAppPlayers()
     }
 
     override fun onTaskRemoved(rootIntent: Intent?) {
@@ -73,9 +90,8 @@ class PlaybackService : MediaSessionService() {
     override fun onDestroy() {
         Log.d("Lifetime Event", "PlaybackService.onDestroy")
 
-        HttpClientManager.proxyChangeListeners.remove(this@PlaybackService::onProxyUpdated)
-
-        managerAllInOne?.releaseAppPlayers()
+        managerAllInOneProxy?.releaseAppPlayers()
+        managerAllInOneNoProxy?.releaseAppPlayers()
 
         super.onDestroy()
     }
@@ -88,14 +104,28 @@ class PlaybackService : MediaSessionService() {
         super.onUpdateNotification(session, startInForegroundRequired)
 
         // Overrides the notification with any player actually playing
-        managerAllInOne?.playingContent()?.forEach {
+        managerAllInOneProxy?.playingContent()?.forEach {
             if (it.player.isPlaying) {
                 super.onUpdateNotification(it, startInForegroundRequired)
             }
         }
 
         // Overrides again with playing with audio
-        managerAllInOne?.playingContent()?.forEach {
+        managerAllInOneProxy?.playingContent()?.forEach {
+            if (it.player.isPlaying && it.player.volume > 0) {
+                super.onUpdateNotification(it, startInForegroundRequired)
+            }
+        }
+
+        // Overrides the notification with any player actually playing
+        managerAllInOneNoProxy?.playingContent()?.forEach {
+            if (it.player.isPlaying) {
+                super.onUpdateNotification(it, startInForegroundRequired)
+            }
+        }
+
+        // Overrides again with playing with audio
+        managerAllInOneNoProxy?.playingContent()?.forEach {
             if (it.player.isPlaying && it.player.volume > 0) {
                 super.onUpdateNotification(it, startInForegroundRequired)
             }
@@ -108,8 +138,9 @@ class PlaybackService : MediaSessionService() {
         val id = controllerInfo.connectionHints.getString("id") ?: return null
         val uri = controllerInfo.connectionHints.getString("uri") ?: return null
         val callbackUri = controllerInfo.connectionHints.getString("callbackUri")
+        val proxyPort = controllerInfo.connectionHints.getInt("proxyPort")
 
-        val manager = lazyDS()
+        val manager = lazyDS(proxyPort)
 
         return manager.getMediaSession(
             id,

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

@@ -43,13 +43,16 @@ class VideoCache {
 
     lateinit var cacheDataSourceFactory: CacheDataSource.Factory
 
-    suspend fun initFileCache(context: Context) {
+    suspend fun initFileCache(
+        context: Context,
+        cachePath: File,
+    ) {
         exoDatabaseProvider = StandaloneDatabaseProvider(context)
 
         withContext(Dispatchers.IO) {
             simpleCache =
                 SimpleCache(
-                    File(context.cacheDir, "exoplayer"),
+                    cachePath,
                     leastRecentlyUsedCacheEvictor,
                     exoDatabaseProvider,
                 )
@@ -62,9 +65,8 @@ class VideoCache {
             CacheDataSource
                 .Factory()
                 .setCache(simpleCache)
-                .setUpstreamDataSourceFactory(
-                    OkHttpDataSource.Factory(client),
-                ).setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
+                .setUpstreamDataSourceFactory(OkHttpDataSource.Factory(client))
+                .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
     }
 
     fun get(client: OkHttpClient): CacheDataSource.Factory {

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

@@ -0,0 +1,111 @@
+/**
+ * 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.previews
+
+import com.vitorpamplona.amethyst.commons.preview.MetaTag
+import com.vitorpamplona.amethyst.commons.preview.MetaTagsParser
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import okhttp3.MediaType
+import okio.BufferedSource
+import okio.ByteString.Companion.decodeHex
+import okio.Options
+import java.nio.charset.Charset
+
+class HtmlParser {
+    companion object {
+        val ATTRIBUTE_VALUE_CHARSET = "charset"
+        val ATTRIBUTE_VALUE_HTTP_EQUIV = "http-equiv"
+        val CONTENT = "content"
+
+        // taken from okhttp
+        private val UNICODE_BOMS =
+            Options.of(
+                // UTF-8
+                "efbbbf".decodeHex(),
+                // UTF-16BE
+                "feff".decodeHex(),
+                // UTF-16LE
+                "fffe".decodeHex(),
+                // UTF-32BE
+                "0000ffff".decodeHex(),
+                // UTF-32LE
+                "ffff0000".decodeHex(),
+            )
+
+        private val RE_CONTENT_TYPE_CHARSET = Regex("""charset=([^;]+)""")
+    }
+
+    suspend fun parseHtml(
+        source: BufferedSource,
+        type: MediaType,
+    ): Sequence<MetaTag> =
+        withContext(Dispatchers.IO) {
+            // sniff charset from Content-Type header or BOM
+            val sniffedCharset = type.charset() ?: source.readBomAsCharset()
+            if (sniffedCharset != null) {
+                val content = source.readByteArray().toString(sniffedCharset)
+                return@withContext MetaTagsParser.parse(content)
+            }
+
+            // if sniffing was failed, detect charset from content
+            val bodyBytes = source.readByteArray()
+            val charset = detectCharset(bodyBytes)
+            val content = bodyBytes.toString(charset)
+            return@withContext MetaTagsParser.parse(content)
+        }
+
+    private fun BufferedSource.readBomAsCharset(): Charset? =
+        when (select(UNICODE_BOMS)) {
+            0 -> Charsets.UTF_8
+            1 -> Charsets.UTF_16BE
+            2 -> Charsets.UTF_16LE
+            3 -> Charsets.UTF_32BE
+            4 -> Charsets.UTF_32LE
+            -1 -> null
+            else -> throw AssertionError()
+        }
+
+    private fun detectCharset(bodyBytes: ByteArray): Charset {
+        // try to detect charset from meta tags parsed from first 1024 bytes of body
+        val firstPart = String(bodyBytes, 0, 1024, Charset.forName("utf-8"))
+        val metaTags = MetaTagsParser.parse(firstPart)
+        metaTags.forEach { meta ->
+            val charsetAttr = meta.attr(ATTRIBUTE_VALUE_CHARSET)
+            if (charsetAttr.isNotEmpty()) {
+                runCatching { Charset.forName(charsetAttr) }.getOrNull()?.let {
+                    return it
+                }
+            }
+            if (meta.attr(ATTRIBUTE_VALUE_HTTP_EQUIV).lowercase() == "content-type") {
+                RE_CONTENT_TYPE_CHARSET
+                    .find(meta.attr(CONTENT))
+                    ?.let {
+                        runCatching { Charset.forName(it.groupValues[1]) }.getOrNull()
+                    }?.let {
+                        return it
+                    }
+            }
+        }
+        // defaults to UTF-8
+        return Charset.forName("utf-8")
+    }
+}

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

@@ -0,0 +1,127 @@
+/**
+ * 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.previews
+
+import com.vitorpamplona.amethyst.commons.preview.MetaTag
+
+class OpenGraphParser {
+    class Result(
+        val title: String,
+        val description: String,
+        val image: String,
+    )
+
+    companion object {
+        val ATTRIBUTE_VALUE_PROPERTY = "property"
+        val ATTRIBUTE_VALUE_NAME = "name"
+        val ATTRIBUTE_VALUE_ITEMPROP = "itemprop"
+
+        // for <meta itemprop=... to get title
+        private val META_X_TITLE =
+            arrayOf(
+                "og:title",
+                "twitter:title",
+                "title",
+            )
+
+        // for <meta itemprop=... to get description
+        private val META_X_DESCRIPTION =
+            arrayOf(
+                "og:description",
+                "twitter:description",
+                "description",
+            )
+
+        // for <meta itemprop=... to get image
+        private val META_X_IMAGE =
+            arrayOf(
+                "og:image",
+                "twitter:image",
+                "image",
+            )
+
+        private val CONTENT = "content"
+    }
+
+    fun extractUrlInfo(metaTags: Sequence<MetaTag>): Result {
+        var title: String = ""
+        var description: String = ""
+        var image: String = ""
+
+        metaTags.forEach {
+            when (it.attr(ATTRIBUTE_VALUE_PROPERTY)) {
+                in META_X_TITLE ->
+                    if (title.isEmpty()) {
+                        title = it.attr(CONTENT)
+                    }
+
+                in META_X_DESCRIPTION ->
+                    if (description.isEmpty()) {
+                        description = it.attr(CONTENT)
+                    }
+
+                in META_X_IMAGE ->
+                    if (image.isEmpty()) {
+                        image = it.attr(CONTENT)
+                    }
+            }
+
+            when (it.attr(ATTRIBUTE_VALUE_NAME)) {
+                in META_X_TITLE ->
+                    if (title.isEmpty()) {
+                        title = it.attr(CONTENT)
+                    }
+
+                in META_X_DESCRIPTION ->
+                    if (description.isEmpty()) {
+                        description = it.attr(CONTENT)
+                    }
+
+                in META_X_IMAGE ->
+                    if (image.isEmpty()) {
+                        image = it.attr(CONTENT)
+                    }
+            }
+
+            when (it.attr(ATTRIBUTE_VALUE_ITEMPROP)) {
+                in META_X_TITLE ->
+                    if (title.isEmpty()) {
+                        title = it.attr(CONTENT)
+                    }
+
+                in META_X_DESCRIPTION ->
+                    if (description.isEmpty()) {
+                        description = it.attr(CONTENT)
+                    }
+
+                in META_X_IMAGE ->
+                    if (image.isEmpty()) {
+                        image = it.attr(CONTENT)
+                    }
+            }
+
+            if (title.isNotEmpty() && description.isNotEmpty() && image.isNotEmpty()) {
+                return Result(title, description, image)
+            }
+        }
+        return Result(title, description, image)
+    }
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/previews/UrlPreview.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.service.previews
+
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.service.okhttp.HttpClientManager
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.Request
+
+class UrlPreview {
+    suspend fun fetch(
+        url: String,
+        forceProxy: Boolean,
+        onComplete: suspend (urlInfo: UrlInfoItem) -> Unit,
+        onFailed: suspend (t: Throwable) -> Unit,
+    ) = try {
+        onComplete(getDocument(url, forceProxy))
+    } catch (t: Throwable) {
+        if (t is CancellationException) throw t
+        onFailed(t)
+    }
+
+    suspend fun getDocument(
+        url: String,
+        forceProxy: Boolean,
+    ): UrlInfoItem =
+        withContext(Dispatchers.IO) {
+            val request =
+                Request
+                    .Builder()
+                    .url(url)
+                    .get()
+                    .build()
+            HttpClientManager.getHttpClient(forceProxy).newCall(request).execute().use {
+                checkNotInMainThread()
+                if (it.isSuccessful) {
+                    val mimeType =
+                        it.headers["Content-Type"]?.toMediaType()
+                            ?: throw IllegalArgumentException("Website returned unknown mimetype: ${it.headers["Content-Type"]}")
+                    if (mimeType.type == "text" && mimeType.subtype == "html") {
+                        val data = OpenGraphParser().extractUrlInfo(HtmlParser().parseHtml(it.body.source(), mimeType))
+                        UrlInfoItem(url, data.title, data.description, data.image, mimeType)
+                    } else if (mimeType.type == "image") {
+                        UrlInfoItem(url, image = url, mimeType = mimeType)
+                    } else if (mimeType.type == "video") {
+                        UrlInfoItem(url, image = url, mimeType = mimeType)
+                    } else {
+                        throw IllegalArgumentException("Website returned unknown encoding for previews: $mimeType")
+                    }
+                } else {
+                    throw IllegalArgumentException("Website returned: " + it.code)
+                }
+            }
+        }
+}

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

@@ -1,244 +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.previews
-
-import com.vitorpamplona.amethyst.commons.preview.MetaTag
-import com.vitorpamplona.amethyst.commons.preview.MetaTagsParser
-import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.ammolite.service.HttpClientManager
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import okhttp3.MediaType
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.Request
-import okio.BufferedSource
-import okio.ByteString.Companion.decodeHex
-import okio.Options
-import java.nio.charset.Charset
-
-private const val ATTRIBUTE_VALUE_PROPERTY = "property"
-private const val ATTRIBUTE_VALUE_NAME = "name"
-private const val ATTRIBUTE_VALUE_ITEMPROP = "itemprop"
-private const val ATTRIBUTE_VALUE_CHARSET = "charset"
-private const val ATTRIBUTE_VALUE_HTTP_EQUIV = "http-equiv"
-
-// for <meta itemprop=... to get title
-private val META_X_TITLE =
-    arrayOf(
-        "og:title",
-        "twitter:title",
-        "title",
-    )
-
-// for <meta itemprop=... to get description
-private val META_X_DESCRIPTION =
-    arrayOf(
-        "og:description",
-        "twitter:description",
-        "description",
-    )
-
-// for <meta itemprop=... to get image
-private val META_X_IMAGE =
-    arrayOf(
-        "og:image",
-        "twitter:image",
-        "image",
-    )
-
-private const val CONTENT = "content"
-
-suspend fun getDocument(
-    url: String,
-    timeOut: Int = 30000,
-): UrlInfoItem =
-    withContext(Dispatchers.IO) {
-        val request: Request =
-            Request
-                .Builder()
-                .url(url)
-                .get()
-                .build()
-        HttpClientManager.getHttpClient().newCall(request).execute().use {
-            checkNotInMainThread()
-            if (it.isSuccessful) {
-                val mimeType =
-                    it.headers["Content-Type"]?.toMediaType()
-                        ?: throw IllegalArgumentException(
-                            "Website returned unknown mimetype: ${it.headers["Content-Type"]}",
-                        )
-                if (mimeType.type == "text" && mimeType.subtype == "html") {
-                    parseHtml(url, it.body.source(), mimeType)
-                } else if (mimeType.type == "image") {
-                    UrlInfoItem(url, image = url, mimeType = mimeType)
-                } else if (mimeType.type == "video") {
-                    UrlInfoItem(url, image = url, mimeType = mimeType)
-                } else {
-                    throw IllegalArgumentException(
-                        "Website returned unknown encoding for previews: $mimeType",
-                    )
-                }
-            } else {
-                throw IllegalArgumentException("Website returned: " + it.code)
-            }
-        }
-    }
-
-suspend fun parseHtml(
-    url: String,
-    source: BufferedSource,
-    type: MediaType,
-): UrlInfoItem =
-    withContext(Dispatchers.IO) {
-        // sniff charset from Content-Type header or BOM
-        val sniffedCharset = type.charset() ?: source.readBomAsCharset()
-        if (sniffedCharset != null) {
-            val metaTags = MetaTagsParser.parse(source.readByteArray().toString(sniffedCharset))
-            return@withContext extractUrlInfo(url, metaTags, type)
-        }
-
-        // if sniffing was failed, detect charset from content
-        val bodyBytes = source.readByteArray()
-        val charset = detectCharset(bodyBytes)
-        val metaTags = MetaTagsParser.parse(bodyBytes.toString(charset))
-        return@withContext extractUrlInfo(url, metaTags, type)
-    }
-
-// taken from okhttp
-private val UNICODE_BOMS =
-    Options.of(
-        // UTF-8
-        "efbbbf".decodeHex(),
-        // UTF-16BE
-        "feff".decodeHex(),
-        // UTF-16LE
-        "fffe".decodeHex(),
-        // UTF-32BE
-        "0000ffff".decodeHex(),
-        // UTF-32LE
-        "ffff0000".decodeHex(),
-    )
-
-private fun BufferedSource.readBomAsCharset(): Charset? =
-    when (select(UNICODE_BOMS)) {
-        0 -> Charsets.UTF_8
-        1 -> Charsets.UTF_16BE
-        2 -> Charsets.UTF_16LE
-        3 -> Charsets.UTF_32BE
-        4 -> Charsets.UTF_32LE
-        -1 -> null
-        else -> throw AssertionError()
-    }
-
-private val RE_CONTENT_TYPE_CHARSET = Regex("""charset=([^;]+)""")
-
-private fun detectCharset(bodyBytes: ByteArray): Charset {
-    // try to detect charset from meta tags parsed from first 1024 bytes of body
-    val firstPart = String(bodyBytes, 0, 1024, Charset.forName("utf-8"))
-    val metaTags = MetaTagsParser.parse(firstPart)
-    metaTags.forEach { meta ->
-        val charsetAttr = meta.attr(ATTRIBUTE_VALUE_CHARSET)
-        if (charsetAttr.isNotEmpty()) {
-            runCatching { Charset.forName(charsetAttr) }.getOrNull()?.let {
-                return it
-            }
-        }
-        if (meta.attr(ATTRIBUTE_VALUE_HTTP_EQUIV).lowercase() == "content-type") {
-            RE_CONTENT_TYPE_CHARSET
-                .find(meta.attr(CONTENT))
-                ?.let {
-                    runCatching { Charset.forName(it.groupValues[1]) }.getOrNull()
-                }?.let {
-                    return it
-                }
-        }
-    }
-    // defaults to UTF-8
-    return Charset.forName("utf-8")
-}
-
-private fun extractUrlInfo(
-    url: String,
-    metaTags: Sequence<MetaTag>,
-    type: MediaType,
-): UrlInfoItem {
-    var title: String = ""
-    var description: String = ""
-    var image: String = ""
-
-    metaTags.forEach {
-        when (it.attr(ATTRIBUTE_VALUE_PROPERTY)) {
-            in META_X_TITLE ->
-                if (title.isEmpty()) {
-                    title = it.attr(CONTENT)
-                }
-
-            in META_X_DESCRIPTION ->
-                if (description.isEmpty()) {
-                    description = it.attr(CONTENT)
-                }
-
-            in META_X_IMAGE ->
-                if (image.isEmpty()) {
-                    image = it.attr(CONTENT)
-                }
-        }
-
-        when (it.attr(ATTRIBUTE_VALUE_NAME)) {
-            in META_X_TITLE ->
-                if (title.isEmpty()) {
-                    title = it.attr(CONTENT)
-                }
-
-            in META_X_DESCRIPTION ->
-                if (description.isEmpty()) {
-                    description = it.attr(CONTENT)
-                }
-
-            in META_X_IMAGE ->
-                if (image.isEmpty()) {
-                    image = it.attr(CONTENT)
-                }
-        }
-
-        when (it.attr(ATTRIBUTE_VALUE_ITEMPROP)) {
-            in META_X_TITLE ->
-                if (title.isEmpty()) {
-                    title = it.attr(CONTENT)
-                }
-
-            in META_X_DESCRIPTION ->
-                if (description.isEmpty()) {
-                    description = it.attr(CONTENT)
-                }
-
-            in META_X_IMAGE ->
-                if (image.isEmpty()) {
-                    image = it.attr(CONTENT)
-                }
-        }
-
-        if (title.isNotEmpty() && description.isNotEmpty() && image.isNotEmpty()) {
-            return UrlInfoItem(url, title, description, image, type)
-        }
-    }
-    return UrlInfoItem(url, title, description, image, type)
-}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/relays/EOSE.kt

@@ -21,7 +21,7 @@
 package com.vitorpamplona.amethyst.service.relays
 
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.ammolite.relays.EOSETime
+import com.vitorpamplona.ammolite.relays.filters.EOSETime
 
 class EOSERelayList(
     var relayList: Map<String, EOSETime> = emptyMap(),

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,51 +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?,
-            onReady: (FileHeader) -> Unit,
-            onError: (String?) -> Unit,
-        ) {
+            dimPrecomputed: Dimension?,
+            forceProxy: Boolean,
+        ): Result<FileHeader> =
             try {
-                val imageData: ByteArray? = ImageDownloader().waitAndGetImage(fileUrl)
+                val imageData: ByteArray? = ImageDownloader().waitAndGetImage(fileUrl, forceProxy)
 
                 if (imageData != null) {
-                    prepare(imageData, mimeType, dimPrecomputed, onReady, onError)
+                    prepare(imageData, mimeType, dimPrecomputed)
                 } else {
-                    onError(null)
+                    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)
+                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
@@ -82,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)
@@ -174,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)
+                Result.failure(e)
             }
-        }
     }
 }
 
@@ -211,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,
+}