0.92.2

Merge pull request #1133 from greenart7c3/external_signer_result
Check for the result field when using external signer
2026-07-22 15:52:22 +00:00 · 2024-10-11 19:35:52 -04:00 · 2024-10-11 08:08:30 -04:00 · 2024-10-11 07:22:34 -03:00 · 2024-10-10 17:52:24 -04:00 · 2024-10-10 16:48:33 -04:00
1000 changed files with 40233 additions and 22281 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -24,9 +24,10 @@ 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.
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,11 +18,11 @@ jobs:
      - name: Set up JDK 17
        uses: actions/setup-java@v4
        with:
-          distribution: 'temurin'
+          distribution: 'zulu'
          java-version: 17

      - name: Cache gradle
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: ~/.gradle/caches
          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
@@ -43,14 +43,14 @@ jobs:
        run: ./gradlew assembleDebug --no-daemon

      - name: Upload APK
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
        with:
          name: Debug APK
-          path: app/build/outputs/apk/debug/app-debug.apk
+          path: amethyst/build/outputs/apk/debug/app-debug.apk

      - name: Upload Test Results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
        with:
          name: Build Reports
-          path: app/build/reports
+          path: amethyst/build/reports

--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -15,11 +15,11 @@ jobs:
      - name: Set up JDK 17
        uses: actions/setup-java@v4
        with:
-          distribution: 'temurin'
+          distribution: 'zulu'
          java-version: 17

      - name: Cache gradle
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: ~/.gradle/caches
          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
@@ -32,7 +32,7 @@ jobs:
      - name: Sign AAB (Google Play)
        uses: r0adkll/sign-android-release@v1
        with:
-          releaseDirectory: app/build/outputs/bundle/playRelease
+          releaseDirectory: amethyst/build/outputs/bundle/playRelease
          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
          alias: ${{ secrets.KEY_ALIAS }}
          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
@@ -44,7 +44,7 @@ jobs:
      - name: Sign AAB (F-Droid)
        uses: r0adkll/sign-android-release@v1
        with:
-          releaseDirectory: app/build/outputs/bundle/fdroidRelease
+          releaseDirectory: amethyst/build/outputs/bundle/fdroidRelease
          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
          alias: ${{ secrets.KEY_ALIAS }}
          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
@@ -59,7 +59,7 @@ jobs:
      - name: Sign APK (Google Play)
        uses: r0adkll/sign-android-release@v1
        with:
-          releaseDirectory: app/build/outputs/apk/play/release
+          releaseDirectory: amethyst/build/outputs/apk/play/release
          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
          alias: ${{ secrets.KEY_ALIAS }}
          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
@@ -71,7 +71,7 @@ jobs:
      - name: Sign APK (F-Droid)
        uses: r0adkll/sign-android-release@v1
        with:
-          releaseDirectory: app/build/outputs/apk/fdroid/release
+          releaseDirectory: amethyst/build/outputs/apk/fdroid/release
          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
          alias: ${{ secrets.KEY_ALIAS }}
          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
@@ -99,7 +99,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/play/release/app-play-universal-release-unsigned-signed.apk
+          asset_path: amethyst/build/outputs/apk/play/release/amethyst-play-universal-release-unsigned-signed.apk
          asset_name: amethyst-googleplay-universal-${{ github.ref_name }}.apk
          asset_content_type: application/zip

@@ -110,7 +110,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/play/release/app-play-x86-release-unsigned-signed.apk
+          asset_path: amethyst/build/outputs/apk/play/release/amethyst-play-x86-release-unsigned-signed.apk
          asset_name: amethyst-googleplay-x86-${{ github.ref_name }}.apk
          asset_content_type: application/zip

@@ -121,7 +121,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/play/release/app-play-x86_64-release-unsigned-signed.apk
+          asset_path: amethyst/build/outputs/apk/play/release/amethyst-play-x86_64-release-unsigned-signed.apk
          asset_name: amethyst-googleplay-x86_64-${{ github.ref_name }}.apk
          asset_content_type: application/zip

@@ -132,7 +132,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/play/release/app-play-arm64-v8a-release-unsigned-signed.apk
+          asset_path: amethyst/build/outputs/apk/play/release/amethyst-play-arm64-v8a-release-unsigned-signed.apk
          asset_name: amethyst-googleplay-arm64-v8a-${{ github.ref_name }}.apk
          asset_content_type: application/zip

@@ -143,7 +143,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/play/release/app-play-armeabi-v7a-release-unsigned-signed.apk
+          asset_path: amethyst/build/outputs/apk/play/release/amethyst-play-armeabi-v7a-release-unsigned-signed.apk
          asset_name: amethyst-googleplay-armeabi-v7a-${{ github.ref_name }}.apk
          asset_content_type: application/zip

@@ -155,7 +155,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-universal-release-unsigned-signed.apk
+          asset_path: amethyst/build/outputs/apk/fdroid/release/amethyst-fdroid-universal-release-unsigned-signed.apk
          asset_name: amethyst-fdroid-universal-${{ github.ref_name }}.apk
          asset_content_type: application/zip

@@ -166,7 +166,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-x86-release-unsigned-signed.apk
+          asset_path: amethyst/build/outputs/apk/fdroid/release/amethyst-fdroid-x86-release-unsigned-signed.apk
          asset_name: amethyst-fdroid-x86-${{ github.ref_name }}.apk
          asset_content_type: application/zip

@@ -177,7 +177,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-x86_64-release-unsigned-signed.apk
+          asset_path: amethyst/build/outputs/apk/fdroid/release/amethyst-fdroid-x86_64-release-unsigned-signed.apk
          asset_name: amethyst-fdroid-x86_64-${{ github.ref_name }}.apk
          asset_content_type: application/zip

@@ -188,7 +188,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-arm64-v8a-release-unsigned-signed.apk
+          asset_path: amethyst/build/outputs/apk/fdroid/release/amethyst-fdroid-arm64-v8a-release-unsigned-signed.apk
          asset_name: amethyst-fdroid-arm64-v8a-${{ github.ref_name }}.apk
          asset_content_type: application/zip

@@ -199,7 +199,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-armeabi-v7a-release-unsigned-signed.apk
+          asset_path: amethyst/build/outputs/apk/fdroid/release/amethyst-fdroid-armeabi-v7a-release-unsigned-signed.apk
          asset_name: amethyst-fdroid-armeabi-v7a-${{ github.ref_name }}.apk
          asset_content_type: application/zip

@@ -213,7 +213,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/bundle/playRelease/app-play-release.aab
+          asset_path: amethyst/build/outputs/bundle/playRelease/amethyst-play-release.aab
          asset_name: amethyst-googleplay-${{ github.ref_name }}.aab
          asset_content_type: application/zip

@@ -225,6 +225,6 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/bundle/fdroidRelease/app-fdroid-release.aab
+          asset_path: amethyst/build/outputs/bundle/fdroidRelease/amethyst-fdroid-release.aab
          asset_name: amethyst-fdroid-${{ github.ref_name }}.aab
          asset_content_type: application/zip
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,8 @@
 /.idea/ktlint-plugin.xml
 /.idea/ktfmt.xml
 /.idea/studiobot.xml
+/.idea/other.xml
+/.idea/runConfigurations.xml
 .DS_Store
 /build
 /captures
@@ -41,6 +43,7 @@ out/
 .gradle
 .gradle/
 build/
+.kotlin/

 # Local configuration file (sdk path, etc)
 local.properties
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.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" />
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.24" />
+    <option name="version" value="2.0.0" />
  </component>
 </project>
--- a/README.md
+++ b/README.md
@@ -226,7 +226,7 @@ openssl base64 < <my-release-key.keystore> | tr -d '\n' | tee some_signing_key.j
    - `KEY_PASSWORD` <- `<your password>`
    - `KEY_STORE_PASSWORD` <- `<your key store password>`
    - `SIGNING_KEY` <- the data from `<my-release-key.keystore>`
-3. Change the `versionCode` and `versionName` on `app/build.gradle`
+3. Change the `versionCode` and `versionName` on `amethyst/build.gradle`
 4. Commit and push.
 5. Tag the commit with `v{x.x.x}`
 6. Let the [Create Release GitHub Action](https://github.com/vitorpamplona/amethyst/actions/workflows/create-release.yml) build a new `aab` file.
--- a/amethyst/.gitignore
+++ b/amethyst/.gitignore
--- a/amethyst/build.gradle
+++ b/amethyst/build.gradle
@@ -1,20 +1,24 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
    alias(libs.plugins.androidApplication)
    alias(libs.plugins.jetbrainsKotlinAndroid)
    alias(libs.plugins.googleServices)
+    alias(libs.plugins.jetbrainsComposeCompiler)
+    alias(libs.plugins.serialization)
 }

 android {
    namespace 'com.vitorpamplona.amethyst'
-    compileSdk 34
+    compileSdk libs.versions.android.compileSdk.get().toInteger()

    defaultConfig {
        applicationId "com.vitorpamplona.amethyst"
-        minSdk 26
-        targetSdk 34
-        versionCode 375
-        versionName "0.87.6"
-        buildConfigField "String", "RELEASE_NOTES_ID", "\"863124b6592359494396c22b917f9d251ad12ac31b09ea29e0265e3c088ce9f8\""
+        minSdk libs.versions.android.minSdk.get().toInteger()
+        targetSdk libs.versions.android.targetSdk.get().toInteger()
+        versionCode 407
+        versionName "0.92.2"
+        buildConfigField "String", "RELEASE_NOTES_ID", "\"98f2acaf9b3eb70d87607942e576f9a086ac28adf37869da9a29f4815cecac86\""

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables {
@@ -132,19 +136,11 @@ android {
        targetCompatibility JavaVersion.VERSION_17
    }

-    kotlinOptions {
-        jvmTarget = '17'
-    }
-
    buildFeatures {
        compose true
        buildConfig true
    }

-    composeOptions {
-        // Should match compose version : https://developer.android.com/jetpack/androidx/releases/compose-kotlin
-        kotlinCompilerExtensionVersion "1.5.14"
-    }
    packagingOptions {
        resources {
            excludes += ['/META-INF/{AL2.0,LGPL2.1}', '**/libscrypt.dylib']
@@ -160,11 +156,23 @@ android {
    }
 }

+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_17
+    }
+}
+
+composeCompiler {
+    reportsDestination = layout.buildDirectory.dir("compose_compiler")
+    metricsDestination = layout.buildDirectory.dir("compose_compiler")
+}
+
 dependencies {
    implementation platform(libs.androidx.compose.bom)

    implementation project(path: ':quartz')
    implementation project(path: ':commons')
+    implementation project(path: ':ammolite')
    implementation libs.androidx.core.ktx
    implementation libs.androidx.activity.compose

@@ -245,6 +253,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
@@ -276,8 +285,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
@@ -287,36 +303,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
 }

-// https://gitlab.com/fdroid/wiki/-/wikis/HOWTO:-diff-&-fix-APKs-for-Reproducible-Builds#differing-assetsdexoptbaselineprofm-easy-to-fix
-// NB: Android Studio can't find the imports; this does not affect the
-// actual build since Gradle can find them just fine.
-import com.android.tools.profgen.ArtProfileKt
-import com.android.tools.profgen.ArtProfileSerializer
-import com.android.tools.profgen.DexFile
-
-project.afterEvaluate {
-    tasks.each { task ->
-        if (task.name.startsWith("compile") && task.name.endsWith("ReleaseArtProfile")) {
-            task.doLast {
-                outputs.files.each { file ->
-                    if (file.name.endsWith(".profm")) {
-                        println("Sorting ${file} ...")
-                        def version = ArtProfileSerializer.valueOf("METADATA_0_0_2")
-                        def profile = ArtProfileKt.ArtProfile(file)
-                        def keys = new ArrayList(profile.profileData.keySet())
-                        def sortedData = new LinkedHashMap()
-                        Collections.sort keys, new DexFile.Companion()
-                        keys.each { key -> sortedData[key] = profile.profileData[key] }
-                        new FileOutputStream(file).with {
-                            write(version.magicBytes$profgen)
-                            write(version.versionBytes$profgen)
-                            version.write$profgen(it, sortedData, "")
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
--- a/amethyst/google-services.json
+++ b/amethyst/google-services.json
--- a/amethyst/proguard-rules.pro
+++ b/amethyst/proguard-rules.pro
@@ -63,3 +63,5 @@
 -keep class com.vitorpamplona.quartz.events.** { *; }
 -keep class com.vitorpamplona.amethyst.model.** { *; }
 -keep class com.vitorpamplona.amethyst.service.** { *; }
+-keep class com.vitorpamplona.ammolite.service.** { *; }
+-keep class com.vitorpamplona.ammolite.relays.** { *; }
--- a/amethyst/src/androidTest/java/com/vitorpamplona/amethyst/CashuBTest.kt
+++ b/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)
+        }
+}
--- a/amethyst/src/androidTest/java/com/vitorpamplona/amethyst/ImageUploadTesting.kt
+++ b/amethyst/src/androidTest/java/com/vitorpamplona/amethyst/ImageUploadTesting.kt
@@ -23,7 +23,9 @@ 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.model.AccountSettings
 import com.vitorpamplona.amethyst.service.FileHeader
 import com.vitorpamplona.amethyst.service.Nip96MediaServers
 import com.vitorpamplona.amethyst.service.Nip96Retriever
@@ -32,6 +34,9 @@ import com.vitorpamplona.amethyst.ui.actions.ImageDownloader
 import com.vitorpamplona.quartz.crypto.KeyPair
 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
@@ -47,6 +52,7 @@ class ImageUploadTesting {
            Nip96Retriever()
                .loadInfo(
                    server.baseUrl,
+                    false,
                )

        val bitmap = Bitmap.createBitmap(200, 300, Bitmap.Config.ARGB_8888)
@@ -60,7 +66,11 @@ class ImageUploadTesting {
        val bytes = baos.toByteArray()
        val inputStream = bytes.inputStream()

-        val account = Account(KeyPair())
+        val account =
+            Account(
+                AccountSettings(KeyPair()),
+                scope = CoroutineScope(Dispatchers.IO + SupervisorJob()),
+            )

        val result =
            Nip96Uploader(account)
@@ -71,20 +81,34 @@ class ImageUploadTesting {
                    alt = null,
                    sensitiveContent = null,
                    serverInfo,
+                    forceProxy = { false },
                    onProgress = {},
+                    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 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"))

        val imageData: ByteArray =
-            ImageDownloader().waitAndGetImage(url)
+            ImageDownloader().waitAndGetImage(url, false)
                ?: run {
                    fail("${server.name}: Should not be null")
                    return
@@ -166,6 +190,12 @@ class ImageUploadTesting {
            testBase(Nip96MediaServers.ServerName("nostpic.com", "https://nostpic.com"))
        }

+    @Test(expected = RuntimeException::class)
+    fun testSprovoostNl() =
+        runBlocking {
+            testBase(Nip96MediaServers.ServerName("sprovoost.nl", "https://img.sprovoost.nl/"))
+        }
+
    @Test()
    @Ignore("Not Working anymore")
    fun testNostrOnch() =
--- a/amethyst/src/androidTest/java/com/vitorpamplona/amethyst/OkHttpOtsTest.kt
+++ b/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
--- a/amethyst/src/androidTest/java/com/vitorpamplona/amethyst/ThreadAssemblerTest.kt
+++ b/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
@@ -79,8 +82,7 @@ class ThreadAssemblerTest {
            {"id":"512962dbada5fd5015fc727a107d5c3f569662de67eab8e5da5a8065012cf11e","pubkey":"7fa56f5d6962ab1e3cd424e758c3002b8665f7b0d8dcee9fe9e288d7751ac194","created_at":1688194800,"kind":1,"tags":[["a","30023:6e468422dfb74a5738702a8823b9b28168abab8655faacb6853cd0ee15deee93:1680612926599","","root"],["e","87a5bd25aa084cefb3357fc9c2a5b327254fab35fdd7b2d4bd0acddc63d0abe8","","reply"]],"content":"another one","sig":"b4bc4d8206a08de0a918043129b27c8863d17f60e4f58b4d2b535326625870d32640b04f247eb9eb5df1d62fe98c8e1b0341bdd119655553488300ec9d5b4036"},
            {"id":"ce6e32e3e17b6901d2cc70b60f3743e24f885bb6e9da6d88cff516079eac1883","pubkey":"726a1e261cc6474674e8285e3951b3bb139be9a773d1acf49dc868db861a1c11","created_at":1688234921,"kind":1,"tags":[["a","30023:6e468422dfb74a5738702a8823b9b28168abab8655faacb6853cd0ee15deee93:1680612926599","","root"],["e","512962dbada5fd5015fc727a107d5c3f569662de67eab8e5da5a8065012cf11e","","reply"]],"content":"yet another one, testing 0.0.3","sig":"13bd41c4029c6a7ee41cb03d12e831e9e9b6e14d43a61c78a72657070b45385ba2ce98e8121049fbcbdb7b2dd777c36c7867ba70b5e6a4798a9b866910ae5b62"}
        ]
-        """
-            .trimIndent()
+        """.trimIndent()

    val header =
        """
@@ -111,8 +113,7 @@ class ThreadAssemblerTest {
            ["p","b9e76546ba06456ed301d9e52bc49fa48e70a6bf2282be7a1ae72947612023dc"]
          ]
        }
-        """
-            .trimIndent()
+        """.trimIndent()

    @Test
    fun threadOrderTest() =
@@ -135,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()
            }
--- a/amethyst/src/androidTest/java/com/vitorpamplona/amethyst/UrlUserTagTransformationTest.kt
+++ b/amethyst/src/androidTest/java/com/vitorpamplona/amethyst/UrlUserTagTransformationTest.kt
--- a/amethyst/src/androidTest/res/values/strings.xml
+++ b/amethyst/src/androidTest/res/values/strings.xml
--- a/amethyst/src/androidTestPlay/java/com/vitorpamplona/amethyst/TranslationsTest.kt
+++ b/amethyst/src/androidTestPlay/java/com/vitorpamplona/amethyst/TranslationsTest.kt
--- a/amethyst/src/fdroid/AndroidManifest.xml
+++ b/amethyst/src/fdroid/AndroidManifest.xml
--- a/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/lang/LanguageTranslatorService.kt
+++ b/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/lang/LanguageTranslatorService.kt
--- a/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt
+++ b/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,15 +53,13 @@ object PushDistributorHandler : PushDistributorActions {
        endpointInternal = ""
    }

-    override fun getSavedDistributor(): String {
-        return 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> {
-        return unifiedPush.getDistributors(appContext)
-    }
+    override fun getInstalledDistributors(): List<String> = unifiedPush.getDistributors(appContext())

    fun formattedDistributorNames(): List<String> {
        val distributorsArray = getInstalledDistributors().toTypedArray()
@@ -73,32 +69,31 @@ 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
                    }
                        as String
-                }
-                .toTypedArray()
+                }.toTypedArray()
        return distributorsNameArray.toList()
    }

    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) {
--- a/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt
+++ b/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,15 +110,14 @@ 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)
        pushHandler.removeEndpoint()
    }

-    fun notificationManager(): NotificationManager {
-        return ContextCompat.getSystemService(appContext, NotificationManager::class.java)
+    fun notificationManager(): NotificationManager =
+        ContextCompat.getSystemService(appContext, NotificationManager::class.java)
            as NotificationManager
-    }
 }
--- a/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationUtils.kt
+++ b/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) {
--- a/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/SelectNotificationProvider.kt
+++ b/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/SelectNotificationProvider.kt
@@ -43,7 +43,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
@@ -56,10 +55,11 @@ 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) {
@@ -79,7 +79,7 @@ fun SelectNotificationProvider(sharedPreferencesViewModel: SharedPreferencesView
                LoadDistributors { currentDistributor, list, readableListWithExplainer ->
                    if (readableListWithExplainer.size > 1) {
                        SpinnerSelectionDialog(
-                            title = stringResource(id = R.string.select_push_server),
+                            title = stringRes(id = R.string.select_push_server),
                            options = readableListWithExplainer,
                            onSelect = { index ->
                                if (list[index] == "None") {
@@ -101,9 +101,9 @@ fun SelectNotificationProvider(sharedPreferencesViewModel: SharedPreferencesView
                    } else {
                        AlertDialog(
                            onDismissRequest = { distributorPresent = true },
-                            title = { Text(stringResource(R.string.push_server_install_app)) },
+                            title = { Text(stringRes(R.string.push_server_install_app)) },
                            text = {
-                                val content = stringResource(R.string.push_server_install_app_description)
+                                val content = stringRes(R.string.push_server_install_app_description)

                                val astNode =
                                    remember {
@@ -128,7 +128,7 @@ fun SelectNotificationProvider(sharedPreferencesViewModel: SharedPreferencesView
                                            sharedPreferencesViewModel.dontShowPushNotificationSelector()
                                        },
                                    ) {
-                                        Text(stringResource(R.string.quick_action_dont_show_again_button))
+                                        Text(stringRes(R.string.quick_action_dont_show_again_button))
                                    }
                                    Button(
                                        onClick = { distributorPresent = true },
@@ -142,7 +142,7 @@ fun SelectNotificationProvider(sharedPreferencesViewModel: SharedPreferencesView
                                                contentDescription = null,
                                            )
                                            Spacer(Modifier.width(8.dp))
-                                            Text(stringResource(R.string.error_dialog_button_ok))
+                                            Text(stringRes(R.string.error_dialog_button_ok))
                                        }
                                    }
                                }
@@ -150,9 +150,6 @@ fun SelectNotificationProvider(sharedPreferencesViewModel: SharedPreferencesView
                        )
                    }
                }
-            } else {
-                val currentDistributor = PushDistributorHandler.getSavedDistributor()
-                PushDistributorHandler.saveDistributor(currentDistributor)
            }
        }
    }
@@ -168,20 +165,19 @@ fun LoadDistributors(onInner: @Composable (String, ImmutableList<String>, Immuta
        }

    val readableListWithExplainer =
-        PushDistributorHandler.formattedDistributorNames()
+        PushDistributorHandler
+            .formattedDistributorNames()
            .mapIndexed { index, name ->
                TitleExplainer(
                    name,
-                    stringResource(id = R.string.push_server_uses_app_explainer, list[index]),
+                    stringRes(id = R.string.push_server_uses_app_explainer, list[index]),
                )
-            }
-            .plus(
+            }.plus(
                TitleExplainer(
-                    stringResource(id = R.string.push_server_none),
-                    stringResource(id = R.string.push_server_none_explainer),
+                    stringRes(id = R.string.push_server_none),
+                    stringRes(id = R.string.push_server_none_explainer),
                ),
-            )
-            .toImmutableList()
+            ).toImmutableList()

    onInner(
        currentDistributor,
--- a/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt
+++ b/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,
--- a/amethyst/src/main/AndroidManifest.xml
+++ b/amethyst/src/main/AndroidManifest.xml
@@ -16,6 +16,9 @@
    <!-- To connect with relays -->
    <uses-permission android:name="android.permission.INTERNET"/>

+    <!-- To take pictures -->
+    <uses-permission android:name="android.permission.CAMERA" />
+
    <!-- To Upload media (newer devices) -->
    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
@@ -121,6 +124,16 @@
            </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>
+
    </application>

 </manifest>
--- a/amethyst/src/main/ic_launcher-playstore.png
+++ b/amethyst/src/main/ic_launcher-playstore.png
--- a/amethyst/src/main/java/androidx/compose/material3/adaptive/Posture.kt
+++ b/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 }
--- a/amethyst/src/main/java/androidx/compose/material3/adaptive/WindowAdaptiveInfo.kt
+++ b/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)"
+}
--- a/amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefresh.kt
+++ b/amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefresh.kt
@@ -118,7 +118,5 @@ private class PullRefreshNestedScrollConnection(
            else -> Offset.Zero
        }

-    override suspend fun onPreFling(available: Velocity): Velocity {
-        return Velocity(0f, onRelease(available.y))
-    }
+    override suspend fun onPreFling(available: Velocity): Velocity = Velocity(0f, onRelease(available.y))
 }
--- a/amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshIndicator.kt
+++ b/amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshIndicator.kt
--- a/amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshIndicatorTransform.kt
+++ b/amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshIndicatorTransform.kt
@@ -63,8 +63,7 @@ fun Modifier.pullRefreshIndicatorTransform(
            ) {
                this@drawWithContent.drawContent()
            }
-        }
-        .graphicsLayer {
+        }.graphicsLayer {
            translationY = state.position - size.height

            if (scale && !state.refreshing) {
--- a/amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshState.kt
+++ b/amethyst/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshState.kt
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
@@ -21,7 +21,9 @@
 package com.vitorpamplona.amethyst

 import android.app.Application
+import android.content.ContentResolver
 import android.content.Context
+import android.os.Looper
 import android.os.StrictMode
 import android.os.StrictMode.ThreadPolicy
 import android.os.StrictMode.VmPolicy
@@ -29,12 +31,11 @@ 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 coil.memory.MemoryCache
 import com.vitorpamplona.amethyst.service.playback.VideoCache
-import com.vitorpamplona.quartz.events.OtsEvent
-import com.vitorpamplona.quartz.ots.OpenTimestamps
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.SupervisorJob
@@ -47,40 +48,68 @@ import kotlin.time.measureTimedValue
 class Amethyst : Application() {
    val applicationIOScope = CoroutineScope(Dispatchers.IO + SupervisorJob())

+    // Service Manager is only active when the activity is active.
+    val serviceManager = ServiceManager(applicationIOScope)
+
    override fun onTerminate() {
        super.onTerminate()
        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
    }

    val coilCache: DiskCache by lazy {
-        DiskCache.Builder()
-            .directory(applicationContext.safeCacheDir.resolve("image_cache"))
+        DiskCache
+            .Builder()
+            .directory(safeCacheDir.resolve("image_cache"))
            .maxSizePercent(0.2)
-            .maximumMaxSizeBytes(500L * 1024 * 1024) // 250MB
+            .maximumMaxSizeBytes(1024 * 1024 * 1024) // 1GB
            .build()
    }

+    val coilMemCache: MemoryCache by lazy {
+        MemoryCache
+            .Builder(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) {
+        if (BuildConfig.DEBUG || BuildConfig.BUILD_TYPE == "benchmark") {
            StrictMode.setThreadPolicy(
-                ThreadPolicy.Builder().detectAll().penaltyLog().build(),
+                ThreadPolicy
+                    .Builder()
+                    .detectAll()
+                    .penaltyLog()
+                    .build(),
            )
            StrictMode.setVmPolicy(
-                VmPolicy.Builder().detectAll().penaltyLog().build(),
+                VmPolicy
+                    .Builder()
+                    .detectAll()
+                    .penaltyLog()
+                    .build(),
            )
+            Looper.getMainLooper().setMessageLogging(LogMonitor())
+            ChoreographerHelper.start()
        }

        GlobalScope.launch(Dispatchers.IO) {
@@ -93,12 +122,25 @@ class Amethyst : Application() {
        }
    }

-    fun imageLoaderBuilder(): ImageLoader.Builder {
-        return ImageLoader.Builder(applicationContext).diskCache { coilCache }
-    }
+    fun imageLoaderBuilder(): ImageLoader.Builder =
+        ImageLoader
+            .Builder(this)
+            .diskCache { coilCache }
+            .memoryCache { coilMemCache }
+            .crossfade(true)

-    fun encryptedStorage(npub: String? = null): EncryptedSharedPreferences {
-        return EncryptedStorage.preferences(instance, npub)
+    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) { serviceManager.trimMemory() }
    }

    companion object {
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/DebugUtils.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/DebugUtils.kt
@@ -0,0 +1,180 @@
+/**
+ * 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 coil.Coil
+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
+import com.vitorpamplona.ammolite.relays.Client
+import com.vitorpamplona.ammolite.relays.RelayPool
+
+fun debugState(context: Context) {
+    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: " + RelayPool.connectedRelays())
+
+    val imageLoader = Coil.imageLoader(context)
+    Log.d(
+        "STATE DUMP",
+        "Image Disk Cache ${(imageLoader.diskCache?.size ?: 0) / (1024 * 1024)}/${(imageLoader.diskCache?.maxSize ?: 0) / (1024 * 1024)} MB",
+    )
+    Log.d(
+        "STATE DUMP",
+        "Image Memory Cache ${(imageLoader.memoryCache?.size ?: 0) / (1024 * 1024)}/${(imageLoader.memoryCache?.maxSize ?: 0) / (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 ")
+    }
+}
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/EncryptedStorage.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/EncryptedStorage.kt
@@ -29,16 +29,15 @@ class EncryptedStorage {
        private const val PREFERENCES_NAME = "secret_keeper"

        // returns the preferences for each account or a global file if null.
-        fun prefsFileName(npub: String? = null): String {
-            return if (npub == null) PREFERENCES_NAME else "${PREFERENCES_NAME}_$npub"
-        }
+        fun prefsFileName(npub: String? = null): String = if (npub == null) PREFERENCES_NAME else "${PREFERENCES_NAME}_$npub"

        fun preferences(
            applicationContext: Context,
            npub: String? = null,
        ): EncryptedSharedPreferences {
            val masterKey: MasterKey =
-                MasterKey.Builder(applicationContext, MasterKey.DEFAULT_MASTER_KEY_ALIAS)
+                MasterKey
+                    .Builder(applicationContext, MasterKey.DEFAULT_MASTER_KEY_ALIAS)
                    .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
                    .build()

--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt
@@ -0,0 +1,664 @@
+/**
+ * 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.annotation.SuppressLint
+import android.content.Context
+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.AccountSettings
+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.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.quartz.crypto.KeyPair
+import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
+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.ChatMessageRelayListEvent
+import com.vitorpamplona.quartz.events.ContactListEvent
+import com.vitorpamplona.quartz.events.Event
+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 kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import java.io.File
+import java.util.Locale
+
+// Release mode (!BuildConfig.DEBUG) always uses encrypted preferences
+// To use plaintext SharedPreferences for debugging, set this to true
+// It will only apply in Debug builds
+private const val DEBUG_PLAINTEXT_PREFERENCES = false
+private const val DEBUG_PREFERENCES_NAME = "debug_prefs"
+
+@Immutable
+data class AccountInfo(
+    val npub: String,
+    val hasPrivKey: Boolean,
+    val loggedInWithExternalSigner: Boolean,
+    val isTransient: Boolean,
+)
+
+private object PrefKeys {
+    const val CURRENT_ACCOUNT = "currently_logged_in_account"
+    const val SAVED_ACCOUNTS = "all_saved_accounts"
+    const val NOSTR_PRIVKEY = "nostr_privkey"
+    const val NOSTR_PUBKEY = "nostr_pubkey"
+    const val RELAYS = "relays"
+    const val DONT_TRANSLATE_FROM = "dontTranslateFrom"
+    const val LOCAL_RELAY_SERVERS = "localRelayServers"
+    const val LANGUAGE_PREFS = "languagePreferences"
+    const val TRANSLATE_TO = "translateTo"
+    const val ZAP_AMOUNTS = "zapAmounts"
+    const val REACTION_CHOICES = "reactionChoices"
+    const val DEFAULT_ZAPTYPE = "defaultZapType"
+    const val DEFAULT_FILE_SERVER = "defaultFileServer"
+    const val DEFAULT_HOME_FOLLOW_LIST = "defaultHomeFollowList"
+    const val DEFAULT_STORIES_FOLLOW_LIST = "defaultStoriesFollowList"
+    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 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"
+    const val WARN_ABOUT_REPORTS = "warn_about_reports"
+    const val FILTER_SPAM_FROM_STRANGERS = "filter_spam_from_strangers"
+    const val LAST_READ_PER_ROUTE = "last_read_route_per_route"
+    const val LOGIN_WITH_EXTERNAL_SIGNER = "login_with_external_signer"
+    const val SIGNER_PACKAGE_NAME = "signer_package_name"
+    const val HAS_DONATED_IN_VERSION = "has_donated_in_version"
+    const val PENDING_ATTESTATIONS = "pending_attestations"
+
+    const val ALL_ACCOUNT_INFO = "all_saved_accounts_info"
+    const val SHARED_SETTINGS = "shared_settings"
+}
+
+object LocalPreferences {
+    private const val COMMA = ","
+
+    private var currentAccount: String? = null
+    private var savedAccounts: MutableStateFlow<List<AccountInfo>?> = MutableStateFlow(null)
+    private var cachedAccounts: MutableMap<String, AccountSettings?> = mutableMapOf()
+
+    suspend fun currentAccount(): String? {
+        if (currentAccount == null) {
+            currentAccount =
+                withContext(Dispatchers.IO) {
+                    encryptedPreferences().getString(PrefKeys.CURRENT_ACCOUNT, null)
+                }
+        }
+        return currentAccount
+    }
+
+    private suspend fun updateCurrentAccount(info: AccountInfo?) {
+        if (info == null) {
+            currentAccount = null
+            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()
+                }
+            }
+        }
+    }
+
+    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.emit(accounts)
+
+                encryptedPreferences()
+                    .edit()
+                    .apply {
+                        putString(
+                            PrefKeys.ALL_ACCOUNT_INFO,
+                            Event.mapper.writeValueAsString(accounts.filter { !it.isTransient }),
+                        )
+                    }.apply()
+            }
+        }
+
+    private val prefsDirPath: String
+        get() = "${Amethyst.instance.filesDir.parent}/shared_prefs/"
+
+    private suspend fun addAccount(accInfo: AccountInfo) {
+        val accounts = savedAccounts().filter { it.npub != accInfo.npub }.plus(accInfo)
+        updateSavedAccounts(accounts)
+    }
+
+    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) = updateCurrentAccount(accountInfo)
+
+    /** Removes the account from the app level shared preferences */
+    private suspend fun removeAccount(accountInfo: AccountInfo) {
+        updateSavedAccounts(savedAccounts().filter { it.npub != accountInfo.npub })
+    }
+
+    /** Deletes the npub-specific shared preference file */
+    private suspend fun deleteUserPreferenceFile(npub: String) {
+        withContext(Dispatchers.IO) {
+            val prefsDir = File(prefsDirPath)
+            prefsDir.list()?.forEach {
+                if (it.contains(npub)) {
+                    File(prefsDir, it).delete()
+                }
+            }
+        }
+    }
+
+    private fun encryptedPreferences(npub: String? = null): SharedPreferences {
+        checkNotInMainThread()
+
+        return if (BuildConfig.DEBUG && DEBUG_PLAINTEXT_PREFERENCES) {
+            val preferenceFile =
+                if (npub == null) DEBUG_PREFERENCES_NAME else "${DEBUG_PREFERENCES_NAME}_$npub"
+            Amethyst.instance.getSharedPreferences(preferenceFile, Context.MODE_PRIVATE)
+        } else {
+            return Amethyst.instance.encryptedStorage(npub)
+        }
+    }
+
+    /**
+     * Clears the preferences for a given npub, deletes the preferences xml file, and switches the
+     * user to the first account in the list if it exists
+     *
+     * We need to use `commit()` to write changes to disk and release the file lock so that it can be
+     * deleted. If we use `apply()` there is a race condition and the file will probably not be
+     * deleted
+     */
+    @SuppressLint("ApplySharedPref")
+    suspend fun updatePrefsForLogout(accountInfo: AccountInfo) {
+        Log.d("LocalPreferences", "Saving to encrypted storage updatePrefsForLogout ${accountInfo.npub}")
+        withContext(Dispatchers.IO) {
+            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))
+            }
+        }
+    }
+
+    suspend fun updatePrefsForLogin(accountSettings: AccountSettings) {
+        setCurrentAccount(accountSettings)
+        saveToEncryptedStorage(accountSettings)
+    }
+
+    suspend fun allSavedAccounts(): List<AccountInfo> = savedAccounts()
+
+    suspend fun saveToEncryptedStorage(settings: AccountSettings) {
+        Log.d("LocalPreferences", "Saving to encrypted storage")
+        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))
+                        putStringSet(PrefKeys.DONT_TRANSLATE_FROM, settings.dontTranslateFrom)
+                        putStringSet(PrefKeys.LOCAL_RELAY_SERVERS, settings.localRelayServers)
+                        putString(
+                            PrefKeys.LANGUAGE_PREFS,
+                            Event.mapper.writeValueAsString(settings.languagePreferences),
+                        )
+                        putString(PrefKeys.TRANSLATE_TO, settings.translateTo)
+                        putString(PrefKeys.ZAP_AMOUNTS, Event.mapper.writeValueAsString(settings.zapAmountChoices.value))
+                        putString(
+                            PrefKeys.REACTION_CHOICES,
+                            Event.mapper.writeValueAsString(settings.reactionChoices.value),
+                        )
+                        putString(PrefKeys.DEFAULT_ZAPTYPE, settings.defaultZapType.value.name)
+                        putString(
+                            PrefKeys.DEFAULT_FILE_SERVER,
+                            Event.mapper.writeValueAsString(settings.defaultFileServer),
+                        )
+                        putString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, settings.defaultHomeFollowList.value)
+                        putString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, settings.defaultStoriesFollowList.value)
+                        putString(
+                            PrefKeys.DEFAULT_NOTIFICATION_FOLLOW_LIST,
+                            settings.defaultNotificationFollowList.value,
+                        )
+                        putString(
+                            PrefKeys.DEFAULT_DISCOVERY_FOLLOW_LIST,
+                            settings.defaultDiscoveryFollowList.value,
+                        )
+                        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)
+                        }
+
+                        if (settings.backupUserMetadata != null) {
+                            putString(
+                                PrefKeys.LATEST_USER_METADATA,
+                                Event.mapper.writeValueAsString(settings.backupUserMetadata),
+                            )
+                        } else {
+                            remove(PrefKeys.LATEST_USER_METADATA)
+                        }
+
+                        if (settings.backupDMRelayList != null) {
+                            putString(
+                                PrefKeys.LATEST_DM_RELAY_LIST,
+                                Event.mapper.writeValueAsString(settings.backupDMRelayList),
+                            )
+                        } else {
+                            remove(PrefKeys.LATEST_DM_RELAY_LIST)
+                        }
+
+                        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.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)
+                        }
+
+                        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()))
+
+                        putBoolean(PrefKeys.WARN_ABOUT_REPORTS, settings.warnAboutPostsWithReports)
+                        putBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, settings.filterSpamFromStrangers)
+
+                        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)
+
+                        if (settings.showSensitiveContent.value == null) {
+                            remove(PrefKeys.SHOW_SENSITIVE_CONTENT)
+                        } else {
+                            putBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, settings.showSensitiveContent.value!!)
+                        }
+
+                        putString(
+                            PrefKeys.PENDING_ATTESTATIONS,
+                            Event.mapper.writeValueAsString(settings.pendingAttestations.value),
+                        )
+                    }.apply()
+            }
+        }
+    }
+
+    suspend fun loadCurrentAccountFromEncryptedStorage(): AccountSettings? = currentAccount()?.let { loadCurrentAccountFromEncryptedStorage(it) }
+
+    suspend fun saveSharedSettings(
+        sharedSettings: Settings,
+        prefs: SharedPreferences = encryptedPreferences(),
+    ) {
+        Log.d("LocalPreferences", "Saving to shared settings")
+        with(prefs.edit()) {
+            putString(PrefKeys.SHARED_SETTINGS, Event.mapper.writeValueAsString(sharedSettings))
+            apply()
+        }
+    }
+
+    suspend fun loadSharedSettings(prefs: SharedPreferences = encryptedPreferences()): Settings? {
+        Log.d("LocalPreferences", "Load shared settings")
+        with(prefs) {
+            return try {
+                getString(PrefKeys.SHARED_SETTINGS, "{}")?.let { Event.mapper.readValue<Settings>(it) }
+            } catch (e: Throwable) {
+                if (e is CancellationException) throw e
+                Log.w(
+                    "LocalPreferences",
+                    "Unable to decode shared preferences: ${getString(PrefKeys.SHARED_SETTINGS, null)}",
+                    e,
+                )
+                e.printStackTrace()
+                null
+            }
+        }
+    }
+
+    val mutex = Mutex()
+
+    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 accountSettings = innerLoadCurrentAccountFromEncryptedStorage(npub)
+
+                cachedAccounts.put(npub, accountSettings)
+
+                return@withContext accountSettings
+            }
+        }
+    }
+
+    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 externalSignerPackageName =
+                    getString(PrefKeys.SIGNER_PACKAGE_NAME, null)
+                        ?: if (getBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, false)) "com.greenart7c3.nostrsigner" else null
+
+                val dontTranslateFrom = getStringSet(PrefKeys.DONT_TRANSLATE_FROM, null) ?: setOf()
+                val localRelayServers = getStringSet(PrefKeys.LOCAL_RELAY_SERVERS, null) ?: setOf()
+                val translateTo = getString(PrefKeys.TRANSLATE_TO, null) ?: Locale.getDefault().language
+                val defaultHomeFollowList =
+                    getString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, null) ?: KIND3_FOLLOWS
+                val defaultStoriesFollowList =
+                    getString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
+                val defaultNotificationFollowList =
+                    getString(PrefKeys.DEFAULT_NOTIFICATION_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
+                val defaultDiscoveryFollowList =
+                    getString(PrefKeys.DEFAULT_DISCOVERY_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
+
+                val defaultZapType =
+                    getString(PrefKeys.DEFAULT_ZAPTYPE, "")?.let { serverName ->
+                        LnZapEvent.ZapType.entries.firstOrNull { it.name == serverName }
+                    } ?: LnZapEvent.ZapType.PUBLIC
+
+                val localRelays = parseOrNull<Set<RelaySetupInfo>>(PrefKeys.RELAYS) ?: emptySet()
+                val reactionChoices = parseOrNull<List<String>>(PrefKeys.REACTION_CHOICES)?.ifEmpty { DefaultReactions } ?: DefaultReactions
+                val zapAmountChoices = parseOrNull<List<Long>>(PrefKeys.ZAP_AMOUNTS)?.ifEmpty { DefaultZapAmounts } ?: DefaultZapAmounts
+
+                val defaultFileServer = parseOrNull<Nip96MediaServers.ServerName>(PrefKeys.DEFAULT_FILE_SERVER) ?: Nip96MediaServers.DEFAULT[0]
+                val zapPaymentRequestServer = parseOrNull<Nip47WalletConnect.Nip47URI>(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER)
+                val pendingAttestations = parseOrNull<Map<HexKey, String>>(PrefKeys.PENDING_ATTESTATIONS) ?: mapOf()
+                val languagePreferences = parseOrNull<Map<String, String>>(PrefKeys.LANGUAGE_PREFS) ?: mapOf()
+
+                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 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 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 {
+                        parseOrNull<TorSettings>(PrefKeys.TOR_SETTINGS) ?: TorSettings()
+                    }
+
+                val showSensitiveContent =
+                    if (contains(PrefKeys.SHOW_SENSITIVE_CONTENT)) {
+                        getBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, false)
+                    } else {
+                        null
+                    }
+                val filterSpam = getBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, true)
+                val warnAboutReports = getBoolean(PrefKeys.WARN_ABOUT_REPORTS, true)
+
+                val lastReadPerRoute =
+                    parseOrNull<Map<String, Long>>(PrefKeys.LAST_READ_PER_ROUTE)?.mapValues {
+                        MutableStateFlow(it.value)
+                    } ?: mapOf()
+
+                val keyPair = KeyPair(privKey = privKey?.hexToByteArray(), pubKey = pubKey.hexToByteArray())
+                val hasDonatedInVersion = getStringSet(PrefKeys.HAS_DONATED_IN_VERSION, null) ?: setOf()
+
+                return@with AccountSettings(
+                    keyPair = keyPair,
+                    transientAccount = false,
+                    externalSignerPackageName = externalSignerPackageName,
+                    localRelays = localRelays,
+                    localRelayServers = localRelayServers,
+                    dontTranslateFrom = dontTranslateFrom,
+                    languagePreferences = languagePreferences,
+                    translateTo = translateTo,
+                    zapAmountChoices = MutableStateFlow(zapAmountChoices.toImmutableList()),
+                    reactionChoices = MutableStateFlow(reactionChoices.toImmutableList()),
+                    defaultZapType = MutableStateFlow(defaultZapType),
+                    defaultFileServer = defaultFileServer,
+                    defaultHomeFollowList = MutableStateFlow(defaultHomeFollowList),
+                    defaultStoriesFollowList = MutableStateFlow(defaultStoriesFollowList),
+                    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,
+                    torSettings = TorSettingsFlow.build(torSettings),
+                    showSensitiveContent = MutableStateFlow(showSensitiveContent),
+                    warnAboutPostsWithReports = warnAboutReports,
+                    filterSpamFromStrangers = filterSpam,
+                    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
+        }
+    }
+}
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/LogMonitor.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/LogMonitor.kt
@@ -0,0 +1,198 @@
+/**
+ * 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.os.Handler
+import android.os.HandlerThread
+import android.os.Looper
+import android.util.Log
+import android.util.Printer
+import android.view.Choreographer
+import java.text.SimpleDateFormat
+import java.util.concurrent.atomic.AtomicBoolean
+
+class LogMonitor : Printer {
+    private val mStackSampler: StackSampler
+    private var mPrintingStarted = false
+    private var mStartTimestamp: Long = 0
+
+    //   threshold
+    private val mBlockThresholdMillis: Long = 16
+
+    // Sampling frequency
+    private val mSampleInterval: Long = 1000
+
+    private val mLogHandler: Handler
+
+    init {
+        mStackSampler = StackSampler(mSampleInterval)
+        val handlerThread = HandlerThread("block-canary-io")
+        handlerThread.start()
+        mLogHandler = Handler(handlerThread.getLooper())
+    }
+
+    override fun println(x: String) {
+        // From if to Else, execute DispatchMessage. If the execution takes more than the threshold, the output stuck information
+        if (!mPrintingStarted) {
+            // Record start time
+            mStartTimestamp = System.currentTimeMillis()
+            mPrintingStarted = true
+            mStackSampler.startDump()
+        } else {
+            val endTime = System.currentTimeMillis()
+
+            if (x.indexOf("com.vitorpamplona.amethyst") > 0) {
+                Log.d("block-canary", "Looper ${endTime - mStartTimestamp}ms for $x")
+            }
+
+            mPrintingStarted = false
+            //
+            if (isBlock(endTime)) {
+                notifyBlockEvent(endTime)
+            }
+            mStackSampler.stopDump()
+        }
+    }
+
+    private fun notifyBlockEvent(endTime: Long) {
+        mLogHandler.post {
+            // Obtain the stack of the main thread stack
+            val stacks: List<String> = mStackSampler.getStacks(mStartTimestamp, endTime)
+            for (stack in stacks) {
+                Log.e("block-canary", stack)
+            }
+        }
+    }
+
+    private fun isBlock(endTime: Long): Boolean = endTime - mStartTimestamp > mBlockThresholdMillis
+}
+
+class StackSampler(
+    private val mSampleInterval: Long,
+) {
+    private val mHandler: Handler
+    private val mStackMap: MutableMap<Long, String> = LinkedHashMap()
+    private val mMaxCount = 100
+
+    // Whether to sample
+    var mShouldSample: AtomicBoolean = AtomicBoolean(false)
+
+    /**
+     * Start sampling and execute stack
+     */
+    fun startDump() {
+        // Avoid repeating start
+        if (mShouldSample.get()) {
+            return
+        }
+        mShouldSample.set(true)
+        mHandler.removeCallbacks(mRunnable)
+        mHandler.postDelayed(mRunnable, mSampleInterval)
+    }
+
+    fun stopDump() {
+        if (!mShouldSample.get()) {
+            return
+        }
+        mShouldSample.set(false)
+        mHandler.removeCallbacks(mRunnable)
+    }
+
+    fun getStacks(
+        startTime: Long,
+        endTime: Long,
+    ): List<String> {
+        val result = mutableListOf<String>()
+        synchronized(mStackMap) {
+            for (entryTime in mStackMap.keys) {
+                if (startTime < entryTime && entryTime < endTime) {
+                    result.add(
+                        TIME_FORMATTER.format(entryTime) +
+                            SEPARATOR +
+                            SEPARATOR +
+                            mStackMap[entryTime],
+                    )
+                }
+            }
+        }
+        return result
+    }
+
+    init {
+        val handlerThread = HandlerThread("block-canary-sampler")
+        handlerThread.start()
+        mHandler = Handler(handlerThread.looper)
+    }
+
+    private val mRunnable: Runnable =
+        object : Runnable {
+            override fun run() {
+                val sb = StringBuilder()
+                val stackTrace = Looper.getMainLooper().thread.stackTrace
+                for (s in stackTrace) {
+                    sb.append(s.toString()).append("\n")
+                }
+                synchronized(mStackMap) {
+                    // Save up to 100 stack information
+                    if (mStackMap.size == mMaxCount) {
+                        mStackMap.remove(mStackMap.keys.iterator().next())
+                    }
+                    mStackMap.put(System.currentTimeMillis(), sb.toString())
+                }
+                if (mShouldSample.get()) {
+                    mHandler.postDelayed(this, mSampleInterval)
+                }
+            }
+        }
+
+    companion object {
+        const val SEPARATOR: String = "\r\n"
+        val TIME_FORMATTER: SimpleDateFormat = SimpleDateFormat("MM-dd HH:mm:ss.SSS")
+    }
+}
+
+object ChoreographerHelper {
+    var lastFrameTimeNanos: Long = 0
+
+    fun start() {
+        Choreographer.getInstance().postFrameCallback(
+            object : Choreographer.FrameCallback {
+                override fun doFrame(frameTimeNanos: Long) {
+                    // Last callback time
+                    if (lastFrameTimeNanos == 0L) {
+                        lastFrameTimeNanos = frameTimeNanos
+                        Choreographer.getInstance().postFrameCallback(this)
+                        return
+                    }
+                    val diff = (frameTimeNanos - lastFrameTimeNanos) / 1000000
+                    // only report after 30ms because videos play at 30fps
+                    if (diff > 35) {
+                        // Follow the frame number
+                        val droppedCount = (diff / 16.6).toInt()
+                        Log.w("block-canary", "Dropped $droppedCount frames. Skipped $diff ms")
+                    }
+                    lastFrameTimeNanos = frameTimeNanos
+                    Choreographer.getInstance().postFrameCallback(this)
+                }
+            },
+        )
+    }
+}
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt
@@ -28,9 +28,10 @@ import coil.decode.GifDecoder
 import coil.decode.ImageDecoderDecoder
 import coil.decode.SvgDecoder
 import coil.size.Precision
+import coil.util.DebugLogger
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.service.HttpClientManager
+import com.vitorpamplona.amethyst.service.Base64Fetcher
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomDataSource
@@ -47,27 +48,35 @@ import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.service.NostrThreadDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
 import com.vitorpamplona.amethyst.service.NostrVideoDataSource
-import com.vitorpamplona.amethyst.service.relays.Client
+import com.vitorpamplona.amethyst.service.ots.OkHttpBlockstreamExplorer
+import com.vitorpamplona.amethyst.service.ots.OkHttpCalendarBuilder
+import com.vitorpamplona.amethyst.ui.tor.TorManager
+import com.vitorpamplona.amethyst.ui.tor.TorType
+import com.vitorpamplona.ammolite.relays.Client
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.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 {
+class ServiceManager(
+    val scope: CoroutineScope,
+) {
    private var isStarted: Boolean =
        false // to not open amber in a loop trying to use auth relays and registering for notifications
    private var account: Account? = null

-    private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
    private var collectorJob: Job? = null

    private fun start(account: Account) {
@@ -85,8 +94,28 @@ class ServiceManager {
        val myAccount = account

        // Resets Proxy Use
-        HttpClientManager.setDefaultProxy(account?.proxy)
-        LocalCache.antiSpam.active = account?.filterSpamFromStrangers ?: true
+        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)
+        }
+
+        LocalCache.antiSpam.active = account?.settings?.filterSpamFromStrangers ?: true
        Coil.setImageLoader {
            Amethyst.instance
                .imageLoaderBuilder()
@@ -97,23 +126,28 @@ class ServiceManager {
                        add(GifDecoder.Factory())
                    }
                    add(SvgDecoder.Factory())
-                } // .logger(DebugLogger())
-                .okHttpClient { HttpClientManager.getHttpClient() }
-                .precision(Precision.INEXACT)
+                    add(Base64Fetcher.Factory)
+                }.apply {
+                    if (BuildConfig.DEBUG || BuildConfig.BUILD_TYPE == "benchmark") {
+                        this.logger(DebugLogger())
+                    }
+                }.okHttpClient {
+                    myAccount?.shouldUseTorForImageDownload()?.let { HttpClientManager.getHttpClient(it) }
+                        ?: HttpClientManager.getHttpClient(false)
+                }.precision(Precision.INEXACT)
                .respectCacheHeaders(false)
                .build()
        }

        if (myAccount != null) {
-            val relaySet = myAccount.connectToRelays.value
-            Log.d("Relay", "Service Manager Connect Connecting ${relaySet.size}")
+            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)
@@ -123,20 +157,23 @@ class ServiceManager {

            // 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()
@@ -187,7 +224,7 @@ class ServiceManager {
        LocalCache.cleanObservers()
    }

-    fun trimMemory() {
+    suspend fun trimMemory() {
        LocalCache.cleanObservers()

        val accounts =
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AccountSettings.kt
@@ -0,0 +1,526 @@
+/**
+ * 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.compose.runtime.Stable
+import androidx.core.os.ConfigurationCompat
+import com.vitorpamplona.amethyst.service.Nip96MediaServers
+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.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.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+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 DefaultReactions =
+    persistentListOf(
+        "\uD83D\uDE80",
+        "\uD83E\uDEC2",
+        "\uD83D\uDC40",
+        "\uD83D\uDE02",
+        "\uD83C\uDF89",
+        "\uD83E\uDD14",
+        "\uD83D\uDE31",
+    )
+
+val DefaultNIP65List =
+    listOf(
+        AdvertisedRelayListEvent.AdvertisedRelayInfo(RelayUrlFormatter.normalize("wss://nostr.mom/"), AdvertisedRelayListEvent.AdvertisedRelayType.BOTH),
+        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://nostr.mom/"),
+        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"),
+    )
+
+val DefaultZapAmounts = persistentListOf(100L, 500L, 1000L)
+
+fun getLanguagesSpokenByUser(): Set<String> {
+    val languageList = ConfigurationCompat.getLocales(Resources.getSystem().getConfiguration())
+    val codedList = mutableSetOf<String>()
+    for (i in 0 until languageList.size()) {
+        languageList.get(i)?.let { codedList.add(it.language) }
+    }
+    return codedList
+}
+
+// This has spaces to avoid mixing with a potential NIP-51 list with the same name.
+val GLOBAL_FOLLOWS = " Global "
+
+// This has spaces to avoid mixing with a potential NIP-51 list with the same name.
+val KIND3_FOLLOWS = " All Follows "
+
+@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 dontTranslateFrom: Set<String> = getLanguagesSpokenByUser(),
+    var languagePreferences: Map<String, String> = mapOf(),
+    var translateTo: String = Locale.getDefault().language,
+    var zapAmountChoices: MutableStateFlow<ImmutableList<Long>> = MutableStateFlow(DefaultZapAmounts),
+    var reactionChoices: MutableStateFlow<ImmutableList<String>> = MutableStateFlow(DefaultReactions),
+    val defaultZapType: MutableStateFlow<LnZapEvent.ZapType> = MutableStateFlow(LnZapEvent.ZapType.PUBLIC),
+    var defaultFileServer: Nip96MediaServers.ServerName = Nip96MediaServers.DEFAULT[0],
+    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,
+    val torSettings: TorSettingsFlow = TorSettingsFlow(),
+    val showSensitiveContent: MutableStateFlow<Boolean?> = MutableStateFlow(null),
+    var warnAboutPostsWithReports: Boolean = true,
+    var filterSpamFromStrangers: Boolean = true,
+    val lastReadPerRoute: MutableStateFlow<Map<String, MutableStateFlow<Long>>> = MutableStateFlow(mapOf()),
+    var hasDonatedInVersion: MutableStateFlow<Set<String>> = MutableStateFlow(setOf<String>()),
+    val pendingAttestations: MutableStateFlow<Map<HexKey, String>> = MutableStateFlow<Map<HexKey, String>>(mapOf()),
+) {
+    val saveable = MutableStateFlow(AccountSettingsUpdater(this))
+
+    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 -> NostrSignerExternal(keyPair.pubKey.toHexKey(), ExternalSignerLauncher(keyPair.pubKey.toHexKey(), packageName))
+            }
+        }
+
+    // ---
+    // Zaps and Reactions
+    // ---
+
+    fun changeDefaultZapType(zapType: LnZapEvent.ZapType) {
+        if (defaultZapType.value != zapType) {
+            defaultZapType.tryEmit(zapType)
+            saveAccountSettings()
+        }
+    }
+
+    fun changeZapAmounts(newAmounts: List<Long>) {
+        if (zapAmountChoices.value != newAmounts) {
+            zapAmountChoices.tryEmit(newAmounts.toImmutableList())
+            saveAccountSettings()
+        }
+    }
+
+    fun changeZapPaymentRequest(newServer: Nip47WalletConnect.Nip47URI?) {
+        if (zapPaymentRequest != newServer) {
+            zapPaymentRequest = newServer
+            saveAccountSettings()
+        }
+    }
+
+    fun changeReactionTypes(newTypes: List<String>) {
+        if (reactionChoices.value != newTypes) {
+            reactionChoices.tryEmit(newTypes.toImmutableList())
+            saveAccountSettings()
+        }
+    }
+
+    // ---
+    // file servers
+    // ---
+
+    fun changeDefaultFileServer(server: Nip96MediaServers.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) {
+        if (!dontTranslateFrom.contains(languageCode)) {
+            dontTranslateFrom = dontTranslateFrom.plus(languageCode)
+            saveAccountSettings()
+        } else {
+            dontTranslateFrom = dontTranslateFrom.minus(languageCode)
+            saveAccountSettings()
+        }
+    }
+
+    fun translateToContains(languageCode: Locale) = translateTo.contains(languageCode.language)
+
+    fun updateTranslateTo(languageCode: Locale) {
+        if (translateTo != languageCode.language) {
+            translateTo = languageCode.language
+            saveAccountSettings()
+        }
+    }
+
+    fun prefer(
+        source: String,
+        target: String,
+        preference: String,
+    ) {
+        val key = "$source,$target"
+        if (key !in languagePreferences) {
+            languagePreferences = languagePreferences + Pair(key, preference)
+            saveAccountSettings()
+        } else {
+            if (languagePreferences.get(key) == preference) {
+                languagePreferences = languagePreferences.minus(key)
+            } else {
+                languagePreferences = languagePreferences + Pair(key, preference)
+            }
+        }
+    }
+
+    fun preferenceBetween(
+        source: String,
+        target: String,
+    ): String? = languagePreferences["$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()
+        }
+    }
+
+    // ----
+    // Warning dialogs
+    // ----
+
+    fun setHideDeleteRequestDialog() {
+        if (!hideDeleteRequestDialog) {
+            hideDeleteRequestDialog = true
+            saveAccountSettings()
+        }
+    }
+
+    fun setHideNIP17WarningDialog() {
+        if (!hideNIP17WarningDialog) {
+            hideNIP17WarningDialog = true
+            saveAccountSettings()
+        }
+    }
+
+    fun setHideBlockAlertDialog() {
+        if (!hideBlockAlertDialog) {
+            hideBlockAlertDialog = true
+            saveAccountSettings()
+        }
+    }
+
+    fun updateShowSensitiveContent(show: Boolean?): Boolean {
+        if (showSensitiveContent.value != show) {
+            showSensitiveContent.update { show }
+            saveAccountSettings()
+            return true
+        }
+        return false
+    }
+
+    // ---
+    // 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 updateOptOutOptions(
+        warnReports: Boolean,
+        filterSpam: Boolean,
+    ): Boolean =
+        if (warnAboutPostsWithReports != warnReports || filterSpam != filterSpamFromStrangers) {
+            warnAboutPostsWithReports = warnReports
+            filterSpamFromStrangers = filterSpam
+
+            saveAccountSettings()
+
+            true
+        } else {
+            false
+        }
+}
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt
@@ -22,18 +22,19 @@ 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.amethyst.service.relays.Relay
-import com.vitorpamplona.amethyst.service.relays.RelayStats
-import com.vitorpamplona.amethyst.ui.components.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, var duplicatedMessages: Set<HexKey>)
+data class Spammer(
+    val pubkeyHex: HexKey,
+    var duplicatedMessages: Set<HexKey>,
+)

 class AntiSpamFilter {
    val recentMessages = LruCache<Int, String>(1000)
@@ -79,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
        }
@@ -105,25 +106,9 @@ class AntiSpamFilter {
        }
    }

-    val liveSpam: AntiSpamLiveData = AntiSpamLiveData(this)
+    val flowSpam = MutableStateFlow<AntiSpamState>(AntiSpamState(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))
-            }
-        }
-    }
-}
-
-class AntiSpamState(val cache: AntiSpamFilter)
+class AntiSpamState(
+    val cache: AntiSpamFilter,
+)
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Channel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Channel.kt
@@ -25,9 +25,9 @@ import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.commons.data.LargeCache
 import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.dal.DefaultFeedOrder
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
+import com.vitorpamplona.ammolite.relays.BundledUpdate
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.Hex
 import com.vitorpamplona.quartz.encoders.HexKey
@@ -37,7 +37,9 @@ import com.vitorpamplona.quartz.events.LiveActivitiesEvent
 import kotlinx.coroutines.Dispatchers

@Stable
-class PublicChatChannel(idHex: String) : Channel(idHex) {
+class PublicChatChannel(
+    idHex: String,
+) : Channel(idHex) {
    var info = ChannelCreateEvent.ChannelData(null, null, null)

    fun updateChannelInfo(
@@ -49,26 +51,22 @@ class PublicChatChannel(idHex: String) : Channel(idHex) {
        super.updateChannelInfo(creator, updatedAt)
    }

-    override fun toBestDisplayName(): String {
-        return info.name ?: super.toBestDisplayName()
-    }
+    override fun toBestDisplayName(): String = info.name ?: super.toBestDisplayName()

-    override fun summary(): String? {
-        return info.about
-    }
+    override fun summary(): String? = info.about

    override fun profilePicture(): String? {
        if (info.picture.isNullOrBlank()) return super.profilePicture()
        return info.picture ?: super.profilePicture()
    }

-    override fun anyNameStartsWith(prefix: String): Boolean {
-        return listOfNotNull(info.name, info.about).filter { it.contains(prefix, true) }.isNotEmpty()
-    }
+    override fun anyNameStartsWith(prefix: String): Boolean = listOfNotNull(info.name, info.about).filter { it.contains(prefix, true) }.isNotEmpty()
 }

@Stable
-class LiveActivitiesChannel(val address: ATag) : Channel(address.toTag()) {
+class LiveActivitiesChannel(
+    val address: ATag,
+) : Channel(address.toTag()) {
    var info: LiveActivitiesEvent? = null

    override fun idNote() = address.toNAddr()
@@ -86,27 +84,22 @@ class LiveActivitiesChannel(val address: ATag) : Channel(address.toTag()) {
        super.updateChannelInfo(creator, updatedAt)
    }

-    override fun toBestDisplayName(): String {
-        return info?.title() ?: super.toBestDisplayName()
-    }
+    override fun toBestDisplayName(): String = info?.title() ?: super.toBestDisplayName()

-    override fun summary(): String? {
-        return info?.summary()
-    }
+    override fun summary(): String? = info?.summary()

-    override fun profilePicture(): String? {
-        return info?.image()?.ifBlank { null }
-    }
+    override fun profilePicture(): String? = info?.image()?.ifBlank { null }

-    override fun anyNameStartsWith(prefix: String): Boolean {
-        return listOfNotNull(info?.title(), info?.summary())
+    override fun anyNameStartsWith(prefix: String): Boolean =
+        listOfNotNull(info?.title(), info?.summary())
            .filter { it.contains(prefix, true) }
            .isNotEmpty()
-    }
 }

@Stable
-abstract class Channel(val idHex: String) {
+abstract class Channel(
+    val idHex: String,
+) {
    var creator: User? = null
    var updatedMetadataAt: Long = 0
    val notes = LargeCache<HexKey, Note>()
@@ -118,21 +111,13 @@ abstract class Channel(val idHex: String) {

    open fun idDisplayNote() = idNote().toShortenHex()

-    open fun toBestDisplayName(): String {
-        return idDisplayNote()
-    }
+    open fun toBestDisplayName(): String = idDisplayNote()

-    open fun summary(): String? {
-        return null
-    }
+    open fun summary(): String? = null

-    open fun creatorName(): String? {
-        return creator?.toBestDisplayName()
-    }
+    open fun creatorName(): String? = creator?.toBestDisplayName()

-    open fun profilePicture(): String? {
-        return creator?.info?.banner
-    }
+    open fun profilePicture(): String? = creator?.info?.banner

    open fun updateChannelInfo(
        creator: User,
@@ -167,10 +152,10 @@ abstract class Channel(val idHex: String) {

    fun pruneOldAndHiddenMessages(account: Account): Set<Note> {
        val important =
-            notes.filter { key, it ->
-                it.author?.let { author -> account.isHidden(author) } == false
-            }
-                .sortedWith(DefaultFeedOrder)
+            notes
+                .filter { key, it ->
+                    it.author?.let { author -> account.isHidden(author) } == false
+                }.sortedWith(DefaultFeedOrder)
                .take(500)
                .toSet()

@@ -182,7 +167,9 @@ abstract class Channel(val idHex: String) {
    }
 }

-class ChannelLiveData(val channel: Channel) : LiveData<ChannelState>(ChannelState(channel)) {
+class ChannelLiveData(
+    val channel: Channel,
+) : LiveData<ChannelState>(ChannelState(channel)) {
    // Refreshes observers in batches.
    private val bundler = BundledUpdate(300, Dispatchers.IO)

@@ -208,4 +195,6 @@ class ChannelLiveData(val channel: Channel) : LiveData<ChannelState>(ChannelStat
    }
 }

-class ChannelState(val channel: Channel)
+class ChannelState(
+    val channel: Channel,
+)
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Chatroom.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Chatroom.kt
@@ -22,11 +22,13 @@ 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
-class Chatroom() {
+class Chatroom {
    var authors: Set<User> = setOf()
    var roomMessages: Set<Note> = setOf()
    var subject: String? = null
@@ -72,12 +74,10 @@ class Chatroom() {
        }
    }

-    fun senderIntersects(keySet: Set<HexKey>): Boolean {
-        return authors.any { it.pubkeyHex in keySet }
-    }
+    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()) {
@@ -86,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
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/HashtagIcon.kt
@@ -47,29 +47,28 @@ 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",
            EmptyTagList,
        ) { word, state ->
            when (word) {
-                is HashTagSegment -> HashTag(word, nav)
+                is HashTagSegment -> HashTag(word, EmptyNav)
                is RegularTextSegment -> Text(word.segmentText)
            }
        }
    }
 }

-fun checkForHashtagWithIcon(tag: String): HashtagIcon? {
-    return when (tag.lowercase()) {
+fun checkForHashtagWithIcon(tag: String): HashtagIcon? =
+    when (tag.lowercase()) {
        "₿itcoin", "bitcoin", "btc", "timechain", "bitcoiner", "bitcoiners" -> bitcoin
        "nostr", "nostrich", "nostriches", "thenostr" -> nostr
        "lightning", "lightningnetwork" -> lightning
@@ -86,7 +85,6 @@ fun checkForHashtagWithIcon(tag: String): HashtagIcon? {
        "weed", "weedstr", "420", "cannabis", "marijuana" -> weed
        else -> null
    }
-}

 val bitcoin = HashtagIcon(CustomHashTagIcons.Btc, "Bitcoin", Modifier.padding(start = 1.dp, bottom = 1.dp, top = 1.dp))
 val nostr = HashtagIcon(CustomHashTagIcons.Nostr, "Nostr", Modifier.padding(start = 1.dp, bottom = 1.dp, top = 1.dp))
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
@@ -29,8 +29,8 @@ import com.vitorpamplona.amethyst.commons.data.LargeCache
 import com.vitorpamplona.amethyst.model.observables.LatestByKindAndAuthor
 import com.vitorpamplona.amethyst.model.observables.LatestByKindWithETag
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.service.relays.Relay
-import com.vitorpamplona.amethyst.ui.components.BundledInsert
+import com.vitorpamplona.ammolite.relays.BundledInsert
+import com.vitorpamplona.ammolite.relays.Relay
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.encoders.HexValidator
@@ -103,6 +103,7 @@ import com.vitorpamplona.quartz.events.PinListEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.PrivateDmEvent
 import com.vitorpamplona.quartz.events.PrivateOutboxRelayListEvent
+import com.vitorpamplona.quartz.events.ProfileGalleryEntryEvent
 import com.vitorpamplona.quartz.events.ReactionEvent
 import com.vitorpamplona.quartz.events.RecommendRelayEvent
 import com.vitorpamplona.quartz.events.RelaySetEvent
@@ -113,6 +114,9 @@ import com.vitorpamplona.quartz.events.SearchRelayListEvent
 import com.vitorpamplona.quartz.events.StatusEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 import com.vitorpamplona.quartz.events.TextNoteModificationEvent
+import com.vitorpamplona.quartz.events.TorrentCommentEvent
+import com.vitorpamplona.quartz.events.TorrentEvent
+import com.vitorpamplona.quartz.events.VerificationState
 import com.vitorpamplona.quartz.events.VideoHorizontalEvent
 import com.vitorpamplona.quartz.events.VideoVerticalEvent
 import com.vitorpamplona.quartz.events.WikiNoteEvent
@@ -148,8 +152,8 @@ object LocalCache {

    val deletionIndex = DeletionIndex()

-    private val observablesByKindAndETag = ConcurrentHashMap<Int, ConcurrentHashMap<HexKey, LatestByKindWithETag<Event>>>(10)
-    private val observablesByKindAndAuthor = ConcurrentHashMap<Int, ConcurrentHashMap<HexKey, LatestByKindAndAuthor<Event>>>(10)
+    val observablesByKindAndETag = ConcurrentHashMap<Int, ConcurrentHashMap<HexKey, LatestByKindWithETag<Event>>>(10)
+    val observablesByKindAndAuthor = ConcurrentHashMap<Int, ConcurrentHashMap<HexKey, LatestByKindAndAuthor<Event>>>(10)

    fun <T : Event> observeETag(
        kind: Int,
@@ -209,13 +213,14 @@ object LocalCache {
        } as LatestByKindAndAuthor<T>
    }

-    fun updateObservables(event: Event) {
-        val observablesOfKind = observablesByKindAndETag[event.kind()] ?: return
-        event.forEachTaggedEvent {
-            observablesOfKind[it]?.updateIfMatches(event)
+    private fun updateObservables(event: Event) {
+        observablesByKindAndETag[event.kind]?.let { observablesOfKind ->
+            event.forEachTaggedEvent {
+                observablesOfKind[it]?.updateIfMatches(event)
+            }
        }

-        observablesByKindAndAuthor[event.kind()]?.get(event.pubKey)?.updateIfMatches(event)
+        observablesByKindAndAuthor[event.kind]?.get(event.pubKey)?.updateIfMatches(event)
    }

    fun checkGetOrCreateUser(key: String): User? {
@@ -241,33 +246,25 @@ object LocalCache {
        return users.get(key)
    }

-    fun getAddressableNoteIfExists(key: String): AddressableNote? {
-        return addressables.get(key)
-    }
+    fun getAddressableNoteIfExists(key: String): AddressableNote? = addressables.get(key)

-    fun getNoteIfExists(key: String): Note? {
-        return addressables.get(key) ?: notes.get(key)
-    }
+    fun getNoteIfExists(key: String): Note? = addressables.get(key) ?: notes.get(key)

-    fun getChannelIfExists(key: String): Channel? {
-        return channels.get(key)
-    }
+    fun getChannelIfExists(key: String): Channel? = channels.get(key)

-    fun getNoteIfExists(event: Event): Note? {
-        return if (event is AddressableEvent) {
+    fun getNoteIfExists(event: Event): Note? =
+        if (event is AddressableEvent) {
            getAddressableNoteIfExists(event.addressTag())
        } else {
            getNoteIfExists(event.id)
        }
-    }

-    fun getOrCreateNote(event: Event): Note {
-        return if (event is AddressableEvent) {
+    fun getOrCreateNote(event: Event): Note =
+        if (event is AddressableEvent) {
            getOrCreateAddressableNote(event.address())
        } else {
            getOrCreateNote(event.id)
        }
-    }

    fun checkGetOrCreateNote(key: String): Note? {
        checkNotInMainThread()
@@ -348,8 +345,8 @@ object LocalCache {
        return HexValidator.isHex(key)
    }

-    fun checkGetOrCreateAddressableNote(key: String): AddressableNote? {
-        return try {
+    fun checkGetOrCreateAddressableNote(key: String): AddressableNote? =
+        try {
            val addr = ATag.parse(key, null) // relay doesn't matter for the index.
            if (addr != null) {
                getOrCreateAddressableNote(addr)
@@ -360,7 +357,6 @@ object LocalCache {
            Log.e("LocalCache", "Invalid Key to create channel: $key", e)
            null
        }
-    }

    fun getOrCreateAddressableNoteInternal(key: ATag): AddressableNote {
        // checkNotInMainThread()
@@ -395,6 +391,10 @@ object LocalCache {
            val newUserMetadata = event.contactMetaData()
            if (newUserMetadata != null) {
                oldUser.updateUserInfo(newUserMetadata, event)
+                if (relay != null) {
+                    oldUser.addRelayBeingUsed(relay, event.createdAt)
+                    oldUser.latestMetadataRelay = relay.url
+                }
            }
            // Log.d("MT", "New User Metadata ${oldUser.pubkeyDisplayHex()} ${oldUser.toBestDisplayName()} from ${relay?.url}")
        } else {
@@ -428,11 +428,11 @@ object LocalCache {
        }
    }

-    fun formattedDateTime(timestamp: Long): String {
-        return Instant.ofEpochSecond(timestamp)
+    fun formattedDateTime(timestamp: Long): String =
+        Instant
+            .ofEpochSecond(timestamp)
            .atZone(ZoneId.systemDefault())
            .format(DateTimeFormatter.ofPattern("uuuu MMM d hh:mm a"))
-    }

    fun consume(
        event: TextNoteEvent,
@@ -466,6 +466,61 @@ object LocalCache {
        refreshObservers(note)
    }

+    fun consume(
+        event: TorrentEvent,
+        relay: Relay?,
+    ) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        if (antiSpam.isSpam(event, relay)) {
+            return
+        }
+
+        note.loadEvent(event, author, emptyList())
+
+        refreshObservers(note)
+    }
+
+    fun consume(
+        event: TorrentCommentEvent,
+        relay: Relay?,
+    ) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        if (antiSpam.isSpam(event, relay)) {
+            return
+        }
+
+        val replyTo = computeReplyTo(event)
+
+        note.loadEvent(event, author, replyTo)
+
+        // Counts the replies
+        replyTo.forEach {
+            it.addReply(note)
+        }
+
+        refreshObservers(note)
+    }
+
    fun consume(
        event: NIP90ContentDiscoveryResponseEvent,
        relay: Relay? = null,
@@ -755,8 +810,8 @@ object LocalCache {
        }
    }

-    fun computeReplyTo(event: Event): List<Note> {
-        return when (event) {
+    fun computeReplyTo(event: Event): List<Note> =
+        when (event) {
            is PollNoteEvent -> event.tagsWithoutCitations().mapNotNull { checkGetOrCreateNote(it) }
            is WikiNoteEvent -> event.tagsWithoutCitations().mapNotNull { checkGetOrCreateNote(it) }
            is LongTextNoteEvent -> event.tagsWithoutCitations().mapNotNull { checkGetOrCreateNote(it) }
@@ -798,14 +853,15 @@ object LocalCache {
                    .tagsWithoutCitations()
                    .filter { it != event.activity()?.toTag() }
                    .mapNotNull { checkGetOrCreateNote(it) }
+            is TorrentCommentEvent ->
+                event.tagsWithoutCitations().mapNotNull { checkGetOrCreateNote(it) }

            is DraftEvent -> {
-                event.taggedEvents().mapNotNull { checkGetOrCreateNote(it) } + event.taggedAddresses().mapNotNull { checkGetOrCreateAddressableNote(it.toTag()) }
+                event.mapTaggedEvent { checkGetOrCreateNote(it) } + event.mapTaggedAddress { checkGetOrCreateAddressableNote(it) }
            }

            else -> emptyList<Note>()
        }
-    }

    fun consume(
        event: PollNoteEvent,
@@ -1038,7 +1094,7 @@ object LocalCache {
        if (version.event?.id() == event.id()) return

        // makes sure the OTS has a valid certificate
-        if (event.cacheVerify() == null) return // no valid OTS
+        if (event.cacheVerify() is VerificationState.Error) return // no valid OTS

        if (version.event == null) {
            version.loadEvent(event, author, emptyList())
@@ -1218,9 +1274,23 @@ object LocalCache {
        if (deletionIndex.add(event)) {
            var deletedAtLeastOne = false

-            event.deleteEvents()
+            event
+                .deleteEvents()
                .mapNotNull { getNoteIfExists(it) }
                .forEach { deleteNote ->
+                    val deleteNoteEvent = deleteNote.event
+                    if (deleteNoteEvent is AddressableEvent) {
+                        val addressableNote = getAddressableNoteIfExists(deleteNoteEvent.addressTag())
+                        if (addressableNote?.author?.pubkeyHex == event.pubKey && (addressableNote.createdAt() ?: 0) <= event.createdAt) {
+                            // Counts the replies
+                            deleteNote(addressableNote)
+
+                            addressables.remove(addressableNote.idHex)
+
+                            deletedAtLeastOne = true
+                        }
+                    }
+
                    // must be the same author
                    if (deleteNote.author?.pubkeyHex == event.pubKey) {
                        // reverts the add
@@ -1293,6 +1363,10 @@ object LocalCache {
            getChannelIfExists(it.toTag())?.removeNote(deleteNote)
        }

+        (deletedEvent as? TorrentCommentEvent)?.torrent()?.let {
+            getNoteIfExists(it)?.removeReply(deleteNote)
+        }
+
        if (deletedEvent is PrivateDmEvent) {
            val author = deleteNote.author
            val recipient =
@@ -1318,6 +1392,9 @@ object LocalCache {
            deleteWraps(deletedEvent)
        }

+        deleteNote.clearFlow()
+        deleteNote.clearLive()
+
        notes.remove(deleteNote.idHex)
    }

@@ -1329,7 +1406,10 @@ object LocalCache {
                if (noteEvent is WrappedEvent) {
                    deleteWraps(noteEvent)
                }
+                it.clearFlow()
+                it.clearLive()
            }
+
            notes.remove(it.id)
        }
    }
@@ -1585,7 +1665,10 @@ object LocalCache {
    @Suppress("UNUSED_PARAMETER")
    fun consume(event: ChannelMuteUserEvent) {}

-    fun consume(event: LnZapEvent) {
+    fun consume(
+        event: LnZapEvent,
+        relay: Relay?,
+    ) {
        val note = getOrCreateNote(event.id)
        // Already processed this event.
        if (note.event != null) return
@@ -1673,6 +1756,26 @@ object LocalCache {
        refreshObservers(note)
    }

+    fun consume(
+        event: ProfileGalleryEntryEvent,
+        relay: Relay?,
+    ) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        refreshObservers(note)
+    }
+
    fun consume(
        event: FileStorageHeaderEvent,
        relay: Relay?,
@@ -1774,7 +1877,7 @@ object LocalCache {
        }

        try {
-            val cachePath = File(Amethyst.instance.applicationContext.cacheDir, "NIP95")
+            val cachePath = Amethyst.instance.nip95cache()
            cachePath.mkdirs()
            val file = File(cachePath, event.id)
            if (!file.exists()) {
@@ -2030,16 +2133,16 @@ object LocalCache {
    suspend fun findStatusesForUser(user: User): ImmutableList<AddressableNote> {
        checkNotInMainThread()

-        return addressables.filter { _, it ->
-            val noteEvent = it.event
-            (
-                noteEvent is StatusEvent &&
-                    noteEvent.pubKey == user.pubkeyHex &&
-                    !noteEvent.isExpired() &&
-                    noteEvent.content.isNotBlank()
-            )
-        }
-            .sortedWith(compareBy({ it.event?.expiration() ?: it.event?.createdAt() }, { it.idHex }))
+        return addressables
+            .filter { _, it ->
+                val noteEvent = it.event
+                (
+                    noteEvent is StatusEvent &&
+                        noteEvent.pubKey == user.pubkeyHex &&
+                        !noteEvent.isExpired() &&
+                        noteEvent.content.isNotBlank()
+                )
+            }.sortedWith(compareBy({ it.event?.expiration() ?: it.event?.createdAt() }, { it.idHex }))
            .reversed()
            .toImmutableList()
    }
@@ -2053,7 +2156,7 @@ object LocalCache {
        notes.forEach { _, item ->
            val noteEvent = item.event
            if ((noteEvent is OtsEvent && noteEvent.isTaggedEvent(note.idHex) && !noteEvent.isExpirationBefore(time))) {
-                noteEvent.verifiedTime?.let { stampedTime ->
+                (noteEvent.cacheVerify() as? VerificationState.Verified)?.verifiedTime?.let { stampedTime ->
                    if (minTime == null || stampedTime < (minTime ?: Long.MAX_VALUE)) {
                        minTime = stampedTime
                    }
@@ -2066,9 +2169,7 @@ object LocalCache {

    val modificationCache = LruCache<HexKey, List<Note>>(20)

-    fun cachedModificationEventsForNote(note: Note): List<Note>? {
-        return modificationCache[note.idHex]
-    }
+    fun cachedModificationEventsForNote(note: Note): List<Note>? = modificationCache[note.idHex]

    suspend fun findLatestModificationForNote(note: Note): List<Note> {
        checkNotInMainThread()
@@ -2082,11 +2183,12 @@ object LocalCache {
        val time = TimeUtils.now()

        val newNotes =
-            notes.filter { _, item ->
-                val noteEvent = item.event
+            notes
+                .filter { _, item ->
+                    val noteEvent = item.event

-                noteEvent is TextNoteModificationEvent && noteEvent.pubKey == originalAuthor && noteEvent.isTaggedEvent(note.idHex) && !noteEvent.isExpirationBefore(time)
-            }.sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
+                    noteEvent is TextNoteModificationEvent && note.author == item.author && noteEvent.isTaggedEvent(note.idHex) && !noteEvent.isExpirationBefore(time)
+                }.sortedWith(compareBy({ it.createdAt() }, { it.idHex }))

        modificationCache.put(note.idHex, newNotes)

@@ -2149,6 +2251,8 @@ object LocalCache {
                val childrenToBeRemoved = mutableListOf<Note>()

                toBeRemoved.forEach {
+                    // TODO: NEED TO TEST IF WRAPS COME BACK WHEN NEEDED BEFORE ACTIVATING
+                    // childrenToBeRemoved.addAll(removeIfWrap(it))
                    removeFromCache(it)

                    childrenToBeRemoved.addAll(it.removeAllChildNotes())
@@ -2158,13 +2262,31 @@ object LocalCache {

                if (toBeRemoved.size > 1) {
                    println(
-                        "PRUNE: ${toBeRemoved.size} private messages with ${user.toBestDisplayName()} removed. ${it.roomMessages.size} kept",
+                        "PRUNE: ${toBeRemoved.size} private messages from ${user.toBestDisplayName()} to ${it.authors.joinToString(", ") { it.toBestDisplayName() }} removed. ${it.roomMessages.size} kept",
                    )
                }
            }
        }
    }

+    fun removeIfWrap(note: Note): List<Note> {
+        val noteEvent = note.event
+
+        val children =
+            if (noteEvent is WrappedEvent) {
+                noteEvent.host?.id?.let {
+                    getNoteIfExists(it)?.let {
+                        removeFromCache(it)
+                        it.removeAllChildNotes()
+                    }
+                }
+            } else {
+                null
+            }
+
+        return children ?: emptyList()
+    }
+
    fun prunePastVersionsOfReplaceables() {
        val toBeRemoved =
            notes.filter { _, note ->
@@ -2210,9 +2332,11 @@ object LocalCache {
                        note.event is GenericRepostEvent
                ) &&
                    note.replyTo?.any { it.liveSet?.isInUse() == true } != true &&
-                    note.liveSet?.isInUse() != true && // don't delete if observing.
+                    note.liveSet?.isInUse() != true &&
+                    // don't delete if observing.
                    note.author?.pubkeyHex !in
-                    accounts && // don't delete if it is the logged in account
+                    accounts &&
+                    // don't delete if it is the logged in account
                    note.event?.isTaggedUsers(accounts) !=
                    true // don't delete if it's a notification to the logged in user
            }
@@ -2271,6 +2395,9 @@ object LocalCache {
            }
        }

+        note.clearFlow()
+        note.clearLive()
+
        notes.remove(note.idHex)
    }

@@ -2308,8 +2435,7 @@ object LocalCache {
                ?.hiddenUsers
                ?.map { userHex ->
                    (notes.filter { _, it -> it.event?.pubKey() == userHex } + addressables.filter { _, it -> it.event?.pubKey() == userHex }).toSet()
-                }
-                ?.flatten()
+                }?.flatten()
                ?: emptyList()

        toBeRemoved.forEach {
@@ -2341,7 +2467,7 @@ object LocalCache {
    }

    // Observers line up here.
-    val live: LocalCacheLiveData = LocalCacheLiveData()
+    val live: LocalCacheFlow = LocalCacheFlow()

    private fun refreshObservers(newNote: Note) {
        updateObservables(newNote.event as Event)
@@ -2489,7 +2615,28 @@ object LocalCache {
        event: Event,
        relay: Relay?,
    ) {
-        if (deletionIndex.hasBeenDeleted(event)) return
+        if (deletionIndex.hasBeenDeleted(event)) {
+            // update relay with deletion event from another.
+            if (relay != null) {
+                deletionIndex.hasBeenDeletedBy(event)?.let {
+                    Log.d("LocalCache", "Updating ${relay.url} with a Deletion Event ${it.toJson()} because of ${event.toJson()}")
+                    relay.send(it)
+                }
+            }
+            return
+        }
+
+        if (event is AddressableEvent && relay != null) {
+            // updates relay with a new event.
+            getAddressableNoteIfExists(event.addressTag())?.let {
+                it.event?.let { existingEvent ->
+                    if (existingEvent.createdAt() > event.createdAt) {
+                        Log.d("LocalCache", "Updating ${relay.url} with a new version of ${event.toJson()} to ${existingEvent.toJson()}")
+                        relay.send(existingEvent)
+                    }
+                }
+            }
+        }

        checkNotInMainThread()

@@ -2534,6 +2681,7 @@ object LocalCache {
                }
                is FhirResourceEvent -> consume(event, relay)
                is FileHeaderEvent -> consume(event, relay)
+                is ProfileGalleryEntryEvent -> consume(event, relay)
                is FileServersEvent -> consume(event, relay)
                is FileStorageEvent -> consume(event, relay)
                is FileStorageHeaderEvent -> consume(event, relay)
@@ -2549,7 +2697,7 @@ object LocalCache {
                    event.zapRequest?.let {
                        // must have a valid request
                        verifyAndConsume(it, relay)
-                        consume(event)
+                        consume(event, relay)
                    }
                }
                is LnZapRequestEvent -> consume(event)
@@ -2583,6 +2731,8 @@ object LocalCache {
                is StatusEvent -> consume(event, relay)
                is TextNoteEvent -> consume(event, relay)
                is TextNoteModificationEvent -> consume(event, relay)
+                is TorrentEvent -> consume(event, relay)
+                is TorrentCommentEvent -> consume(event, relay)
                is VideoHorizontalEvent -> consume(event, relay)
                is VideoVerticalEvent -> consume(event, relay)
                is WikiNoteEvent -> consume(event, relay)
@@ -2596,8 +2746,8 @@ object LocalCache {
        }
    }

-    fun hasConsumed(notificationEvent: Event): Boolean {
-        return if (notificationEvent is AddressableEvent) {
+    fun hasConsumed(notificationEvent: Event): Boolean =
+        if (notificationEvent is AddressableEvent) {
            val note = addressables.get(notificationEvent.addressTag())
            val noteEvent = note?.event
            noteEvent != null && notificationEvent.createdAt <= noteEvent.createdAt()
@@ -2605,11 +2755,10 @@ object LocalCache {
            val note = notes.get(notificationEvent.id)
            note?.event != null
        }
-    }
 }

@Stable
-class LocalCacheLiveData {
+class LocalCacheFlow {
    private val _newEventBundles = MutableSharedFlow<Set<Note>>(0, 10, BufferOverflow.DROP_OLDEST)
    val newEventBundles = _newEventBundles.asSharedFlow() // read-only public view

@@ -2617,8 +2766,7 @@ class LocalCacheLiveData {
    private val bundler = BundledInsert<Note>(1000, Dispatchers.IO)

    fun invalidateData(newNote: Note) {
-        bundler.invalidateList(newNote) {
-                bundledNewNotes ->
+        bundler.invalidateList(newNote) { bundledNewNotes ->
            _newEventBundles.emit(bundledNewNotes)
        }
    }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/MiniFhir.kt
+++ b/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,16 +65,16 @@ class Patient(
    var gender: String? = null,
 ) : Resource(resourceType, id)

+@Stable
 class HumanName(
    var use: String? = null,
    var family: String? = null,
    var given: ArrayList<String> = arrayListOf(),
 ) {
-    fun assembleName(): String {
-        return given.joinToString(" ") + " " + family
-    }
+    fun assembleName(): String = given.joinToString(" ") + " " + family
 }

+@Stable
 class Bundle(
    resourceType: String? = null,
    id: String = "",
@@ -79,6 +83,7 @@ class Bundle(
    var entry: List<Resource> = arrayListOf(),
 ) : Resource(resourceType, id)

+@Stable
 class VisionPrescription(
    resourceType: String? = null,
    id: String = "",
@@ -89,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,
@@ -107,6 +128,7 @@ class LensSpecification(
    var note: String? = null,
 )

+@Stable
 class Prism(
    var amount: Double? = null,
    var base: String? = null,
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
@@ -20,7 +20,6 @@
 */
 package com.vitorpamplona.amethyst.model

-import android.util.LruCache
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
@@ -29,18 +28,18 @@ import androidx.lifecycle.distinctUntilChanged
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.firstFullCharOrEmoji
-import com.vitorpamplona.amethyst.service.relays.EOSETime
-import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.actions.relays.updated
-import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 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.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.RelayUrlFormatter
 import com.vitorpamplona.quartz.encoders.toNote
 import com.vitorpamplona.quartz.events.AddressableEvent
 import com.vitorpamplona.quartz.events.BaseTextNoteEvent
@@ -68,14 +67,18 @@ 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.flow.flatMapLatest
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withTimeoutOrNull
 import java.math.BigDecimal
 import kotlin.coroutines.resume

@Stable
-class AddressableNote(val address: ATag) : Note(address.toTag()) {
+class AddressableNote(
+    val address: ATag,
+) : Note(address.toTag()) {
    override fun idNote() = address.toNAddr()

    override fun toNEvent() = address.toNAddr()
@@ -93,9 +96,7 @@ class AddressableNote(val address: ATag) : Note(address.toTag()) {
        return minOf(publishedAt, lastCreatedAt)
    }

-    fun dTag(): String? {
-        return (event as? AddressableEvent)?.dTag()
-    }
+    fun dTag(): String? = (event as? AddressableEvent)?.dTag()

    override fun wasOrShouldBeDeletedBy(
        deletionEvents: Set<HexKey>,
@@ -107,7 +108,9 @@ class AddressableNote(val address: ATag) : Note(address.toTag()) {
 }

@Stable
-open class Note(val idHex: String) {
+open class Note(
+    val idHex: String,
+) {
    // These fields are only available after the Text Note event is received.
    // They are immutable after that.
    var event: EventInterface? = null
@@ -163,14 +166,12 @@ open class Note(val idHex: String) {
        }
    }

-    fun toNostrUri(): String {
-        return "nostr:${toNEvent()}"
-    }
+    fun toNostrUri(): String = "nostr:${toNEvent()}"

    open fun idDisplayNote() = idNote().toShortenHex()

-    fun channelHex(): HexKey? {
-        return if (
+    fun channelHex(): HexKey? =
+        if (
            event is ChannelMessageEvent ||
            event is ChannelMetadataEvent ||
            event is ChannelCreateEvent ||
@@ -185,7 +186,6 @@ open class Note(val idHex: String) {
        } else {
            null
        }
-    }

    open fun address(): ATag? = null

@@ -259,7 +259,9 @@ open class Note(val idHex: String) {
        if (repliesChanged) liveSet?.innerReplies?.invalidateData()
        if (reactionsChanged) liveSet?.innerReactions?.invalidateData()
        if (boostsChanged) liveSet?.innerBoosts?.invalidateData()
-        if (reportsChanged) liveSet?.innerReports?.invalidateData()
+        if (reportsChanged) {
+            flowSet?.reports?.invalidateData()
+        }
        if (zapsChanged) liveSet?.innerZaps?.invalidateData()

        return toBeRemoved
@@ -291,7 +293,7 @@ open class Note(val idHex: String) {
        if (reports[author]?.contains(deleteNote) == true) {
            reports[author]?.let {
                reports = reports + Pair(author, it.minus(deleteNote))
-                liveSet?.innerReports?.invalidateData()
+                flowSet?.reports?.invalidateData()
            }
        }
    }
@@ -400,10 +402,10 @@ open class Note(val idHex: String) {

        if (reportsByAuthor == null) {
            reports = reports + Pair(author, listOf(note))
-            liveSet?.innerReports?.invalidateData()
+            flowSet?.reports?.invalidateData()
        } else if (!reportsByAuthor.contains(note)) {
            reports = reports + Pair(author, reportsByAuthor + note)
-            liveSet?.innerReports?.invalidateData()
+            flowSet?.reports?.invalidateData()
        }
    }

@@ -417,7 +419,7 @@ open class Note(val idHex: String) {
    fun addRelay(relay: Relay) {
        if (relay.brief !in relays) {
            addRelaySync(relay.brief)
-            liveSet?.innerRelays?.invalidateData()
+            flowSet?.relays?.invalidateData()
        }
    }

@@ -523,39 +525,30 @@ open class Note(val idHex: String) {
        isZappedByCalculation(option, user, account, zaps, onWasZappedByAuthor)
    }

-    fun getReactionBy(user: User): String? {
-        return reactions.firstNotNullOfOrNull {
+    fun getReactionBy(user: User): String? =
+        reactions.firstNotNullOfOrNull {
            if (it.value.any { it.author?.pubkeyHex == user.pubkeyHex }) {
                it.key
            } else {
                null
            }
        }
-    }

-    fun isBoostedBy(user: User): Boolean {
-        return boosts.any { it.author?.pubkeyHex == user.pubkeyHex }
-    }
+    fun isBoostedBy(user: User): Boolean = boosts.any { it.author?.pubkeyHex == user.pubkeyHex }

-    fun hasReportsBy(user: User): Boolean {
-        return reports[user]?.isNotEmpty() ?: false
-    }
+    fun hasReportsBy(user: User): Boolean = reports[user]?.isNotEmpty() ?: false

-    fun countReportAuthorsBy(users: Set<HexKey>): Int {
-        return reports.count { it.key.pubkeyHex in users }
-    }
+    fun countReportAuthorsBy(users: Set<HexKey>): Int = reports.count { it.key.pubkeyHex in users }

-    fun reportsBy(users: Set<HexKey>): List<Note> {
-        return reports
+    fun reportsBy(users: Set<HexKey>): List<Note> =
+        reports
            .mapNotNull {
                if (it.key.pubkeyHex in users) {
                    it.value
                } else {
                    null
                }
-            }
-            .flatten()
-    }
+            }.flatten()

    private fun updateZapTotal() {
        var sumOfAmounts = BigDecimal.ZERO
@@ -635,8 +628,8 @@ open class Note(val idHex: String) {
        )
    }

-    fun hasPledgeBy(user: User): Boolean {
-        return replies
+    fun hasPledgeBy(user: User): Boolean =
+        replies
            .filter { it.event?.isTaggedHash("bounty-added-reward") ?: false }
            .any {
                val pledgeValue =
@@ -650,10 +643,9 @@ open class Note(val idHex: String) {

                pledgeValue != null && it.author == user
            }
-    }

-    fun pledgedAmountByOthers(): BigDecimal {
-        return replies
+    fun pledgedAmountByOthers(): BigDecimal =
+        replies
            .filter { it.event?.isTaggedHash("bounty-added-reward") ?: false }
            .mapNotNull {
                try {
@@ -663,9 +655,7 @@ open class Note(val idHex: String) {
                    null
                    // do nothing if it can't convert to bigdecimal
                }
-            }
-            .sumOf { it }
-    }
+            }.sumOf { it }

    fun hasAnyReports(): Boolean {
        val dayAgo = TimeUtils.oneDayAgo()
@@ -676,8 +666,8 @@ open class Note(val idHex: String) {
            )
    }

-    fun isNewThread(): Boolean {
-        return (
+    fun isNewThread(): Boolean =
+        (
            event is RepostEvent ||
                event is GenericRepostEvent ||
                replyTo == null ||
@@ -685,29 +675,20 @@ open class Note(val idHex: String) {
        ) &&
            event !is ChannelMessageEvent &&
            event !is LiveActivitiesChatMessageEvent
-    }

-    fun hasZapped(loggedIn: User): Boolean {
-        return zaps.any { it.key.author == loggedIn }
-    }
+    fun hasZapped(loggedIn: User): Boolean = zaps.any { it.key.author == loggedIn }

    fun hasReacted(
        loggedIn: User,
        content: String,
-    ): Boolean {
-        return reactedBy(loggedIn, content).isNotEmpty()
-    }
+    ): Boolean = reactedBy(loggedIn, content).isNotEmpty()

    fun reactedBy(
        loggedIn: User,
        content: String,
-    ): List<Note> {
-        return reactions[content]?.filter { it.author == loggedIn } ?: emptyList()
-    }
+    ): List<Note> = reactions[content]?.filter { it.author == loggedIn } ?: emptyList()

-    fun reactedBy(loggedIn: User): List<String> {
-        return reactions.filter { it.value.any { it.author == loggedIn } }.mapNotNull { it.key }
-    }
+    fun reactedBy(loggedIn: User): List<String> = reactions.filter { it.value.any { it.author == loggedIn } }.mapNotNull { it.key }

    fun hasBoostedInTheLast5Minutes(loggedIn: User): Boolean {
        return boosts.firstOrNull {
@@ -715,9 +696,7 @@ open class Note(val idHex: String) {
        } != null // 5 minute protection
    }

-    fun boostedBy(loggedIn: User): List<Note> {
-        return boosts.filter { it.author == loggedIn }
-    }
+    fun boostedBy(loggedIn: User): List<Note> = boosts.filter { it.author == loggedIn }

    fun moveAllReferencesTo(note: AddressableNote) {
        // migrates these comments to a new version
@@ -762,33 +741,62 @@ open class Note(val idHex: String) {

    fun isHiddenFor(accountChoices: Account.LiveHiddenUsers): Boolean {
        val thisEvent = event ?: return false
+        val hash = thisEvent.pubKey().hashCode()

-        val isBoostedNoteHidden =
-            if (
-                thisEvent is GenericRepostEvent ||
-                thisEvent is RepostEvent ||
-                thisEvent is CommunityPostApprovalEvent
-            ) {
-                replyTo?.lastOrNull()?.isHiddenFor(accountChoices) ?: false
-            } else {
-                false
+        // if the author is hidden by spam or blocked
+        if (accountChoices.hiddenUsersHashCodes.contains(hash) ||
+            accountChoices.spammersHashCodes.contains(hash)
+        ) {
+            return true
+        }
+
+        // if the post is sensitive and the user doesn't want to see sensitive content
+        if (accountChoices.showSensitiveContent == false && thisEvent.isSensitive()) {
+            return true
+        }
+
+        // if this is a repost, consider the inner event.
+        if (
+            thisEvent is GenericRepostEvent ||
+            thisEvent is RepostEvent ||
+            thisEvent is CommunityPostApprovalEvent
+        ) {
+            if (replyTo?.lastOrNull()?.isHiddenFor(accountChoices) == true) {
+                return true
+            }
+        }
+
+        if (accountChoices.hiddenWordsCase.isNotEmpty()) {
+            if (thisEvent is BaseTextNoteEvent && thisEvent.content.containsAny(accountChoices.hiddenWordsCase)) {
+                return true
            }

-        val isHiddenByWord =
-            if (thisEvent is BaseTextNoteEvent) {
-                accountChoices.hiddenWords.any {
-                    thisEvent.content.containsAny(accountChoices.hiddenWordsCase)
-                }
-            } else {
-                false
+            if (author?.toBestDisplayName()?.containsAny(accountChoices.hiddenWordsCase) == true) {
+                return true
            }

-        val isSensitive = thisEvent.isSensitive()
-        return isBoostedNoteHidden ||
-            isHiddenByWord ||
-            accountChoices.hiddenUsers.contains(author?.pubkeyHex) ||
-            accountChoices.spammers.contains(author?.pubkeyHex) ||
-            (isSensitive && accountChoices.showSensitiveContent == false)
+            if (author?.profilePicture()?.containsAny(accountChoices.hiddenWordsCase) == true) {
+                return true
+            }
+
+            if (author?.info?.banner?.containsAny(accountChoices.hiddenWordsCase) == true) {
+                return true
+            }
+
+            if (author?.info?.about?.containsAny(accountChoices.hiddenWordsCase) == true) {
+                return true
+            }
+
+            if (author?.info?.lud06?.containsAny(accountChoices.hiddenWordsCase) == true) {
+                return true
+            }
+
+            if (author?.info?.lud16?.containsAny(accountChoices.hiddenWordsCase) == true) {
+                return true
+            }
+        }
+
+        return false
    }

    var liveSet: NoteLiveSet? = null
@@ -858,28 +866,44 @@ open class Note(val idHex: String) {
 }

@Stable
-class NoteFlowSet(u: Note) {
+class NoteFlowSet(
+    u: Note,
+) {
    // Observers line up here.
    val metadata = NoteBundledRefresherFlow(u)
+    val reports = NoteBundledRefresherFlow(u)
+    val relays = NoteBundledRefresherFlow(u)

-    fun isInUse(): Boolean {
-        return metadata.stateFlow.subscriptionCount.value > 0
-    }
+    @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 ||
+            relays.stateFlow.subscriptionCount.value > 0

    fun destroy() {
        metadata.destroy()
+        reports.destroy()
+        relays.destroy()
    }
 }

@Stable
-class NoteLiveSet(u: Note) {
+class NoteLiveSet(
+    u: Note,
+) {
    // Observers line up here.
    val innerMetadata = NoteBundledRefresherLiveData(u)
    val innerReactions = NoteBundledRefresherLiveData(u)
    val innerBoosts = NoteBundledRefresherLiveData(u)
    val innerReplies = NoteBundledRefresherLiveData(u)
-    val innerReports = NoteBundledRefresherLiveData(u)
-    val innerRelays = NoteBundledRefresherLiveData(u)
    val innerZaps = NoteBundledRefresherLiveData(u)
    val innerOts = NoteBundledRefresherLiveData(u)
    val innerModifications = NoteBundledRefresherLiveData(u)
@@ -888,8 +912,6 @@ class NoteLiveSet(u: Note) {
    val reactions = innerReactions.map { it }
    val boosts = innerBoosts.map { it }
    val replies = innerReplies.map { it }
-    val reports = innerReports.map { it }
-    val relays = innerRelays.map { it }
    val zaps = innerZaps.map { it }

    val hasEvent = innerMetadata.map { it.note.event != null }.distinctUntilChanged()
@@ -901,8 +923,7 @@ class NoteLiveSet(u: Note) {
                    ?: false ||
                    boostState?.note?.boosts?.isNotEmpty() ?: false ||
                    reactionState?.note?.reactions?.isNotEmpty() ?: false
-            }
-            .distinctUntilChanged()
+            }.distinctUntilChanged()

    val replyCount = innerReplies.map { it.note.replies.size }.distinctUntilChanged()

@@ -912,22 +933,17 @@ class NoteLiveSet(u: Note) {
                var total = 0
                it.note.reactions.forEach { total += it.value.size }
                total
-            }
-            .distinctUntilChanged()
+            }.distinctUntilChanged()

    val boostCount = innerBoosts.map { it.note.boosts.size }.distinctUntilChanged()

-    val relayInfo = innerRelays.map { it.note.relays }
-
    val content = innerMetadata.map { it.note.event?.content() ?: "" }

-    fun isInUse(): Boolean {
-        return metadata.hasObservers() ||
+    fun isInUse(): Boolean =
+        metadata.hasObservers() ||
            reactions.hasObservers() ||
            boosts.hasObservers() ||
            replies.hasObservers() ||
-            reports.hasObservers() ||
-            relays.hasObservers() ||
            zaps.hasObservers() ||
            hasEvent.hasObservers() ||
            hasReactions.hasObservers() ||
@@ -936,15 +952,12 @@ class NoteLiveSet(u: Note) {
            boostCount.hasObservers() ||
            innerOts.hasObservers() ||
            innerModifications.hasObservers()
-    }

    fun destroy() {
        innerMetadata.destroy()
        innerReactions.destroy()
        innerBoosts.destroy()
        innerReplies.destroy()
-        innerReports.destroy()
-        innerRelays.destroy()
        innerZaps.destroy()
        innerOts.destroy()
        innerModifications.destroy()
@@ -952,8 +965,11 @@ class NoteLiveSet(u: Note) {
 }

@Stable
-class NoteBundledRefresherFlow(val note: Note) {
+class NoteBundledRefresherFlow(
+    val note: Note,
+) {
    // Refreshes observers in batches.
+    // TODO: Replace the bundler for .sample
    private val bundler = BundledUpdate(500, Dispatchers.IO)
    val stateFlow = MutableStateFlow(NoteState(note))

@@ -973,7 +989,9 @@ class NoteBundledRefresherFlow(val note: Note) {
 }

@Stable
-class NoteBundledRefresherLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
+class NoteBundledRefresherLiveData(
+    val note: Note,
+) : LiveData<NoteState>(NoteState(note)) {
    // Refreshes observers in batches.
    private val bundler = BundledUpdate(500, Dispatchers.IO)

@@ -1000,7 +1018,10 @@ class NoteBundledRefresherLiveData(val note: Note) : LiveData<NoteState>(NoteSta
 }

@Stable
-class NoteLoadingLiveData<Y>(val note: Note, initialValue: Y?) : MediatorLiveData<Y>(initialValue) {
+class NoteLoadingLiveData<Y>(
+    val note: Note,
+    initialValue: Y?,
+) : MediatorLiveData<Y>(initialValue) {
    override fun onActive() {
        super.onActive()
        if (note is AddressableNote) {
@@ -1020,24 +1041,6 @@ class NoteLoadingLiveData<Y>(val note: Note, initialValue: Y?) : MediatorLiveDat
    }
 }

-@Immutable class NoteState(val note: Note)
-
-object RelayBriefInfoCache {
-    val cache = LruCache<String, RelayBriefInfo?>(50)
-
-    @Immutable
-    data class RelayBriefInfo(
-        val url: String,
-        val displayUrl: String = RelayUrlFormatter.displayUrl(url).intern(),
-        val favIcon: String = "https://$displayUrl/favicon.ico".intern(),
-    )
-
-    fun get(url: String): RelayBriefInfo {
-        val info = cache[url]
-        if (info != null) return info
-
-        val newInfo = RelayBriefInfo(url)
-        cache.put(url, newInfo)
-        return newInfo
-    }
-}
+@Immutable class NoteState(
+    val note: Note,
+)
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/ParticipantListBuilder.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/ParticipantListBuilder.kt
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Settings.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Settings.kt
@@ -34,17 +34,20 @@ data class Settings(
    val automaticallyShowProfilePictures: ConnectivityType = ConnectivityType.ALWAYS,
    val dontShowPushNotificationSelector: Boolean = false,
    val dontAskForNotificationPermissions: Boolean = false,
-    val featureSet: FeatureSetType = FeatureSetType.COMPLETE,
+    val featureSet: FeatureSetType = FeatureSetType.SIMPLIFIED,
 )

-enum class ThemeType(val screenCode: Int, val resourceId: Int) {
+enum class ThemeType(
+    val screenCode: Int,
+    val resourceId: Int,
+) {
    SYSTEM(0, R.string.system),
    LIGHT(1, R.string.light),
    DARK(2, R.string.dark),
 }

-fun parseThemeType(code: Int?): ThemeType {
-    return when (code) {
+fun parseThemeType(code: Int?): ThemeType =
+    when (code) {
        ThemeType.SYSTEM.screenCode -> ThemeType.SYSTEM
        ThemeType.LIGHT.screenCode -> ThemeType.LIGHT
        ThemeType.DARK.screenCode -> ThemeType.DARK
@@ -52,21 +55,28 @@ fun parseThemeType(code: Int?): ThemeType {
            ThemeType.SYSTEM
        }
    }
-}

-enum class ConnectivityType(val prefCode: Boolean?, val screenCode: Int, val resourceId: Int) {
+enum class ConnectivityType(
+    val prefCode: Boolean?,
+    val screenCode: Int,
+    val resourceId: Int,
+) {
    ALWAYS(null, 0, R.string.connectivity_type_always),
-    WIFI_ONLY(true, 1, R.string.connectivity_type_wifi_only),
+    WIFI_ONLY(true, 1, R.string.connectivity_type_unmetered_wifi_only),
    NEVER(false, 2, R.string.connectivity_type_never),
 }

-enum class FeatureSetType(val screenCode: Int, val resourceId: Int) {
+enum class FeatureSetType(
+    val screenCode: Int,
+    val resourceId: Int,
+) {
    COMPLETE(0, R.string.ui_feature_set_type_complete),
    SIMPLIFIED(1, R.string.ui_feature_set_type_simplified),
+    PERFORMANCE(2, R.string.ui_feature_set_type_performance),
 }

-fun parseConnectivityType(code: Boolean?): ConnectivityType {
-    return when (code) {
+fun parseConnectivityType(code: Boolean?): ConnectivityType =
+    when (code) {
        ConnectivityType.ALWAYS.prefCode -> ConnectivityType.ALWAYS
        ConnectivityType.WIFI_ONLY.prefCode -> ConnectivityType.WIFI_ONLY
        ConnectivityType.NEVER.prefCode -> ConnectivityType.NEVER
@@ -74,10 +84,9 @@ fun parseConnectivityType(code: Boolean?): ConnectivityType {
            ConnectivityType.ALWAYS
        }
    }
-}

-fun parseConnectivityType(screenCode: Int): ConnectivityType {
-    return when (screenCode) {
+fun parseConnectivityType(screenCode: Int): ConnectivityType =
+    when (screenCode) {
        ConnectivityType.ALWAYS.screenCode -> ConnectivityType.ALWAYS
        ConnectivityType.WIFI_ONLY.screenCode -> ConnectivityType.WIFI_ONLY
        ConnectivityType.NEVER.screenCode -> ConnectivityType.NEVER
@@ -85,39 +94,40 @@ fun parseConnectivityType(screenCode: Int): ConnectivityType {
            ConnectivityType.ALWAYS
        }
    }
-}

-fun parseFeatureSetType(screenCode: Int): FeatureSetType {
-    return when (screenCode) {
+fun parseFeatureSetType(screenCode: Int): FeatureSetType =
+    when (screenCode) {
        FeatureSetType.COMPLETE.screenCode -> FeatureSetType.COMPLETE
        FeatureSetType.SIMPLIFIED.screenCode -> FeatureSetType.SIMPLIFIED
+        FeatureSetType.PERFORMANCE.screenCode -> FeatureSetType.PERFORMANCE
        else -> {
            FeatureSetType.COMPLETE
        }
    }
-}

-enum class BooleanType(val prefCode: Boolean?, val screenCode: Int, val reourceId: Int) {
+enum class BooleanType(
+    val prefCode: Boolean?,
+    val screenCode: Int,
+    val reourceId: Int,
+) {
    ALWAYS(null, 0, R.string.connectivity_type_always),
    NEVER(false, 1, R.string.connectivity_type_never),
 }

-fun parseBooleanType(code: Boolean?): BooleanType {
-    return when (code) {
+fun parseBooleanType(code: Boolean?): BooleanType =
+    when (code) {
        BooleanType.ALWAYS.prefCode -> BooleanType.ALWAYS
        BooleanType.NEVER.prefCode -> BooleanType.NEVER
        else -> {
            BooleanType.ALWAYS
        }
    }
-}

-fun parseBooleanType(screenCode: Int): BooleanType {
-    return when (screenCode) {
+fun parseBooleanType(screenCode: Int): BooleanType =
+    when (screenCode) {
        BooleanType.ALWAYS.screenCode -> BooleanType.ALWAYS
        BooleanType.NEVER.screenCode -> BooleanType.NEVER
        else -> {
            BooleanType.ALWAYS
        }
    }
-}
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/ThreadAssembler.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/ThreadAssembler.kt
@@ -62,8 +62,7 @@ class ThreadAssembler {
                    } else {
                        null
                    }
-                }
-                ?.filterNotNull()
+                }?.filterNotNull()

        if (roots != null && roots.isNotEmpty()) {
            return roots[0]
@@ -148,9 +147,7 @@ class OnlyLatestVersionSet : MutableSet<Note> {
        }
    }

-    override fun addAll(elements: Collection<Note>): Boolean {
-        return elements.map { add(it) }.any()
-    }
+    override fun addAll(elements: Collection<Note>): Boolean = elements.map { add(it) }.any()

    override val size: Int
        get() = set.size
@@ -160,29 +157,17 @@ class OnlyLatestVersionSet : MutableSet<Note> {
        map.clear()
    }

-    override fun isEmpty(): Boolean {
-        return set.isEmpty()
-    }
+    override fun isEmpty(): Boolean = set.isEmpty()

-    override fun containsAll(elements: Collection<Note>): Boolean {
-        return set.containsAll(elements)
-    }
+    override fun containsAll(elements: Collection<Note>): Boolean = set.containsAll(elements)

-    override fun contains(element: Note): Boolean {
-        return set.contains(element)
-    }
+    override fun contains(element: Note): Boolean = set.contains(element)

-    override fun iterator(): MutableIterator<Note> {
-        return set.iterator()
-    }
+    override fun iterator(): MutableIterator<Note> = set.iterator()

-    override fun retainAll(elements: Collection<Note>): Boolean {
-        return set.retainAll(elements)
-    }
+    override fun retainAll(elements: Collection<Note>): Boolean = set.retainAll(elements)

-    override fun removeAll(elements: Collection<Note>): Boolean {
-        return elements.map { remove(it) }.any()
-    }
+    override fun removeAll(elements: Collection<Note>): Boolean = elements.map { remove(it) }.any()

    override fun remove(element: Note): Boolean {
        element.address()?.let {
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/ThreadLevelCalculator.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/ThreadLevelCalculator.kt
@@ -27,16 +27,20 @@ import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter

-data class LevelSignature(val signature: String, val createdAt: Long?, val author: User?)
+data class LevelSignature(
+    val signature: String,
+    val createdAt: Long?,
+    val author: User?,
+)

 object ThreadLevelCalculator {
    val levelFormatter = DateTimeFormatter.ofPattern("uuuu-MM-dd-HH:mm:ss")

-    private fun formattedDateTime(timestamp: Long): String {
-        return Instant.ofEpochSecond(timestamp)
+    private fun formattedDateTime(timestamp: Long): String =
+        Instant
+            .ofEpochSecond(timestamp)
            .atZone(ZoneId.systemDefault())
            .format(levelFormatter)
-    }

    /**
     * This method caches signatures during each execution to avoid recalculation in longer threads
@@ -76,8 +80,7 @@ object ThreadLevelCalculator {
                                accountFollowingSet,
                                now,
                            ).apply { cachedSignatures.put(it, this) }
-                    }
-                    .maxByOrNull { it.signature.length }
+                    }.maxByOrNull { it.signature.length }
            )

        val parentSignature = parent?.signature?.removeSuffix(";") ?: ""
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/UrlCachedPreviewer.kt
+++ b/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,40 +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)
+            },
+            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)
            },
        )
-            .fetchUrlPreview()
    }
 }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/User.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/User.kt
@@ -27,14 +27,16 @@ import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.distinctUntilChanged
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.service.relays.EOSETime
-import com.vitorpamplona.amethyst.service.relays.Relay
-import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
+import com.vitorpamplona.ammolite.relays.BundledUpdate
+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
+import com.vitorpamplona.quartz.encoders.Nip19Bech32
 import com.vitorpamplona.quartz.encoders.toNpub
+import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.events.BookmarkListEvent
 import com.vitorpamplona.quartz.events.ChatroomKey
 import com.vitorpamplona.quartz.events.ContactListEvent
@@ -49,10 +51,13 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import java.math.BigDecimal

@Stable
-class User(val pubkeyHex: String) {
+class User(
+    val pubkeyHex: String,
+) {
    var info: UserMetadata? = null

    var latestMetadata: MetadataEvent? = null
+    var latestMetadataRelay: String? = null
    var latestContactList: ContactListEvent? = null
    var latestBookmarkList: BookmarkListEvent? = null

@@ -76,7 +81,16 @@ class User(val pubkeyHex: String) {

    fun pubkeyDisplayHex() = pubkeyNpub().toShortenHex()

-    fun toNostrUri() = "nostr:${pubkeyNpub()}"
+    fun toNProfile(): String {
+        val relayList = (LocalCache.getAddressableNoteIfExists(AdvertisedRelayListEvent.createAddressTag(pubkeyHex))?.event as? AdvertisedRelayListEvent)?.writeRelays()
+
+        return Nip19Bech32.createNProfile(
+            pubkeyHex,
+            relayList?.take(3) ?: listOfNotNull(latestMetadataRelay),
+        )
+    }
+
+    fun toNostrUri() = "nostr:${toNProfile()}"

    override fun toString(): String = pubkeyHex

@@ -96,17 +110,11 @@ class User(val pubkeyHex: String) {
        return firstName
    }

-    fun toBestDisplayName(): String {
-        return info?.bestName() ?: pubkeyDisplayHex()
-    }
+    fun toBestDisplayName(): String = info?.bestName() ?: pubkeyDisplayHex()

-    fun nip05(): String? {
-        return info?.nip05
-    }
+    fun nip05(): String? = info?.nip05

-    fun profilePicture(): String? {
-        return info?.picture
-    }
+    fun profilePicture(): String? = info?.picture

    fun updateBookmark(event: BookmarkListEvent) {
        if (event.id == latestBookmarkList?.id) return
@@ -132,10 +140,18 @@ class User(val pubkeyHex: String) {
        // Update Followers of the past user list
        // Update Followers of the new contact list
        (oldContactListEvent)?.unverifiedFollowKeySet()?.forEach {
-            LocalCache.getUserIfExists(it)?.liveSet?.innerFollowers?.invalidateData()
+            LocalCache
+                .getUserIfExists(it)
+                ?.liveSet
+                ?.innerFollowers
+                ?.invalidateData()
        }
        (latestContactList)?.unverifiedFollowKeySet()?.forEach {
-            LocalCache.getUserIfExists(it)?.liveSet?.innerFollowers?.invalidateData()
+            LocalCache
+                .getUserIfExists(it)
+                ?.liveSet
+                ?.innerFollowers
+                ?.invalidateData()
        }

        liveSet?.innerRelays?.invalidateData()
@@ -198,25 +214,19 @@ class User(val pubkeyHex: String) {
        return amount
    }

-    fun reportsBy(user: User): Set<Note> {
-        return reports[user] ?: emptySet()
-    }
+    fun reportsBy(user: User): Set<Note> = reports[user] ?: emptySet()

-    fun countReportAuthorsBy(users: Set<HexKey>): Int {
-        return reports.count { it.key.pubkeyHex in users }
-    }
+    fun countReportAuthorsBy(users: Set<HexKey>): Int = reports.count { it.key.pubkeyHex in users }

-    fun reportsBy(users: Set<HexKey>): List<Note> {
-        return reports
+    fun reportsBy(users: Set<HexKey>): List<Note> =
+        reports
            .mapNotNull {
                if (it.key.pubkeyHex in users) {
                    it.value
                } else {
                    null
                }
-            }
-            .flatten()
-    }
+            }.flatten()

    @Synchronized
    private fun getOrCreatePrivateChatroomSync(key: ChatroomKey): Chatroom {
@@ -235,9 +245,7 @@ class User(val pubkeyHex: String) {
        return getOrCreatePrivateChatroom(key)
    }

-    private fun getOrCreatePrivateChatroom(key: ChatroomKey): Chatroom {
-        return privateChatrooms[key] ?: getOrCreatePrivateChatroomSync(key)
-    }
+    private fun getOrCreatePrivateChatroom(key: ChatroomKey): Chatroom = privateChatrooms[key] ?: getOrCreatePrivateChatroomSync(key)

    fun addMessage(
        room: ChatroomKey,
@@ -323,76 +331,29 @@ class User(val pubkeyHex: String) {
            }
        }

+        flowSet?.metadata?.invalidateData()
        liveSet?.innerMetadata?.invalidateData()
    }

-    fun isFollowing(user: User): Boolean {
-        return latestContactList?.isTaggedUser(user.pubkeyHex) ?: false
-    }
+    fun isFollowing(user: User): Boolean = latestContactList?.isTaggedUser(user.pubkeyHex) ?: false

    fun isFollowingHashtag(tag: String): Boolean {
-        return latestContactList?.isTaggedHash(tag) ?: false
-    }
-
-    fun isFollowingHashtagCached(tag: String): Boolean {
-        return latestContactList?.verifiedFollowTagSet?.let {
+        return latestContactList?.unverifiedFollowTagSet()?.map { it.lowercase() }?.toSet()?.let {
            return tag.lowercase() in it
        }
            ?: false
    }

-    fun isFollowingGeohashCached(geoTag: String): Boolean {
-        return latestContactList?.verifiedFollowGeohashSet?.let {
+    fun isFollowingGeohash(geoTag: String): Boolean {
+        return latestContactList?.unverifiedFollowAddressSet()?.toSet()?.let {
            return geoTag.lowercase() in it
        }
            ?: false
    }

-    fun isFollowingCached(user: User): Boolean {
-        return latestContactList?.verifiedFollowKeySet?.let {
-            return user.pubkeyHex in it
-        }
-            ?: false
-    }
+    fun transientFollowCount(): Int? = latestContactList?.unverifiedFollowKeySet()?.size

-    fun isFollowingCached(userHex: String): Boolean {
-        return latestContactList?.verifiedFollowKeySet?.let {
-            return userHex in it
-        }
-            ?: false
-    }
-
-    fun transientFollowCount(): Int? {
-        return latestContactList?.unverifiedFollowKeySet()?.size
-    }
-
-    suspend fun transientFollowerCount(): Int {
-        return LocalCache.users.count { _, it -> it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
-    }
-
-    fun cachedFollowingKeySet(): Set<HexKey> {
-        return latestContactList?.verifiedFollowKeySet ?: emptySet()
-    }
-
-    fun cachedFollowingTagSet(): Set<String> {
-        return latestContactList?.verifiedFollowTagSet ?: emptySet()
-    }
-
-    fun cachedFollowingGeohashSet(): Set<HexKey> {
-        return latestContactList?.verifiedFollowGeohashSet ?: emptySet()
-    }
-
-    fun cachedFollowingCommunitiesSet(): Set<HexKey> {
-        return latestContactList?.verifiedFollowCommunitySet ?: emptySet()
-    }
-
-    fun cachedFollowCount(): Int? {
-        return latestContactList?.verifiedFollowKeySet?.size
-    }
-
-    suspend fun cachedFollowerCount(): Int {
-        return LocalCache.users.count { _, it -> it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
-    }
+    suspend fun transientFollowerCount(): Int = LocalCache.users.count { _, it -> it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }

    fun hasSentMessagesTo(key: ChatroomKey?): Boolean {
        val messagesToUser = privateChatrooms[key] ?: return false
@@ -403,16 +364,13 @@ class User(val pubkeyHex: String) {
    fun hasReport(
        loggedIn: User,
        type: ReportEvent.ReportType,
-    ): Boolean {
-        return reports[loggedIn]?.firstOrNull {
+    ): Boolean =
+        reports[loggedIn]?.firstOrNull {
            it.event is ReportEvent &&
                (it.event as ReportEvent).reportedAuthor().any { it.reportType == type }
        } != null
-    }

-    fun anyNameStartsWith(username: String): Boolean {
-        return info?.anyNameStartsWith(username) ?: false
-    }
+    fun anyNameStartsWith(username: String): Boolean = info?.anyNameStartsWith(username) ?: false

    var liveSet: UserLiveSet? = null
    var flowSet: UserFlowSet? = null
@@ -473,23 +431,30 @@ class User(val pubkeyHex: String) {
 }

@Stable
-class UserFlowSet(u: User) {
+class UserFlowSet(
+    u: User,
+) {
    // Observers line up here.
+    val metadata = UserBundledRefresherFlow(u)
    val follows = UserBundledRefresherFlow(u)
    val relays = UserBundledRefresherFlow(u)

-    fun isInUse(): Boolean {
-        return 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()
    }
 }

@Stable
-class UserLiveSet(u: User) {
+class UserLiveSet(
+    u: User,
+) {
    val innerMetadata = UserBundledRefresherLiveData(u)

    // UI Observers line up here.
@@ -521,8 +486,8 @@ class UserLiveSet(u: User) {

    val userMetadataInfo = innerMetadata.map { it.user.info }.distinctUntilChanged()

-    fun isInUse(): Boolean {
-        return metadata.hasObservers() ||
+    fun isInUse(): Boolean =
+        metadata.hasObservers() ||
            follows.hasObservers() ||
            followers.hasObservers() ||
            reports.hasObservers() ||
@@ -535,7 +500,6 @@ class UserLiveSet(u: User) {
            profilePictureChanges.hasObservers() ||
            nip05Changes.hasObservers() ||
            userMetadataInfo.hasObservers()
-    }

    fun destroy() {
        innerMetadata.destroy()
@@ -558,7 +522,9 @@ data class RelayInfo(
    var counter: Long,
 )

-class UserBundledRefresherLiveData(val user: User) : LiveData<UserState>(UserState(user)) {
+class UserBundledRefresherLiveData(
+    val user: User,
+) : LiveData<UserState>(UserState(user)) {
    // Refreshes observers in batches.
    private val bundler = BundledUpdate(500, Dispatchers.IO)

@@ -585,7 +551,9 @@ class UserBundledRefresherLiveData(val user: User) : LiveData<UserState>(UserSta
 }

@Stable
-class UserBundledRefresherFlow(val user: User) {
+class UserBundledRefresherFlow(
+    val user: User,
+) {
    // Refreshes observers in batches.
    private val bundler = BundledUpdate(500, Dispatchers.IO)
    val stateFlow = MutableStateFlow(UserState(user))
@@ -605,7 +573,10 @@ class UserBundledRefresherFlow(val user: User) {
    }
 }

-class UserLoadingLiveData<Y>(val user: User, initialValue: Y?) : MediatorLiveData<Y>(initialValue) {
+class UserLoadingLiveData<Y>(
+    val user: User,
+    initialValue: Y?,
+) : MediatorLiveData<Y>(initialValue) {
    override fun onActive() {
        super.onActive()
        NostrSingleUserDataSource.add(user)
@@ -617,4 +588,6 @@ class UserLoadingLiveData<Y>(val user: User, initialValue: Y?) : MediatorLiveDat
    }
 }

-@Immutable class UserState(val user: User)
+@Immutable class UserState(
+    val user: User,
+)
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/observables/CreatedAtComparator.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/observables/CreatedAtComparator.kt
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/observables/LatestByKindAndAuthor.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/observables/LatestByKindAndAuthor.kt
@@ -27,7 +27,10 @@ import com.vitorpamplona.quartz.events.Event
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow

-class LatestByKindAndAuthor<T : Event>(private val kind: Int, private val pubkey: String) {
+class LatestByKindAndAuthor<T : Event>(
+    private val kind: Int,
+    private val pubkey: String,
+) {
    private val _latest = MutableStateFlow<T?>(null)
    val latest = _latest.asStateFlow()

@@ -41,32 +44,38 @@ class LatestByKindAndAuthor<T : Event>(private val kind: Int, private val pubkey
        }
    }

-    fun canDelete(): Boolean {
-        return _latest.subscriptionCount.value == 0
+    fun canDelete(): Boolean = _latest.subscriptionCount.value == 0
+
+    fun restart() {
+        val latestNote =
+            if ((kind in 10000..19999) || (kind in 30000..39999)) {
+                LocalCache.addressables
+                    .maxOrNullOf(
+                        filter = { idHex: String, note: AddressableNote ->
+                            note.event?.let {
+                                it.kind() == kind && it.pubKey() == pubkey
+                            } == true
+                        },
+                        comparator = CreatedAtComparatorAddresses,
+                    )?.event as? T
+            } else {
+                LocalCache.notes
+                    .maxOrNullOf(
+                        filter = { idHex: String, note: Note ->
+                            note.event?.let {
+                                it.kind() == kind && it.pubKey() == pubkey
+                            } == true
+                        },
+                        comparator = CreatedAtComparator,
+                    )?.event as? T
+            }
+
+        if (_latest.value != latestNote) {
+            _latest.tryEmit(latestNote)
+        }
    }

    suspend fun init() {
-        val latestNote =
-            if ((kind in 10000..19999) || (kind in 30000..39999)) {
-                LocalCache.addressables.maxOrNullOf(
-                    filter = { idHex: String, note: AddressableNote ->
-                        note.event?.let {
-                            it.kind() == kind && it.pubKey() == pubkey
-                        } == true
-                    },
-                    comparator = CreatedAtComparatorAddresses,
-                )?.event as? T
-            } else {
-                LocalCache.notes.maxOrNullOf(
-                    filter = { idHex: String, note: Note ->
-                        note.event?.let {
-                            it.kind() == kind && it.pubKey() == pubkey
-                        } == true
-                    },
-                    comparator = CreatedAtComparator,
-                )?.event as? T
-            }
-
-        _latest.tryEmit(latestNote)
+        restart()
    }
 }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/observables/LatestByKindWithETag.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/observables/LatestByKindWithETag.kt
@@ -26,7 +26,10 @@ import com.vitorpamplona.quartz.events.Event
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow

-class LatestByKindWithETag<T : Event>(private val kind: Int, private val eTag: String) {
+class LatestByKindWithETag<T : Event>(
+    private val kind: Int,
+    private val eTag: String,
+) {
    private val _latest = MutableStateFlow<T?>(null)
    val latest = _latest.asStateFlow()

@@ -40,21 +43,26 @@ class LatestByKindWithETag<T : Event>(private val kind: Int, private val eTag: S
        }
    }

-    fun canDelete(): Boolean {
-        return _latest.subscriptionCount.value == 0
+    fun canDelete(): Boolean = _latest.subscriptionCount.value == 0
+
+    fun restart() {
+        val latestNote =
+            LocalCache.notes
+                .maxOrNullOf(
+                    filter = { idHex: String, note: Note ->
+                        note.event?.let {
+                            it.kind() == kind && it.isTaggedEvent(eTag)
+                        } == true
+                    },
+                    comparator = CreatedAtComparator,
+                )?.event as? T
+
+        if (_latest.value != latestNote) {
+            _latest.tryEmit(latestNote)
+        }
    }

    suspend fun init() {
-        val latestNote =
-            LocalCache.notes.maxOrNullOf(
-                filter = { idHex: String, note: Note ->
-                    note.event?.let {
-                        it.kind() == kind && it.isTaggedEvent(eTag)
-                    } == true
-                },
-                comparator = CreatedAtComparator,
-            )?.event as? T
-
-        _latest.tryEmit(latestNote)
+        restart()
    }
 }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/AmethystNostrDataSource.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/AmethystNostrDataSource.kt
@@ -0,0 +1,51 @@
+/**
+ * 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 com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.ammolite.relays.NostrDataSource
+import com.vitorpamplona.ammolite.relays.Relay
+import com.vitorpamplona.quartz.events.AddressableEvent
+import com.vitorpamplona.quartz.events.Event
+
+abstract class AmethystNostrDataSource(
+    debugName: String,
+) : NostrDataSource(debugName) {
+    override fun consume(
+        event: Event,
+        relay: Relay,
+    ) {
+        LocalCache.verifyAndConsume(event, relay)
+    }
+
+    override fun markAsSeenOnRelay(
+        eventId: String,
+        relay: Relay,
+    ) {
+        val note = LocalCache.getNoteIfExists(eventId)
+        val noteEvent = note?.event
+        if (noteEvent is AddressableEvent) {
+            LocalCache.getAddressableNoteIfExists(noteEvent.address().toTag())?.addRelay(relay)
+        } else {
+            note?.addRelay(relay)
+        }
+    }
+}
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/Base64Image.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/Base64Image.kt
@@ -18,44 +18,47 @@
 * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-package com.vitorpamplona.amethyst.ui.components
+package com.vitorpamplona.amethyst.service

 import android.content.Context
+import android.graphics.BitmapFactory
 import android.net.Uri
 import androidx.compose.runtime.Stable
+import androidx.core.graphics.drawable.toDrawable
 import coil.ImageLoader
 import coil.decode.DataSource
-import coil.decode.ImageSource
+import coil.fetch.DrawableResult
+import coil.fetch.FetchResult
 import coil.fetch.Fetcher
-import coil.fetch.SourceResult
 import coil.request.ImageRequest
 import coil.request.Options
-import com.vitorpamplona.amethyst.commons.robohash.Robohash
-import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import okio.buffer
-import okio.source
-import java.nio.charset.Charset
+import com.vitorpamplona.amethyst.commons.richtext.RichTextParser.Companion.base64contentPattern
+import java.util.Base64

@Stable
-class HashImageFetcher(
-    private val context: Context,
-    private val isLightTheme: Boolean,
+class Base64Fetcher(
+    private val options: Options,
    private val data: Uri,
 ) : Fetcher {
-    override suspend fun fetch(): SourceResult {
+    override suspend fun fetch(): FetchResult {
        checkNotInMainThread()

-        val source =
-            try {
-                Robohash.assemble(data.toString(), isLightTheme).byteInputStream(Charset.defaultCharset()).source().buffer()
-            } finally {
-            }
+        val matcher = base64contentPattern.matcher(data.toString())

-        return SourceResult(
-            source = ImageSource(source, context),
-            mimeType = "image/svg+xml",
-            dataSource = DataSource.MEMORY,
-        )
+        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 DrawableResult(
+                drawable = bitmap.toDrawable(options.context.resources),
+                isSampled = false,
+                dataSource = DataSource.MEMORY,
+            )
+        } else {
+            throw Exception("Unable to load base64 $data")
+        }
    }

    object Factory : Fetcher.Factory<Uri> {
@@ -63,28 +66,24 @@ class HashImageFetcher(
            data: Uri,
            options: Options,
            imageLoader: ImageLoader,
-        ): Fetcher {
-            return HashImageFetcher(
-                options.context,
-                options.parameters.value("isLightTheme") ?: true,
-                data,
-            )
+        ): Fetcher? {
+            return if (base64contentPattern.matcher(data.toString()).find()) {
+                return Base64Fetcher(options, data)
+            } else {
+                null
+            }
        }
    }
 }

-@Deprecated("Use the RobohashAssembler instead")
-object RobohashImageRequest {
-    fun build(
+object Base64Requester {
+    fun imageRequest(
        context: Context,
        message: String,
-        isLightTheme: Boolean,
-    ): ImageRequest {
-        return ImageRequest.Builder(context)
+    ): ImageRequest =
+        ImageRequest
+            .Builder(context)
            .data(message)
-            .fetcherFactory(HashImageFetcher.Factory)
-            .setParameter("isLightTheme", isLightTheme)
-            .addHeader("Cache-Control", "max-age=31536000")
+            .fetcherFactory(Base64Fetcher.Factory)
            .build()
-    }
 }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/BlurHashImage.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/BlurHashImage.kt
@@ -59,9 +59,7 @@ class BlurHashFetcher(
            data: Uri,
            options: Options,
            imageLoader: ImageLoader,
-        ): Fetcher {
-            return BlurHashFetcher(options, data)
-        }
+        ): Fetcher = BlurHashFetcher(options, data)
    }
 }

@@ -72,7 +70,8 @@ object BlurHashRequester {
    ): ImageRequest {
        val encodedMessage = URLEncoder.encode(message, "utf-8")

-        return ImageRequest.Builder(context)
+        return ImageRequest
+            .Builder(context)
            .data("bluehash:$encodedMessage")
            .fetcherFactory(BlurHashFetcher.Factory)
            .build()
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/CachedRichTextParser.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/CachedRichTextParser.kt
@@ -26,18 +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)
+
+    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 {
-        return if (richTextCache[content] != null) {
-            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
        }
    }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/CashuProcessor.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/CashuProcessor.kt
@@ -0,0 +1,417 @@
+/**
+ * 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.util.LruCache
+import androidx.compose.runtime.Immutable
+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.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
+import java.util.Base64
+import kotlin.coroutines.cancellation.CancellationException
+
+@Immutable
+data class CashuToken(
+    val token: String,
+    val mint: String,
+    val totalAmount: Long,
+    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<ImmutableList<CashuToken>>>(20)
+
+    fun cached(token: String): GenericLoadable<ImmutableList<CashuToken>> = cashuCache[token] ?: GenericLoadable.Loading()
+
+    fun parse(token: String): GenericLoadable<ImmutableList<CashuToken>> {
+        if (cashuCache[token] !is GenericLoadable.Loaded) {
+            checkNotInMainThread()
+            val newCachuData = CashuProcessor().parse(token)
+
+            cashuCache.put(token, newCachuData)
+        }
+
+        return cashuCache[token]
+    }
+}
+
+class CashuProcessor {
+    @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().readValue<V3Token>(String(Base64.getDecoder().decode(base64token)))
+
+            if (cashu.token == null) {
+                return GenericLoadable.Error("No token found")
+            }
+
+            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("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,
+    ) {
+        checkNotInMainThread()
+
+        runCatching {
+            LightningAddressResolver()
+                .lnAddressInvoice(
+                    lnaddress = lud16,
+                    // 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(
+                                        lnaddress = lud16,
+                                        // Make invoice and leave room for fees
+                                        milliSats = (token.totalAmount - fees) * 1000,
+                                        message = "Redeem Cashu",
+                                        forceProxy = forceProxy,
+                                        onSuccess = { invoice ->
+                                            meltInvoice(token, invoice, fees, forceProxy, onSuccess, onError, context)
+                                        },
+                                        onProgress = {},
+                                        onError = onError,
+                                        context = context,
+                                    )
+                            },
+                            onError = onError,
+                            context,
+                        )
+                    },
+                    onProgress = {},
+                    onError = onError,
+                    context = context,
+                )
+        }
+    }
+
+    fun feeCalculator(
+        mintAddress: String,
+        invoice: String,
+        forceProxy: (String) -> Boolean,
+        onSuccess: (Int) -> Unit,
+        onError: (String, String) -> Unit,
+        context: Context,
+    ) {
+        checkNotInMainThread()
+
+        try {
+            val url = "$mintAddress/checkfees" // Melt cashu tokens at Mint
+            val client = HttpClientManager.getHttpClient(forceProxy(url))
+
+            val factory = Event.mapper.nodeFactory
+
+            val jsonObject = factory.objectNode()
+            jsonObject.put("pr", invoice)
+
+            val mediaType = "application/json; charset=utf-8".toMediaType()
+            val requestBody = jsonObject.toString().toRequestBody(mediaType)
+            val request =
+                Request
+                    .Builder()
+                    .url(url)
+                    .post(requestBody)
+                    .build()
+
+            client.newCall(request).execute().use {
+                val body = it.body.string()
+                val tree = jacksonObjectMapper().readTree(body)
+
+                val feeCost = tree?.get("fee")?.asInt()
+
+                if (feeCost != null) {
+                    onSuccess(
+                        feeCost,
+                    )
+                } else {
+                    val msg =
+                        tree
+                            ?.get("detail")
+                            ?.asText()
+                            ?.split('.')
+                            ?.getOrNull(0)
+                            ?.ifBlank { null }
+                    onError(
+                        stringRes(context, R.string.cashu_failed_redemption),
+                        if (msg != null) {
+                            stringRes(context, R.string.cashu_failed_redemption_explainer_error_msg, msg)
+                        } else {
+                            stringRes(context, R.string.cashu_failed_redemption_explainer_error_msg)
+                        },
+                    )
+                }
+            }
+        } catch (e: Exception) {
+            if (e is CancellationException) throw e
+            onError(
+                stringRes(context, R.string.cashu_successful_redemption),
+                stringRes(context, R.string.cashu_failed_redemption_explainer_error_msg, e.message),
+            )
+        }
+    }
+
+    private fun meltInvoice(
+        token: CashuToken,
+        invoice: String,
+        fees: Int,
+        forceProxy: (String) -> Boolean,
+        onSuccess: (String, String) -> Unit,
+        onError: (String, String) -> Unit,
+        context: Context,
+    ) {
+        try {
+            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.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()
+            val requestBody = jsonObject.toString().toRequestBody(mediaType)
+            val request =
+                Request
+                    .Builder()
+                    .url(url)
+                    .post(requestBody)
+                    .build()
+
+            client.newCall(request).execute().use {
+                val body = it.body.string()
+                val tree = jacksonObjectMapper().readTree(body)
+
+                val successful = tree?.get("paid")?.asText() == "true"
+
+                if (successful) {
+                    onSuccess(
+                        stringRes(context, R.string.cashu_successful_redemption),
+                        stringRes(
+                            context,
+                            R.string.cashu_successful_redemption_explainer,
+                            token.totalAmount.toString(),
+                            fees.toString(),
+                        ),
+                    )
+                } else {
+                    val msg =
+                        tree
+                            ?.get("detail")
+                            ?.asText()
+                            ?.split('.')
+                            ?.getOrNull(0)
+                            ?.ifBlank { null }
+                    onError(
+                        stringRes(context, R.string.cashu_failed_redemption),
+                        if (msg != null) {
+                            stringRes(context, R.string.cashu_failed_redemption_explainer_error_msg, msg)
+                        } else {
+                            stringRes(context, R.string.cashu_failed_redemption_explainer_error_msg)
+                        },
+                    )
+                }
+            }
+        } catch (e: Exception) {
+            if (e is CancellationException) throw e
+            onError(
+                stringRes(context, R.string.cashu_successful_redemption),
+                stringRes(context, R.string.cashu_failed_redemption_explainer_error_msg, e.message),
+            )
+        }
+    }
+}
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/EmojiUtils.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/EmojiUtils.kt
@@ -22,9 +22,7 @@ package com.vitorpamplona.amethyst.service

 import com.vitorpamplona.quartz.events.ImmutableListOfLists

-fun String.isUTF16Char(pos: Int): Boolean {
-    return Character.charCount(this.codePointAt(pos)) == 2
-}
+fun String.isUTF16Char(pos: Int): Boolean = Character.charCount(this.codePointAt(pos)) == 2

 fun String.firstFullCharOld(): String {
    return when (this.length) {
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/FileHeader.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/FileHeader.kt
@@ -48,21 +48,22 @@ class FileHeader(
            fileUrl: String,
            mimeType: String?,
            dimPrecomputed: String?,
+            forceProxy: Boolean,
            onReady: (FileHeader) -> Unit,
-            onError: (String?) -> Unit,
+            onError: (String) -> Unit,
        ) {
            try {
-                val imageData: ByteArray? = ImageDownloader().waitAndGetImage(fileUrl)
+                val imageData: ByteArray? = ImageDownloader().waitAndGetImage(fileUrl, forceProxy)

                if (imageData != null) {
                    prepare(imageData, mimeType, dimPrecomputed, onReady, onError)
                } else {
-                    onError(null)
+                    onError("Unable to download image from $fileUrl")
                }
            } catch (e: Exception) {
                if (e is CancellationException) throw e
                Log.e("ImageDownload", "Couldn't download image from server: ${e.message}")
-                onError(e.message)
+                onError(e.message ?: e.javaClass.simpleName)
            }
        }

@@ -71,7 +72,7 @@ class FileHeader(
            mimeType: String?,
            dimPrecomputed: String?,
            onReady: (FileHeader) -> Unit,
-            onError: (String?) -> Unit,
+            onError: (String) -> Unit,
        ) {
            try {
                val hash = CryptoUtils.sha256(data).toHexKey()
@@ -178,7 +179,7 @@ class FileHeader(
            } 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)
+                onError(e.message ?: e.javaClass.simpleName)
            }
        }
    }
@@ -236,10 +237,10 @@ fun MediaMetadataRetriever.prepareVideoHeight(): Int? {
    }
 }

-class ByteArrayMediaDataSource(var imageData: ByteArray) : MediaDataSource() {
-    override fun getSize(): Long {
-        return imageData.size.toLong()
-    }
+class ByteArrayMediaDataSource(
+    var imageData: ByteArray,
+) : MediaDataSource() {
+    override fun getSize(): Long = imageData.size.toLong()

    @Throws(IOException::class)
    override fun readAt(
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/HttpStatusMessages.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/HttpStatusMessages.kt
@@ -0,0 +1,63 @@
+/**
+ * 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 com.vitorpamplona.amethyst.R
+
+class HttpStatusMessages {
+    companion object {
+        fun resourceIdFor(statusCode: Int = 0): Int? =
+            when (statusCode) {
+                400 -> R.string.http_status_400
+                401 -> R.string.http_status_401
+                402 -> R.string.http_status_402
+                403 -> R.string.http_status_403
+                404 -> R.string.http_status_404
+                405 -> R.string.http_status_405
+                406 -> R.string.http_status_406
+                407 -> R.string.http_status_407
+                408 -> R.string.http_status_408
+                409 -> R.string.http_status_409
+                410 -> R.string.http_status_410
+                411 -> R.string.http_status_411
+                412 -> R.string.http_status_412
+                413 -> R.string.http_status_413
+                414 -> R.string.http_status_414
+                415 -> R.string.http_status_415
+                416 -> R.string.http_status_416
+                417 -> R.string.http_status_417
+                426 -> R.string.http_status_426
+
+                500 -> R.string.http_status_500
+                501 -> R.string.http_status_501
+                502 -> R.string.http_status_502
+                503 -> R.string.http_status_503
+                504 -> R.string.http_status_504
+                505 -> R.string.http_status_505
+                506 -> R.string.http_status_506
+                507 -> R.string.http_status_507
+                508 -> R.string.http_status_508
+                511 -> R.string.http_status_511
+
+                else -> null
+            }
+    }
+}
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/LocationUtil.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/LocationUtil.kt
@@ -33,7 +33,9 @@ import androidx.compose.runtime.mutableStateOf
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.flow.MutableStateFlow

-class LocationUtil(context: Context) {
+class LocationUtil(
+    context: Context,
+) {
    companion object {
        const val MIN_TIME: Long = 1000L
        const val MIN_DISTANCE: Float = 0.0f
@@ -96,9 +98,7 @@ class LocationUtil(context: Context) {
 object CachedGeoLocations {
    val locationNames = LruCache<String, String>(20)

-    fun cached(geoHashStr: String): String? {
-        return locationNames[geoHashStr]
-    }
+    fun cached(geoHashStr: String): String? = locationNames[geoHashStr]

    suspend fun geoLocate(
        geoHashStr: String,
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/MainThreadChecker.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/MainThreadChecker.kt
@@ -31,4 +31,6 @@ fun checkNotInMainThread() {

 fun isMainThread() = Looper.myLooper() == Looper.getMainLooper()

-class OnMainThreadException(str: String) : RuntimeException(str)
+class OnMainThreadException(
+    str: String,
+) : RuntimeException(str)
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip05NostrAddressVerifier.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip05NostrAddressVerifier.kt
@@ -22,15 +22,13 @@ package com.vitorpamplona.amethyst.service

 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import okhttp3.Call
-import okhttp3.Callback
 import okhttp3.Request
-import okhttp3.Response

-class Nip05NostrAddressVerifier() {
+class Nip05NostrAddressVerifier {
    fun assembleUrl(nip05address: String): String? {
        val parts = nip05address.trim().split("@")

@@ -46,7 +44,8 @@ class Nip05NostrAddressVerifier() {

    suspend fun fetchNip05Json(
        nip05: String,
-        onSuccess: (String) -> Unit,
+        forceProxy: (String) -> Boolean,
+        onSuccess: suspend (String) -> Unit,
        onError: (String) -> Unit,
    ) = withContext(Dispatchers.IO) {
        checkNotInMainThread()
@@ -60,52 +59,40 @@ class Nip05NostrAddressVerifier() {

        try {
            val request =
-                Request.Builder()
+                Request
+                    .Builder()
                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                    .url(url)
                    .build()
-
-            HttpClientManager.getHttpClient()
+            // Fetchers MUST ignore any HTTP redirects given by the /.well-known/nostr.json endpoint.
+            HttpClientManager
+                .getHttpClient(forceProxy(url))
+                .newBuilder()
+                .followRedirects(false)
+                .build()
                .newCall(request)
-                .enqueue(
-                    object : Callback {
-                        override fun onResponse(
-                            call: Call,
-                            response: Response,
-                        ) {
-                            checkNotInMainThread()
+                .execute()
+                .use {
+                    checkNotInMainThread()

-                            response.use {
-                                if (it.isSuccessful) {
-                                    onSuccess(it.body.string())
-                                } else {
-                                    onError(
-                                        "Could not resolve $nip05. Error: ${it.code}. Check if the server is up and if the address $nip05 is correct",
-                                    )
-                                }
-                            }
-                        }
-
-                        override fun onFailure(
-                            call: Call,
-                            e: java.io.IOException,
-                        ) {
-                            onError(
-                                "Could not resolve $url. Check if the server is up and if the address $nip05 is correct",
-                            )
-                            e.printStackTrace()
-                        }
-                    },
-                )
+                    if (it.isSuccessful) {
+                        onSuccess(it.body.string())
+                    } else {
+                        onError(
+                            "Could not resolve $nip05. Error: ${it.code}. Check if the server is up and if the address $nip05 is correct",
+                        )
+                    }
+                }
        } catch (e: Exception) {
            if (e is CancellationException) throw e
-            onError("Could not resolve '$url': ${e.message}")
+            onError("Could not resolve NIP-05 $nip05 as URL $url: ${e.message}")
        }
    }

    suspend fun verifyNip05(
        nip05: String,
-        onSuccess: (String) -> Unit,
+        forceProxy: (String) -> Boolean,
+        onSuccess: suspend (String) -> Unit,
        onError: (String) -> Unit,
    ) {
        // check fails on tests
@@ -115,6 +102,7 @@ class Nip05NostrAddressVerifier() {

        fetchNip05Json(
            nip05,
+            forceProxy,
            onSuccess = {
                checkNotInMainThread()

@@ -141,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)
                }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip11RelayInfoRetriever.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip11RelayInfoRetriever.kt
@@ -22,6 +22,7 @@ package com.vitorpamplona.amethyst.service

 import android.util.Log
 import android.util.LruCache
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.encoders.Nip11RelayInformation
 import com.vitorpamplona.quartz.encoders.RelayUrlFormatter
 import com.vitorpamplona.quartz.utils.TimeUtils
@@ -33,14 +34,23 @@ import okhttp3.Response
 import java.io.IOException

 object Nip11CachedRetriever {
-    open class RetrieveResult(val time: Long)
+    open class RetrieveResult(
+        val time: Long,
+    )

-    class RetrieveResultError(val error: Nip11Retriever.ErrorCode, val msg: String? = null) : RetrieveResult(TimeUtils.now())
+    class RetrieveResultError(
+        val error: Nip11Retriever.ErrorCode,
+        val msg: String? = null,
+    ) : RetrieveResult(TimeUtils.now())

-    class RetrieveResultSuccess(val data: Nip11RelayInformation) : RetrieveResult(TimeUtils.now())
+    class RetrieveResultSuccess(
+        val data: Nip11RelayInformation,
+    ) : RetrieveResult(TimeUtils.now())

-    val relayInformationDocumentCache = LruCache<String, RetrieveResult?>(100)
-    val retriever = Nip11Retriever()
+    class RetrieveResultLoading : RetrieveResult(TimeUtils.now())
+
+    private val relayInformationDocumentCache = LruCache<String, RetrieveResult?>(100)
+    private val retriever = Nip11Retriever()

    fun getFromCache(dirtyUrl: String): Nip11RelayInformation? {
        val result = relayInformationDocumentCache.get(RelayUrlFormatter.getHttpsUrl(dirtyUrl)) ?: return null
@@ -50,48 +60,59 @@ object Nip11CachedRetriever {

    suspend fun loadRelayInfo(
        dirtyUrl: String,
+        forceProxy: Boolean,
        onInfo: (Nip11RelayInformation) -> Unit,
        onError: (String, Nip11Retriever.ErrorCode, String?) -> Unit,
    ) {
+        checkNotInMainThread()
        val url = RelayUrlFormatter.getHttpsUrl(dirtyUrl)
        val doc = relayInformationDocumentCache.get(url)

        if (doc != null) {
            if (doc is RetrieveResultSuccess) {
                onInfo(doc.data)
+            } else if (doc is RetrieveResultLoading) {
+                if (TimeUtils.now() - doc.time < TimeUtils.ONE_MINUTE) {
+                    // just wait.
+                } else {
+                    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 {
-                    retriever.loadRelayInfo(
-                        url = url,
-                        dirtyUrl = dirtyUrl,
-                        onInfo = {
-                            relayInformationDocumentCache.put(url, RetrieveResultSuccess(it))
-                            onInfo(it)
-                        },
-                        onError = { dirtyUrl, code, errorMsg ->
-                            relayInformationDocumentCache.put(url, RetrieveResultError(code, errorMsg))
-                            onError(url, code, errorMsg)
-                        },
-                    )
+                    retrieve(url, dirtyUrl, forceProxy, onInfo, onError)
                }
            }
        } else {
-            retriever.loadRelayInfo(
-                url = url,
-                dirtyUrl = dirtyUrl,
-                onInfo = {
-                    relayInformationDocumentCache.put(url, RetrieveResultSuccess(it))
-                    onInfo(it)
-                },
-                onError = { dirtyUrl, code, errorMsg ->
-                    relayInformationDocumentCache.put(url, RetrieveResultError(code, errorMsg))
-                    onError(url, code, errorMsg)
-                },
-            )
+            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,
+    ) {
+        relayInformationDocumentCache.put(url, RetrieveResultLoading())
+        retriever.loadRelayInfo(
+            url = url,
+            dirtyUrl = dirtyUrl,
+            forceProxy = forceProxy,
+            onInfo = {
+                checkNotInMainThread()
+                relayInformationDocumentCache.put(url, RetrieveResultSuccess(it))
+                onInfo(it)
+            },
+            onError = { dirtyUrl, code, errorMsg ->
+                checkNotInMainThread()
+                relayInformationDocumentCache.put(url, RetrieveResultError(code, errorMsg))
+                onError(url, code, errorMsg)
+            },
+        )
+    }
 }

 class Nip11Retriever {
@@ -105,15 +126,21 @@ class Nip11Retriever {
    suspend fun loadRelayInfo(
        url: String,
        dirtyUrl: String,
+        forceProxy: Boolean,
        onInfo: (Nip11RelayInformation) -> Unit,
        onError: (String, ErrorCode, String?) -> Unit,
    ) {
        checkNotInMainThread()
        try {
            val request: Request =
-                Request.Builder().header("Accept", "application/nostr+json").url(url).build()
+                Request
+                    .Builder()
+                    .header("Accept", "application/nostr+json")
+                    .url(url)
+                    .build()

-            HttpClientManager.getHttpClientForUrl(dirtyUrl)
+            HttpClientManager
+                .getHttpClient(forceProxy)
                .newCall(request)
                .enqueue(
                    object : Callback {
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip96MediaServers.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip96MediaServers.kt
@@ -24,8 +24,11 @@ import android.util.Log
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import kotlinx.coroutines.CancellationException
 import okhttp3.Request
+import java.net.URI
+import java.net.URL

 object Nip96MediaServers {
    val DEFAULT =
@@ -37,15 +40,21 @@ object Nip96MediaServers {
            ServerName("Void.cat", "https://void.cat"),
        )

-    data class ServerName(val name: String, val baseUrl: String)
+    data class ServerName(
+        val name: String,
+        val baseUrl: String,
+    )

    val cache: MutableMap<String, Nip96Retriever.ServerInfo> = mutableMapOf()

-    suspend fun load(url: String): Nip96Retriever.ServerInfo {
+    suspend fun load(
+        url: String,
+        forceProxy: Boolean,
+    ): Nip96Retriever.ServerInfo {
        val cached = cache[url]
        if (cached != null) return cached

-        val fetched = Nip96Retriever().loadInfo(url)
+        val fetched = Nip96Retriever().loadInfo(url, forceProxy)
        cache[url] = fetched
        return fetched
    }
@@ -72,28 +81,48 @@ class Nip96Retriever {
        val mediaTransformations: Map<MimeType, Array<String>> = emptyMap(),
    )

-    fun parse(body: String): ServerInfo {
+    fun parse(
+        baseUrl: String,
+        body: String,
+    ): ServerInfo {
        val mapper =
            jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-        return mapper.readValue(body, ServerInfo::class.java)
+        val serverInfo = mapper.readValue(body, ServerInfo::class.java)
+
+        return serverInfo.copy(
+            apiUrl = makeAbsoluteIfRelativeUrl(baseUrl, serverInfo.apiUrl),
+            downloadUrl = serverInfo.downloadUrl?.let { makeAbsoluteIfRelativeUrl(baseUrl, it) },
+            delegatedToUrl = serverInfo.delegatedToUrl?.let { makeAbsoluteIfRelativeUrl(baseUrl, it) },
+            tosUrl = serverInfo.tosUrl?.let { makeAbsoluteIfRelativeUrl(baseUrl, it) },
+            plans =
+                serverInfo.plans.mapValues { u ->
+                    u.value.copy(
+                        url = u.value.url?.let { makeAbsoluteIfRelativeUrl(baseUrl, it) },
+                    )
+                },
+        )
    }

-    suspend fun loadInfo(baseUrl: String): ServerInfo {
+    suspend fun loadInfo(
+        baseUrl: String,
+        forceProxy: Boolean,
+    ): ServerInfo {
        checkNotInMainThread()

        val request: Request =
-            Request.Builder()
+            Request
+                .Builder()
                .header("Accept", "application/nostr+json")
                .url(baseUrl.removeSuffix("/") + "/.well-known/nostr/nip96.json")
                .build()

-        HttpClientManager.getHttpClient().newCall(request).execute().use { response ->
+        HttpClientManager.getHttpClient(forceProxy).newCall(request).execute().use { response ->
            checkNotInMainThread()
            response.use {
                val body = it.body.string()
                try {
                    if (it.isSuccessful) {
-                        return parse(body)
+                        return parse(baseUrl, body)
                    } else {
                        throw RuntimeException(
                            "Resulting Message from $baseUrl is an error: ${response.code} ${response.message}",
@@ -112,3 +141,18 @@ class Nip96Retriever {
 typealias PlanName = String

 typealias MimeType = String
+
+fun makeAbsoluteIfRelativeUrl(
+    baseUrl: String,
+    potentialyRelativeUrl: String,
+): String =
+    try {
+        val apiUrl = URI(potentialyRelativeUrl)
+        if (apiUrl.isAbsolute) {
+            potentialyRelativeUrl
+        } else {
+            URL(URL(baseUrl), potentialyRelativeUrl).toString()
+        }
+    } catch (e: Exception) {
+        potentialyRelativeUrl
+    }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip96Uploader.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip96Uploader.kt
@@ -21,6 +21,7 @@
 package com.vitorpamplona.amethyst.service

 import android.content.ContentResolver
+import android.content.Context
 import android.net.Uri
 import android.provider.OpenableColumns
 import android.webkit.MimeTypeMap
@@ -29,7 +30,10 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.ui.stringRes
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withTimeoutOrNull
@@ -47,7 +51,9 @@ val charPool: List<Char> = ('a'..'z') + ('A'..'Z') + ('0'..'9')

 fun randomChars() = List(16) { charPool.random() }.joinToString("")

-class Nip96Uploader(val account: Account?) {
+class Nip96Uploader(
+    val account: Account?,
+) {
    suspend fun uploadImage(
        uri: Uri,
        contentType: String?,
@@ -56,12 +62,15 @@ class Nip96Uploader(val account: Account?) {
        sensitiveContent: String?,
        server: Nip96MediaServers.ServerName,
        contentResolver: ContentResolver,
+        forceProxy: (String) -> Boolean,
        onProgress: (percentage: Float) -> Unit,
+        context: Context,
    ): PartialEvent {
        val serverInfo =
            Nip96Retriever()
                .loadInfo(
                    server.baseUrl,
+                    forceProxy(server.baseUrl),
                )

        return uploadImage(
@@ -72,7 +81,9 @@ class Nip96Uploader(val account: Account?) {
            sensitiveContent,
            serverInfo,
            contentResolver,
+            forceProxy,
            onProgress,
+            context,
        )
    }

@@ -84,7 +95,9 @@ class Nip96Uploader(val account: Account?) {
        sensitiveContent: String?,
        server: Nip96Retriever.ServerInfo,
        contentResolver: ContentResolver,
+        forceProxy: (String) -> Boolean,
        onProgress: (percentage: Float) -> Unit,
+        context: Context,
    ): PartialEvent {
        checkNotInMainThread()

@@ -109,7 +122,9 @@ class Nip96Uploader(val account: Account?) {
            alt,
            sensitiveContent,
            server,
+            forceProxy,
            onProgress,
+            context,
        )
    }

@@ -120,7 +135,9 @@ class Nip96Uploader(val account: Account?) {
        alt: String?,
        sensitiveContent: String?,
        server: Nip96Retriever.ServerInfo,
+        forceProxy: (String) -> Boolean,
        onProgress: (percentage: Float) -> Unit,
+        context: Context,
    ): PartialEvent {
        checkNotInMainThread()

@@ -128,21 +145,20 @@ class Nip96Uploader(val account: Account?) {
        val extension =
            contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""

-        val client = HttpClientManager.getHttpClient()
-        val requestBody: RequestBody
+        val client = HttpClientManager.getHttpClient(forceProxy(server.apiUrl))
        val requestBuilder = Request.Builder()

-        requestBody =
-            MultipartBody.Builder()
+        val requestBody: RequestBody =
+            MultipartBody
+                .Builder()
                .setType(MultipartBody.FORM)
                .addFormDataPart("expiration", "")
                .addFormDataPart("size", length.toString())
                .also { body ->
-                    alt?.let { body.addFormDataPart("alt", it) }
+                    alt?.ifBlank { null }?.let { body.addFormDataPart("alt", it) }
                    sensitiveContent?.let { body.addFormDataPart("content-warning", it) }
                    contentType?.let { body.addFormDataPart("content_type", it) }
-                }
-                .addFormDataPart(
+                }.addFormDataPart(
                    "file",
                    "$fileName.$extension",
                    object : RequestBody() {
@@ -154,8 +170,7 @@ class Nip96Uploader(val account: Account?) {
                            inputStream.source().use(sink::writeAll)
                        }
                    },
-                )
-                .build()
+                ).build()

        nip98Header(server.apiUrl)?.let { requestBuilder.addHeader("Authorization", it) }

@@ -173,15 +188,38 @@ class Nip96Uploader(val account: Account?) {
                    val result = parseResults(str)

                    if (!result.processingUrl.isNullOrBlank()) {
-                        return waitProcessing(result, server, onProgress)
+                        return waitProcessing(result, server, forceProxy, onProgress)
                    } else if (result.status == "success" && result.nip94Event != null) {
                        return result.nip94Event
                    } else {
-                        throw RuntimeException("Failed to upload with message: ${result.message}")
+                        throw RuntimeException(stringRes(context, R.string.failed_to_upload_with_message, result.message))
                    }
                }
            } else {
-                throw RuntimeException("Error Uploading image: ${response.code}")
+                val msg = response.body.string()
+
+                val errorMessage =
+                    try {
+                        val tree = jacksonObjectMapper().readTree(msg)
+                        val status = tree.get("status")?.asText()
+                        val message = tree.get("message")?.asText()
+                        if (status == "error" && message != null) {
+                            message
+                        } else {
+                            null
+                        }
+                    } catch (e: Exception) {
+                        null
+                    }
+
+                val explanation = HttpStatusMessages.resourceIdFor(response.code)
+                if (errorMessage != null) {
+                    throw RuntimeException(stringRes(context, R.string.failed_to_upload_with_message, errorMessage))
+                } else if (explanation != null) {
+                    throw RuntimeException(stringRes(context, R.string.failed_to_upload_with_message, stringRes(context, explanation)))
+                } else {
+                    throw RuntimeException(stringRes(context, R.string.failed_to_upload_with_message, response.code))
+                }
            }
        }
    }
@@ -190,11 +228,13 @@ class Nip96Uploader(val account: Account?) {
        hash: String,
        contentType: String?,
        server: Nip96Retriever.ServerInfo,
+        forceProxy: (String) -> Boolean,
+        context: Context,
    ): Boolean {
        val extension =
            contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""

-        val client = HttpClientManager.getHttpClient()
+        val client = HttpClientManager.getHttpClient(forceProxy(server.apiUrl))

        val requestBuilder = Request.Builder()

@@ -215,7 +255,12 @@ class Nip96Uploader(val account: Account?) {
                    return result.status == "success"
                }
            } else {
-                throw RuntimeException("Error Uploading image: ${response.code}")
+                val explanation = HttpStatusMessages.resourceIdFor(response.code)
+                if (explanation != null) {
+                    throw RuntimeException(stringRes(context, R.string.failed_to_delete_with_message, stringRes(context, explanation)))
+                } else {
+                    throw RuntimeException(stringRes(context, R.string.failed_to_delete_with_message, response.code))
+                }
            }
        }
    }
@@ -223,20 +268,22 @@ class Nip96Uploader(val account: Account?) {
    private suspend fun waitProcessing(
        result: Nip96Result,
        server: Nip96Retriever.ServerInfo,
+        forceProxy: (String) -> Boolean,
        onProgress: (percentage: Float) -> Unit,
    ): PartialEvent {
-        val client = HttpClientManager.getHttpClient()
        var currentResult = result

        while (!result.processingUrl.isNullOrBlank() && (currentResult.percentage ?: 100) < 100) {
            onProgress((currentResult.percentage ?: 100) / 100f)

            val request: Request =
-                Request.Builder()
+                Request
+                    .Builder()
                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                    .url(result.processingUrl)
                    .build()

+            val client = HttpClientManager.getHttpClient(forceProxy(result.processingUrl))
            client.newCall(request).execute().use {
                if (it.isSuccessful) {
                    it.body.use { currentResult = parseResults(it.string()) }
@@ -256,13 +303,12 @@ class Nip96Uploader(val account: Account?) {
        }
    }

-    suspend fun nip98Header(url: String): String? {
-        return withTimeoutOrNull(5000) {
+    suspend fun nip98Header(url: String): String? =
+        withTimeoutOrNull(5000) {
            suspendCancellableCoroutine { continuation ->
                nip98Header(url, "POST") { authorizationToken -> continuation.resume(authorizationToken) }
            }
        }
-    }

    fun nip98Header(
        url: String,
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt
@@ -23,13 +23,14 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
-import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
-import com.vitorpamplona.amethyst.service.relays.EOSETime
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.Relay
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
+import com.vitorpamplona.ammolite.relays.Client
+import com.vitorpamplona.ammolite.relays.EVENT_FINDER_TYPES
+import com.vitorpamplona.ammolite.relays.Relay
+import com.vitorpamplona.ammolite.relays.TypedFilter
+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.BadgeAwardEvent
@@ -67,126 +68,143 @@ import com.vitorpamplona.quartz.events.SearchRelayListEvent
 import com.vitorpamplona.quartz.events.StatusEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 import com.vitorpamplona.quartz.utils.TimeUtils
+import kotlinx.coroutines.flow.filter

 // TODO: Migrate this to a property of AccountVi
-object NostrAccountDataSource : NostrDataSource("AccountData") {
+object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
    lateinit var account: Account
    var otherAccounts = listOf<HexKey>()

    val latestEOSEs = EOSEAccount()
    val hasLoadedTheBasics = mutableMapOf<User, Boolean>()

-    fun createAccountContactListFilter(): TypedFilter {
-        return TypedFilter(
+    fun createAccountContactListFilter(): TypedFilter =
+        TypedFilter(
            types = COMMON_FEED_TYPES,
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds = listOf(ContactListEvent.KIND),
                    authors = listOf(account.userProfile().pubkeyHex),
                    limit = 1,
                ),
        )
-    }

-    fun createAccountMetadataFilter(): TypedFilter {
-        return TypedFilter(
+    fun createAccountMetadataFilter(): TypedFilter =
+        TypedFilter(
            types = COMMON_FEED_TYPES,
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds = listOf(MetadataEvent.KIND),
                    authors = listOf(account.userProfile().pubkeyHex),
                    limit = 1,
                ),
        )
-    }

-    fun createAccountRelayListFilter(): TypedFilter {
-        return TypedFilter(
+    fun createAccountRelayListFilter(): TypedFilter =
+        TypedFilter(
            types = COMMON_FEED_TYPES,
            filter =
-                JsonFilter(
-                    kinds = listOf(StatusEvent.KIND, AdvertisedRelayListEvent.KIND, ChatMessageRelayListEvent.KIND, SearchRelayListEvent.KIND, PrivateOutboxRelayListEvent.KIND),
+                SincePerRelayFilter(
+                    kinds =
+                        listOf(
+                            StatusEvent.KIND,
+                            AdvertisedRelayListEvent.KIND,
+                            ChatMessageRelayListEvent.KIND,
+                            SearchRelayListEvent.KIND,
+                            FileServersEvent.KIND,
+                            PrivateOutboxRelayListEvent.KIND,
+                        ),
                    authors = listOf(account.userProfile().pubkeyHex),
                    limit = 10,
                ),
        )
-    }

    fun createOtherAccountsBaseFilter(): TypedFilter? {
-        if (otherAccounts.isEmpty()) return null
+        val otherAuthors = otherAccounts.filter { it != account.userProfile().pubkeyHex }
+        if (otherAuthors.isEmpty()) return null
        return TypedFilter(
-            types = COMMON_FEED_TYPES,
+            types = EVENT_FINDER_TYPES,
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds =
                        listOf(
                            MetadataEvent.KIND,
                            ContactListEvent.KIND,
                            AdvertisedRelayListEvent.KIND,
                            ChatMessageRelayListEvent.KIND,
-                            PrivateOutboxRelayListEvent.KIND,
                            SearchRelayListEvent.KIND,
                            FileServersEvent.KIND,
                            MuteListEvent.KIND,
                            PeopleListEvent.KIND,
                        ),
-                    authors = otherAccounts.filter { it != account.userProfile().pubkeyHex },
+                    authors = otherAuthors,
                    limit = 100,
                ),
        )
    }

-    fun createAccountSettingsFilter(): TypedFilter {
-        return TypedFilter(
+    fun createAccountSettingsFilter(): TypedFilter =
+        TypedFilter(
            types = COMMON_FEED_TYPES,
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds = listOf(BookmarkListEvent.KIND, PeopleListEvent.KIND, MuteListEvent.KIND, BadgeProfilesEvent.KIND, EmojiPackSelectionEvent.KIND),
                    authors = listOf(account.userProfile().pubkeyHex),
                    limit = 100,
                ),
        )
-    }

-    fun createAccountReportsFilter(): TypedFilter {
-        return TypedFilter(
+    fun createAccountReportsFilter(): TypedFilter =
+        TypedFilter(
            types = COMMON_FEED_TYPES,
            filter =
-                JsonFilter(
+                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,
                ),
        )
-    }

-    fun createAccountLastPostsListFilter(): TypedFilter {
-        return TypedFilter(
+    fun createAccountLastPostsListFilter(): TypedFilter =
+        TypedFilter(
            types = COMMON_FEED_TYPES,
            filter =
-                JsonFilter(
+                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 =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds =
                        listOf(
                            TextNoteEvent.KIND,
@@ -211,7 +229,7 @@ object NostrAccountDataSource : NostrDataSource("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()) }
@@ -219,7 +237,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
        return TypedFilter(
            types = COMMON_FEED_TYPES,
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds =
                        listOf(
                            GitReplyEvent.KIND,
@@ -241,7 +259,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
        TypedFilter(
            types = COMMON_FEED_TYPES,
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds = listOf(GiftWrapEvent.KIND),
                    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
                    since =
@@ -260,7 +278,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
            if (hasLoadedTheBasics[account.userProfile()] != null) {
                latestEOSEs.addOrUpdate(
                    account.userProfile(),
-                    account.defaultNotificationFollowList.value,
+                    account.settings.defaultNotificationFollowList.value,
                    relayUrl,
                    time,
                )
@@ -281,95 +299,121 @@ object NostrAccountDataSource : NostrDataSource("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) {
-                            LocalCache.justConsume(noteEvent, relay)
-                            noteEvent.cachedGift(account.signer) {
-                                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) { this.consume(it, relay) }
+                        // decrypts
+                        event.cachedDraft(account.signer) {}
+
                        LocalCache.justConsume(event, 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
-                            LocalCache.consume(noteEvent, relay)
-                            noteEvent.cachedGossip(account.signer) {
+            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)
                            }
-                        }
-                    } else {
-                        // new event
-                        event.cachedGossip(account.signer) { LocalCache.justConsume(it, relay) }
-                        LocalCache.justConsume(event, 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) {}
+                        } ?: 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)
+            }
        }
    }

@@ -382,30 +426,41 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
        super.markAsSeenOnRelay(eventId, relay)

        val note = LocalCache.getNoteIfExists(eventId) ?: return
-        val privKey = account.keyPair.privKey ?: return
-
        val noteEvent = note.event ?: return
-        markInnerAsSeenOnRelay(noteEvent, privKey, relay)
+        markInnerAsSeenOnRelay(noteEvent, relay)
    }

    private fun markInnerAsSeenOnRelay(
-        noteEvent: EventInterface,
-        privKey: ByteArray,
+        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, privKey, relay) }
-        } else if (noteEvent is SealedGossipEvent) {
-            noteEvent.cachedGossip(account.signer) { rumor ->
-                markInnerAsSeenOnRelay(rumor, privKey, 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)
+                }
            }
        }
    }

-    override fun updateChannelFilters() {
-        return if (hasLoadedTheBasics[account.userProfile()] != null) {
+    override fun updateChannelFilters() =
+        if (hasLoadedTheBasics[account.userProfile()] != null) {
            // gets everything about the user logged in
            accountChannel.typedFilters =
                listOfNotNull(
@@ -419,8 +474,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                    createAccountSettingsFilter(),
                    createAccountLastPostsListFilter(),
                    createOtherAccountsBaseFilter(),
-                )
-                    .ifEmpty { null }
+                ).ifEmpty { null }
        } else {
            // just the basics.
            accountChannel.typedFilters =
@@ -429,10 +483,8 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                    createAccountContactListFilter(),
                    createAccountRelayListFilter(),
                    createAccountSettingsFilter(),
-                )
-                    .ifEmpty { null }
+                ).ifEmpty { null }
        }
-    }

    override fun auth(
        relay: Relay,
@@ -442,10 +494,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {

        if (this::account.isInitialized) {
            account.createAuthEvent(relay, challenge) {
-                Client.send(
-                    it,
-                    relay.url,
-                )
+                Client.sendIfExists(it, relay)
            }
        }
    }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrChannelDataSource.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrChannelDataSource.kt
@@ -24,13 +24,13 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LiveActivitiesChannel
 import com.vitorpamplona.amethyst.model.PublicChatChannel
-import com.vitorpamplona.amethyst.service.relays.FeedType
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.FeedType
+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

-object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
+object NostrChannelDataSource : AmethystNostrDataSource("ChatroomFeed") {
    var account: Account? = null
    var channel: Channel? = null

@@ -58,7 +58,7 @@ object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
            return TypedFilter(
                types = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS, FeedType.GLOBAL, FeedType.SEARCH),
                filter =
-                    JsonFilter(
+                    SincePerRelayFilter(
                        kinds = listOf(ChannelMessageEvent.KIND),
                        authors = listOf(myAccount.userProfile().pubkeyHex),
                        limit = 50,
@@ -71,7 +71,7 @@ object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
            return TypedFilter(
                types = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS, FeedType.GLOBAL, FeedType.SEARCH),
                filter =
-                    JsonFilter(
+                    SincePerRelayFilter(
                        kinds = listOf(LiveActivitiesChatMessageEvent.KIND),
                        authors = listOf(myAccount.userProfile().pubkeyHex),
                        limit = 50,
@@ -86,7 +86,7 @@ object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
            return TypedFilter(
                types = setOf(FeedType.PUBLIC_CHATS),
                filter =
-                    JsonFilter(
+                    SincePerRelayFilter(
                        kinds = listOf(ChannelMessageEvent.KIND),
                        tags = mapOf("e" to listOfNotNull(channel?.idHex)),
                        limit = 200,
@@ -96,7 +96,7 @@ object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
            return TypedFilter(
                types = setOf(FeedType.PUBLIC_CHATS),
                filter =
-                    JsonFilter(
+                    SincePerRelayFilter(
                        kinds = listOf(LiveActivitiesChatMessageEvent.KIND),
                        tags = mapOf("a" to listOfNotNull(channel?.idHex)),
                        limit = 200,
@@ -113,7 +113,6 @@ object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
            listOfNotNull(
                createMessagesToChannelFilter(),
                createMessagesByMeToChannelFilter(),
-            )
-                .ifEmpty { null }
+            ).ifEmpty { null }
    }
 }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomDataSource.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomDataSource.kt
@@ -22,13 +22,13 @@ package com.vitorpamplona.amethyst.service

 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
-import com.vitorpamplona.amethyst.service.relays.FeedType
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.FeedType
+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

-object NostrChatroomDataSource : NostrDataSource("ChatroomFeed") {
+object NostrChatroomDataSource : AmethystNostrDataSource("ChatroomFeed") {
    lateinit var account: Account
    private var withRoom: ChatroomKey? = null

@@ -50,9 +50,9 @@ object NostrChatroomDataSource : NostrDataSource("ChatroomFeed") {
            TypedFilter(
                types = setOf(FeedType.PRIVATE_DMS),
                filter =
-                    JsonFilter(
+                    SincePerRelayFilter(
                        kinds = listOf(PrivateDmEvent.KIND),
-                        authors = myPeer.users.map { it },
+                        authors = myPeer.users.toList(),
                        tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
                        since =
                            latestEOSEs.users[account.userProfile()]
@@ -73,7 +73,7 @@ object NostrChatroomDataSource : NostrDataSource("ChatroomFeed") {
            TypedFilter(
                types = setOf(FeedType.PRIVATE_DMS),
                filter =
-                    JsonFilter(
+                    SincePerRelayFilter(
                        kinds = listOf(PrivateDmEvent.KIND),
                        authors = listOf(account.userProfile().pubkeyHex),
                        tags = mapOf("p" to myPeer.users.map { it }),
@@ -103,7 +103,6 @@ object NostrChatroomDataSource : NostrDataSource("ChatroomFeed") {
            listOfNotNull(
                createMessagesToMeFilter(),
                createMessagesFromMeFilter(),
-            )
-                .ifEmpty { null }
+            ).ifEmpty { null }
    }
 }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomListDataSource.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomListDataSource.kt
@@ -22,16 +22,16 @@ package com.vitorpamplona.amethyst.service

 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
-import com.vitorpamplona.amethyst.service.relays.EVENT_FINDER_TYPES
-import com.vitorpamplona.amethyst.service.relays.FeedType
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.EVENT_FINDER_TYPES
+import com.vitorpamplona.ammolite.relays.FeedType
+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
 import com.vitorpamplona.quartz.events.PrivateDmEvent

-object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
+object NostrChatroomListDataSource : AmethystNostrDataSource("MailBoxFeed") {
    lateinit var account: Account

    val latestEOSEs = EOSEAccount()
@@ -41,11 +41,14 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
        TypedFilter(
            types = setOf(FeedType.PRIVATE_DMS),
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds = listOf(PrivateDmEvent.KIND),
                    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
                    since =
-                        latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList,
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get(chatRoomList)
+                            ?.relayList,
                ),
        )

@@ -53,11 +56,14 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
        TypedFilter(
            types = setOf(FeedType.PRIVATE_DMS),
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds = listOf(PrivateDmEvent.KIND),
                    authors = listOf(account.userProfile().pubkeyHex),
                    since =
-                        latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList,
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get(chatRoomList)
+                            ?.relayList,
                ),
        )

@@ -65,11 +71,14 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
        TypedFilter(
            types = setOf(FeedType.PUBLIC_CHATS),
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds = listOf(ChannelCreateEvent.KIND, ChannelMetadataEvent.KIND),
                    authors = listOf(account.userProfile().pubkeyHex),
                    since =
-                        latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList,
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get(chatRoomList)
+                            ?.relayList,
                ),
        )

@@ -82,11 +91,14 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
            // Metadata comes from any relay
            types = EVENT_FINDER_TYPES,
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds = listOf(ChannelCreateEvent.KIND),
                    ids = followingEvents.toList(),
                    since =
-                        latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList,
+                        latestEOSEs.users[account.userProfile()]
+                            ?.followList
+                            ?.get(chatRoomList)
+                            ?.relayList,
                ),
        )
    }
@@ -101,7 +113,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
                // Metadata comes from any relay
                types = EVENT_FINDER_TYPES,
                filter =
-                    JsonFilter(
+                    SincePerRelayFilter(
                        kinds = listOf(ChannelMetadataEvent.KIND),
                        tags = mapOf("e" to listOf(it)),
                        limit = 1,
@@ -119,11 +131,14 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
            TypedFilter(
                types = setOf(FeedType.PUBLIC_CHATS),
                filter =
-                    JsonFilter(
+                    SincePerRelayFilter(
                        kinds = listOf(ChannelMessageEvent.KIND),
                        tags = mapOf("e" to listOf(it)),
                        since =
-                            latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList,
+                            latestEOSEs.users[account.userProfile()]
+                                ?.followList
+                                ?.get(chatRoomList)
+                                ?.relayList,
                        // Remember to consider spam that is being removed from the UI
                        limit = 50,
                    ),
@@ -149,8 +164,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
                list,
                createLastChannelInfoFilter(),
                createLastMessageOfEachChannelFilter(),
-            )
-                .flatten()
+            ).flatten()
                .ifEmpty { null }
    }
 }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrCommunityDataSource.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrCommunityDataSource.kt
@@ -21,13 +21,13 @@
 package com.vitorpamplona.amethyst.service

 import com.vitorpamplona.amethyst.model.AddressableNote
-import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
+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

-object NostrCommunityDataSource : NostrDataSource("SingleCommunityFeed") {
+object NostrCommunityDataSource : AmethystNostrDataSource("SingleCommunityFeed") {
    private var communityToWatch: AddressableNote? = null

    private fun createLoadCommunityFilter(): TypedFilter? {
@@ -35,15 +35,19 @@ object NostrCommunityDataSource : NostrDataSource("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 =
-                JsonFilter(
-                    authors =
-                        community
-                            .moderators()
-                            .map { it.key }
-                            .plus(listOfNotNull(myCommunityToWatch.author?.pubkeyHex)),
+                SincePerRelayFilter(
+                    authors = authors,
                    tags =
                        mapOf(
                            "a" to listOf(myCommunityToWatch.address.toTag()),
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrDiscoveryDataSource.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrDiscoveryDataSource.kt
@@ -23,9 +23,10 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
-import com.vitorpamplona.amethyst.service.relays.FeedType
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.FeedType
+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
@@ -39,7 +40,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch

-object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
+object NostrDiscoveryDataSource : AmethystNostrDataSource("DiscoveryFeed") {
    lateinit var account: Account

    val scope = Amethyst.instance.applicationIOScope
@@ -66,22 +67,30 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
    }

    fun createMarketplaceFilter(): List<TypedFilter> {
-        val follows = account.liveDiscoveryFollowLists.value?.users?.toList()
-        val hashToLoad = account.liveDiscoveryFollowLists.value?.hashtags?.toList()
-        val geohashToLoad = account.liveDiscoveryFollowLists.value?.geotags?.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 =
-                    JsonFilter(
+                    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,
                    ),
            ),
@@ -89,7 +98,7 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                TypedFilter(
                    types = setOf(FeedType.GLOBAL),
                    filter =
-                        JsonFilter(
+                        SincePerRelayFilter(
                            kinds = listOf(ClassifiedsEvent.KIND),
                            tags =
                                mapOf(
@@ -102,7 +111,7 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                            since =
                                latestEOSEs.users[account.userProfile()]
                                    ?.followList
-                                    ?.get(account.defaultDiscoveryFollowList.value)
+                                    ?.get(account.settings.defaultDiscoveryFollowList.value)
                                    ?.relayList,
                        ),
                )
@@ -111,7 +120,7 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                TypedFilter(
                    types = setOf(FeedType.GLOBAL),
                    filter =
-                        JsonFilter(
+                        SincePerRelayFilter(
                            kinds = listOf(ClassifiedsEvent.KIND),
                            tags =
                                mapOf(
@@ -124,7 +133,7 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                            since =
                                latestEOSEs.users[account.userProfile()]
                                    ?.followList
-                                    ?.get(account.defaultDiscoveryFollowList.value)
+                                    ?.get(account.settings.defaultDiscoveryFollowList.value)
                                    ?.relayList,
                        ),
                )
@@ -132,55 +141,60 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
        )
    }

-    fun createNIP89Filter(kTags: List<String>): List<TypedFilter> {
-        return listOfNotNull(
+    fun createNIP89Filter(kTags: List<String>): List<TypedFilter> =
+        listOfNotNull(
            TypedFilter(
                types = setOf(FeedType.GLOBAL),
                filter =
-                    JsonFilter(
+                    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,
                    ),
            ),
        )
-    }

    fun createLiveStreamFilter(): List<TypedFilter> {
-        val follows = account.liveDiscoveryFollowLists.value?.users?.toList()
+        val follows =
+            account.liveDiscoveryFollowLists.value
+                ?.users
+                ?.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 =
-                    JsonFilter(
-                        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 =
-                        JsonFilter(
+                        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,
                        ),
                )
@@ -189,21 +203,21 @@ object NostrDiscoveryDataSource : NostrDataSource("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 =
-                    JsonFilter(
+                    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,
                    ),
            ),
@@ -211,14 +225,14 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                TypedFilter(
                    types = setOf(FeedType.PUBLIC_CHATS),
                    filter =
-                        JsonFilter(
+                        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,
                        ),
                )
@@ -229,33 +243,36 @@ object NostrDiscoveryDataSource : NostrDataSource("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 =
-                JsonFilter(
+                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,
                ),
        )
    }

    fun createLiveStreamTagsFilter(): TypedFilter? {
-        val hashToLoad = account.liveDiscoveryFollowLists.value?.hashtags?.toList()
+        val hashToLoad =
+            account.liveDiscoveryFollowLists.value
+                ?.hashtags
+                ?.toList()

        if (hashToLoad.isNullOrEmpty()) return null

        return TypedFilter(
            types = setOf(FeedType.GLOBAL),
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds = listOf(LiveActivitiesChatMessageEvent.KIND, LiveActivitiesEvent.KIND),
                    tags =
                        mapOf(
@@ -268,21 +285,24 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                    since =
                        latestEOSEs.users[account.userProfile()]
                            ?.followList
-                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.get(account.settings.defaultDiscoveryFollowList.value)
                            ?.relayList,
                ),
        )
    }

    fun createLiveStreamGeohashesFilter(): TypedFilter? {
-        val hashToLoad = account.liveDiscoveryFollowLists.value?.geotags?.toList()
+        val hashToLoad =
+            account.liveDiscoveryFollowLists.value
+                ?.geotags
+                ?.toList()

        if (hashToLoad.isNullOrEmpty()) return null

        return TypedFilter(
            types = setOf(FeedType.GLOBAL),
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds = listOf(LiveActivitiesChatMessageEvent.KIND, LiveActivitiesEvent.KIND),
                    tags =
                        mapOf(
@@ -295,21 +315,24 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                    since =
                        latestEOSEs.users[account.userProfile()]
                            ?.followList
-                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.get(account.settings.defaultDiscoveryFollowList.value)
                            ?.relayList,
                ),
        )
    }

    fun createPublicChatsTagsFilter(): TypedFilter? {
-        val hashToLoad = account.liveDiscoveryFollowLists.value?.hashtags?.toList()
+        val hashToLoad =
+            account.liveDiscoveryFollowLists.value
+                ?.hashtags
+                ?.toList()

        if (hashToLoad.isNullOrEmpty()) return null

        return TypedFilter(
            types = setOf(FeedType.PUBLIC_CHATS),
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds =
                        listOf(ChannelCreateEvent.KIND, ChannelMetadataEvent.KIND, ChannelMessageEvent.KIND),
                    tags =
@@ -323,21 +346,24 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                    since =
                        latestEOSEs.users[account.userProfile()]
                            ?.followList
-                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.get(account.settings.defaultDiscoveryFollowList.value)
                            ?.relayList,
                ),
        )
    }

    fun createPublicChatsGeohashesFilter(): TypedFilter? {
-        val hashToLoad = account.liveDiscoveryFollowLists.value?.geotags?.toList()
+        val hashToLoad =
+            account.liveDiscoveryFollowLists.value
+                ?.geotags
+                ?.toList()

        if (hashToLoad.isNullOrEmpty()) return null

        return TypedFilter(
            types = setOf(FeedType.PUBLIC_CHATS),
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds =
                        listOf(ChannelCreateEvent.KIND, ChannelMetadataEvent.KIND, ChannelMessageEvent.KIND),
                    tags =
@@ -351,21 +377,24 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                    since =
                        latestEOSEs.users[account.userProfile()]
                            ?.followList
-                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.get(account.settings.defaultDiscoveryFollowList.value)
                            ?.relayList,
                ),
        )
    }

    fun createCommunitiesTagsFilter(): TypedFilter? {
-        val hashToLoad = account.liveDiscoveryFollowLists.value?.hashtags?.toList()
+        val hashToLoad =
+            account.liveDiscoveryFollowLists.value
+                ?.hashtags
+                ?.toList()

        if (hashToLoad.isNullOrEmpty()) return null

        return TypedFilter(
            types = setOf(FeedType.GLOBAL),
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds = listOf(CommunityDefinitionEvent.KIND, CommunityPostApprovalEvent.KIND),
                    tags =
                        mapOf(
@@ -378,21 +407,24 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                    since =
                        latestEOSEs.users[account.userProfile()]
                            ?.followList
-                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.get(account.settings.defaultDiscoveryFollowList.value)
                            ?.relayList,
                ),
        )
    }

    fun createCommunitiesGeohashesFilter(): TypedFilter? {
-        val hashToLoad = account.liveDiscoveryFollowLists.value?.geotags?.toList()
+        val hashToLoad =
+            account.liveDiscoveryFollowLists.value
+                ?.geotags
+                ?.toList()

        if (hashToLoad.isNullOrEmpty()) return null

        return TypedFilter(
            types = setOf(FeedType.GLOBAL),
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds = listOf(CommunityDefinitionEvent.KIND, CommunityPostApprovalEvent.KIND),
                    tags =
                        mapOf(
@@ -405,7 +437,7 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                    since =
                        latestEOSEs.users[account.userProfile()]
                            ?.followList
-                            ?.get(account.defaultDiscoveryFollowList.value)
+                            ?.get(account.settings.defaultDiscoveryFollowList.value)
                            ?.relayList,
                ),
        )
@@ -415,7 +447,7 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
        requestNewChannel { time, relayUrl ->
            latestEOSEs.addOrUpdate(
                account.userProfile(),
-                account.defaultDiscoveryFollowList.value,
+                account.settings.defaultDiscoveryFollowList.value,
                relayUrl,
                time,
            )
@@ -437,8 +469,7 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                        createPublicChatsTagsFilter(),
                        createPublicChatsGeohashesFilter(),
                    ),
-                )
-                .toList()
+                ).toList()
                .ifEmpty { null }
    }
 }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrGeohashDataSource.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrGeohashDataSource.kt
@@ -20,9 +20,9 @@
 */
 package com.vitorpamplona.amethyst.service

-import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
+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
@@ -34,7 +34,7 @@ import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 import com.vitorpamplona.quartz.events.WikiNoteEvent

-object NostrGeohashDataSource : NostrDataSource("SingleGeoHashFeed") {
+object NostrGeohashDataSource : AmethystNostrDataSource("SingleGeoHashFeed") {
    private var geohashToWatch: String? = null

    fun createLoadHashtagFilter(): TypedFilter? {
@@ -43,7 +43,7 @@ object NostrGeohashDataSource : NostrDataSource("SingleGeoHashFeed") {
        return TypedFilter(
            types = COMMON_FEED_TYPES,
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    tags =
                        mapOf(
                            "g" to
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrHashtagDataSource.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrHashtagDataSource.kt
@@ -20,9 +20,9 @@
 */
 package com.vitorpamplona.amethyst.service

-import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
+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
@@ -34,7 +34,7 @@ import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 import com.vitorpamplona.quartz.events.WikiNoteEvent

-object NostrHashtagDataSource : NostrDataSource("SingleHashtagFeed") {
+object NostrHashtagDataSource : AmethystNostrDataSource("SingleHashtagFeed") {
    private var hashtagToWatch: String? = null

    fun createLoadHashtagFilter(): TypedFilter? {
@@ -43,7 +43,7 @@ object NostrHashtagDataSource : NostrDataSource("SingleHashtagFeed") {
        return TypedFilter(
            types = COMMON_FEED_TYPES,
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    tags =
                        mapOf(
                            "t" to
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt
@@ -23,9 +23,11 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
-import com.vitorpamplona.amethyst.service.relays.FeedType
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.FeedType
+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
@@ -35,6 +37,7 @@ import com.vitorpamplona.quartz.events.HighlightEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesEvent
 import com.vitorpamplona.quartz.events.LongTextNoteEvent
+import com.vitorpamplona.quartz.events.MetadataEvent
 import com.vitorpamplona.quartz.events.PinListEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.RepostEvent
@@ -43,44 +46,53 @@ import com.vitorpamplona.quartz.events.WikiNoteEvent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext

-object NostrHomeDataSource : NostrDataSource("HomeFeed") {
+object NostrHomeDataSource : AmethystNostrDataSource("HomeFeed") {
    lateinit var account: Account

    val scope = Amethyst.instance.applicationIOScope
    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 }
+        val follows =
+            account.liveHomeListAuthorsPerRelay.value

        return TypedFilter(
            types = setOf(if (follows == null) FeedType.GLOBAL else FeedType.FOLLOWS),
            filter =
-                JsonFilter(
+                SinceAuthorPerRelayFilter(
                    kinds =
                        listOf(
                            TextNoteEvent.KIND,
@@ -97,17 +109,43 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
                            LiveActivitiesEvent.KIND,
                            WikiNoteEvent.KIND,
                        ),
-                    authors = followSet,
+                    authors = follows,
                    limit = 400,
                    since =
                        latestEOSEs.users[account.userProfile()]
                            ?.followList
-                            ?.get(account.defaultHomeFollowList.value)
+                            ?.get(account.settings.defaultHomeFollowList.value)
                            ?.relayList,
                ),
        )
    }

+    fun createFollowMetadataAndReleaseFilter(): TypedFilter? {
+        val follows = account.liveHomeListAuthorsPerRelay.value
+
+        return if (!follows.isNullOrEmpty()) {
+            TypedFilter(
+                types = setOf(FeedType.FOLLOWS),
+                filter =
+                    SinceAuthorPerRelayFilter(
+                        kinds =
+                            listOf(
+                                MetadataEvent.KIND,
+                                AdvertisedRelayListEvent.KIND,
+                            ),
+                        authors = follows,
+                        since =
+                            latestEOSEs.users[account.userProfile()]
+                                ?.followList
+                                ?.get(account.settings.defaultHomeFollowList.value)
+                                ?.relayList,
+                    ),
+            )
+        } else {
+            null
+        }
+    }
+
    fun createFollowTagsFilter(): TypedFilter? {
        val hashToLoad = account.liveHomeFollowLists.value?.hashtags ?: return null

@@ -116,7 +154,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
        return TypedFilter(
            types = setOf(FeedType.FOLLOWS),
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds =
                        listOf(
                            TextNoteEvent.KIND,
@@ -141,7 +179,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
                    since =
                        latestEOSEs.users[account.userProfile()]
                            ?.followList
-                            ?.get(account.defaultHomeFollowList.value)
+                            ?.get(account.settings.defaultHomeFollowList.value)
                            ?.relayList,
                ),
        )
@@ -155,7 +193,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
        return TypedFilter(
            types = setOf(FeedType.FOLLOWS),
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds =
                        listOf(
                            TextNoteEvent.KIND,
@@ -180,7 +218,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
                    since =
                        latestEOSEs.users[account.userProfile()]
                            ?.followList
-                            ?.get(account.defaultHomeFollowList.value)
+                            ?.get(account.settings.defaultHomeFollowList.value)
                            ?.relayList,
                ),
        )
@@ -194,7 +232,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
        return TypedFilter(
            types = setOf(FeedType.FOLLOWS),
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds =
                        listOf(
                            TextNoteEvent.KIND,
@@ -215,7 +253,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
                    since =
                        latestEOSEs.users[account.userProfile()]
                            ?.followList
-                            ?.get(account.defaultHomeFollowList.value)
+                            ?.get(account.settings.defaultHomeFollowList.value)
                            ?.relayList,
                ),
        )
@@ -225,7 +263,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
        requestNewChannel { time, relayUrl ->
            latestEOSEs.addOrUpdate(
                account.userProfile(),
-                account.defaultHomeFollowList.value,
+                account.settings.defaultHomeFollowList.value,
                relayUrl,
                time,
            )
@@ -235,10 +273,10 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
        followAccountChannel.typedFilters =
            listOfNotNull(
                createFollowAccountsFilter(),
+                createFollowMetadataAndReleaseFilter(),
                createFollowCommunitiesFilter(),
                createFollowTagsFilter(),
                createFollowGeohashesFilter(),
-            )
-                .ifEmpty { null }
+            ).ifEmpty { null }
    }
 }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrLnZapPaymentResponseDataSource.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrLnZapPaymentResponseDataSource.kt
@@ -20,13 +20,10 @@
 */
 package com.vitorpamplona.amethyst.service

-import com.vitorpamplona.amethyst.service.relays.Client
-import com.vitorpamplona.amethyst.service.relays.FeedType
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.Relay
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.FeedType
+import com.vitorpamplona.ammolite.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter
 import com.vitorpamplona.quartz.events.LnZapPaymentResponseEvent
-import com.vitorpamplona.quartz.events.RelayAuthEvent
 import com.vitorpamplona.quartz.signers.NostrSigner

 class NostrLnZapPaymentResponseDataSource(
@@ -34,7 +31,7 @@ class NostrLnZapPaymentResponseDataSource(
    private val toUserHex: String,
    private val replyingToHex: String,
    private val authSigner: NostrSigner,
-) : NostrDataSource("LnZapPaymentResponseFeed") {
+) : AmethystNostrDataSource("LnZapPaymentResponseFeed") {
    val feedTypes = setOf(FeedType.WALLET_CONNECT)

    private fun createWalletConnectServiceWatcher(): TypedFilter {
@@ -42,7 +39,7 @@ class NostrLnZapPaymentResponseDataSource(
        return TypedFilter(
            types = feedTypes,
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds = listOf(LnZapPaymentResponseEvent.KIND),
                    authors = listOf(fromServiceHex),
                    tags =
@@ -62,18 +59,4 @@ class NostrLnZapPaymentResponseDataSource(

        channel.typedFilters = listOfNotNull(wc).ifEmpty { null }
    }
-
-    override fun auth(
-        relay: Relay,
-        challenge: String,
-    ) {
-        super.auth(relay, challenge)
-
-        RelayAuthEvent.create(relay.url, challenge, authSigner) {
-            Client.send(
-                it,
-                relay.url,
-            )
-        }
-    }
 }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt
@@ -20,10 +20,10 @@
 */
 package com.vitorpamplona.amethyst.service

-import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
-import com.vitorpamplona.amethyst.service.relays.FeedType
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
+import com.vitorpamplona.ammolite.relays.FeedType
+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
@@ -52,7 +52,7 @@ import com.vitorpamplona.quartz.events.TextNoteEvent
 import com.vitorpamplona.quartz.events.WikiNoteEvent
 import kotlin.coroutines.cancellation.CancellationException

-object NostrSearchEventOrUserDataSource : NostrDataSource("SearchEventFeed") {
+object NostrSearchEventOrUserDataSource : AmethystNostrDataSource("SearchEventFeed") {
    private var searchString: String? = null

    private fun createAnythingWithIDFilter(): List<TypedFilter>? {
@@ -95,7 +95,7 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SearchEventFeed") {
                            TypedFilter(
                                types = COMMON_FEED_TYPES,
                                filter =
-                                    JsonFilter(
+                                    SincePerRelayFilter(
                                        kinds = listOf(MetadataEvent.KIND, aTag.kind),
                                        authors = listOfNotNull(aTag.pubKeyHex),
                                        // just to be sure
@@ -110,7 +110,7 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SearchEventFeed") {
                        TypedFilter(
                            types = COMMON_FEED_TYPES,
                            filter =
-                                JsonFilter(
+                                SincePerRelayFilter(
                                    ids = listOfNotNull(hexToWatch),
                                ),
                        ),
@@ -118,7 +118,7 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SearchEventFeed") {
                        TypedFilter(
                            types = COMMON_FEED_TYPES,
                            filter =
-                                JsonFilter(
+                                SincePerRelayFilter(
                                    kinds = listOf(MetadataEvent.KIND),
                                    authors = listOfNotNull(hexToWatch),
                                    // just to be sure
@@ -135,7 +135,7 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SearchEventFeed") {
                TypedFilter(
                    types = setOf(FeedType.SEARCH),
                    filter =
-                        JsonFilter(
+                        SincePerRelayFilter(
                            kinds = listOf(MetadataEvent.KIND),
                            search = mySearchString,
                            limit = 1000,
@@ -144,7 +144,7 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SearchEventFeed") {
                TypedFilter(
                    types = setOf(FeedType.SEARCH),
                    filter =
-                        JsonFilter(
+                        SincePerRelayFilter(
                            kinds =
                                listOf(
                                    TextNoteEvent.KIND,
@@ -165,7 +165,7 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SearchEventFeed") {
                TypedFilter(
                    types = setOf(FeedType.SEARCH),
                    filter =
-                        JsonFilter(
+                        SincePerRelayFilter(
                            kinds =
                                listOf(
                                    ChannelMetadataEvent.KIND,
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleChannelDataSource.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleChannelDataSource.kt
@@ -23,14 +23,14 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LiveActivitiesChannel
 import com.vitorpamplona.amethyst.model.PublicChatChannel
-import com.vitorpamplona.amethyst.service.relays.EVENT_FINDER_TYPES
-import com.vitorpamplona.amethyst.service.relays.FeedType
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.EVENT_FINDER_TYPES
+import com.vitorpamplona.ammolite.relays.FeedType
+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

-object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
+object NostrSingleChannelDataSource : AmethystNostrDataSource("SingleChannelFeed") {
    private var channelsToWatch = setOf<Channel>()

    private fun createMetadataChangeFilter(): TypedFilter? {
@@ -44,7 +44,7 @@ object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
        return TypedFilter(
            types = setOf(FeedType.PUBLIC_CHATS),
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds = listOf(ChannelMetadataEvent.KIND),
                    tags = mapOf("e" to reactionsToWatch),
                ),
@@ -65,7 +65,7 @@ object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
        return TypedFilter(
            types = EVENT_FINDER_TYPES,
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds = listOf(ChannelCreateEvent.KIND),
                    ids = interestedEvents.toList(),
                ),
@@ -88,7 +88,7 @@ object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
                TypedFilter(
                    types = EVENT_FINDER_TYPES,
                    filter =
-                        JsonFilter(
+                        SincePerRelayFilter(
                            kinds = listOf(aTag.kind),
                            tags = mapOf("d" to listOf(aTag.dTag)),
                            authors = listOf(aTag.pubKeyHex),
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleEventDataSource.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleEventDataSource.kt
@@ -0,0 +1,371 @@
+/**
+ * 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 com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.ammolite.relays.EVENT_FINDER_TYPES
+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
+import com.vitorpamplona.quartz.events.GitReplyEvent
+import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.quartz.events.LnZapEvent
+import com.vitorpamplona.quartz.events.NIP90ContentDiscoveryResponseEvent
+import com.vitorpamplona.quartz.events.NIP90StatusEvent
+import com.vitorpamplona.quartz.events.OtsEvent
+import com.vitorpamplona.quartz.events.PollNoteEvent
+import com.vitorpamplona.quartz.events.ReactionEvent
+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>()
+    private var nextAddressesToWatch = setOf<Note>()
+
+    private var eventsToWatchInProd = setOf<Note>()
+    private var addressesToWatchInProd = setOf<Note>()
+
+    private fun createReactionsToWatchInAddressFilter(): List<TypedFilter>? {
+        val myAddressesToWatch =
+            (
+                eventsToWatchInProd.filter { it.address() != null } +
+                    addressesToWatchInProd.filter { it.address() != null }
+            ).toSet()
+
+        if (myAddressesToWatch.isEmpty()) {
+            return null
+        }
+
+        return groupByEOSEPresence(myAddressesToWatch)
+            .map {
+                listOf(
+                    TypedFilter(
+                        types = EVENT_FINDER_TYPES,
+                        filter =
+                            SincePerRelayFilter(
+                                kinds =
+                                    listOf(
+                                        TextNoteEvent.KIND,
+                                        ReactionEvent.KIND,
+                                        RepostEvent.KIND,
+                                        GenericRepostEvent.KIND,
+                                        ReportEvent.KIND,
+                                        LnZapEvent.KIND,
+                                        PollNoteEvent.KIND,
+                                        CommunityPostApprovalEvent.KIND,
+                                        LiveActivitiesChatMessageEvent.KIND,
+                                    ),
+                                tags = mapOf("a" to it.mapNotNull { it.address()?.toTag() }),
+                                since = findMinimumEOSEs(it),
+                                // Max amount of "replies" to download on a specific event.
+                                limit = 1000,
+                            ),
+                    ),
+                    TypedFilter(
+                        types = EVENT_FINDER_TYPES,
+                        filter =
+                            SincePerRelayFilter(
+                                kinds =
+                                    listOf(
+                                        DeletionEvent.KIND,
+                                    ),
+                                tags = mapOf("a" to it.mapNotNull { it.address()?.toTag() }),
+                                since = findMinimumEOSEs(it),
+                                // Max amount of "replies" to download on a specific event.
+                                limit = 10,
+                            ),
+                    ),
+                )
+            }.flatten()
+    }
+
+    private fun createAddressFilter(): List<TypedFilter>? {
+        val myAddressesToWatch = addressesToWatchInProd.filter { it.event == null }
+
+        if (myAddressesToWatch.isEmpty()) {
+            return null
+        }
+
+        return myAddressesToWatch.mapNotNull {
+            it.address()?.let { aTag ->
+                if (aTag.kind < 25000 && aTag.dTag.isBlank()) {
+                    TypedFilter(
+                        types = EVENT_FINDER_TYPES,
+                        filter =
+                            SincePerRelayFilter(
+                                kinds = listOf(aTag.kind),
+                                authors = listOf(aTag.pubKeyHex),
+                                limit = 5,
+                            ),
+                    )
+                } else {
+                    TypedFilter(
+                        types = EVENT_FINDER_TYPES,
+                        filter =
+                            SincePerRelayFilter(
+                                kinds = listOf(aTag.kind),
+                                tags = mapOf("d" to listOf(aTag.dTag)),
+                                authors = listOf(aTag.pubKeyHex),
+                                limit = 5,
+                            ),
+                    )
+                }
+            }
+        }
+    }
+
+    private fun createRepliesAndReactionsFilter(): List<TypedFilter>? {
+        if (eventsToWatchInProd.isEmpty()) {
+            return null
+        }
+
+        return groupByEOSEPresence(eventsToWatchInProd)
+            .map {
+                listOf(
+                    TypedFilter(
+                        types = EVENT_FINDER_TYPES,
+                        filter =
+                            SincePerRelayFilter(
+                                kinds =
+                                    listOf(
+                                        TextNoteEvent.KIND,
+                                        ReactionEvent.KIND,
+                                        RepostEvent.KIND,
+                                        GenericRepostEvent.KIND,
+                                        ReportEvent.KIND,
+                                        LnZapEvent.KIND,
+                                        PollNoteEvent.KIND,
+                                        OtsEvent.KIND,
+                                        TextNoteModificationEvent.KIND,
+                                        GitReplyEvent.KIND,
+                                    ),
+                                tags = mapOf("e" to it.map { it.idHex }),
+                                since = findMinimumEOSEs(it),
+                                // Max amount of "replies" to download on a specific event.
+                                limit = 10000,
+                            ),
+                    ),
+                    TypedFilter(
+                        types = EVENT_FINDER_TYPES,
+                        filter =
+                            SincePerRelayFilter(
+                                kinds =
+                                    listOf(
+                                        DeletionEvent.KIND,
+                                        NIP90ContentDiscoveryResponseEvent.KIND,
+                                        NIP90StatusEvent.KIND,
+                                        TorrentCommentEvent.KIND,
+                                    ),
+                                tags = mapOf("e" to it.map { it.idHex }),
+                                since = findMinimumEOSEs(it),
+                                limit = 100,
+                            ),
+                    ),
+                )
+            }.flatten()
+    }
+
+    private fun createQuotesFilter(): List<TypedFilter>? {
+        if (eventsToWatchInProd.isEmpty()) {
+            return null
+        }
+
+        return groupByEOSEPresence(eventsToWatchInProd)
+            .map {
+                listOf(
+                    TypedFilter(
+                        types = EVENT_FINDER_TYPES,
+                        filter =
+                            SincePerRelayFilter(
+                                kinds = listOf(TextNoteEvent.KIND),
+                                tags = mapOf("q" to it.map { it.idHex }),
+                                since = findMinimumEOSEs(it),
+                                // Max amount of "replies" to download on a specific event.
+                                limit = 1000,
+                            ),
+                    ),
+                )
+            }.flatten()
+    }
+
+    fun createLoadEventsIfNotLoadedFilter(): List<TypedFilter>? {
+        val directEventsToLoad = eventsToWatchInProd.filter { it.event == null }
+
+        val threadingEventsToLoad =
+            eventsToWatchInProd
+                .mapNotNull { it.replyTo }
+                .flatten()
+                .filter { it !is AddressableNote && it.event == null }
+
+        val interestedEvents = (directEventsToLoad + threadingEventsToLoad).map { it.idHex }.toSet()
+
+        if (interestedEvents.isEmpty()) {
+            return null
+        }
+
+        // downloads linked events to this event.
+        return listOf(
+            TypedFilter(
+                types = EVENT_FINDER_TYPES,
+                filter =
+                    SincePerRelayFilter(
+                        ids = interestedEvents.toList(),
+                    ),
+            ),
+        )
+    }
+
+    val singleEventChannel =
+        requestNewChannel { time, relayUrl ->
+            // Ignores EOSE if it is in the middle of a filter change.
+            if (changingFilters.get()) return@requestNewChannel
+
+            checkNotInMainThread()
+
+            eventsToWatchInProd.forEach {
+                val eose = it.lastReactionsDownloadTime[relayUrl]
+                if (eose == null) {
+                    it.lastReactionsDownloadTime += Pair(relayUrl, EOSETime(time))
+                } else {
+                    eose.time = time
+                }
+            }
+
+            addressesToWatchInProd.forEach {
+                val eose = it.lastReactionsDownloadTime[relayUrl]
+                if (eose == null) {
+                    it.lastReactionsDownloadTime += Pair(relayUrl, EOSETime(time))
+                } else {
+                    eose.time = time
+                }
+            }
+
+            // Many relays operate with limits in the amount of filters.
+            // As information comes, the filters will be rotated to get more data.
+            invalidateFilters()
+        }
+
+    override fun updateChannelFilters() {
+        addressesToWatchInProd = nextAddressesToWatch
+        eventsToWatchInProd = nextEventsToWatch
+
+        val reactions = createRepliesAndReactionsFilter()
+        val missing = createLoadEventsIfNotLoadedFilter()
+        val addresses = createAddressFilter()
+        val addressReactions = createReactionsToWatchInAddressFilter()
+        val quotes = createQuotesFilter()
+
+        singleEventChannel.typedFilters =
+            listOfNotNull(missing, addresses, reactions, addressReactions, quotes).flatten().ifEmpty { null }
+    }
+
+    fun add(eventId: Note) {
+        if (!nextEventsToWatch.contains(eventId)) {
+            nextEventsToWatch = nextEventsToWatch.plus(eventId)
+            invalidateFilters()
+        }
+    }
+
+    fun remove(eventId: Note) {
+        if (nextEventsToWatch.contains(eventId)) {
+            nextEventsToWatch = nextEventsToWatch.minus(eventId)
+            invalidateFilters()
+        }
+    }
+
+    fun addAddress(addressableNote: Note) {
+        if (!nextAddressesToWatch.contains(addressableNote)) {
+            nextAddressesToWatch = nextAddressesToWatch.plus(addressableNote)
+            invalidateFilters()
+        }
+    }
+
+    fun removeAddress(addressableNote: Note) {
+        if (nextAddressesToWatch.contains(addressableNote)) {
+            nextAddressesToWatch = nextAddressesToWatch.minus(addressableNote)
+            invalidateFilters()
+        }
+    }
+}
+
+fun groupByEOSEPresence(notes: Set<Note>): Collection<List<Note>> =
+    notes
+        .groupBy {
+            it.lastReactionsDownloadTime.keys
+                .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
+        .groupBy {
+            it.latestEOSEs.keys
+                .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>()
+
+    notes.forEach { note ->
+        note.lastReactionsDownloadTime.forEach {
+            val minEose = minLatestEOSEs[it.key]
+            if (minEose == null) {
+                minLatestEOSEs.put(it.key, EOSETime(it.value.time))
+            } else if (it.value.time < minEose.time) {
+                minEose.time = it.value.time
+            }
+        }
+    }
+
+    return minLatestEOSEs
+}
+
+fun findMinimumEOSEsForUsers(users: List<User>): Map<String, EOSETime> {
+    val minLatestEOSEs = mutableMapOf<String, EOSETime>()
+
+    users.forEach {
+        it.latestEOSEs.forEach {
+            val minEose = minLatestEOSEs[it.key]
+            if (minEose == null) {
+                minLatestEOSEs.put(it.key, EOSETime(it.value.time))
+            } else if (it.value.time < minEose.time) {
+                minEose.time = it.value.time
+            }
+        }
+    }
+
+    return minLatestEOSEs
+}
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleUserDataSource.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleUserDataSource.kt
@@ -21,17 +21,18 @@
 package com.vitorpamplona.amethyst.service

 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.service.relays.EOSETime
-import com.vitorpamplona.amethyst.service.relays.EVENT_FINDER_TYPES
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.EVENT_FINDER_TYPES
+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.ReportEvent
 import com.vitorpamplona.quartz.events.StatusEvent

-object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
-    var usersToWatch = setOf<User>()
+object NostrSingleUserDataSource : AmethystNostrDataSource("SingleUserFeed") {
+    private var usersToWatch = setOf<User>()

    fun createUserMetadataFilter(): List<TypedFilter>? {
        if (usersToWatch.isEmpty()) return null
@@ -44,7 +45,7 @@ object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
            TypedFilter(
                types = EVENT_FINDER_TYPES,
                filter =
-                    JsonFilter(
+                    SincePerRelayFilter(
                        kinds = listOf(MetadataEvent.KIND, AdvertisedRelayListEvent.KIND),
                        authors = firstTimers,
                    ),
@@ -63,28 +64,32 @@ object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
            .map { group ->
                val groupIds = group.map { it.pubkeyHex }
                val minEOSEs = findMinimumEOSEsForUsers(group)
-                listOf(
-                    TypedFilter(
-                        types = EVENT_FINDER_TYPES,
-                        filter =
-                            JsonFilter(
-                                kinds = listOf(MetadataEvent.KIND, StatusEvent.KIND, AdvertisedRelayListEvent.KIND),
-                                authors = groupIds,
-                                since = minEOSEs,
-                            ),
-                    ),
-                    TypedFilter(
-                        types = EVENT_FINDER_TYPES,
-                        filter =
-                            JsonFilter(
-                                kinds = listOf(ReportEvent.KIND),
-                                tags = mapOf("p" to groupIds),
-                                since = minEOSEs,
-                            ),
-                    ),
-                )
-            }
-            .flatten()
+
+                if (groupIds.isNotEmpty()) {
+                    listOf(
+                        TypedFilter(
+                            types = EVENT_FINDER_TYPES,
+                            filter =
+                                SincePerRelayFilter(
+                                    kinds = listOf(MetadataEvent.KIND, StatusEvent.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()
    }

    val userChannel =
@@ -92,13 +97,11 @@ object NostrSingleUserDataSource : NostrDataSource("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
                }
            }
        }
@@ -110,8 +113,7 @@ object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
            listOfNotNull(
                createUserMetadataFilter(),
                createUserMetadataStatusReportFilter(),
-            )
-                .flatten()
+            ).flatten()
                .ifEmpty { null }
    }

--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrThreadDataSource.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrThreadDataSource.kt
@@ -21,11 +21,11 @@
 package com.vitorpamplona.amethyst.service

 import com.vitorpamplona.amethyst.model.ThreadAssembler
-import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
+import com.vitorpamplona.ammolite.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.filters.SincePerRelayFilter

-object NostrThreadDataSource : NostrDataSource("SingleThreadFeed") {
+object NostrThreadDataSource : AmethystNostrDataSource("SingleThreadFeed") {
    private var eventToWatch: String? = null

    fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
@@ -45,7 +45,7 @@ object NostrThreadDataSource : NostrDataSource("SingleThreadFeed") {
        return TypedFilter(
            types = COMMON_FEED_TYPES,
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    ids = eventsToLoad.toList(),
                ),
        )
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt
@@ -21,9 +21,9 @@
 package com.vitorpamplona.amethyst.service

 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.COMMON_FEED_TYPES
+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
@@ -39,11 +39,14 @@ import com.vitorpamplona.quartz.events.MetadataEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
 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.WikiNoteEvent

-object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
+object NostrUserProfileDataSource : AmethystNostrDataSource("UserProfileFeed") {
    var user: User? = null

    fun loadUserProfile(user: User?) {
@@ -55,7 +58,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
            TypedFilter(
                types = COMMON_FEED_TYPES,
                filter =
-                    JsonFilter(
+                    SincePerRelayFilter(
                        kinds = listOf(MetadataEvent.KIND),
                        authors = listOf(it.pubkeyHex),
                        limit = 1,
@@ -68,7 +71,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
            TypedFilter(
                types = COMMON_FEED_TYPES,
                filter =
-                    JsonFilter(
+                    SincePerRelayFilter(
                        kinds =
                            listOf(
                                TextNoteEvent.KIND,
@@ -88,14 +91,32 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
            )
        }

+    fun createUserPostsFilter2() =
+        user?.let {
+            TypedFilter(
+                types = COMMON_FEED_TYPES,
+                filter =
+                    SincePerRelayFilter(
+                        kinds =
+                            listOf(
+                                TorrentEvent.KIND,
+                                TorrentCommentEvent.KIND,
+                            ),
+                        authors = listOf(it.pubkeyHex),
+                        limit = 20,
+                    ),
+            )
+        }
+
    fun createUserReceivedZapsFilter() =
        user?.let {
            TypedFilter(
                types = COMMON_FEED_TYPES,
                filter =
-                    JsonFilter(
+                    SincePerRelayFilter(
                        kinds = listOf(LnZapEvent.KIND),
                        tags = mapOf("p" to listOf(it.pubkeyHex)),
+                        limit = 200,
                    ),
            )
        }
@@ -105,7 +126,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
            TypedFilter(
                types = COMMON_FEED_TYPES,
                filter =
-                    JsonFilter(
+                    SincePerRelayFilter(
                        kinds = listOf(ContactListEvent.KIND),
                        authors = listOf(it.pubkeyHex),
                        limit = 1,
@@ -118,7 +139,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
            TypedFilter(
                types = COMMON_FEED_TYPES,
                filter =
-                    JsonFilter(
+                    SincePerRelayFilter(
                        kinds = listOf(ContactListEvent.KIND),
                        tags = mapOf("p" to listOf(it.pubkeyHex)),
                    ),
@@ -130,7 +151,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
            TypedFilter(
                types = COMMON_FEED_TYPES,
                filter =
-                    JsonFilter(
+                    SincePerRelayFilter(
                        kinds = listOf(BadgeProfilesEvent.KIND),
                        authors = listOf(it.pubkeyHex),
                        limit = 1,
@@ -143,7 +164,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
            TypedFilter(
                types = COMMON_FEED_TYPES,
                filter =
-                    JsonFilter(
+                    SincePerRelayFilter(
                        kinds =
                            listOf(BookmarkListEvent.KIND, PeopleListEvent.KIND, AppRecommendationEvent.KIND),
                        authors = listOf(it.pubkeyHex),
@@ -152,12 +173,26 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
            )
        }

+    fun createProfileGalleryFilter() =
+        user?.let {
+            TypedFilter(
+                types = COMMON_FEED_TYPES,
+                filter =
+                    SincePerRelayFilter(
+                        kinds =
+                            listOf(ProfileGalleryEntryEvent.KIND),
+                        authors = listOf(it.pubkeyHex),
+                        limit = 1000,
+                    ),
+            )
+        }
+
    fun createReceivedAwardsFilter() =
        user?.let {
            TypedFilter(
                types = COMMON_FEED_TYPES,
                filter =
-                    JsonFilter(
+                    SincePerRelayFilter(
                        kinds = listOf(BadgeAwardEvent.KIND),
                        tags = mapOf("p" to listOf(it.pubkeyHex)),
                        limit = 20,
@@ -172,13 +207,14 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
            listOfNotNull(
                createUserInfoFilter(),
                createUserPostsFilter(),
+                createUserPostsFilter2(),
+                createProfileGalleryFilter(),
                createFollowFilter(),
                createFollowersFilter(),
                createUserReceivedZapsFilter(),
                createAcceptedAwardsFilter(),
                createReceivedAwardsFilter(),
                createBookmarksFilter(),
-            )
-                .ifEmpty { null }
+            ).ifEmpty { null }
    }
 }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrVideoDataSource.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrVideoDataSource.kt
@@ -23,9 +23,10 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
-import com.vitorpamplona.amethyst.service.relays.FeedType
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.ammolite.relays.FeedType
+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.VideoHorizontalEvent
@@ -34,10 +35,10 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch

-val SUPPORTED_VIDEO_FEED_MIME_TYPES = listOf("image/jpeg", "image/gif", "image/png", "image/webp", "video/mp4", "video/mpeg", "video/webm", "audio/aac", "audio/mpeg", "audio/webm", "audio/wav")
+val SUPPORTED_VIDEO_FEED_MIME_TYPES = listOf("image/jpeg", "image/gif", "image/png", "image/webp", "video/mp4", "video/mpeg", "video/webm", "audio/aac", "audio/mpeg", "audio/webm", "audio/wav", "image/avif")
 val SUPPORTED_VIDEO_FEED_MIME_TYPES_SET = SUPPORTED_VIDEO_FEED_MIME_TYPES.toSet()

-object NostrVideoDataSource : NostrDataSource("VideoFeed") {
+object NostrVideoDataSource : AmethystNostrDataSource("VideoFeed") {
    lateinit var account: Account

    val scope = Amethyst.instance.applicationIOScope
@@ -64,12 +65,12 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
    }

    fun createContextualFilter(): TypedFilter {
-        val follows = account.liveStoriesFollowLists.value?.users?.toList()
+        val follows = account.liveStoriesListAuthorsPerRelay.value

        return TypedFilter(
-            types = setOf(FeedType.GLOBAL),
+            types = if (follows == null) setOf(FeedType.GLOBAL) else setOf(FeedType.FOLLOWS),
            filter =
-                JsonFilter(
+                SinceAuthorPerRelayFilter(
                    authors = follows,
                    kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND, VideoHorizontalEvent.KIND, VideoVerticalEvent.KIND),
                    limit = 200,
@@ -77,21 +78,24 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
                    since =
                        latestEOSEs.users[account.userProfile()]
                            ?.followList
-                            ?.get(account.defaultStoriesFollowList.value)
+                            ?.get(account.settings.defaultStoriesFollowList.value)
                            ?.relayList,
                ),
        )
    }

    fun createFollowTagsFilter(): TypedFilter? {
-        val hashToLoad = account.liveStoriesFollowLists.value?.hashtags?.toList() ?: return null
+        val hashToLoad =
+            account.liveStoriesFollowLists.value
+                ?.hashtags
+                ?.toList() ?: return null

        if (hashToLoad.isEmpty()) return null

        return TypedFilter(
            types = setOf(FeedType.GLOBAL),
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND, VideoHorizontalEvent.KIND, VideoVerticalEvent.KIND),
                    tags =
                        mapOf(
@@ -105,21 +109,24 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
                    since =
                        latestEOSEs.users[account.userProfile()]
                            ?.followList
-                            ?.get(account.defaultStoriesFollowList.value)
+                            ?.get(account.settings.defaultStoriesFollowList.value)
                            ?.relayList,
                ),
        )
    }

    fun createFollowGeohashesFilter(): TypedFilter? {
-        val hashToLoad = account.liveStoriesFollowLists.value?.geotags?.toList() ?: return null
+        val hashToLoad =
+            account.liveStoriesFollowLists.value
+                ?.geotags
+                ?.toList() ?: return null

        if (hashToLoad.isEmpty()) return null

        return TypedFilter(
            types = setOf(FeedType.GLOBAL),
            filter =
-                JsonFilter(
+                SincePerRelayFilter(
                    kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND, VideoHorizontalEvent.KIND, VideoVerticalEvent.KIND),
                    tags =
                        mapOf(
@@ -133,7 +140,7 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
                    since =
                        latestEOSEs.users[account.userProfile()]
                            ?.followList
-                            ?.get(account.defaultStoriesFollowList.value)
+                            ?.get(account.settings.defaultStoriesFollowList.value)
                            ?.relayList,
                ),
        )
@@ -143,7 +150,7 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
        requestNewChannel { time, relayUrl ->
            latestEOSEs.addOrUpdate(
                account.userProfile(),
-                account.defaultStoriesFollowList.value,
+                account.settings.defaultStoriesFollowList.value,
                relayUrl,
                time,
            )
@@ -155,7 +162,6 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
                createContextualFilter(),
                createFollowTagsFilter(),
                createFollowGeohashesFilter(),
-            )
-                .ifEmpty { null }
+            ).ifEmpty { null }
    }
 }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/OnlineCheck.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/OnlineCheck.kt
@@ -24,6 +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.quartz.crypto.CryptoUtils
 import okhttp3.EventListener
 import okhttp3.Protocol
@@ -31,7 +32,10 @@ import okhttp3.Request
 import okio.ByteString.Companion.toByteString
 import kotlin.coroutines.cancellation.CancellationException

-@Immutable data class OnlineCheckResult(val timeInMs: Long, val online: Boolean)
+@Immutable data class OnlineCheckResult(
+    val timeInMs: Long,
+    val online: Boolean,
+)

 object OnlineChecker {
    val checkOnlineCache = LruCache<String, OnlineCheckResult>(100)
@@ -45,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
@@ -57,7 +64,8 @@ object OnlineChecker {
            val result =
                if (url.startsWith("wss")) {
                    val request =
-                        Request.Builder()
+                        Request
+                            .Builder()
                            .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                            .url(url.replace("wss+livekit://", "wss://"))
                            .header("Upgrade", "websocket")
@@ -68,7 +76,9 @@ object OnlineChecker {
                            .build()

                    val client =
-                        HttpClientManager.getHttpClient().newBuilder()
+                        HttpClientManager
+                            .getHttpClient(forceProxy)
+                            .newBuilder()
                            .eventListener(EventListener.NONE)
                            .protocols(listOf(Protocol.HTTP_1_1))
                            .build()
@@ -79,13 +89,14 @@ object OnlineChecker {
                    }
                } else {
                    val request =
-                        Request.Builder()
+                        Request
+                            .Builder()
                            .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                            .url(url)
                            .get()
                            .build()

-                    HttpClientManager.getHttpClient().newCall(request).execute().use {
+                    HttpClientManager.getHttpClient(forceProxy).newCall(request).execute().use {
                        checkNotInMainThread()
                        it.isSuccessful
                    }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/PackageUtils.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/PackageUtils.kt
@@ -28,15 +28,12 @@ object PackageUtils {
    private fun isPackageInstalled(
        context: Context,
        target: String,
-    ): Boolean {
-        return context.packageManager.getInstalledApplications(0).find { info ->
+    ): Boolean =
+        context.packageManager.getInstalledApplications(0).find { info ->
            info.packageName == target
        } != null
-    }

-    fun isOrbotInstalled(context: Context): Boolean {
-        return isPackageInstalled(context, "org.torproject.android")
-    }
+    fun isOrbotInstalled(context: Context): Boolean = isPackageInstalled(context, "org.torproject.android")

    fun isExternalSignerInstalled(context: Context): Boolean {
        val intent =
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/ZapPaymentHandler.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/ZapPaymentHandler.kt
@@ -27,8 +27,11 @@ 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
 import com.vitorpamplona.quartz.events.LiveActivitiesEvent
 import com.vitorpamplona.quartz.events.LnZapEvent
@@ -40,7 +43,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlin.math.round

-class ZapPaymentHandler(val account: Account) {
+class ZapPaymentHandler(
+    val account: Account,
+) {
    @Immutable
    data class Payable(
        val info: ZapSplitSetup,
@@ -55,6 +60,8 @@ class ZapPaymentHandler(val account: Account) {
        pollOption: Int?,
        message: String,
        context: Context,
+        showErrorIfNoLnAddress: Boolean,
+        forceProxy: (String) -> Boolean,
        onError: (String, String) -> Unit,
        onProgress: (percent: Float) -> Unit,
        onPayViaIntent: (ImmutableList<Payable>) -> Unit,
@@ -76,12 +83,15 @@ class ZapPaymentHandler(val account: Account) {
                    val lud16 = note.author?.info?.lnAddress()

                    if (lud16.isNullOrBlank()) {
-                        onError(
-                            context.getString(R.string.missing_lud16),
-                            context.getString(
-                                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,
+                                ),
+                            )
+                        }
                        return@withContext
                    }

@@ -91,12 +101,15 @@ class ZapPaymentHandler(val account: Account) {
                val lud16 = note.author?.info?.lnAddress()

                if (lud16.isNullOrBlank()) {
-                    onError(
-                        context.getString(R.string.missing_lud16),
-                        context.getString(
-                            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,
+                            ),
+                        )
+                    }
                    return@withContext
                }

@@ -112,7 +125,7 @@ class ZapPaymentHandler(val account: Account) {
                onProgress(0.05f)
            }

-            assembleAllInvoices(splitZapRequestPairs.toList(), amountMilliSats, message, onError, onProgress = {
+            assembleAllInvoices(splitZapRequestPairs.toList(), amountMilliSats, message, showErrorIfNoLnAddress, forceProxy, onError, onProgress = {
                onProgress(it * 0.7f + 0.05f) // keeps within range.
            }, context) {
                if (it.isEmpty()) {
@@ -130,14 +143,15 @@ class ZapPaymentHandler(val account: Account) {
                    }
                } else {
                    onPayViaIntent(
-                        it.map {
-                            Payable(
-                                info = it.key.first,
-                                user = it.key.second.user,
-                                amountMilliSats = it.value.zapValue,
-                                invoice = it.value.invoice,
-                            )
-                        }.toImmutableList(),
+                        it
+                            .map {
+                                Payable(
+                                    info = it.key.first,
+                                    user = it.key.second.user,
+                                    amountMilliSats = it.value.zapValue,
+                                    invoice = it.value.invoice,
+                                )
+                            }.toImmutableList(),
                    )

                    onProgress(0f)
@@ -157,7 +171,7 @@ class ZapPaymentHandler(val account: Account) {
    }

    class SignAllZapRequestsReturn(
-        val zapRequestJson: String,
+        val zapRequestJson: String?,
        val user: User? = null,
    )

@@ -169,6 +183,18 @@ class ZapPaymentHandler(val account: Account) {
        zapsToSend: List<ZapSplitSetup>,
        onAllDone: suspend (MutableMap<ZapSplitSetup, SignAllZapRequestsReturn>) -> Unit,
    ) {
+        val authorRelayList =
+            note.author
+                ?.pubkeyHex
+                ?.let {
+                    (
+                        LocalCache
+                            .getAddressableNoteIfExists(
+                                AdvertisedRelayListEvent.createAddressTag(it),
+                            )?.event as? AdvertisedRelayListEvent?
+                    )?.readRelays()
+                }?.toSet()
+
        collectSuccessfulSigningOperations<ZapSplitSetup, SignAllZapRequestsReturn>(
            operationsInput = zapsToSend,
            runRequestFor = { next: ZapSplitSetup, onReady ->
@@ -180,10 +206,18 @@ class ZapPaymentHandler(val account: Account) {
                    }
                } else {
                    val user = LocalCache.getUserIfExists(next.lnAddressOrPubKeyHex)
-                    prepareZapRequestIfNeeded(note, pollOption, message, zapType, user) { zapRequestJson ->
-                        if (zapRequestJson != null) {
-                            onReady(SignAllZapRequestsReturn(zapRequestJson, user))
-                        }
+                    val userRelayList =
+                        (
+                            (
+                                LocalCache
+                                    .getAddressableNoteIfExists(
+                                        AdvertisedRelayListEvent.createAddressTag(next.lnAddressOrPubKeyHex),
+                                    )?.event as? AdvertisedRelayListEvent?
+                            )?.readRelays()?.toSet() ?: emptySet()
+                        ) + (authorRelayList ?: emptySet())
+
+                    prepareZapRequestIfNeeded(note, pollOption, message, zapType, user, userRelayList) { zapRequestJson ->
+                        onReady(SignAllZapRequestsReturn(zapRequestJson, user))
                    }
                }
            },
@@ -195,6 +229,8 @@ class ZapPaymentHandler(val account: Account) {
        invoices: List<Pair<ZapSplitSetup, SignAllZapRequestsReturn>>,
        totalAmountMilliSats: Long,
        message: String,
+        showErrorIfNoLnAddress: Boolean,
+        forceProxy: (String) -> Boolean,
        onError: (String, String) -> Unit,
        onProgress: (percent: Float) -> Unit,
        context: Context,
@@ -211,6 +247,8 @@ class ZapPaymentHandler(val account: Account) {
                    nostrZapRequest = splitZapRequestPair.second.zapRequestJson,
                    zapValue = calculateZapValue(totalAmountMilliSats, splitZapRequestPair.first.weight, totalWeight),
                    message = message,
+                    showErrorIfNoLnAddress = showErrorIfNoLnAddress,
+                    forceProxy = forceProxy,
                    onError = onError,
                    onProgressStep = { percentStepForThisPayment ->
                        progressAllPayments += percentStepForThisPayment / invoices.size
@@ -250,8 +288,9 @@ class ZapPaymentHandler(val account: Account) {
                            progressAllPayments += 0.5f / invoices.size
                            onProgress(progressAllPayments)
                            onError(
-                                context.getString(R.string.error_dialog_pay_invoice_error),
-                                context.getString(
+                                stringRes(context, R.string.error_dialog_pay_invoice_error),
+                                stringRes(
+                                    context,
                                    R.string.wallet_connect_pay_invoice_error_error,
                                    response.error?.message
                                        ?: response.error?.code?.toString() ?: "Error parsing error message",
@@ -275,9 +314,11 @@ class ZapPaymentHandler(val account: Account) {

    private fun assembleInvoice(
        splitSetup: ZapSplitSetup,
-        nostrZapRequest: String,
+        nostrZapRequest: String?,
        zapValue: Long,
        message: String,
+        showErrorIfNoLnAddress: Boolean = true,
+        forceProxy: (String) -> Boolean,
        onError: (String, String) -> Unit,
        onProgressStep: (percent: Float) -> Unit,
        context: Context,
@@ -301,6 +342,7 @@ class ZapPaymentHandler(val account: Account) {
                    milliSats = zapValue,
                    message = message,
                    nostrRequest = nostrZapRequest,
+                    forceProxy = forceProxy,
                    onError = onError,
                    onProgress = {
                        val step = it - progressThisPayment
@@ -314,15 +356,19 @@ class ZapPaymentHandler(val account: Account) {
                    },
                )
        } else {
-            onError(
-                context.getString(
-                    R.string.missing_lud16,
-                ),
-                context.getString(
-                    R.string.user_x_does_not_have_a_lightning_address_setup_to_receive_sats,
-                    user?.toBestDisplayName() ?: splitSetup.lnAddressOrPubKeyHex,
-                ),
-            )
+            if (showErrorIfNoLnAddress) {
+                onError(
+                    stringRes(
+                        context,
+                        R.string.missing_lud16,
+                    ),
+                    stringRes(
+                        context,
+                        R.string.user_x_does_not_have_a_lightning_address_setup_to_receive_sats,
+                        user?.toBestDisplayName() ?: splitSetup.lnAddressOrPubKeyHex,
+                    ),
+                )
+            }
        }
    }

@@ -332,10 +378,12 @@ class ZapPaymentHandler(val account: Account) {
        message: String,
        zapType: LnZapEvent.ZapType,
        overrideUser: User? = null,
+        additionalRelays: Set<String>? = null,
        onReady: (String?) -> Unit,
    ) {
        if (zapType != LnZapEvent.ZapType.NONZAP) {
-            account.createZapRequestFor(note, pollOption, message, zapType, overrideUser) { zapRequest ->
+            account.createZapRequestFor(note, pollOption, message, zapType, overrideUser, additionalRelays) { zapRequest ->
+                println("Zap Request " + zapRequest.toJson())
                onReady(zapRequest.toJson())
            }
        } else {
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/CachedLnInvoice.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/CachedLnInvoice.kt
@@ -27,14 +27,15 @@ import kotlinx.coroutines.CancellationException
 import java.text.NumberFormat

@Stable
-data class InvoiceAmount(val invoice: String, val amount: String?)
+data class InvoiceAmount(
+    val invoice: String,
+    val amount: String?,
+)

 object CachedLnInvoiceParser {
    val lnInvoicesCache = LruCache<String, InvoiceAmount>(20)

-    fun cached(lnurl: String): InvoiceAmount? {
-        return lnInvoicesCache[lnurl]
-    }
+    fun cached(lnurl: String): InvoiceAmount? = lnInvoicesCache[lnurl]

    fun parse(lnbcWord: String): InvoiceAmount? {
        val myInvoice = LnInvoiceUtil.findInvoice(lnbcWord)
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt
@@ -24,8 +24,9 @@ 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.HttpClientManager
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
+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
@@ -34,9 +35,7 @@ import java.math.RoundingMode
 import java.net.URLEncoder
 import kotlin.coroutines.cancellation.CancellationException

-class LightningAddressResolver() {
-    val client = HttpClientManager.getHttpClient()
-
+class LightningAddressResolver {
    fun assembleUrl(lnaddress: String): String? {
        val parts = lnaddress.split("@")

@@ -53,6 +52,7 @@ class LightningAddressResolver() {

    private fun fetchLightningAddressJson(
        lnaddress: String,
+        forceProxy: (url: String) -> Boolean,
        onSuccess: (String) -> Unit,
        onError: (String, String) -> Unit,
        context: Context,
@@ -63,8 +63,9 @@ class LightningAddressResolver() {

        if (url == null) {
            onError(
-                context.getString(R.string.error_unable_to_fetch_invoice),
-                context.getString(
+                stringRes(context, R.string.error_unable_to_fetch_invoice),
+                stringRes(
+                    context,
                    R.string.could_not_assemble_lnurl_from_lightning_address_check_the_user_s_setup,
                    lnaddress,
                ),
@@ -72,9 +73,12 @@ class LightningAddressResolver() {
            return
        }

+        val client = HttpClientManager.getHttpClient(forceProxy(url))
+
        try {
            val request: Request =
-                Request.Builder()
+                Request
+                    .Builder()
                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                    .url(url)
                    .build()
@@ -84,8 +88,9 @@ class LightningAddressResolver() {
                    onSuccess(it.body.string())
                } else {
                    onError(
-                        context.getString(R.string.error_unable_to_fetch_invoice),
-                        context.getString(
+                        stringRes(context, R.string.error_unable_to_fetch_invoice),
+                        stringRes(
+                            context,
                            R.string
                                .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,
@@ -99,8 +104,9 @@ class LightningAddressResolver() {
            if (e is CancellationException) throw e
            e.printStackTrace()
            onError(
-                context.getString(R.string.error_unable_to_fetch_invoice),
-                context.getString(
+                stringRes(context, R.string.error_unable_to_fetch_invoice),
+                stringRes(
+                    context,
                    R.string
                        .could_not_resolve_check_if_you_are_connected_if_the_server_is_up_and_if_the_lightning_address_is_correct_exception,
                    url,
@@ -116,6 +122,7 @@ class LightningAddressResolver() {
        milliSats: Long,
        message: String,
        nostrRequest: String? = null,
+        forceProxy: (url: String) -> Boolean,
        onSuccess: (String) -> Unit,
        onError: (String, String) -> Unit,
        context: Context,
@@ -132,8 +139,11 @@ class LightningAddressResolver() {
            url += "&nostr=$encodedNostrRequest"
        }

+        val client = HttpClientManager.getHttpClient(forceProxy(url))
+
        val request: Request =
-            Request.Builder()
+            Request
+                .Builder()
                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                .url(url)
                .build()
@@ -143,8 +153,8 @@ class LightningAddressResolver() {
                onSuccess(it.body.string())
            } else {
                onError(
-                    context.getString(R.string.error_unable_to_fetch_invoice),
-                    context.getString(R.string.could_not_fetch_invoice_from, lnCallback),
+                    stringRes(context, R.string.error_unable_to_fetch_invoice),
+                    stringRes(context, R.string.could_not_fetch_invoice_from, lnCallback),
                )
            }
        }
@@ -155,6 +165,7 @@ class LightningAddressResolver() {
        milliSats: Long,
        message: String,
        nostrRequest: String? = null,
+        forceProxy: (url: String) -> Boolean,
        onSuccess: (String) -> Unit,
        onError: (String, String) -> Unit,
        onProgress: (percent: Float) -> Unit,
@@ -164,6 +175,7 @@ class LightningAddressResolver() {

        fetchLightningAddressJson(
            lnaddress,
+            forceProxy,
            onSuccess = { lnAddressJson ->
                onProgress(0.4f)

@@ -173,8 +185,9 @@ class LightningAddressResolver() {
                    } catch (t: Throwable) {
                        if (t is CancellationException) throw t
                        onError(
-                            context.getString(R.string.error_unable_to_fetch_invoice),
-                            context.getString(
+                            stringRes(context, R.string.error_unable_to_fetch_invoice),
+                            stringRes(
+                                context,
                                R.string.error_parsing_json_from_lightning_address_check_the_user_s_lightning_setup_with_user,
                                lnaddress,
                            ),
@@ -186,8 +199,9 @@ class LightningAddressResolver() {

                if (callback == null) {
                    onError(
-                        context.getString(R.string.error_unable_to_fetch_invoice),
-                        context.getString(
+                        stringRes(context, R.string.error_unable_to_fetch_invoice),
+                        stringRes(
+                            context,
                            R.string.callback_url_not_found_in_the_user_s_lightning_address_server_configuration_with_user,
                            lnaddress,
                        ),
@@ -202,6 +216,7 @@ class LightningAddressResolver() {
                        milliSats,
                        message,
                        if (allowsNostr) nostrRequest else null,
+                        forceProxy,
                        onSuccess = {
                            onProgress(0.6f)

@@ -211,8 +226,9 @@ class LightningAddressResolver() {
                                } catch (t: Throwable) {
                                    if (t is CancellationException) throw t
                                    onError(
-                                        context.getString(R.string.error_unable_to_fetch_invoice),
-                                        context.getString(
+                                        stringRes(context, R.string.error_unable_to_fetch_invoice),
+                                        stringRes(
+                                            context,
                                            R.string
                                                .error_parsing_json_from_lightning_address_s_invoice_fetch_check_the_user_s_lightning_setup_with_user,
                                            lnaddress,
@@ -236,8 +252,9 @@ class LightningAddressResolver() {
                                    } else {
                                        onProgress(0.0f)
                                        onError(
-                                            context.getString(R.string.error_unable_to_fetch_invoice),
-                                            context.getString(
+                                            stringRes(context, R.string.error_unable_to_fetch_invoice),
+                                            stringRes(
+                                                context,
                                                R.string.incorrect_invoice_amount_sats_from_it_should_have_been,
                                                invoiceAmount.toLong().toString(),
                                                lnaddress,
@@ -253,8 +270,9 @@ class LightningAddressResolver() {
                                    ?.let { reason ->
                                        onProgress(0.0f)
                                        onError(
-                                            context.getString(R.string.error_unable_to_fetch_invoice),
-                                            context.getString(
+                                            stringRes(context, R.string.error_unable_to_fetch_invoice),
+                                            stringRes(
+                                                context,
                                                R.string
                                                    .unable_to_create_a_lightning_invoice_before_sending_the_zap_the_receiver_s_lightning_wallet_sent_the_following_error_with_user,
                                                lnaddress,
@@ -265,8 +283,9 @@ class LightningAddressResolver() {
                                ?: run {
                                    onProgress(0.0f)
                                    onError(
-                                        context.getString(R.string.error_unable_to_fetch_invoice),
-                                        context.getString(
+                                        stringRes(context, R.string.error_unable_to_fetch_invoice),
+                                        stringRes(
+                                            context,
                                            R.string
                                                .unable_to_create_a_lightning_invoice_before_sending_the_zap_element_pr_not_found_in_the_resulting_json_with_user,
                                            lnaddress,
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/EventNotificationConsumer.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/EventNotificationConsumer.kt
@@ -0,0 +1,378 @@
+/**
+ * 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.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.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.events.ChatMessageEvent
+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 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(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)) {
+                LocalPreferences.loadCurrentAccountFromEncryptedStorage(it.npub)?.let { acc ->
+                    Log.d(TAG, "New Notification Testing if for ${it.npub}")
+                    try {
+                        consumeIfMatchesAccount(event, acc)
+                        matchAccount = true
+                    } catch (e: Exception) {
+                        if (e is CancellationException) throw e
+                        Log.d(TAG, "Message was not for user ${it.npub}: ${e.message}")
+                    }
+                }
+            }
+        }
+    }
+
+    private suspend fun consumeIfMatchesAccount(
+        pushWrappedEvent: GiftWrapEvent,
+        account: AccountSettings,
+    ) {
+        // 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,
+            )
+        }
+
+        pushWrappedEvent.unwrapThrowing(signer) { notificationEvent ->
+            val consumed = LocalCache.hasConsumed(notificationEvent)
+            val verified = LocalCache.justVerify(notificationEvent)
+            Log.d(TAG, "New Notification ${notificationEvent.kind} ${notificationEvent.id} Arrived for ${signer.pubKey} consumed= $consumed && verified= $verified")
+            if (!consumed && verified) {
+                Log.d(TAG, "New Notification was verified")
+                unwrapAndConsume(notificationEvent, signer) { innerEvent ->
+                    Log.d(TAG, "Unwrapped consume $consumed ${innerEvent.javaClass.simpleName}")
+                    if (innerEvent is PrivateDmEvent) {
+                        Log.d(TAG, "New Nip-04 DM to Notify")
+                        notify(innerEvent, signer, account)
+                    } else if (innerEvent is LnZapEvent) {
+                        Log.d(TAG, "New Zap to Notify")
+                        notify(innerEvent, signer, account)
+                    } else if (innerEvent is ChatMessageEvent) {
+                        Log.d(TAG, "New ChatMessage to Notify")
+                        notify(innerEvent, signer, account)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun unwrapAndConsume(
+        event: Event,
+        signer: NostrSigner,
+        onReady: (Event) -> Unit,
+    ) {
+        if (!LocalCache.justVerify(event)) return
+        if (LocalCache.hasConsumed(event)) return
+
+        when (event) {
+            is GiftWrapEvent -> {
+                event.unwrap(signer) {
+                    unwrapAndConsume(it, signer, onReady)
+                    LocalCache.justConsume(event, null)
+                }
+            }
+            is SealedGossipEvent -> {
+                event.unseal(signer) {
+                    if (!LocalCache.hasConsumed(it)) {
+                        // this is not verifiable
+                        LocalCache.justConsume(it, null)
+                        onReady(it)
+                    }
+                    LocalCache.justConsume(event, null)
+                }
+            }
+            else -> {
+                LocalCache.justConsume(event, null)
+                onReady(event)
+            }
+        }
+    }
+
+    private fun notify(
+        event: ChatMessageEvent,
+        signer: NostrSigner,
+        acc: AccountSettings,
+    ) {
+        if (
+            event.createdAt > TimeUtils.fifteenMinutesAgo() &&
+            // old event being re-broadcasted
+            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()
+                notificationManager()
+                    .sendDMNotification(
+                        event.id,
+                        content,
+                        user,
+                        event.createdAt,
+                        userPicture,
+                        noteUri,
+                        applicationContext,
+                    )
+            }
+        }
+    }
+
+    private fun notify(
+        event: PrivateDmEvent,
+        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 (signer.pubKey == event.verifiedRecipientPubKey()) {
+            val followingKeySet = acc.backupContactList?.unverifiedFollowKeySet()?.toSet() ?: return
+
+            val chatRoom = event.chatroomKey(signer.pubKey)
+
+            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()
+                        notificationManager()
+                            .sendDMNotification(event.id, content, user, event.createdAt, userPicture, noteUri, applicationContext)
+                    }
+                }
+            }
+        }
+    }
+
+    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,
+        signer: NostrSigner,
+        acc: AccountSettings,
+    ) {
+        Log.d(TAG, "Notify Start ${event.toNostrUri()}")
+        val noteZapEvent = LocalCache.getNoteIfExists(event.id) ?: return
+
+        Log.d(TAG, "Notify Not Notified Yet")
+
+        // old event being re-broadcast
+        if (event.createdAt < TimeUtils.fifteenMinutesAgo()) return
+
+        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(TAG, "Notify ZapRequest $noteZapRequest zapped $noteZapped")
+
+        if ((event.amount ?: BigDecimal.ZERO) < BigDecimal.TEN) return
+
+        Log.d(TAG, "Notify Amount Bigger than 10")
+
+        if (event.isTaggedUser(signer.pubKey)) {
+            val amount = showAmount(event.amount)
+
+            Log.d(TAG, "Notify Amount $amount")
+
+            (noteZapRequest.event as? LnZapRequestEvent)?.let { event ->
+                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) {
+                        decryptContent(noteZapped, signer) {
+                            Log.d(TAG, "Notify Decrypted if Private Note")
+
+                            val zappedContent = it.split("\n").get(0)
+
+                            val user = senderInfo.first.toBestDisplayName()
+                            var title = stringRes(applicationContext, R.string.app_notification_zaps_channel_message, amount)
+                            senderInfo.second?.ifBlank { null }?.let { title += " ($it)" }
+
+                            var content =
+                                stringRes(
+                                    applicationContext,
+                                    R.string.app_notification_zaps_channel_message_from,
+                                    user,
+                                )
+                            zappedContent.let {
+                                content +=
+                                    " " +
+                                    stringRes(
+                                        applicationContext,
+                                        R.string.app_notification_zaps_channel_message_for,
+                                        zappedContent,
+                                    )
+                            }
+                            val userPicture = senderInfo.first.profilePicture()
+                            val noteUri = "nostr:Notifications"
+
+                            Log.d(TAG, "Notify ${event.id} $content $title $noteUri")
+
+                            notificationManager()
+                                .sendZapNotification(
+                                    event.id,
+                                    content,
+                                    title,
+                                    event.createdAt,
+                                    userPicture,
+                                    noteUri,
+                                    applicationContext,
+                                )
+                        }
+                    } else {
+                        // doesn't have a base note to refer to.
+                        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)
+                        senderInfo.second?.ifBlank { null }?.let { title += " ($it)" }
+
+                        val content =
+                            stringRes(
+                                applicationContext,
+                                R.string.app_notification_zaps_channel_message_from,
+                                user,
+                            )
+
+                        val userPicture = senderInfo.first.profilePicture()
+                        val noteUri = "nostr:Notifications"
+
+                        Log.d(TAG, "Notify ${event.id} $content $title $noteUri")
+
+                        notificationManager()
+                            .sendZapNotification(
+                                event.id,
+                                content,
+                                title,
+                                event.createdAt,
+                                userPicture,
+                                noteUri,
+                                applicationContext,
+                            )
+                    }
+                }
+            }
+        }
+    }
+
+    fun notificationManager(): NotificationManager =
+        ContextCompat.getSystemService(applicationContext, NotificationManager::class.java)
+            as NotificationManager
+}
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/NotificationUtils.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/NotificationUtils.kt
@@ -34,6 +34,7 @@ import coil.executeBlocking
 import coil.request.ImageRequest
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.MainActivity
+import com.vitorpamplona.amethyst.ui.stringRes

 object NotificationUtils {
    private var dmChannel: NotificationChannel? = null
@@ -46,14 +47,13 @@ object NotificationUtils {

        dmChannel =
            NotificationChannel(
-                applicationContext.getString(R.string.app_notification_dms_channel_id),
-                applicationContext.getString(R.string.app_notification_dms_channel_name),
+                stringRes(applicationContext, R.string.app_notification_dms_channel_id),
+                stringRes(applicationContext, R.string.app_notification_dms_channel_name),
                NotificationManager.IMPORTANCE_DEFAULT,
-            )
-                .apply {
-                    description =
-                        applicationContext.getString(R.string.app_notification_dms_channel_description)
-                }
+            ).apply {
+                description =
+                    stringRes(applicationContext, R.string.app_notification_dms_channel_description)
+            }

        // Register the channel with the system
        val notificationManager: NotificationManager =
@@ -69,14 +69,13 @@ object NotificationUtils {

        zapChannel =
            NotificationChannel(
-                applicationContext.getString(R.string.app_notification_zaps_channel_id),
-                applicationContext.getString(R.string.app_notification_zaps_channel_name),
+                stringRes(applicationContext, R.string.app_notification_zaps_channel_id),
+                stringRes(applicationContext, R.string.app_notification_zaps_channel_name),
                NotificationManager.IMPORTANCE_DEFAULT,
-            )
-                .apply {
-                    description =
-                        applicationContext.getString(R.string.app_notification_zaps_channel_description)
-                }
+            ).apply {
+                description =
+                    stringRes(applicationContext, R.string.app_notification_zaps_channel_description)
+            }

        // Register the channel with the system
        val notificationManager: NotificationManager =
@@ -91,17 +90,19 @@ object NotificationUtils {
        id: String,
        messageBody: String,
        messageTitle: String,
+        time: Long,
        pictureUrl: String?,
        uri: String,
        applicationContext: Context,
    ) {
        val zapChannel = getOrCreateZapChannel(applicationContext)
-        val channelId = applicationContext.getString(R.string.app_notification_zaps_channel_id)
+        val channelId = stringRes(applicationContext, R.string.app_notification_zaps_channel_id)

        sendNotification(
            id,
            messageBody,
            messageTitle,
+            time,
            pictureUrl,
            uri,
            channelId,
@@ -114,17 +115,19 @@ object NotificationUtils {
        id: String,
        messageBody: String,
        messageTitle: String,
+        time: Long,
        pictureUrl: String?,
        uri: String,
        applicationContext: Context,
    ) {
        val dmChannel = getOrCreateDMChannel(applicationContext)
-        val channelId = applicationContext.getString(R.string.app_notification_dms_channel_id)
+        val channelId = stringRes(applicationContext, R.string.app_notification_dms_channel_id)

        sendNotification(
            id,
            messageBody,
            messageTitle,
+            time,
            pictureUrl,
            uri,
            channelId,
@@ -137,6 +140,7 @@ object NotificationUtils {
        id: String,
        messageBody: String,
        messageTitle: String,
+        time: Long,
        pictureUrl: String?,
        uri: String,
        channelId: String,
@@ -152,6 +156,7 @@ object NotificationUtils {
                id = id,
                messageBody = messageBody,
                messageTitle = messageTitle,
+                time = time,
                picture = imageResult.drawable as? BitmapDrawable,
                uri = uri,
                channelId,
@@ -163,6 +168,7 @@ object NotificationUtils {
                id = id,
                messageBody = messageBody,
                messageTitle = messageTitle,
+                time = time,
                picture = null,
                uri = uri,
                channelId,
@@ -176,6 +182,7 @@ object NotificationUtils {
        id: String,
        messageBody: String,
        messageTitle: String,
+        time: Long,
        picture: BitmapDrawable?,
        uri: String,
        channelId: String,
@@ -205,13 +212,13 @@ object NotificationUtils {

        // Build the notification
        val builderPublic =
-            NotificationCompat.Builder(
-                applicationContext,
-                channelId,
-            )
-                .setSmallIcon(R.drawable.amethyst)
+            NotificationCompat
+                .Builder(
+                    applicationContext,
+                    channelId,
+                ).setSmallIcon(R.drawable.amethyst)
                .setContentTitle(messageTitle)
-                .setContentText(applicationContext.getString(R.string.app_notification_private_message))
+                .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
@@ -219,14 +226,15 @@ object NotificationUtils {
                .setContentIntent(contentPendingIntent)
                .setPriority(NotificationCompat.PRIORITY_HIGH)
                .setAutoCancel(true)
+                .setWhen(time * 1000)

        // Build the notification
        val builder =
-            NotificationCompat.Builder(
-                applicationContext,
-                channelId,
-            )
-                .setSmallIcon(R.drawable.amethyst)
+            NotificationCompat
+                .Builder(
+                    applicationContext,
+                    channelId,
+                ).setSmallIcon(R.drawable.amethyst)
                .setContentTitle(messageTitle)
                .setContentText(messageBody)
                .setLargeIcon(picture?.bitmap)
@@ -237,6 +245,7 @@ object NotificationUtils {
                .setPublicVersion(builderPublic.build())
                .setPriority(NotificationCompat.PRIORITY_HIGH)
                .setAutoCancel(true)
+                .setWhen(time * 1000)

        notify(notId, builder.build())
    }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt
@@ -0,0 +1,189 @@
+/**
+ * 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.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.AccountSettings
+import com.vitorpamplona.ammolite.service.HttpClientManager
+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
+import kotlin.coroutines.resume
+
+class RegisterAccounts(
+    private val accounts: List<AccountInfo>,
+) {
+    val tag =
+        if (BuildConfig.FLAVOR == "play") {
+            "RegisterAccounts FirebaseMsgService"
+        } else {
+            "RegisterAccounts UnifiedPushService"
+        }
+
+    private suspend fun signAllAuths(
+        notificationToken: String,
+        remainingTos: List<Pair<AccountSettings, List<String>>>,
+        output: MutableList<RelayAuthEvent>,
+        onReady: (List<RelayAuthEvent>) -> Unit,
+    ) {
+        if (remainingTos.isEmpty()) {
+            onReady(output)
+            return
+        }
+
+        coroutineScope {
+            val jobs =
+                remainingTos.map { accountRelayPair ->
+                    async {
+                        val result =
+                            withTimeoutOrNull(10000) {
+                                suspendCancellableCoroutine { continuation ->
+                                    val signer = accountRelayPair.first.createSigner()
+                                    // TODO: Modify the external launcher to launch as different users.
+                                    // Right now it only registers if Amber has already approved this signature
+                                    if (signer is NostrSignerExternal) {
+                                        signer.launcher.registerLauncher(
+                                            launcher = { },
+                                            contentResolver = Amethyst.instance::contentResolverFn,
+                                        )
+                                    }
+
+                                    RelayAuthEvent.create(accountRelayPair.second, notificationToken, signer) { result ->
+                                        continuation.resume(result)
+                                    }
+                                }
+                            }
+
+                        if (result != null) {
+                            output.add(result)
+                        }
+                    }
+                }
+
+            // runs in parallel to avoid overcrowding Amber.
+            withTimeoutOrNull(15000) {
+                jobs.joinAll()
+            }
+        }
+
+        onReady(output)
+    }
+
+    // creates proof that it controls all accounts
+    private suspend fun signEventsToProveControlOfAccounts(
+        accounts: List<AccountInfo>,
+        notificationToken: String,
+        onReady: (List<RelayAuthEvent>) -> Unit,
+    ) {
+        val readyToSend =
+            accounts
+                .mapNotNull {
+                    Log.d(tag, "Register Account ${it.npub}")
+
+                    val acc = LocalPreferences.loadCurrentAccountFromEncryptedStorage(it.npub)
+                    if (acc != null && acc.isWriteable()) {
+                        val nip65Read = acc.backupNIP65RelayList?.readRelays() ?: emptyList()
+
+                        Log.d(tag, "Register Account ${it.npub} NIP65 Reads ${nip65Read.joinToString(", ")}")
+
+                        val nip17Read = acc.backupDMRelayList?.relays() ?: emptyList<String>()
+
+                        Log.d(tag, "Register Account ${it.npub} NIP17 Reads ${nip17Read.joinToString(", ")}")
+
+                        val readKind3Relays = acc.backupContactList?.relays()?.mapNotNull { if (it.value.read) it.key else null } ?: emptyList<String>()
+
+                        Log.d(tag, "Register Account ${it.npub} Kind3 Reads ${readKind3Relays.joinToString(", ")}")
+
+                        val relays = (nip65Read + nip17Read + readKind3Relays)
+
+                        if (relays.isNotEmpty()) {
+                            Pair(acc, relays)
+                        } else {
+                            null
+                        }
+                    } else {
+                        null
+                    }
+                }
+
+        val listOfAuthEvents = mutableListOf<RelayAuthEvent>()
+        signAllAuths(
+            notificationToken,
+            readyToSend,
+            listOfAuthEvents,
+            onReady,
+        )
+    }
+
+    fun postRegistrationEvent(events: List<RelayAuthEvent>) {
+        try {
+            val jsonObject =
+                """{
+                "events": [ ${events.joinToString(", ") { it.toJson() }} ]
+            }
+            """
+
+            val mediaType = "application/json; charset=utf-8".toMediaType()
+            val body = jsonObject.toRequestBody(mediaType)
+
+            val request =
+                Request
+                    .Builder()
+                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                    .url("https://push.amethyst.social/register")
+                    .post(body)
+                    .build()
+
+            // 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) {
+        if (notificationToken.isNotEmpty()) {
+            withContext(Dispatchers.IO) {
+                signEventsToProveControlOfAccounts(accounts, notificationToken) { postRegistrationEvent(it) }
+
+                PushNotificationUtils.hasInit = true
+            }
+        }
+    }
+}
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpBlockstreamExplorer.kt
+++ b/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.amethyst.service.HttpClientManager
+import com.vitorpamplona.ammolite.service.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,11 +44,17 @@ 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.Builder()
+            Request
+                .Builder()
                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                .header("Accept", "application/json")
                .url(url)
@@ -58,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)
@@ -74,12 +89,17 @@ 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.Builder()
+            Request
+                .Builder()
                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                .url(url)
                .get()
@@ -90,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
+            }
    }
 }
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendar.kt
+++ b/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.amethyst.service.HttpClientManager
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.encoders.Hex
 import com.vitorpamplona.quartz.ots.ICalendar
 import com.vitorpamplona.quartz.ots.StreamDeserializationContext
@@ -30,14 +30,16 @@ import com.vitorpamplona.quartz.ots.exceptions.CommitmentNotFoundException
 import com.vitorpamplona.quartz.ots.exceptions.DeserializationException
 import com.vitorpamplona.quartz.ots.exceptions.ExceededSizeException
 import com.vitorpamplona.quartz.ots.exceptions.UrlException
-import com.vitorpamplona.quartz.ots.http.Request
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.RequestBody.Companion.toRequestBody

 /**
 * Class representing remote calendar server interface.
 */
-class OkHttpCalendar(val url: String) : ICalendar {
+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.
     *
@@ -50,14 +52,15 @@ class OkHttpCalendar(val url: String) : ICalendar {
    @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()
            val requestBody = digest.toRequestBody(mediaType)

            val request =
-                okhttp3.Request.Builder()
+                okhttp3.Request
+                    .Builder()
                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                    .header("Accept", "application/vnd.opentimestamps.v1")
                    .header("Content-Type", "application/x-www-form-urlencoded")
@@ -100,11 +103,12 @@ class OkHttpCalendar(val url: String) : ICalendar {
    )
    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 =
-                okhttp3.Request.Builder()
+                okhttp3.Request
+                    .Builder()
                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                    .header("Accept", "application/vnd.opentimestamps.v1")
                    .header("Content-Type", "application/x-www-form-urlencoded")
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendarAsyncSubmit.kt
+++ b/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.amethyst.service.HttpClientManager
+import com.vitorpamplona.ammolite.service.HttpClientManager
 import com.vitorpamplona.quartz.ots.ICalendarAsyncSubmit
 import com.vitorpamplona.quartz.ots.StreamDeserializationContext
 import com.vitorpamplona.quartz.ots.Timestamp
@@ -33,7 +33,11 @@ import java.util.concurrent.BlockingQueue
 /**
 * For making async calls to a calendar server
 */
-class OkHttpCalendarAsyncSubmit(private val url: String, private val digest: ByteArray) : ICalendarAsyncSubmit {
+class OkHttpCalendarAsyncSubmit(
+    private val url: String,
+    private val digest: ByteArray,
+    private val forceProxy: Boolean,
+) : ICalendarAsyncSubmit {
    private var queue: BlockingQueue<Optional<Timestamp>>? = null

    fun setQueue(queue: BlockingQueue<Optional<Timestamp>>?) {
@@ -42,14 +46,15 @@ class OkHttpCalendarAsyncSubmit(private val url: String, private val digest: Byt

    @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()
        val requestBody = digest.toRequestBody(mediaType)

        val request =
-            okhttp3.Request.Builder()
+            okhttp3.Request
+                .Builder()
                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                .header("Accept", "application/vnd.opentimestamps.v1")
                .header("Content-Type", "application/x-www-form-urlencoded")
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendarBuilder.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpCalendarBuilder.kt
@@ -24,15 +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 {
-        return 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 {
-        return OkHttpCalendarAsyncSubmit(url, digest)
-    }
+    ): ICalendarAsyncSubmit = OkHttpCalendarAsyncSubmit(url, digest, forceProxy(url))
 }
--- a/Show More
+++ b/Show More