v0.76.2

New Crowdin Translations

.github/workflows/create-release.yml

@@ -112,6 +112,28 @@ jobs:
           asset_name: amethyst-googleplay-x86_64-${{ github.ref_name }}.apk
           asset_content_type: application/zip
 
+      - name: Upload Play APK arm64-v8a Asset
+        id: upload-release-asset-play-arm64-v8a-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          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_name: amethyst-googleplay-arm64-v8a-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
+      - name: Upload Play APK armeabi-v7a Asset
+        id: upload-release-asset-play-armeabi-v7a-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          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_name: amethyst-googleplay-armeabi-v7a-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
       # F-Droid APK
       - name: Upload F-Droid APK Universal Asset
         id: upload-release-asset-fdroid-universal-apk
@@ -146,6 +168,28 @@ jobs:
           asset_name: amethyst-fdroid-x86_64-${{ github.ref_name }}.apk
           asset_content_type: application/zip
 
+      - name: Upload F-Droid APK arm64-v8a Asset
+        id: upload-release-asset-fdroid-arm64-v8a-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          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_name: amethyst-fdroid-arm64-v8a-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
+      - name: Upload F-Droid APK armeabi-v7a Asset
+        id: upload-release-asset-fdroid-armeabi-v7a-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          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_name: amethyst-fdroid-armeabi-v7a-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
 
 
       # Google Play AAB

.github/workflows/crowdin.yml

@@ -0,0 +1,30 @@
+name: Crowdin Action
+
+on:
+  push:
+    # paths: ["app/src/main/res/**/strings.xml"] // removes filter to allow downloads at any moment.
+    branches: [ main ]
+
+jobs:
+  synchronize-with-crowdin:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: crowdin action
+        uses: crowdin/github-action@v1
+        with:
+          upload_sources: true
+          upload_translations: true
+          download_translations: true
+          localization_branch_name: l10n_crowdin_translations
+          create_pull_request: true
+          pull_request_title: 'New Crowdin Translations'
+          pull_request_body: 'New Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action)'
+          pull_request_base_branch_name: 'main'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

.idea/.name

@@ -1 +0,0 @@
-Amethyst

.idea/inspectionProfiles/Project_Default.xml

@@ -1,40 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="composableFile" value="true" />
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-  </profile>
-</component>

README.md

@@ -75,17 +75,21 @@ height="80">](https://github.com/vitorpamplona/amethyst/releases)
 - [x] Relay Pages (NIP-11)
 - [x] HTTP Auth (NIP-98)
 - [x] Zapraiser (NIP-TBD)
-- [x] Moderated Communities (NIP-172)
+- [x] Moderated Communities (NIP-72)
 - [x] Emoji Packs (Kind:30030)
 - [x] Personal Emoji Lists (Kind:10030)
 - [x] Classifieds (Kind:30403)
+- [x] Private Messages and Small Groups (NIP-24)
+- [x] Gift Wraps & Seals (NIP-59)
+- [x] Versioned Encrypted Payloads (NIP-44)
+- [x] Expiration Support (NIP-40)
+- [x] Status Event (NIP-38)
 - [ ] Marketplace (NIP-15)
 - [ ] Image/Video Capture in the app
 - [ ] Local Database
 - [ ] Bookmarks, Pinned Posts, Muted Events (NIP-51)
 - [ ] Proof of Work in the Phone (NIP-13, NIP-20)
 - [ ] Workspaces
-- [ ] Expiration Support (NIP-40)
 - [ ] Infinity Scroll
 - [ ] Relay List Metadata (NIP-65)
 - [ ] Signing Requests (NIP-46)
@@ -102,7 +106,7 @@ height="80">](https://github.com/vitorpamplona/amethyst/releases)
 
 This is a native Android app made with Kotlin and Jetpack Compose.
 The app uses a modified version of the [nostrpostrlib](https://github.com/Giszmo/NostrPostr/tree/master/nostrpostrlib) to talk to Nostr relays.
-The overall architecture consists in the UI, which uses the usual State/ViewModel/Composition, the service layer that connects with Nostr relays,
+The overall architecture consists of the UI, which uses the usual State/ViewModel/Composition, the service layer that connects with Nostr relays,
 and the model/repository layer, which keeps all Nostr objects in memory, in a full OO graph.
 
 The repository layer stores Nostr Events as Notes and Users separately. Those classes use LiveData objects to
@@ -168,7 +172,7 @@ For the Play build:
 keytool -genkey -v -keystore <my-release-key.keystore> -alias <alias_name> -keyalg RSA -keysize 2048 -validity 10000
 openssl base64 < <my-release-key.keystore> | tr -d '\n' | tee some_signing_key.jks.base64.txt
 ```
-2. Create 4 Secret Key variables on your GitHub repository and fill in with the signing key information
+2. Create four Secret Key variables on your GitHub repository and fill in the signing key information
     - `KEY_ALIAS` <- `<alias_name>`
     - `KEY_PASSWORD` <- `<your password>`
     - `KEY_STORE_PASSWORD` <- `<your key store password>`
@@ -188,15 +192,15 @@ The relay also learns which public keys you are requesting, meaning your public
 Relays have all your data in raw text. They know your IP, your name, your location (guessed from IP), your pub key, all your contacts, and other relays, and can read every action you do (post, like, boost, quote, report, etc) with the exception of Private Zaps and Private DMs.
 
 # DM Privacy #
-While the content of direct messages (DMs) is only visible to you, and your DM nostr counterparty, everyone can see that and when you and your counterparty are DM-ing each other.
+While the content of direct messages (DMs) is only visible to you and your DM counterparty, everyone can see when you and your counterparty DM each other.
 
 # Visibility & Permanence of Your Content on nostr
 ## Information Visibility ##
 Content that you share can be shared to other relays. 
-Information that you share is publicly visible to anyone reading from relays that have your information. Your information may also be visible to nostr users who do not share relays with you.
+Information that you share publicly is visible to anyone reading from relays that have your information. Your information may also be visible to nostr users who do not share relays with you.
 
 ## Information Permanence ##
-Information shared on nostr should be assumed permanent for privacy purposes. There is no way to guarantee deleting or editing any content once posted. 
+Information shared on nostr should be assumed permanent for privacy purposes. There is no way to guarantee edit or deletion of any content once posted. 
 
 # Screenshots
 

app/build.gradle

@@ -1,26 +1,26 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id 'org.jlleitschuh.gradle.ktlint' version "11.5.0"
+    id 'org.jlleitschuh.gradle.ktlint' version "11.5.1"
     id 'com.google.gms.google-services'
 }
 
 android {
     namespace 'com.vitorpamplona.amethyst'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
-        targetSdk 33
-        versionCode 272
-        versionName "0.73.3"
+        targetSdk 34
+        versionCode 296
+        versionName "0.76.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary true
         }
-        resourceConfigurations += ['ar', 'cs', 'de', 'eo', 'es', 'fa', 'fr', 'hu', 'night', 'nl', 'pt-rBR', 'ru', 'sv-rSE', 'ta', 'tr', 'uk', 'zh', 'sh-rHK', 'zh-rTW', 'ja']
+        resourceConfigurations += ['ar', 'cs', 'de', 'eo', 'es', 'fa', 'fr', 'hu', 'in', 'ja', 'night', 'nl', 'pt-rBR', 'ru', 'sv-rSE', 'ta', 'th', 'tr', 'uk', 'zh', 'sh-rHK', 'zh-rTW']
     }
 
     buildTypes {
@@ -54,7 +54,7 @@ android {
         abi {
             enable true
             reset()
-            include "x86", "x86_64"
+            include "x86", "x86_64", "arm64-v8a", "armeabi-v7a"
             universalApk true
         }
     }
@@ -87,7 +87,8 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation project(path: ':quartz')
+    implementation "androidx.core:core-ktx:$core_ktx_version"
     implementation 'androidx.activity:activity-compose:1.7.2'
     implementation "androidx.compose.ui:ui:$compose_ui_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
@@ -110,22 +111,16 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
-    implementation "net.engawapg.lib:zoomable:1.4.3"
+    // Zoomable images
+    implementation 'net.engawapg.lib:zoomable:1.5.1'
 
     // Biometrics
     implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"
 
-    // Bitcoin secp256k1 bindings to Android
-    implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.10.1'
-
     // Websockets API
     implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'
 
-    // Json Serialization TODO: We might need to converge between gson and Jackson (we are usin both)
-    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2'
-    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
-
-    // link preview
+    // HTML Parsing for Link Preview
     implementation 'org.jsoup:jsoup:1.16.1'
 
     // Encrypted Key Storage
@@ -149,9 +144,6 @@ dependencies {
     // Permission to upload pictures:
     implementation "com.google.accompanist:accompanist-permissions:$accompanist_version"
 
-    // Parses URLs from Text:
-    implementation "io.github.url-detector:url-detector:0.1.23"
-
     // For QR generation
     implementation 'com.google.zxing:core:3.5.2'
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
@@ -168,9 +160,9 @@ dependencies {
 
     // Language picker and Theme chooser
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.media3:media3-exoplayer-hls:1.1.0'
-    implementation 'androidx.media3:media3-ui:1.1.0'
-    implementation 'androidx.media3:media3-session:1.1.0'
+    implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
+    implementation "androidx.media3:media3-ui:$media3_version"
+    implementation "androidx.media3:media3-session:$media3_version"
 
     // Local model for language identification
     playImplementation 'com.google.mlkit:language-id:17.0.4'
@@ -179,7 +171,7 @@ dependencies {
     playImplementation 'com.google.mlkit:translate:17.0.1'
 
     // PushNotifications
-    playImplementation platform('com.google.firebase:firebase-bom:32.2.0')
+    playImplementation platform('com.google.firebase:firebase-bom:32.2.3')
     playImplementation 'com.google.firebase:firebase-messaging-ktx'
 
     // Charts
@@ -188,15 +180,11 @@ dependencies {
     implementation "com.patrykandpatrick.vico:views:${vico_version}"
     implementation "com.patrykandpatrick.vico:compose-m2:${vico_version}"
 
-    // immutable collections to avoid recomposition
-    implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5")
-
     // GeoHash
     implementation 'com.github.drfonfon:android-kotlin-geohash:1.0'
 
-    // LibSodium for XChaCha encryption
-    implementation "com.goterl:lazysodium-android:5.1.0@aar"
-    implementation 'net.java.dev.jna:jna:5.13.0@aar'
+    // Waveform visualizer
+    implementation 'com.github.lincollincol:compose-audiowaveform:1.1.1'
 
     // Video compression lib
     implementation 'com.github.AbedElazizShe:LightCompressor:1.3.1'
@@ -204,7 +192,7 @@ dependencies {
     implementation 'id.zelory:compressor:3.0.1'
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'io.mockk:mockk:1.13.5'
+    testImplementation 'io.mockk:mockk:1.13.7'
     androidTestImplementation 'androidx.test.ext:junit:1.2.0-alpha01'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version"

app/proguard-rules.pro

@@ -52,23 +52,9 @@
     private static java.lang.Object fromNative(com.sun.jna.FromNativeConverter, java.lang.Object, java.lang.reflect.Method);
 }
 
-# GSON parsing
--keep class com.vitorpamplona.amethyst.service.model.** { *; }
+# JSON parsing
+-keep class com.vitorpamplona.quartz.crypto.** { *; }
+-keep class com.vitorpamplona.quartz.encoders.** { *; }
+-keep class com.vitorpamplona.quartz.events.** { *; }
 -keep class com.vitorpamplona.amethyst.model.** { *; }
 -keep class com.vitorpamplona.amethyst.service.** { *; }
-
-# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
-# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
--keep class * extends com.google.gson.TypeAdapter
--keep class * implements com.google.gson.TypeAdapterFactory
--keep class * implements com.google.gson.JsonSerializer
--keep class * implements com.google.gson.JsonDeserializer
-
-# Prevent R8 from leaving Data object members always null
--keepclassmembers,allowobfuscation class * {
-  @com.google.gson.annotations.SerializedName <fields>;
-}
-
-# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
--keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
--keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken

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

@@ -1,113 +1,78 @@
 package com.vitorpamplona.amethyst
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.ui.actions.FileServer
 import com.vitorpamplona.amethyst.ui.actions.ImageUploader
 import com.vitorpamplona.amethyst.ui.actions.ImgurServer
 import com.vitorpamplona.amethyst.ui.actions.NostrBuildServer
 import com.vitorpamplona.amethyst.ui.actions.NostrFilesDevServer
 import com.vitorpamplona.amethyst.ui.actions.NostrImgServer
-import junit.framework.TestCase.assertNotNull
-import junit.framework.TestCase.fail
-import kotlinx.coroutines.delay
+import com.vitorpamplona.quartz.crypto.KeyPair
 import kotlinx.coroutines.runBlocking
+import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
 import java.util.Base64
+import java.util.concurrent.CountDownLatch
 
 @RunWith(AndroidJUnit4::class)
 class ImageUploadTesting {
 
     val image = "R0lGODlhPQBEAPeoAJosM//AwO/AwHVYZ/z595kzAP/s7P+goOXMv8+fhw/v739/f+8PD98fH/8mJl+fn/9ZWb8/PzWlwv///6wWGbImAPgTEMImIN9gUFCEm/gDALULDN8PAD6atYdCTX9gUNKlj8wZAKUsAOzZz+UMAOsJAP/Z2ccMDA8PD/95eX5NWvsJCOVNQPtfX/8zM8+QePLl38MGBr8JCP+zs9myn/8GBqwpAP/GxgwJCPny78lzYLgjAJ8vAP9fX/+MjMUcAN8zM/9wcM8ZGcATEL+QePdZWf/29uc/P9cmJu9MTDImIN+/r7+/vz8/P8VNQGNugV8AAF9fX8swMNgTAFlDOICAgPNSUnNWSMQ5MBAQEJE3QPIGAM9AQMqGcG9vb6MhJsEdGM8vLx8fH98AANIWAMuQeL8fABkTEPPQ0OM5OSYdGFl5jo+Pj/+pqcsTE78wMFNGQLYmID4dGPvd3UBAQJmTkP+8vH9QUK+vr8ZWSHpzcJMmILdwcLOGcHRQUHxwcK9PT9DQ0O/v70w5MLypoG8wKOuwsP/g4P/Q0IcwKEswKMl8aJ9fX2xjdOtGRs/Pz+Dg4GImIP8gIH0sKEAwKKmTiKZ8aB/f39Wsl+LFt8dgUE9PT5x5aHBwcP+AgP+WltdgYMyZfyywz78AAAAAAAD///8AAP9mZv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAKgALAAAAAA9AEQAAAj/AFEJHEiwoMGDCBMqXMiwocAbBww4nEhxoYkUpzJGrMixogkfGUNqlNixJEIDB0SqHGmyJSojM1bKZOmyop0gM3Oe2liTISKMOoPy7GnwY9CjIYcSRYm0aVKSLmE6nfq05QycVLPuhDrxBlCtYJUqNAq2bNWEBj6ZXRuyxZyDRtqwnXvkhACDV+euTeJm1Ki7A73qNWtFiF+/gA95Gly2CJLDhwEHMOUAAuOpLYDEgBxZ4GRTlC1fDnpkM+fOqD6DDj1aZpITp0dtGCDhr+fVuCu3zlg49ijaokTZTo27uG7Gjn2P+hI8+PDPERoUB318bWbfAJ5sUNFcuGRTYUqV/3ogfXp1rWlMc6awJjiAAd2fm4ogXjz56aypOoIde4OE5u/F9x199dlXnnGiHZWEYbGpsAEA3QXYnHwEFliKAgswgJ8LPeiUXGwedCAKABACCN+EA1pYIIYaFlcDhytd51sGAJbo3onOpajiihlO92KHGaUXGwWjUBChjSPiWJuOO/LYIm4v1tXfE6J4gCSJEZ7YgRYUNrkji9P55sF/ogxw5ZkSqIDaZBV6aSGYq/lGZplndkckZ98xoICbTcIJGQAZcNmdmUc210hs35nCyJ58fgmIKX5RQGOZowxaZwYA+JaoKQwswGijBV4C6SiTUmpphMspJx9unX4KaimjDv9aaXOEBteBqmuuxgEHoLX6Kqx+yXqqBANsgCtit4FWQAEkrNbpq7HSOmtwag5w57GrmlJBASEU18ADjUYb3ADTinIttsgSB1oJFfA63bduimuqKB1keqwUhoCSK374wbujvOSu4QG6UvxBRydcpKsav++Ca6G8A6Pr1x2kVMyHwsVxUALDq/krnrhPSOzXG1lUTIoffqGR7Goi2MAxbv6O2kEG56I7CSlRsEFKFVyovDJoIRTg7sugNRDGqCJzJgcKE0ywc0ELm6KBCCJo8DIPFeCWNGcyqNFE06ToAfV0HBRgxsvLThHn1oddQMrXj5DyAQgjEHSAJMWZwS3HPxT/QMbabI/iBCliMLEJKX2EEkomBAUCxRi42VDADxyTYDVogV+wSChqmKxEKCDAYFDFj4OmwbY7bDGdBhtrnTQYOigeChUmc1K3QTnAUfEgGFgAWt88hKA6aCRIXhxnQ1yg3BCayK44EWdkUQcBByEQChFXfCB776aQsG0BIlQgQgE8qO26X1h8cEUep8ngRBnOy74E9QgRgEAC8SvOfQkh7FDBDmS43PmGoIiKUUEGkMEC/PJHgxw0xH74yx/3XnaYRJgMB8obxQW6kL9QYEJ0FIFgByfIL7/IQAlvQwEpnAC7DtLNJCKUoO/w45c44GwCXiAFB/OXAATQryUxdN4LfFiwgjCNYg+kYMIEFkCKDs6PKAIJouyGWMS1FSKJOMRB/BoIxYJIUXFUxNwoIkEKPAgCBZSQHQ1A2EWDfDEUVLyADj5AChSIQW6gu10bE/JG2VnCZGfo4R4d0sdQoBAHhPjhIB94v/wRoRKQWGRHgrhGSQJxCS+0pCZbEhAAOw=="
 
-    @Test()
-    fun testImgurUpload() = runBlocking {
+    private fun testBase(server: FileServer) {
         val bytes = Base64.getDecoder().decode(image)
         val inputStream = bytes.inputStream()
 
+        val countDownLatch = CountDownLatch(1)
+        var url: String? = null
+        var error: String? = null
+
+        ImageUploader.account = Account(
+            KeyPair()
+        )
+
         ImageUploader.uploadImage(
             inputStream,
             bytes.size.toLong(),
             "image/gif",
-            ImgurServer(),
-            onSuccess = { url, contentType ->
-                println("Uploaded to $url")
-                assertNotNull(url)
+            server,
+            onSuccess = { newUrl, contentType ->
+                println("Uploaded $contentType to $url")
+                url = newUrl
+                countDownLatch.countDown()
             },
             onError = {
                 println("Failed to Upload")
-                fail("${it.message}")
+                error = it.message
+                countDownLatch.countDown()
             }
         )
 
-        delay(5000)
+        countDownLatch.await()
+
+        Assert.assertNull(error)
+        Assert.assertTrue(url?.startsWith("http") == true)
+    }
+
+    @Test()
+    fun testImgurUpload() = runBlocking {
+        testBase(ImgurServer())
     }
 
     @Test()
     fun testNostrBuildUpload() = runBlocking {
-        val bytes = Base64.getDecoder().decode(image)
-        val inputStream = bytes.inputStream()
-
-        ImageUploader.uploadImage(
-            inputStream,
-            bytes.size.toLong(),
-            "image/gif",
-            NostrBuildServer(),
-            onSuccess = { url, contentType ->
-                println("Uploaded to $url")
-                assertNotNull(url)
-            },
-            onError = {
-                println("Failed to Upload")
-                fail("${it.message}")
-            }
-        )
-
-        delay(1000)
+        testBase(NostrBuildServer())
     }
 
     @Test()
     fun testNostrImgUpload() = runBlocking {
-        val bytes = Base64.getDecoder().decode(image)
-        val inputStream = bytes.inputStream()
-
-        ImageUploader.uploadImage(
-            inputStream,
-            bytes.size.toLong(),
-            "image/gif",
-            NostrImgServer(),
-            onSuccess = { url, contentType ->
-                println("Uploaded to $url")
-                assertNotNull(url)
-            },
-            onError = {
-                println("Failed to Upload")
-                fail("${it.message}")
-            }
-        )
-
-        delay(1000)
+        testBase(NostrImgServer())
     }
 
     @Test()
     fun testNostrFilesDevUpload() = runBlocking {
-        val bytes = Base64.getDecoder().decode(image)
-        val inputStream = bytes.inputStream()
-
-        ImageUploader.uploadImage(
-            inputStream,
-            bytes.size.toLong(),
-            "image/gif",
-            NostrFilesDevServer(),
-            onSuccess = { url, contentType ->
-                println("Uploaded to $url")
-                assertNotNull(url)
-            },
-            onError = {
-                println("Failed to Upload")
-                fail("${it.message}")
-            }
-        )
-
-        delay(5000)
+        testBase(NostrFilesDevServer())
     }
 }

app/src/androidTest/java/com/vitorpamplona/amethyst/RichTextParserTest.kt

@@ -3,7 +3,7 @@ package com.vitorpamplona.amethyst
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.vitorpamplona.amethyst.service.RichTextParser
 import com.vitorpamplona.amethyst.service.RichTextViewerState
-import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
+import com.vitorpamplona.quartz.events.ImmutableListOfLists
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -4128,7 +4128,7 @@ https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db
     }
 
     private fun printStateForDebug(state: RichTextViewerState) {
-        state.paragraphs.forEachIndexed { index, paragraph ->
+        state.paragraphs.forEach { paragraph ->
             paragraph.words.forEach { seg ->
                 println(
                     "\"${

app/src/androidTest/java/com/vitorpamplona/amethyst/UrlUserTagTransformationTest.kt

@@ -5,10 +5,10 @@ import androidx.compose.ui.text.AnnotatedString
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.UserMetadata
-import com.vitorpamplona.amethyst.model.decodePublicKey
-import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.ui.actions.buildAnnotatedStringWithUrlHighlighting
+import com.vitorpamplona.quartz.encoders.decodePublicKey
+import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.events.UserMetadata
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -29,7 +29,10 @@ class UrlUserTagTransformationTest {
 
     @Test
     fun transformationText() {
-        val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z").toHexKey())
+        val user = LocalCache.getOrCreateUser(
+            decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z")
+                .toHexKey()
+        )
         user.info = UserMetadata()
         user.info?.displayName = "Vitor Pamplona"
 
@@ -63,7 +66,10 @@ class UrlUserTagTransformationTest {
 
     @Test
     fun transformationTextTwoKeys() {
-        val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z").toHexKey())
+        val user = LocalCache.getOrCreateUser(
+            decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z")
+                .toHexKey()
+        )
         user.info = UserMetadata()
         user.info?.displayName = "Vitor Pamplona"
 

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

@@ -4,8 +4,8 @@ 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.actions.ImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.quartz.events.ImmutableListOfLists
 
 @Composable
 fun TranslatableRichTextViewer(

app/src/main/AndroidManifest.xml

@@ -60,7 +60,7 @@
         android:usesCleartextTraffic="true"
         android:hardwareAccelerated="true"
         android:localeConfig="@xml/locales_config"
-        tools:targetApi="33">
+        tools:targetApi="34">
         <activity
             android:name=".ui.MainActivity"
             android:exported="true"

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

@@ -4,8 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.compose.runtime.Immutable
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
+import com.fasterxml.jackson.module.kotlin.readValue
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.ConnectivityType
 import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
@@ -14,17 +13,16 @@ import com.vitorpamplona.amethyst.model.Nip47URI
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.model.ServersAvailable
 import com.vitorpamplona.amethyst.model.Settings
-import com.vitorpamplona.amethyst.model.hexToByteArray
 import com.vitorpamplona.amethyst.model.parseConnectivityType
-import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.HttpClient
-import com.vitorpamplona.amethyst.service.KeyPair
-import com.vitorpamplona.amethyst.service.model.ContactListEvent
-import com.vitorpamplona.amethyst.service.model.Event
-import com.vitorpamplona.amethyst.service.model.Event.Companion.getRefinedEvent
-import com.vitorpamplona.amethyst.service.model.LnZapEvent
-import com.vitorpamplona.amethyst.service.toNpub
-import fr.acinq.secp256k1.Hex
+import com.vitorpamplona.quartz.crypto.KeyPair
+import com.vitorpamplona.quartz.encoders.Hex
+import com.vitorpamplona.quartz.encoders.hexToByteArray
+import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.encoders.toNpub
+import com.vitorpamplona.quartz.events.ContactListEvent
+import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.events.LnZapEvent
 import java.io.File
 import java.util.Locale
 
@@ -79,8 +77,6 @@ private object PrefKeys {
     val LAST_READ: (String) -> String = { route -> "last_read_route_$route" }
 }
 
-private val gson = GsonBuilder().create()
-
 object LocalPreferences {
     private const val comma = ","
 
@@ -209,6 +205,10 @@ object LocalPreferences {
         }
     }
 
+    fun allLocalAccountNPubs(): Set<String> {
+        return savedAccounts().toSet()
+    }
+
     fun saveToEncryptedStorage(account: Account) {
         val prefs = encryptedPreferences(account.userProfile().pubkeyNpub())
         prefs.edit().apply {
@@ -217,20 +217,20 @@ object LocalPreferences {
             putStringSet(PrefKeys.FOLLOWING_CHANNELS, account.followingChannels)
             putStringSet(PrefKeys.FOLLOWING_COMMUNITIES, account.followingCommunities)
             putStringSet(PrefKeys.HIDDEN_USERS, account.hiddenUsers)
-            putString(PrefKeys.RELAYS, gson.toJson(account.localRelays))
+            putString(PrefKeys.RELAYS, Event.mapper.writeValueAsString(account.localRelays))
             putStringSet(PrefKeys.DONT_TRANSLATE_FROM, account.dontTranslateFrom)
-            putString(PrefKeys.LANGUAGE_PREFS, gson.toJson(account.languagePreferences))
+            putString(PrefKeys.LANGUAGE_PREFS, Event.mapper.writeValueAsString(account.languagePreferences))
             putString(PrefKeys.TRANSLATE_TO, account.translateTo)
-            putString(PrefKeys.ZAP_AMOUNTS, gson.toJson(account.zapAmountChoices))
-            putString(PrefKeys.REACTION_CHOICES, gson.toJson(account.reactionChoices))
-            putString(PrefKeys.DEFAULT_ZAPTYPE, gson.toJson(account.defaultZapType))
-            putString(PrefKeys.DEFAULT_FILE_SERVER, gson.toJson(account.defaultFileServer))
+            putString(PrefKeys.ZAP_AMOUNTS, Event.mapper.writeValueAsString(account.zapAmountChoices))
+            putString(PrefKeys.REACTION_CHOICES, Event.mapper.writeValueAsString(account.reactionChoices))
+            putString(PrefKeys.DEFAULT_ZAPTYPE, account.defaultZapType.name)
+            putString(PrefKeys.DEFAULT_FILE_SERVER, account.defaultFileServer.name)
             putString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, account.defaultHomeFollowList)
             putString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, account.defaultStoriesFollowList)
             putString(PrefKeys.DEFAULT_NOTIFICATION_FOLLOW_LIST, account.defaultNotificationFollowList)
             putString(PrefKeys.DEFAULT_DISCOVERY_FOLLOW_LIST, account.defaultDiscoveryFollowList)
-            putString(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, gson.toJson(account.zapPaymentRequest))
-            putString(PrefKeys.LATEST_CONTACT_LIST, Event.gson.toJson(account.backupContactList))
+            putString(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, Event.mapper.writeValueAsString(account.zapPaymentRequest))
+            putString(PrefKeys.LATEST_CONTACT_LIST, Event.mapper.writeValueAsString(account.backupContactList))
             putBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, account.hideDeleteRequestDialog)
             putBoolean(PrefKeys.HIDE_NIP_24_WARNING_DIALOG, account.hideNIP24WarningDialog)
             putBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, account.hideBlockAlertDialog)
@@ -238,7 +238,7 @@ object LocalPreferences {
             putInt(PrefKeys.PROXY_PORT, account.proxyPort)
             putBoolean(PrefKeys.WARN_ABOUT_REPORTS, account.warnAboutPostsWithReports)
             putBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, account.filterSpamFromStrangers)
-            putString(PrefKeys.LAST_READ_PER_ROUTE, gson.toJson(account.lastReadPerRoute))
+            putString(PrefKeys.LAST_READ_PER_ROUTE, Event.mapper.writeValueAsString(account.lastReadPerRoute))
 
             if (account.showSensitiveContent == null) {
                 remove(PrefKeys.SHOW_SENSITIVE_CONTENT)
@@ -302,10 +302,10 @@ object LocalPreferences {
             val followingChannels = getStringSet(PrefKeys.FOLLOWING_CHANNELS, null) ?: setOf()
             val followingCommunities = getStringSet(PrefKeys.FOLLOWING_COMMUNITIES, null) ?: setOf()
             val hiddenUsers = getStringSet(PrefKeys.HIDDEN_USERS, emptySet()) ?: setOf()
-            val localRelays = gson.fromJson(
-                getString(PrefKeys.RELAYS, "[]"),
-                object : TypeToken<Set<RelaySetupInfo>>() {}.type
-            ) ?: setOf<RelaySetupInfo>()
+            val localRelays = getString(PrefKeys.RELAYS, "[]")?.let {
+                println("LocalRelays: $it")
+                Event.mapper.readValue<Set<RelaySetupInfo>?>(it)
+            } ?: setOf<RelaySetupInfo>()
 
             val dontTranslateFrom = getStringSet(PrefKeys.DONT_TRANSLATE_FROM, null) ?: setOf()
             val translateTo = getString(PrefKeys.TRANSLATE_TO, null) ?: Locale.getDefault().language
@@ -314,29 +314,25 @@ object LocalPreferences {
             val defaultNotificationFollowList = getString(PrefKeys.DEFAULT_NOTIFICATION_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
             val defaultDiscoveryFollowList = getString(PrefKeys.DEFAULT_DISCOVERY_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
 
-            val zapAmountChoices = gson.fromJson(
-                getString(PrefKeys.ZAP_AMOUNTS, "[]"),
-                object : TypeToken<List<Long>>() {}.type
-            ) ?: listOf(500L, 1000L, 5000L)
+            val zapAmountChoices = getString(PrefKeys.ZAP_AMOUNTS, "[]")?.let {
+                Event.mapper.readValue<List<Long>?>(it)
+            }?.ifEmpty { listOf(500L, 1000L, 5000L) } ?: listOf(500L, 1000L, 5000L)
 
-            val reactionChoices = gson.fromJson<List<String>>(
-                getString(PrefKeys.REACTION_CHOICES, "[]"),
-                object : TypeToken<List<String>>() {}.type
-            ).ifEmpty { listOf("+") } ?: listOf("+")
+            val reactionChoices = getString(PrefKeys.REACTION_CHOICES, "[]")?.let {
+                Event.mapper.readValue<List<String>?>(it)
+            }?.ifEmpty { listOf("+") } ?: listOf("+")
 
-            val defaultZapType = gson.fromJson(
-                getString(PrefKeys.DEFAULT_ZAPTYPE, "PUBLIC"),
-                object : TypeToken<LnZapEvent.ZapType>() {}.type
-            ) ?: LnZapEvent.ZapType.PUBLIC
+            val defaultZapType = getString(PrefKeys.DEFAULT_ZAPTYPE, "")?.let { serverName ->
+                LnZapEvent.ZapType.values().firstOrNull() { it.name == serverName }
+            } ?: LnZapEvent.ZapType.PUBLIC
 
-            val defaultFileServer = gson.fromJson(
-                getString(PrefKeys.DEFAULT_FILE_SERVER, "NOSTR_BUILD"),
-                object : TypeToken<ServersAvailable>() {}.type
-            ) ?: ServersAvailable.NOSTR_BUILD
+            val defaultFileServer = getString(PrefKeys.DEFAULT_FILE_SERVER, "")?.let { serverName ->
+                ServersAvailable.values().firstOrNull() { it.name == serverName }
+            } ?: ServersAvailable.NOSTR_BUILD
 
             val zapPaymentRequestServer = try {
                 getString(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, null)?.let {
-                    gson.fromJson(it, Nip47URI::class.java)
+                    Event.mapper.readValue<Nip47URI?>(it)
                 }
             } catch (e: Throwable) {
                 e.printStackTrace()
@@ -345,8 +341,7 @@ object LocalPreferences {
 
             val latestContactList = try {
                 getString(PrefKeys.LATEST_CONTACT_LIST, null)?.let {
-                    Event.gson.fromJson(it, Event::class.java)
-                        .getRefinedEvent(true) as ContactListEvent
+                    Event.fromJson(it) as ContactListEvent?
                 }
             } catch (e: Throwable) {
                 e.printStackTrace()
@@ -355,10 +350,7 @@ object LocalPreferences {
 
             val languagePreferences = try {
                 getString(PrefKeys.LANGUAGE_PREFS, null)?.let {
-                    gson.fromJson(
-                        it,
-                        object : TypeToken<Map<String, String>>() {}.type
-                    ) as Map<String, String>
+                    Event.mapper.readValue<Map<String, String>?>(it)
                 } ?: mapOf()
             } catch (e: Throwable) {
                 e.printStackTrace()
@@ -382,10 +374,7 @@ object LocalPreferences {
 
             val lastReadPerRoute = try {
                 getString(PrefKeys.LAST_READ_PER_ROUTE, null)?.let {
-                    gson.fromJson(
-                        it,
-                        object : TypeToken<Map<String, Long>>() {}.type
-                    ) as Map<String, Long>
+                    Event.mapper.readValue<Map<String, Long>?>(it)
                 } ?: mapOf()
             } catch (e: Throwable) {
                 e.printStackTrace()

app/src/main/java/com/vitorpamplona/amethyst/MultiPlayerPlaybackManager.kt

@@ -92,9 +92,7 @@ class MultiPlayerPlaybackManager(
             override fun onPlaybackStateChanged(playbackState: Int) {
                 when (playbackState) {
                     STATE_IDLE -> {
-                        if (player.currentPosition > 5 * 60) { // 5 seconds
-                            cachedPositions.add(uri, player.currentPosition)
-                        }
+                        cachedPositions.add(uri, player.currentPosition)
                     }
                     STATE_READY -> {
                         cachedPositions.get(uri)?.let { lastPosition ->
@@ -104,9 +102,7 @@ class MultiPlayerPlaybackManager(
                         }
                     }
                     else -> {
-                        if (player.currentPosition > 5 * 60) { // 5 seconds
-                            cachedPositions.add(uri, player.currentPosition)
-                        }
+                        cachedPositions.add(uri, player.currentPosition)
                     }
                 }
             }

app/src/main/java/com/vitorpamplona/amethyst/PlaybackService.kt

@@ -26,15 +26,35 @@ class PlaybackService : MediaSessionService() {
         return ProgressiveMediaSource.Factory(VideoCache.get(Amethyst.instance, HttpClient.getHttpClient()))
     }
 
+    fun lazyHlsDS(): MultiPlayerPlaybackManager {
+        managerHls?.let { return it }
+
+        val newInstance = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
+        managerHls = newInstance
+        return newInstance
+    }
+
+    fun lazyProgressiveDS(): MultiPlayerPlaybackManager {
+        managerProgressive?.let { return it }
+
+        val newInstance = MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
+        managerProgressive = newInstance
+        return newInstance
+    }
+
+    fun lazyLocalDS(): MultiPlayerPlaybackManager {
+        managerLocal?.let { return it }
+
+        val newInstance = MultiPlayerPlaybackManager(cachedPositions = videoViewedPositionCache)
+        managerLocal = newInstance
+        return newInstance
+    }
+
     // Create your Player and MediaSession in the onCreate lifecycle event
     @OptIn(UnstableApi::class)
     override fun onCreate() {
         super.onCreate()
 
-        managerHls = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
-        managerProgressive = MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
-        managerLocal = MultiPlayerPlaybackManager(cachedPositions = videoViewedPositionCache)
-
         // Stop all videos and recreates all managers when the proxy changes.
         HttpClient.proxyChangeListeners.add(this@PlaybackService::onProxyUpdated)
     }
@@ -62,11 +82,11 @@ class PlaybackService : MediaSessionService() {
 
     fun getAppropriateMediaSessionManager(fileName: String): MultiPlayerPlaybackManager? {
         return if (fileName.startsWith("file")) {
-            managerLocal
+            lazyLocalDS()
         } else if (fileName.endsWith("m3u8")) {
-            managerHls
+            lazyHlsDS()
         } else {
-            managerProgressive
+            lazyProgressiveDS()
         }
     }
 

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

@@ -31,6 +31,7 @@ import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
 import com.vitorpamplona.amethyst.service.NostrVideoDataSource
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.ui.actions.ImageUploader
+import com.vitorpamplona.quartz.encoders.decodePublicKeyAsHexOrNull
 import java.io.File
 
 object ServiceManager {
@@ -114,14 +115,22 @@ object ServiceManager {
         Client.disconnect()
     }
 
-    fun cleanUp() {
+    fun cleanObservers() {
         LocalCache.cleanObservers()
+    }
+
+    fun trimMemory() {
+        LocalCache.cleanObservers()
+
+        val accounts = LocalPreferences.allLocalAccountNPubs().mapNotNull { decodePublicKeyAsHexOrNull(it) }.toSet()
 
         account?.let {
             LocalCache.pruneOldAndHiddenMessages(it)
             LocalCache.pruneHiddenMessages(it)
-            LocalCache.pruneContactLists(it)
-            LocalCache.pruneRepliesAndReactions(it)
+            LocalCache.pruneContactLists(accounts)
+            LocalCache.pruneRepliesAndReactions(accounts)
+            LocalCache.prunePastVersionsOfReplaceables()
+            LocalCache.pruneExpiredEvents()
         }
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt

@@ -8,11 +8,8 @@ import androidx.core.os.ConfigurationCompat
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.distinctUntilChanged
 import com.vitorpamplona.amethyst.OptOutFromFilters
-import com.vitorpamplona.amethyst.service.CryptoUtils
 import com.vitorpamplona.amethyst.service.FileHeader
-import com.vitorpamplona.amethyst.service.KeyPair
 import com.vitorpamplona.amethyst.service.NostrLnZapPaymentResponseDataSource
-import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.Constants
 import com.vitorpamplona.amethyst.service.relays.FeedType
@@ -20,6 +17,13 @@ import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.service.relays.RelayPool
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.combineWith
+import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.crypto.KeyPair
+import com.vitorpamplona.quartz.encoders.ATag
+import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.hexToByteArray
+import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.events.*
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.collections.immutable.toImmutableSet
@@ -45,8 +49,8 @@ fun getLanguagesSpokenByUser(): Set<String> {
     return codedList
 }
 
-val GLOBAL_FOLLOWS = " Global "
-val KIND3_FOLLOWS = " All Follows "
+val GLOBAL_FOLLOWS = " Global " // This has spaces to avoid mixing with a potential NIP-51 list with the same name.
+val KIND3_FOLLOWS = " All Follows " // This has spaces to avoid mixing with a potential NIP-51 list with the same name.
 
 @OptIn(DelicateCoroutinesApi::class)
 @Stable
@@ -74,8 +78,8 @@ class Account(
     var hideBlockAlertDialog: Boolean = false,
     var hideNIP24WarningDialog: Boolean = false,
     var backupContactList: ContactListEvent? = null,
-    var proxy: Proxy?,
-    var proxyPort: Int,
+    var proxy: Proxy? = null,
+    var proxyPort: Int = 9050,
     var showSensitiveContent: Boolean? = null,
     var warnAboutPostsWithReports: Boolean = true,
     var filterSpamFromStrangers: Boolean = true,
@@ -97,14 +101,16 @@ class Account(
         val showSensitiveContent: Boolean?
     )
 
-    val liveHiddenUsers: LiveData<LiveHiddenUsers> = live.combineWith(getBlockListNote().live().metadata) { localLive, liveMuteListEvent ->
-        val liveBlockedUsers = (liveMuteListEvent?.note?.event as? PeopleListEvent)?.publicAndPrivateUsers(keyPair.privKey)
-        LiveHiddenUsers(
-            hiddenUsers = liveBlockedUsers ?: persistentSetOf(),
-            spammers = localLive?.account?.transientHiddenUsers ?: persistentSetOf(),
-            showSensitiveContent = showSensitiveContent
-        )
-    }.distinctUntilChanged()
+    val liveHiddenUsers: LiveData<LiveHiddenUsers> by lazy {
+        live.combineWith(getBlockListNote().live().metadata) { localLive, liveMuteListEvent ->
+            val liveBlockedUsers = (liveMuteListEvent?.note?.event as? PeopleListEvent)?.publicAndPrivateUsers(keyPair.privKey)
+            LiveHiddenUsers(
+                hiddenUsers = liveBlockedUsers ?: persistentSetOf(),
+                spammers = localLive?.account?.transientHiddenUsers ?: persistentSetOf(),
+                showSensitiveContent = showSensitiveContent
+            )
+        }.distinctUntilChanged()
+    }
 
     var userProfileCache: User? = null
 
@@ -274,7 +280,7 @@ class Account(
         }
     }
 
-    fun createZapRequestFor(note: Note, pollOption: Int?, message: String = "", zapType: LnZapEvent.ZapType): LnZapRequestEvent? {
+    fun createZapRequestFor(note: Note, pollOption: Int?, message: String = "", zapType: LnZapEvent.ZapType, toUser: User?): LnZapRequestEvent? {
         if (!isWriteable()) return null
 
         note.event?.let { event ->
@@ -285,7 +291,8 @@ class Account(
                 keyPair.privKey!!,
                 pollOption,
                 message,
-                zapType
+                zapType,
+                toUser?.pubkeyHex
             )
         }
         return null
@@ -448,7 +455,13 @@ class Account(
 
     fun broadcast(note: Note) {
         note.event?.let {
-            Client.send(it)
+            if (it is WrappedEvent && it.host != null) {
+                it.host?.let { hostEvent ->
+                    Client.send(hostEvent)
+                }
+            } else {
+                Client.send(it)
+            }
         }
     }
 
@@ -747,7 +760,7 @@ class Account(
         replyTo: List<Note>?,
         mentions: List<User>?,
         tags: List<String>? = null,
-        zapReceiver: String? = null,
+        zapReceiver: List<ZapSplitSetup>? = null,
         wantsToMarkAsSensitive: Boolean,
         zapRaiserAmount: Long? = null,
         replyingTo: String?,
@@ -780,6 +793,23 @@ class Account(
 
         Client.send(signedEvent, relayList = relayList)
         LocalCache.consume(signedEvent)
+
+        // broadcast replied notes
+        replyingTo?.let {
+            LocalCache.getNoteIfExists(replyingTo)?.event?.let {
+                Client.send(it, relayList = relayList)
+            }
+        }
+        replyTo?.forEach {
+            it.event?.let {
+                Client.send(it, relayList = relayList)
+            }
+        }
+        addresses?.forEach {
+            LocalCache.getAddressableNoteIfExists(it.toTag())?.event?.let {
+                Client.send(it, relayList = relayList)
+            }
+        }
     }
 
     fun sendPoll(
@@ -791,7 +821,7 @@ class Account(
         valueMinimum: Int?,
         consensusThreshold: Int?,
         closedAt: Int?,
-        zapReceiver: String? = null,
+        zapReceiver: List<ZapSplitSetup>? = null,
         wantsToMarkAsSensitive: Boolean,
         zapRaiserAmount: Long? = null,
         relayList: List<Relay>? = null,
@@ -822,9 +852,20 @@ class Account(
         // println("Sending new PollNoteEvent: %s".format(signedEvent.toJson()))
         Client.send(signedEvent, relayList = relayList)
         LocalCache.consume(signedEvent)
+
+        replyTo?.forEach {
+            it.event?.let {
+                Client.send(it, relayList = relayList)
+            }
+        }
+        addresses?.forEach {
+            LocalCache.getAddressableNoteIfExists(it.toTag())?.event?.let {
+                Client.send(it, relayList = relayList)
+            }
+        }
     }
 
-    fun sendChannelMessage(message: String, toChannel: String, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null, geohash: String? = null) {
+    fun sendChannelMessage(message: String, toChannel: String, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: List<ZapSplitSetup>? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null, geohash: String? = null) {
         if (!isWriteable()) return
 
         // val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
@@ -846,7 +887,7 @@ class Account(
         LocalCache.consume(signedEvent, null)
     }
 
-    fun sendLiveMessage(message: String, toChannel: ATag, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null, geohash: String? = null) {
+    fun sendLiveMessage(message: String, toChannel: ATag, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: List<ZapSplitSetup>? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null, geohash: String? = null) {
         if (!isWriteable()) return
 
         // val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
@@ -868,11 +909,11 @@ class Account(
         LocalCache.consume(signedEvent, null)
     }
 
-    fun sendPrivateMessage(message: String, toUser: User, replyingTo: Note? = null, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null, geohash: String? = null) {
+    fun sendPrivateMessage(message: String, toUser: User, replyingTo: Note? = null, mentions: List<User>?, zapReceiver: List<ZapSplitSetup>? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null, geohash: String? = null) {
         sendPrivateMessage(message, toUser.pubkeyHex, replyingTo, mentions, zapReceiver, wantsToMarkAsSensitive, zapRaiserAmount, geohash)
     }
 
-    fun sendPrivateMessage(message: String, toUser: HexKey, replyingTo: Note? = null, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null, geohash: String? = null) {
+    fun sendPrivateMessage(message: String, toUser: HexKey, replyingTo: Note? = null, mentions: List<User>?, zapReceiver: List<ZapSplitSetup>? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null, geohash: String? = null) {
         if (!isWriteable()) return
 
         val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
@@ -901,7 +942,7 @@ class Account(
         subject: String? = null,
         replyingTo: Note? = null,
         mentions: List<User>?,
-        zapReceiver: String? = null,
+        zapReceiver: List<ZapSplitSetup>? = null,
         wantsToMarkAsSensitive: Boolean,
         zapRaiserAmount: Long? = null,
         geohash: String? = null
@@ -970,6 +1011,40 @@ class Account(
         }
     }
 
+    fun updateStatus(oldStatus: AddressableNote, newStatus: String) {
+        if (!isWriteable()) return
+        val oldEvent = oldStatus.event as? StatusEvent ?: return
+
+        val event = StatusEvent.update(oldEvent, newStatus, keyPair.privKey!!)
+
+        Client.send(event)
+        LocalCache.consume(event, null)
+    }
+
+    fun createStatus(newStatus: String) {
+        if (!isWriteable()) return
+
+        val event = StatusEvent.create(newStatus, "general", expiration = null, keyPair.privKey!!)
+
+        Client.send(event)
+        LocalCache.consume(event, null)
+    }
+
+    fun deleteStatus(oldStatus: AddressableNote) {
+        if (!isWriteable()) return
+        val oldEvent = oldStatus.event as? StatusEvent ?: return
+
+        val event = StatusEvent.clear(oldEvent, keyPair.privKey!!)
+
+        Client.send(event)
+        LocalCache.consume(event, null)
+
+        val event2 = DeletionEvent.create(listOf(event.id), keyPair.privKey!!)
+
+        Client.send(event2)
+        LocalCache.consume(event2)
+    }
+
     fun removeEmojiPack(usersEmojiList: Note, emojiList: Note) {
         if (!isWriteable()) return
 
@@ -1140,7 +1215,7 @@ class Account(
         val event = if (note is AddressableNote) {
             BookmarkListEvent.create(
                 "bookmark",
-                bookmarks?.taggedEvents() ?: emptyList(),
+                bookmarks?.taggedEvents()?.minus(note.address.toTag()) ?: emptyList(),
                 bookmarks?.taggedUsers() ?: emptyList(),
                 bookmarks?.taggedAddresses()?.minus(note.address),
 
@@ -1192,7 +1267,12 @@ class Account(
     }
 
     fun getBlockListNote(): AddressableNote {
-        val aTag = ATag(PeopleListEvent.kind, userProfile().pubkeyHex, PeopleListEvent.blockList, null)
+        val aTag = ATag(
+            PeopleListEvent.kind,
+            userProfile().pubkeyHex,
+            PeopleListEvent.blockList,
+            null
+        )
         return LocalCache.getOrCreateAddressableNote(aTag)
     }
 
@@ -1320,7 +1400,12 @@ class Account(
         val privKey = keyPair.privKey
 
         return if (listName != null) {
-            val aTag = ATag(PeopleListEvent.kind, userProfile().pubkeyHex, listName, null).toTag()
+            val aTag = ATag(
+                PeopleListEvent.kind,
+                userProfile().pubkeyHex,
+                listName,
+                null
+            ).toTag()
             val list = LocalCache.addressables[aTag]
             if (list != null) {
                 val publicHexList = (list.event as? PeopleListEvent)?.bookmarkedPeople() ?: emptySet()
@@ -1344,7 +1429,12 @@ class Account(
         val privKey = keyPair.privKey
 
         return if (listName != null) {
-            val aTag = ATag(PeopleListEvent.kind, userProfile().pubkeyHex, listName, null).toTag()
+            val aTag = ATag(
+                PeopleListEvent.kind,
+                userProfile().pubkeyHex,
+                listName,
+                null
+            ).toTag()
             val list = LocalCache.addressables[aTag]
             if (list != null) {
                 val publicAddresses = list.event?.hashtags() ?: emptySet()
@@ -1368,7 +1458,12 @@ class Account(
         val privKey = keyPair.privKey
 
         return if (listName != null) {
-            val aTag = ATag(PeopleListEvent.kind, userProfile().pubkeyHex, listName, null).toTag()
+            val aTag = ATag(
+                PeopleListEvent.kind,
+                userProfile().pubkeyHex,
+                listName,
+                null
+            ).toTag()
             val list = LocalCache.addressables[aTag]
             if (list != null) {
                 val publicAddresses = list.event?.geohashes() ?: emptySet()
@@ -1392,7 +1487,12 @@ class Account(
         val privKey = keyPair.privKey
 
         return if (listName != null) {
-            val aTag = ATag(PeopleListEvent.kind, userProfile().pubkeyHex, listName, null).toTag()
+            val aTag = ATag(
+                PeopleListEvent.kind,
+                userProfile().pubkeyHex,
+                listName,
+                null
+            ).toTag()
             val list = LocalCache.addressables[aTag]
             if (list != null) {
                 val publicAddresses = list.event?.taggedAddresses()?.map { it.toTag() } ?: emptySet()
@@ -1562,14 +1662,18 @@ class Account(
 
         // Ugly, but forces nostr.band as the only search-supporting relay today.
         // TODO: Remove when search becomes more available.
-        if (usersRelayList.none { it.activeTypes.contains(FeedType.SEARCH) }) {
-            usersRelayList = usersRelayList + Relay(
-                Constants.forcedRelayForSearch.url,
-                Constants.forcedRelayForSearch.read,
-                Constants.forcedRelayForSearch.write,
-                Constants.forcedRelayForSearch.feedTypes,
-                proxy
-            )
+        val searchRelays = usersRelayList.filter { it.url.removeSuffix("/") in Constants.forcedRelaysForSearchSet }
+        val hasSearchRelay = usersRelayList.any { it.activeTypes.contains(FeedType.SEARCH) }
+        if (!hasSearchRelay && searchRelays.isEmpty()) {
+            usersRelayList = usersRelayList + Constants.forcedRelayForSearch.map {
+                Relay(
+                    it.url,
+                    it.read,
+                    it.write,
+                    it.feedTypes,
+                    proxy
+                )
+            }
         }
 
         return usersRelayList.toTypedArray()
@@ -1581,12 +1685,16 @@ class Account(
         }.toTypedArray()
     }
 
-    fun convertGlobalRelays(): Array<String> {
-        return localRelays.filter { it.feedTypes.contains(FeedType.GLOBAL) }
+    fun activeGlobalRelays(): Array<String> {
+        return (activeRelays() ?: convertLocalRelays()).filter { it.activeTypes.contains(FeedType.GLOBAL) }
             .map { it.url }
             .toTypedArray()
     }
 
+    fun activeWriteRelays(): List<Relay> {
+        return (activeRelays() ?: convertLocalRelays()).filter { it.write }
+    }
+
     fun reconnectIfRelaysHaveChanged() {
         val newRelaySet = activeRelays() ?: convertLocalRelays()
         if (!Client.isSameRelaySetConfig(newRelaySet)) {

app/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt

@@ -6,10 +6,11 @@ import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.OptOutFromFilters
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.service.model.Event
-import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
+import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.Nip19
+import com.vitorpamplona.quartz.events.Event
 import kotlinx.coroutines.Dispatchers
 
 data class Spammer(val pubkeyHex: HexKey, var duplicatedMessages: Set<HexKey>)

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

@@ -4,13 +4,14 @@ import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.service.model.ATag
-import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
-import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent
-import com.vitorpamplona.amethyst.service.toNote
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
-import fr.acinq.secp256k1.Hex
+import com.vitorpamplona.quartz.encoders.ATag
+import com.vitorpamplona.quartz.encoders.Hex
+import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.toNote
+import com.vitorpamplona.quartz.events.ChannelCreateEvent
+import com.vitorpamplona.quartz.events.LiveActivitiesEvent
 import kotlinx.coroutines.Dispatchers
 import java.util.concurrent.ConcurrentHashMap
 
@@ -163,20 +164,12 @@ class ChannelLiveData(val channel: Channel) : LiveData<ChannelState>(ChannelStat
 
     override fun onActive() {
         super.onActive()
-        if (channel is PublicChatChannel) {
-            NostrSingleChannelDataSource.add(channel.idHex)
-        } else {
-            NostrSingleChannelDataSource.add(channel.idHex)
-        }
+        NostrSingleChannelDataSource.add(channel)
     }
 
     override fun onInactive() {
         super.onInactive()
-        if (channel is PublicChatChannel) {
-            NostrSingleChannelDataSource.remove(channel.idHex)
-        } else {
-            NostrSingleChannelDataSource.remove(channel.idHex)
-        }
+        NostrSingleChannelDataSource.remove(channel)
     }
 }
 

app/src/main/java/com/vitorpamplona/amethyst/model/Chatroom.kt

@@ -0,0 +1,63 @@
+package com.vitorpamplona.amethyst.model
+
+import androidx.compose.runtime.Stable
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.utils.TimeUtils
+
+@Stable
+class Chatroom() {
+    var roomMessages: Set<Note> = setOf()
+    var subject: String? = null
+    var subjectCreatedAt: Long? = null
+
+    @Synchronized
+    fun addMessageSync(msg: Note) {
+        checkNotInMainThread()
+
+        if (msg !in roomMessages) {
+            roomMessages = roomMessages + msg
+
+            val newSubject = msg.event?.subject()
+
+            if (newSubject != null && (msg.createdAt() ?: 0) > (subjectCreatedAt ?: 0)) {
+                subject = newSubject
+                subjectCreatedAt = msg.createdAt()
+            }
+        }
+    }
+
+    @Synchronized
+    fun removeMessageSync(msg: Note) {
+        checkNotInMainThread()
+
+        if (msg !in roomMessages) {
+            roomMessages = roomMessages + msg
+
+            roomMessages.filter { it.event?.subject() != null }.sortedBy { it.createdAt() }.lastOrNull()?.let {
+                subject = it.event?.subject()
+                subjectCreatedAt = it.createdAt()
+            }
+        }
+    }
+
+    fun senderIntersects(keySet: Set<HexKey>): Boolean {
+        return roomMessages.any { it.author?.pubkeyHex in keySet }
+    }
+
+    fun pruneMessagesToTheLatestOnly(): Set<Note> {
+        val sorted = roomMessages.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
+
+        val toKeep = if ((sorted.firstOrNull()?.createdAt() ?: 0) > TimeUtils.oneWeekAgo()) {
+            // Recent messages, keep last 100
+            sorted.take(100).toSet()
+        } else {
+            // Old messages, keep the last one.
+            sorted.take(1).toSet()
+        } + sorted.filter { it.liveSet?.isInUse() ?: false }
+
+        val toRemove = roomMessages.minus(toKeep)
+        roomMessages = toKeep
+        return toRemove
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/model/HexUtils.kt

@@ -1,52 +0,0 @@
-package com.vitorpamplona.amethyst.model
-
-import com.vitorpamplona.amethyst.service.KeyPair
-import com.vitorpamplona.amethyst.service.bechToBytes
-import com.vitorpamplona.amethyst.service.nip19.Nip19
-import com.vitorpamplona.amethyst.ui.note.toShortenHex
-import fr.acinq.secp256k1.Hex
-
-/** Makes the distinction between String and Hex **/
-typealias HexKey = String
-
-fun ByteArray.toHexKey(): HexKey {
-    return Hex.encode(this)
-}
-
-fun HexKey.hexToByteArray(): ByteArray {
-    return Hex.decode(this)
-}
-
-fun HexKey.toDisplayHexKey(): String {
-    return this.toShortenHex()
-}
-
-fun decodePublicKey(key: String): ByteArray {
-    val parsed = Nip19.uriToRoute(key)
-    val pubKeyParsed = parsed?.hex?.hexToByteArray()
-
-    return if (key.startsWith("nsec")) {
-        KeyPair(privKey = key.bechToBytes()).pubKey
-    } else if (pubKeyParsed != null) {
-        pubKeyParsed
-    } else {
-        Hex.decode(key)
-    }
-}
-
-fun decodePublicKeyAsHexOrNull(key: String): HexKey? {
-    return try {
-        val parsed = Nip19.uriToRoute(key)
-        val pubKeyParsed = parsed?.hex
-
-        if (key.startsWith("nsec")) {
-            KeyPair(privKey = key.bechToBytes()).pubKey.toHexKey()
-        } else if (pubKeyParsed != null) {
-            pubKeyParsed
-        } else {
-            Hex.decode(key).toHexKey()
-        }
-    } catch (e: Exception) {
-        null
-    }
-}

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

@@ -3,14 +3,20 @@ package com.vitorpamplona.amethyst.model
 import android.util.Log
 import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.Amethyst
-import com.vitorpamplona.amethyst.service.HexValidator
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.service.model.*
-import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.BundledInsert
-import fr.acinq.secp256k1.Hex
+import com.vitorpamplona.quartz.encoders.ATag
+import com.vitorpamplona.quartz.encoders.Hex
+import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.HexValidator
+import com.vitorpamplona.quartz.encoders.Nip19
+import com.vitorpamplona.quartz.encoders.decodePublicKeyAsHexOrNull
+import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.events.*
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentSetOf
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -47,6 +53,10 @@ object LocalCache {
         // checkNotInMainThread()
 
         return users[key] ?: run {
+            require(isValidHex(key = key)) {
+                "$key is not a valid hex"
+            }
+
             val newObject = User(key)
             users.putIfAbsent(key, newObject) ?: newObject
         }
@@ -92,6 +102,10 @@ object LocalCache {
         checkNotInMainThread()
 
         return notes.get(idHex) ?: run {
+            require(isValidHex(idHex)) {
+                "$idHex is not a valid hex"
+            }
+
             val newObject = Note(idHex)
             notes.putIfAbsent(idHex, newObject) ?: newObject
         }
@@ -200,26 +214,6 @@ object LocalCache {
         }
     }
 
-    fun consume(event: PeopleListEvent) {
-        val version = getOrCreateNote(event.id)
-        val note = getOrCreateAddressableNote(event.address())
-        val author = getOrCreateUser(event.pubKey)
-
-        if (version.event == null) {
-            version.loadEvent(event, author, emptyList())
-            version.moveAllReferencesTo(note)
-        }
-
-        // Already processed this event.
-        if (note.event?.id() == event.id()) return
-
-        if (event.createdAt > (note.createdAt() ?: 0)) {
-            note.loadEvent(event, author, emptyList())
-
-            refreshObservers(note)
-        }
-    }
-
     fun formattedDateTime(timestamp: Long): String {
         return Instant.ofEpochSecond(timestamp).atZone(ZoneId.systemDefault())
             .format(DateTimeFormatter.ofPattern("uuuu MMM d hh:mm a"))
@@ -325,25 +319,6 @@ object LocalCache {
         refreshObservers(note)
     }
 
-    private fun consume(event: CommunityDefinitionEvent, relay: Relay?) {
-        val version = getOrCreateNote(event.id)
-        val note = getOrCreateAddressableNote(event.address())
-        val author = getOrCreateUser(event.pubKey)
-
-        if (version.event == null) {
-            version.loadEvent(event, author, emptyList())
-            version.moveAllReferencesTo(note)
-        }
-
-        if (note.event?.id() == event.id()) return
-
-        if (event.createdAt > (note.createdAt() ?: 0)) {
-            note.loadEvent(event, author, emptyList())
-
-            refreshObservers(note)
-        }
-    }
-
     private fun consume(event: LiveActivitiesEvent, relay: Relay?) {
         val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
@@ -368,102 +343,16 @@ object LocalCache {
         }
     }
 
-    fun consume(event: EmojiPackSelectionEvent) {
-        val version = getOrCreateNote(event.id)
-        val note = getOrCreateAddressableNote(event.address())
-        val author = getOrCreateUser(event.pubKey)
-
-        if (version.event == null) {
-            version.loadEvent(event, author, emptyList())
-            version.moveAllReferencesTo(note)
-        }
-
-        if (note.event?.id() == event.id()) return
-
-        if (event.createdAt > (note.createdAt() ?: 0)) {
-            note.loadEvent(event, author, emptyList())
-
-            refreshObservers(note)
-        }
-    }
-
-    private fun consume(event: EmojiPackEvent) {
-        val version = getOrCreateNote(event.id)
-        val note = getOrCreateAddressableNote(event.address())
-        val author = getOrCreateUser(event.pubKey)
-
-        if (version.event == null) {
-            version.loadEvent(event, author, emptyList())
-            version.moveAllReferencesTo(note)
-        }
-
-        if (note.event?.id() == event.id()) return
-
-        if (event.createdAt > (note.createdAt() ?: 0)) {
-            note.loadEvent(event, author, emptyList())
-
-            refreshObservers(note)
-        }
-    }
-
-    private fun consume(event: ClassifiedsEvent) {
-        val version = getOrCreateNote(event.id)
-        val note = getOrCreateAddressableNote(event.address())
-        val author = getOrCreateUser(event.pubKey)
-
-        if (version.event == null) {
-            version.loadEvent(event, author, emptyList())
-            version.moveAllReferencesTo(note)
-        }
-
-        if (note.event?.id() == event.id()) return
-
-        if (event.createdAt > (note.createdAt() ?: 0)) {
-            note.loadEvent(event, author, emptyList())
-
-            refreshObservers(note)
-        }
-    }
-
-    private fun consume(event: PinListEvent) {
-        val version = getOrCreateNote(event.id)
-        val note = getOrCreateAddressableNote(event.address())
-        val author = getOrCreateUser(event.pubKey)
-
-        if (version.event == null) {
-            version.loadEvent(event, author, emptyList())
-            version.moveAllReferencesTo(note)
-        }
-
-        if (note.event?.id() == event.id()) return
-
-        if (event.createdAt > (note.createdAt() ?: 0)) {
-            note.loadEvent(event, author, emptyList())
-
-            refreshObservers(note)
-        }
-    }
-
-    private fun consume(event: RelaySetEvent) {
-        val version = getOrCreateNote(event.id)
-        val note = getOrCreateAddressableNote(event.address())
-        val author = getOrCreateUser(event.pubKey)
-
-        if (version.event == null) {
-            version.loadEvent(event, author, emptyList())
-            version.moveAllReferencesTo(note)
-        }
-
-        if (note.event?.id() == event.id()) return
-
-        if (event.createdAt > (note.createdAt() ?: 0)) {
-            note.loadEvent(event, author, emptyList())
-
-            refreshObservers(note)
-        }
-    }
-
-    private fun consume(event: AudioTrackEvent) {
+    fun consume(event: PeopleListEvent) { consumeBaseReplaceable(event) }
+    private fun consume(event: AdvertisedRelayListEvent) { consumeBaseReplaceable(event) }
+    private fun consume(event: CommunityDefinitionEvent, relay: Relay?) { consumeBaseReplaceable(event) }
+    fun consume(event: EmojiPackSelectionEvent) { consumeBaseReplaceable(event) }
+    private fun consume(event: EmojiPackEvent) { consumeBaseReplaceable(event) }
+    private fun consume(event: ClassifiedsEvent) { consumeBaseReplaceable(event) }
+    private fun consume(event: PinListEvent) { consumeBaseReplaceable(event) }
+    private fun consume(event: RelaySetEvent) { consumeBaseReplaceable(event) }
+    private fun consume(event: AudioTrackEvent) { consumeBaseReplaceable(event) }
+    fun consume(event: StatusEvent, relay: Relay?) {
         val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
@@ -479,30 +368,14 @@ object LocalCache {
         if (event.createdAt > (note.createdAt() ?: 0)) {
             note.loadEvent(event, author, emptyList())
 
-            refreshObservers(note)
-        }
-    }
-
-    fun consume(event: BadgeDefinitionEvent) {
-        val version = getOrCreateNote(event.id)
-        val note = getOrCreateAddressableNote(event.address())
-        val author = getOrCreateUser(event.pubKey)
-
-        if (version.event == null) {
-            version.loadEvent(event, author, emptyList())
-            version.moveAllReferencesTo(note)
-        }
-
-        // Already processed this event.
-        if (note.event?.id() == event.id()) return
-
-        if (event.createdAt > (note.createdAt() ?: 0)) {
-            note.loadEvent(event, author, emptyList<Note>())
+            author.liveSet?.innerStatuses?.invalidateData()
 
             refreshObservers(note)
         }
     }
 
+    fun consume(event: BadgeDefinitionEvent) { consumeBaseReplaceable(event) }
+
     fun consume(event: BadgeProfilesEvent) {
         val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
@@ -517,7 +390,7 @@ object LocalCache {
         if (note.event?.id() == event.id()) return
 
         val replyTo = event.badgeAwardEvents().mapNotNull { checkGetOrCreateNote(it) } +
-            event.badgeAwardDefinitions().mapNotNull { getOrCreateAddressableNote(it) }
+            event.badgeAwardDefinitions().map { getOrCreateAddressableNote(it) }
 
         if (event.createdAt > (note.createdAt() ?: 0)) {
             note.loadEvent(event, author, replyTo)
@@ -547,7 +420,14 @@ object LocalCache {
         refreshObservers(note)
     }
 
-    private fun comsume(event: NNSEvent) {
+    private fun comsume(event: NNSEvent) { consumeBaseReplaceable(event) }
+    fun consume(event: AppDefinitionEvent) { consumeBaseReplaceable(event) }
+    private fun consume(event: CalendarEvent) { consumeBaseReplaceable(event) }
+    private fun consume(event: CalendarDateSlotEvent) { consumeBaseReplaceable(event) }
+    private fun consume(event: CalendarTimeSlotEvent) { consumeBaseReplaceable(event) }
+    private fun consume(event: CalendarRSVPEvent) { consumeBaseReplaceable(event) }
+
+    private fun consumeBaseReplaceable(event: BaseAddressableEvent) {
         val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
@@ -567,45 +447,7 @@ object LocalCache {
         }
     }
 
-    fun consume(event: AppDefinitionEvent) {
-        val version = getOrCreateNote(event.id)
-        val note = getOrCreateAddressableNote(event.address())
-        val author = getOrCreateUser(event.pubKey)
-
-        if (version.event == null) {
-            version.loadEvent(event, author, emptyList())
-            version.moveAllReferencesTo(note)
-        }
-
-        // Already processed this event.
-        if (note.event?.id() == event.id()) return
-
-        if (event.createdAt > (note.createdAt() ?: 0)) {
-            note.loadEvent(event, author, emptyList())
-
-            refreshObservers(note)
-        }
-    }
-
-    fun consume(event: AppRecommendationEvent) {
-        val version = getOrCreateNote(event.id)
-        val note = getOrCreateAddressableNote(event.address())
-        val author = getOrCreateUser(event.pubKey)
-
-        if (version.event == null) {
-            version.loadEvent(event, author, emptyList())
-            version.moveAllReferencesTo(note)
-        }
-
-        // Already processed this event.
-        if (note.event?.id() == event.id()) return
-
-        if (event.createdAt > (note.createdAt() ?: 0)) {
-            note.loadEvent(event, author, emptyList())
-
-            refreshObservers(note)
-        }
-    }
+    fun consume(event: AppRecommendationEvent) { consumeBaseReplaceable(event) }
 
     @Suppress("UNUSED_PARAMETER")
     fun consume(event: RecommendRelayEvent) {
@@ -705,7 +547,7 @@ object LocalCache {
 
         val author = getOrCreateUser(event.pubKey)
         val repliesTo = event.boostedPost().mapNotNull { checkGetOrCreateNote(it) } +
-            event.taggedAddresses().mapNotNull { getOrCreateAddressableNote(it) }
+            event.taggedAddresses().map { getOrCreateAddressableNote(it) }
 
         note.loadEvent(event, author, repliesTo)
 
@@ -727,7 +569,7 @@ object LocalCache {
 
         val author = getOrCreateUser(event.pubKey)
         val repliesTo = event.boostedPost().mapNotNull { checkGetOrCreateNote(it) } +
-            event.taggedAddresses().mapNotNull { getOrCreateAddressableNote(it) }
+            event.taggedAddresses().map { getOrCreateAddressableNote(it) }
 
         note.loadEvent(event, author, repliesTo)
 
@@ -816,7 +658,7 @@ object LocalCache {
 
             mentions.forEach {
                 // doesn't add to reports, but triggers recounts
-                it.liveSet?.reports?.invalidateData()
+                it.liveSet?.innerReports?.invalidateData()
             }
         }
 
@@ -973,23 +815,23 @@ object LocalCache {
         // Already processed this event.
         if (note.event != null) return
 
-        val zapRequest = event.zapRequest?.id?.let { getOrCreateNote(it) }
+        val zapRequest = event.zapRequest?.id?.let { getNoteIfExists(it) }
+
+        if (zapRequest == null || zapRequest.event !is LnZapRequestEvent) {
+            Log.e("ZP", "Zap Request not found. Unable to process Zap {${event.toJson()}}")
+            return
+        }
 
         val author = getOrCreateUser(event.pubKey)
         val mentions = event.zappedAuthor().mapNotNull { checkGetOrCreateUser(it) }
         val repliesTo = event.zappedPost().mapNotNull { checkGetOrCreateNote(it) } +
             event.taggedAddresses().map { getOrCreateAddressableNote(it) } +
             (
-                (zapRequest?.event as? LnZapRequestEvent)?.taggedAddresses()?.map { getOrCreateAddressableNote(it) } ?: emptySet<Note>()
+                (zapRequest.event as? LnZapRequestEvent)?.taggedAddresses()?.map { getOrCreateAddressableNote(it) } ?: emptySet<Note>()
                 )
 
         note.loadEvent(event, author, repliesTo)
 
-        if (zapRequest == null) {
-            Log.e("ZP", "Zap Request not found. Unable to process Zap {${event.toJson()}}")
-            return
-        }
-
         // Log.d("ZP", "New ZapEvent ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
 
         repliesTo.forEach {
@@ -1027,6 +869,23 @@ object LocalCache {
         refreshObservers(note)
     }
 
+    fun consume(event: AudioHeaderEvent, relay: Relay?) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        refreshObservers(note)
+    }
+
     fun consume(event: FileHeaderEvent, relay: Relay?) {
         val note = getOrCreateNote(event.id)
         val author = getOrCreateUser(event.pubKey)
@@ -1260,7 +1119,7 @@ object LocalCache {
         }
 
         return notes.values.filter {
-            (it.event !is GenericRepostEvent && it.event !is RepostEvent && it.event !is CommunityPostApprovalEvent && it.event !is ReactionEvent) &&
+            (it.event !is GenericRepostEvent && it.event !is RepostEvent && it.event !is CommunityPostApprovalEvent && it.event !is ReactionEvent && it.event !is GiftWrapEvent && it.event !is LnZapEvent && it.event !is LnZapRequestEvent) &&
                 (
                     it.event?.content()?.contains(text, true) ?: false ||
                         it.event?.matchTag1With(text) ?: false ||
@@ -1268,7 +1127,7 @@ object LocalCache {
                         it.idNote().startsWith(text, true)
                     )
         } + addressables.values.filter {
-            (it.event !is GenericRepostEvent && it.event !is RepostEvent && it.event !is CommunityPostApprovalEvent && it.event !is ReactionEvent) &&
+            (it.event !is GenericRepostEvent && it.event !is RepostEvent && it.event !is CommunityPostApprovalEvent && it.event !is ReactionEvent && it.event !is GiftWrapEvent && it.event !is LnZapEvent && it.event !is LnZapRequestEvent) &&
                 (
                     it.event?.content()?.contains(text, true) ?: false ||
                         it.event?.matchTag1With(text) ?: false ||
@@ -1297,6 +1156,18 @@ object LocalCache {
         }
     }
 
+    suspend fun findStatusesForUser(user: User): ImmutableList<AddressableNote> {
+        checkNotInMainThread()
+
+        return addressables.filter {
+            val noteEvent = it.value.event
+            (noteEvent is StatusEvent && noteEvent.pubKey == user.pubkeyHex && !noteEvent.isExpired() && noteEvent.content.isNotBlank())
+        }.values
+            .sortedWith(compareBy({ it.event?.expiration() ?: it.event?.createdAt() }, { it.idHex }))
+            .reversed()
+            .toImmutableList()
+    }
+
     fun cleanObservers() {
         notes.forEach {
             it.value.clearLive()
@@ -1320,13 +1191,7 @@ object LocalCache {
             val childrenToBeRemoved = mutableListOf<Note>()
 
             toBeRemoved.forEach {
-                notes.remove(it.idHex)
-                // Doesn't need to clean up the replies and mentions.. Too small to matter.
-
-                // Counts the replies
-                it.replyTo?.forEach { _ ->
-                    it.removeReply(it)
-                }
+                removeFromCache(it)
 
                 childrenToBeRemoved.addAll(it.removeAllChildNotes())
             }
@@ -1345,12 +1210,7 @@ object LocalCache {
                 val childrenToBeRemoved = mutableListOf<Note>()
 
                 toBeRemoved.forEach {
-                    notes.remove(it.idHex)
-
-                    // Counts the replies
-                    it.replyTo?.forEach { _ ->
-                        it.removeReply(it)
-                    }
+                    removeFromCache(it)
 
                     childrenToBeRemoved.addAll(it.removeAllChildNotes())
                 }
@@ -1364,9 +1224,37 @@ object LocalCache {
         }
     }
 
-    fun pruneRepliesAndReactions(account: Account) {
+    fun prunePastVersionsOfReplaceables() {
+        val toBeRemoved = notes.filter {
+            val noteEvent = it.value.event
+            if (noteEvent is AddressableEvent) {
+                noteEvent.createdAt() < (addressables[noteEvent.address().toTag()]?.event?.createdAt() ?: 0)
+            } else {
+                false
+            }
+        }.values
+
+        val childrenToBeRemoved = mutableListOf<Note>()
+
+        toBeRemoved.forEach {
+            val newerVersion = addressables[(it.event as? AddressableEvent)?.address()?.toTag()]
+            if (newerVersion != null) {
+                it.moveAllReferencesTo(newerVersion)
+            }
+
+            removeFromCache(it)
+            childrenToBeRemoved.addAll(it.removeAllChildNotes())
+        }
+
+        removeChildrenOf(childrenToBeRemoved)
+
+        if (toBeRemoved.size > 1) {
+            println("PRUNE: ${toBeRemoved.size} old version of addressables removed.")
+        }
+    }
+
+    fun pruneRepliesAndReactions(accounts: Set<HexKey>) {
         checkNotInMainThread()
-        val user = account.userProfile()
 
         val toBeRemoved = notes.filter {
             (
@@ -1374,27 +1262,113 @@ object LocalCache {
                     it.value.event is ReactionEvent || it.value.event is LnZapEvent || it.value.event is LnZapRequestEvent ||
                     it.value.event is ReportEvent || it.value.event is GenericRepostEvent
                 ) &&
+                it.value.replyTo?.any { it.liveSet?.isInUse() == true } != true &&
                 it.value.liveSet?.isInUse() != true && // don't delete if observing.
-                it.value.author != user && // don't delete if it is the logged in account
-                it.value.event?.isTaggedUser(user.pubkeyHex) != true // don't delete if it's a notification to the logged in user
+                it.value.author?.pubkeyHex !in accounts && // don't delete if it is the logged in account
+                it.value.event?.isTaggedUsers(accounts) != true // don't delete if it's a notification to the logged in user
         }.values
 
         val childrenToBeRemoved = mutableListOf<Note>()
 
         toBeRemoved.forEach {
-            notes.remove(it.idHex)
-
-            it.replyTo?.forEach { masterNote ->
-                masterNote.removeReply(it)
-                masterNote.removeBoost(it)
-                masterNote.removeReaction(it)
-                masterNote.removeZap(it)
-                masterNote.clearEOSE() // allows reloading of these events
-            }
-
+            removeFromCache(it)
             childrenToBeRemoved.addAll(it.removeAllChildNotes())
         }
 
+        removeChildrenOf(childrenToBeRemoved)
+
+        toBeRemoved.forEach {
+            it.replyTo?.forEach { masterNote ->
+                masterNote.clearEOSE() // allows reloading of these events
+            }
+        }
+
+        if (toBeRemoved.size > 1) {
+            println("PRUNE: ${toBeRemoved.size} thread replies removed.")
+        }
+    }
+
+    private fun removeFromCache(note: Note) {
+        note.replyTo?.forEach { masterNote ->
+            masterNote.removeReply(note)
+            masterNote.removeBoost(note)
+            masterNote.removeReaction(note)
+            masterNote.removeZap(note)
+            masterNote.removeReport(note)
+            masterNote.clearEOSE() // allows reloading of these events if needed
+        }
+
+        if (note.event is LnZapEvent) {
+            (note.event as LnZapEvent).zappedAuthor().mapNotNull {
+                val author = getUserIfExists(it)
+                author?.removeZap(note)
+                author?.clearEOSE()
+            }
+        }
+        if (note.event is LnZapRequestEvent) {
+            (note.event as LnZapRequestEvent).zappedAuthor().mapNotNull {
+                val author = getUserIfExists(it)
+                author?.removeZap(note)
+                author?.clearEOSE()
+            }
+        }
+        if (note.event is ReportEvent) {
+            (note.event as ReportEvent).reportedAuthor().mapNotNull {
+                val author = getUserIfExists(it.key)
+                author?.removeReport(note)
+                author?.clearEOSE()
+            }
+        }
+
+        notes.remove(note.idHex)
+    }
+
+    fun removeAuthorLinkTo(note: Note) {
+        if (note.event is LnZapEvent) {
+            (note.event as LnZapEvent).zappedAuthor().mapNotNull {
+                val author = getUserIfExists(it)
+                author?.removeZap(note)
+                author?.clearEOSE()
+            }
+        }
+        if (note.event is LnZapRequestEvent) {
+            (note.event as LnZapRequestEvent).zappedAuthor().mapNotNull {
+                val author = getUserIfExists(it)
+                author?.removeZap(note)
+                author?.clearEOSE()
+            }
+        }
+        if (note.event is ReportEvent) {
+            (note.event as ReportEvent).reportedAuthor().mapNotNull {
+                val author = getUserIfExists(it.key)
+                author?.removeReport(note)
+                author?.clearEOSE()
+            }
+        }
+    }
+
+    fun removeChildrenOf(nextToBeRemoved: List<Note>) {
+        nextToBeRemoved.forEach { note ->
+            removeFromCache(note)
+        }
+    }
+
+    fun pruneExpiredEvents() {
+        checkNotInMainThread()
+
+        val toBeRemoved = notes.filter {
+            it.value.event?.isExpired() == true
+        }.values
+
+        val childrenToBeRemoved = mutableListOf<Note>()
+
+        toBeRemoved.forEach {
+            removeFromCache(it)
+            childrenToBeRemoved.addAll(it.removeAllChildNotes())
+        }
+
+        removeChildrenOf(childrenToBeRemoved)
+
         if (toBeRemoved.size > 1) {
             println("PRUNE: ${toBeRemoved.size} thread replies removed.")
         }
@@ -1416,17 +1390,7 @@ object LocalCache {
         }.flatten()
 
         toBeRemoved.forEach {
-            // Counts the replies
-            it.replyTo?.forEach { masterNote ->
-                masterNote.removeReply(it)
-                masterNote.removeBoost(it)
-                masterNote.removeReaction(it)
-                masterNote.removeZap(it)
-                masterNote.removeReport(it)
-            }
-
-            notes.remove(it.idHex)
-
+            removeFromCache(it)
             childrenToBeRemoved.addAll(it.removeAllChildNotes())
         }
 
@@ -1435,27 +1399,15 @@ object LocalCache {
         println("PRUNE: ${toBeRemoved.size} messages removed because they were Hidden")
     }
 
-    fun removeChildrenOf(nextToBeRemoved: List<Note>) {
-        nextToBeRemoved.forEach { note ->
-            if (note.event is LnZapEvent) {
-                (note.event as LnZapEvent).zappedAuthor().mapNotNull { getUserIfExists(it)?.removeZap(note) }
-            }
-            if (note.event is LnZapRequestEvent) {
-                (note.event as LnZapRequestEvent).zappedAuthor().mapNotNull { getUserIfExists(it)?.removeZap(note) }
-            }
-            if (note.event is ReportEvent) {
-                (note.event as ReportEvent).reportedAuthor().mapNotNull { getUserIfExists(it.key)?.removeZap(note) }
-            }
-            notes.remove(note.idHex)
-        }
-    }
-
-    fun pruneContactLists(userAccount: Account) {
+    fun pruneContactLists(loggedIn: Set<HexKey>) {
         checkNotInMainThread()
 
         var removingContactList = 0
         users.values.forEach {
-            if (it != userAccount.userProfile() && (it.liveSet == null || it.liveSet?.isInUse() == false) && it.latestContactList != null) {
+            if (it.pubkeyHex !in loggedIn &&
+                (it.liveSet == null || it.liveSet?.isInUse() == false) &&
+                it.latestContactList != null
+            ) {
                 it.latestContactList = null
                 removingContactList++
             }
@@ -1497,13 +1449,19 @@ object LocalCache {
 
         try {
             when (event) {
+                is AdvertisedRelayListEvent -> consume(event)
                 is AppDefinitionEvent -> consume(event)
                 is AppRecommendationEvent -> consume(event)
+                is AudioHeaderEvent -> consume(event, relay)
                 is AudioTrackEvent -> consume(event)
                 is BadgeAwardEvent -> consume(event)
                 is BadgeDefinitionEvent -> consume(event)
                 is BadgeProfilesEvent -> consume(event)
                 is BookmarkListEvent -> consume(event)
+                is CalendarEvent -> consume(event)
+                is CalendarDateSlotEvent -> consume(event)
+                is CalendarTimeSlotEvent -> consume(event)
+                is CalendarRSVPEvent -> consume(event)
                 is ChannelCreateEvent -> consume(event)
                 is ChannelHideMessageEvent -> consume(event)
                 is ChannelMessageEvent -> consume(event, relay)
@@ -1533,9 +1491,10 @@ object LocalCache {
                 is LiveActivitiesChatMessageEvent -> consume(event, relay)
                 is LnZapEvent -> {
                     event.zapRequest?.let {
+                        // must have a valid request
                         verifyAndConsume(it, relay)
+                        consume(event)
                     }
-                    consume(event)
                 }
                 is LnZapRequestEvent -> consume(event)
                 is LnZapPaymentRequestEvent -> consume(event)
@@ -1546,6 +1505,7 @@ object LocalCache {
                 is PrivateDmEvent -> consume(event, relay)
                 is PinListEvent -> consume(event)
                 is PeopleListEvent -> consume(event)
+                is PollNoteEvent -> consume(event, relay)
                 is ReactionEvent -> consume(event)
                 is RecommendRelayEvent -> consume(event)
                 is RelaySetEvent -> consume(event)
@@ -1562,8 +1522,9 @@ object LocalCache {
                     }
                     consume(event)
                 }
+                is StatusEvent -> consume(event, relay)
                 is TextNoteEvent -> consume(event, relay)
-                is PollNoteEvent -> consume(event, relay)
+
                 else -> {
                     Log.w("Event Not Supported", event.toJson())
                 }

app/src/main/java/com/vitorpamplona/amethyst/model/Nip47URI.kt

@@ -1,3 +1,5 @@
 package com.vitorpamplona.amethyst.model
 
+import com.vitorpamplona.quartz.encoders.HexKey
+
 data class Nip47URI(val pubKeyHex: HexKey, val relayUri: String?, val secret: HexKey?)

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

@@ -3,28 +3,31 @@ package com.vitorpamplona.amethyst.model
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+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.lnurl.LnInvoiceUtil
-import com.vitorpamplona.amethyst.service.model.*
-import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.Relay
-import com.vitorpamplona.amethyst.service.toNote
-import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.actions.updated
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
+import com.vitorpamplona.amethyst.ui.note.combineWith
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
-import fr.acinq.secp256k1.Hex
+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.Nip19
+import com.vitorpamplona.quartz.encoders.toNote
+import com.vitorpamplona.quartz.events.*
+import com.vitorpamplona.quartz.utils.TimeUtils
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import java.math.BigDecimal
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
-import java.util.regex.Pattern
-
-val tagSearch = Pattern.compile("(?:\\s|\\A)\\#\\[([0-9]+)\\]")
 
 @Stable
 class AddressableNote(val address: ATag) : Note(address.toTag()) {
@@ -73,7 +76,22 @@ open class Note(val idHex: String) {
     open fun idNote() = id().toNote()
 
     open fun toNEvent(): String {
-        return Nip19.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relays.firstOrNull())
+        val myEvent = event
+        return if (myEvent is WrappedEvent) {
+            val host = myEvent.host
+            if (host != null) {
+                Nip19.createNEvent(
+                    host.id,
+                    host.pubKey,
+                    host.kind(),
+                    relays.firstOrNull()
+                )
+            } else {
+                Nip19.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relays.firstOrNull())
+            }
+        } else {
+            Nip19.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relays.firstOrNull())
+        }
     }
 
     fun toNostrUri(): String {
@@ -109,7 +127,7 @@ open class Note(val idHex: String) {
             this.author = author
             this.replyTo = replyTo
 
-            liveSet?.metadata?.invalidateData()
+            liveSet?.innerMetadata?.invalidateData()
         }
     }
 
@@ -118,20 +136,63 @@ open class Note(val idHex: String) {
             .format(DateTimeFormatter.ofPattern("uuuu-MM-dd-HH:mm:ss"))
     }
 
+    data class LevelSignature(val signature: String, val createdAt: Long?, val author: User?)
+
     /**
      * This method caches signatures during each execution to avoid recalculation in longer threads
      */
-    fun replyLevelSignature(cachedSignatures: MutableMap<Note, String> = mutableMapOf()): String {
+    fun replyLevelSignature(
+        eventsToConsider: Set<HexKey>,
+        cachedSignatures: MutableMap<Note, LevelSignature>,
+        account: User,
+        accountFollowingSet: Set<String>,
+        now: Long
+    ): LevelSignature {
         val replyTo = replyTo
         if (event is RepostEvent || event is GenericRepostEvent || replyTo == null || replyTo.isEmpty()) {
-            return "/" + formattedDateTime(createdAt() ?: 0) + ";"
+            return LevelSignature(
+                signature = "/" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) + ";",
+                createdAt = createdAt(),
+                author = author
+            )
         }
 
-        return replyTo
-            .map {
-                cachedSignatures[it] ?: it.replyLevelSignature(cachedSignatures).apply { cachedSignatures.put(it, this) }
-            }
-            .maxBy { it.length }.removeSuffix(";") + "/" + formattedDateTime(createdAt() ?: 0) + ";"
+        val parent = (
+            replyTo
+                .filter { it.idHex in eventsToConsider } // This forces the signature to be based on a branch, avoiding two roots
+                .map {
+                    cachedSignatures[it] ?: it.replyLevelSignature(
+                        eventsToConsider,
+                        cachedSignatures,
+                        account,
+                        accountFollowingSet,
+                        now
+                    ).apply { cachedSignatures.put(it, this) }
+                }
+                .maxByOrNull { it.signature.length }
+            )
+
+        val parentSignature = parent?.signature?.removeSuffix(";") ?: ""
+
+        val threadOrder = if (parent?.author == author && createdAt() != null) {
+            // author of the thread first, in **ascending** order
+            "9" + formattedDateTime((parent?.createdAt ?: 0) + (now - (createdAt() ?: 0))) + idHex.substring(0, 8)
+        } else if (author?.pubkeyHex == account.pubkeyHex) {
+            "8" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) // my replies
+        } else if (author?.pubkeyHex in accountFollowingSet) {
+            "7" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) // my follows replies.
+        } else {
+            "0" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) // everyone else.
+        }
+
+        val mySignature = LevelSignature(
+            signature = parentSignature + "/" + threadOrder + ";",
+            createdAt = createdAt(),
+            author = author
+        )
+
+        cachedSignatures[this] = mySignature
+        return mySignature
     }
 
     fun replyLevel(cachedLevels: MutableMap<Note, Int> = mutableMapOf()): Int {
@@ -148,21 +209,21 @@ open class Note(val idHex: String) {
     fun addReply(note: Note) {
         if (note !in replies) {
             replies = replies + note
-            liveSet?.replies?.invalidateData()
+            liveSet?.innerReplies?.invalidateData()
         }
     }
 
     fun removeReply(note: Note) {
         if (note in replies) {
             replies = replies - note
-            liveSet?.replies?.invalidateData()
+            liveSet?.innerReplies?.invalidateData()
         }
     }
 
     fun removeBoost(note: Note) {
         if (note in boosts) {
             boosts = boosts - note
-            liveSet?.boosts?.invalidateData()
+            liveSet?.innerBoosts?.invalidateData()
         }
     }
 
@@ -185,11 +246,11 @@ open class Note(val idHex: String) {
         relays = listOf<String>()
         lastReactionsDownloadTime = emptyMap()
 
-        liveSet?.replies?.invalidateData()
-        liveSet?.reactions?.invalidateData()
-        liveSet?.boosts?.invalidateData()
-        liveSet?.reports?.invalidateData()
-        liveSet?.zaps?.invalidateData()
+        liveSet?.innerReplies?.invalidateData()
+        liveSet?.innerReactions?.invalidateData()
+        liveSet?.innerBoosts?.invalidateData()
+        liveSet?.innerReports?.invalidateData()
+        liveSet?.innerZaps?.invalidateData()
 
         return toBeRemoved
     }
@@ -208,7 +269,7 @@ open class Note(val idHex: String) {
                         reactions = reactions + Pair(reaction, newList)
                     }
 
-                    liveSet?.reactions?.invalidateData()
+                    liveSet?.innerReactions?.invalidateData()
                 }
             }
         }
@@ -220,7 +281,7 @@ open class Note(val idHex: String) {
         if (author in reports.keys && reports[author]?.contains(deleteNote) == true) {
             reports[author]?.let {
                 reports = reports + Pair(author, it.minus(deleteNote))
-                liveSet?.reports?.invalidateData()
+                liveSet?.innerReports?.invalidateData()
             }
         }
     }
@@ -228,29 +289,28 @@ open class Note(val idHex: String) {
     fun removeZap(note: Note) {
         if (zaps[note] != null) {
             zaps = zaps.minus(note)
-            liveSet?.zaps?.invalidateData()
+            liveSet?.innerZaps?.invalidateData()
         } else if (zaps.containsValue(note)) {
-            val toRemove = zaps.filterValues { it == note }
-            zaps = zaps.minus(toRemove.keys)
-            liveSet?.zaps?.invalidateData()
+            zaps = zaps.filterValues { it != note }
+            liveSet?.innerZaps?.invalidateData()
         }
     }
 
     fun removeZapPayment(note: Note) {
         if (zapPayments[note] != null) {
             zapPayments = zapPayments.minus(note)
-            liveSet?.zaps?.invalidateData()
+            liveSet?.innerZaps?.invalidateData()
         } else if (zapPayments.containsValue(note)) {
             val toRemove = zapPayments.filterValues { it == note }
             zapPayments = zapPayments.minus(toRemove.keys)
-            liveSet?.zaps?.invalidateData()
+            liveSet?.innerZaps?.invalidateData()
         }
     }
 
     fun addBoost(note: Note) {
         if (note !in boosts) {
             boosts = boosts + note
-            liveSet?.boosts?.invalidateData()
+            liveSet?.innerBoosts?.invalidateData()
         }
     }
 
@@ -272,12 +332,12 @@ open class Note(val idHex: String) {
         if (zapRequest !in zaps.keys) {
             val inserted = innerAddZap(zapRequest, zap)
             if (inserted) {
-                liveSet?.zaps?.invalidateData()
+                liveSet?.innerZaps?.invalidateData()
             }
         } else if (zaps[zapRequest] == null) {
             val inserted = innerAddZap(zapRequest, zap)
             if (inserted) {
-                liveSet?.zaps?.invalidateData()
+                liveSet?.innerZaps?.invalidateData()
             }
         }
     }
@@ -300,12 +360,12 @@ open class Note(val idHex: String) {
         if (zapPaymentRequest !in zapPayments.keys) {
             val inserted = innerAddZapPayment(zapPaymentRequest, zapPayment)
             if (inserted) {
-                liveSet?.zaps?.invalidateData()
+                liveSet?.innerZaps?.invalidateData()
             }
         } else if (zapPayments[zapPaymentRequest] == null) {
             val inserted = innerAddZapPayment(zapPaymentRequest, zapPayment)
             if (inserted) {
-                liveSet?.zaps?.invalidateData()
+                liveSet?.innerZaps?.invalidateData()
             }
         }
     }
@@ -316,10 +376,10 @@ open class Note(val idHex: String) {
 
         if (reaction !in reactions.keys) {
             reactions = reactions + Pair(reaction, listOf(note))
-            liveSet?.reactions?.invalidateData()
+            liveSet?.innerReactions?.invalidateData()
         } else if (reactions[reaction]?.contains(note) == false) {
             reactions = reactions + Pair(reaction, (reactions[reaction] ?: emptySet()) + note)
-            liveSet?.reactions?.invalidateData()
+            liveSet?.innerReactions?.invalidateData()
         }
     }
 
@@ -328,17 +388,17 @@ open class Note(val idHex: String) {
 
         if (author !in reports.keys) {
             reports = reports + Pair(author, listOf(note))
-            liveSet?.reports?.invalidateData()
+            liveSet?.innerReports?.invalidateData()
         } else if (reports[author]?.contains(note) == false) {
             reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
-            liveSet?.reports?.invalidateData()
+            liveSet?.innerReports?.invalidateData()
         }
     }
 
     fun addRelay(relay: Relay) {
         if (relay.url !in relays) {
             relays = relays + relay.url
-            liveSet?.relays?.invalidateData()
+            liveSet?.innerRelays?.invalidateData()
         }
     }
 
@@ -438,10 +498,6 @@ open class Note(val idHex: String) {
         }.flatten()
     }
 
-    fun countReactions(): Int {
-        return reactions.values.sumOf { it.size }
-    }
-
     fun zappedAmount(privKey: ByteArray?, walletServicePubkey: ByteArray?): BigDecimal {
         // Regular Zap Receipts
         val completedZaps = zaps.asSequence()
@@ -607,6 +663,7 @@ open class Note(val idHex: String) {
 
     fun clearLive() {
         if (liveSet != null && liveSet?.isInUse() == false) {
+            liveSet?.destroy()
             liveSet = null
         }
     }
@@ -628,16 +685,60 @@ open class Note(val idHex: String) {
     }
 }
 
+@Stable
 class NoteLiveSet(u: Note) {
     // Observers line up here.
-    val metadata: NoteLiveData = NoteLiveData(u)
+    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 reactions: NoteLiveData = NoteLiveData(u)
-    val boosts: NoteLiveData = NoteLiveData(u)
-    val replies: NoteLiveData = NoteLiveData(u)
-    val reports: NoteLiveData = NoteLiveData(u)
-    val relays: NoteLiveData = NoteLiveData(u)
-    val zaps: NoteLiveData = NoteLiveData(u)
+    val metadata = innerMetadata.map { it }
+    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 authorChanges = innerMetadata.map {
+        it.note.author
+    }
+
+    val hasEvent = innerMetadata.map {
+        it.note.event != null
+    }.distinctUntilChanged()
+
+    val hasReactions = innerZaps.combineWith(innerBoosts, innerReactions) { zapState, boostState, reactionState ->
+        zapState?.note?.zaps?.isNotEmpty() ?: false ||
+            boostState?.note?.boosts?.isNotEmpty() ?: false ||
+            reactionState?.note?.reactions?.isNotEmpty() ?: false
+    }.distinctUntilChanged()
+
+    val replyCount = innerReplies.map {
+        it.note.replies.size
+    }.distinctUntilChanged()
+
+    val reactionCount = innerReactions.map {
+        it.note.reactions.values.sumOf { it.size }
+    }.distinctUntilChanged()
+
+    val boostCount = innerBoosts.map {
+        it.note.boosts.size
+    }.distinctUntilChanged()
+
+    val boostList = innerBoosts.map {
+        it.note.boosts.toImmutableList()
+    }.distinctUntilChanged()
+
+    val relayInfo = innerRelays.map {
+        it.note.relays.map {
+            RelayBriefInfo(it)
+        }.toImmutableList()
+    }
 
     fun isInUse(): Boolean {
         return metadata.hasObservers() ||
@@ -646,28 +747,56 @@ class NoteLiveSet(u: Note) {
             replies.hasObservers() ||
             reports.hasObservers() ||
             relays.hasObservers() ||
-            zaps.hasObservers()
+            zaps.hasObservers() ||
+            authorChanges.hasObservers() ||
+            hasEvent.hasObservers() ||
+            hasReactions.hasObservers() ||
+            replyCount.hasObservers() ||
+            reactionCount.hasObservers() ||
+            boostCount.hasObservers() ||
+            boostList.hasObservers()
+    }
+
+    fun destroy() {
+        innerMetadata.destroy()
+        innerReactions.destroy()
+        innerBoosts.destroy()
+        innerReplies.destroy()
+        innerReports.destroy()
+        innerRelays.destroy()
+        innerZaps.destroy()
     }
 }
 
-class NoteLiveData(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)
 
-    fun invalidateData() {
-        if (!hasObservers()) return
+    fun destroy() {
+        bundler.cancel()
+    }
 
+    fun invalidateData() {
         checkNotInMainThread()
 
         bundler.invalidate() {
             checkNotInMainThread()
 
-            if (hasActiveObservers()) {
-                postValue(NoteState(note))
-            }
+            postValue(NoteState(note))
         }
     }
 
+    fun <Y> map(
+        transform: (NoteState) -> Y
+    ): NoteLoadingLiveData<Y> {
+        val initialValue = this.value?.let { transform(it) }
+        val result = NoteLoadingLiveData(note, initialValue)
+        result.addSource(this) { x -> result.value = transform(x) }
+        return result
+    }
+}
+
+class NoteLoadingLiveData<Y>(val note: Note, initialValue: Y?) : MediatorLiveData<Y>(initialValue) {
     override fun onActive() {
         super.onActive()
         if (note is AddressableNote) {
@@ -689,3 +818,10 @@ class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
 
 @Immutable
 class NoteState(val note: Note)
+
+@Immutable
+data class RelayBriefInfo(
+    val url: String,
+    val displayUrl: String = url.trim().removePrefix("wss://").removePrefix("ws://").removeSuffix("/").intern(),
+    val favIcon: String = "https://$displayUrl/favicon.ico".intern()
+)

app/src/main/java/com/vitorpamplona/amethyst/model/ParticipantListBuilder.kt

@@ -1,5 +1,7 @@
 package com.vitorpamplona.amethyst.model
 
+import com.vitorpamplona.quartz.encoders.HexKey
+
 class ParticipantListBuilder {
     private fun addFollowsThatDirectlyParticipateOnToSet(baseNote: Note, followingSet: Set<HexKey>?, set: MutableSet<User>) {
         baseNote.author?.let { author ->

app/src/main/java/com/vitorpamplona/amethyst/model/RelayInformation.kt

@@ -1,17 +1,12 @@
 package com.vitorpamplona.amethyst.model
 
 import androidx.compose.runtime.Stable
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import com.google.gson.JsonArray
-import com.google.gson.JsonElement
-import com.google.gson.JsonObject
-import com.google.gson.JsonSerializationContext
-import com.google.gson.JsonSerializer
-import java.lang.reflect.Type
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 
 @Stable
 class RelayInformation(
+    val id: String?,
     val name: String?,
     val description: String?,
     val pubkey: String?,
@@ -29,15 +24,9 @@ class RelayInformation(
     val fees: RelayInformationFees?
 ) {
     companion object {
-        val gson: Gson = GsonBuilder()
-            .disableHtmlEscaping()
-            .registerTypeAdapter(RelayInformation::class.java, RelayInformationSerializer())
-            .registerTypeAdapter(RelayInformationLimitation::class.java, RelayInformationLimitationSerializer())
-            .registerTypeAdapter(RelayInformationFees::class.java, RelayInformationFeesSerializer())
-            .registerTypeAdapter(RelayInformationFee::class.java, RelayInformationFeeSerializer())
-            .create()
+        val mapper = jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
 
-        fun fromJson(json: String): RelayInformation = gson.fromJson(json, RelayInformation::class.java)
+        fun fromJson(json: String): RelayInformation = mapper.readValue(json, RelayInformation::class.java)
     }
 }
 
@@ -47,96 +36,14 @@ class RelayInformationFee(
     val unit: String?,
     val period: Int?,
     val kinds: List<Int>?
-) {
-    companion object {
-        val gson: Gson = GsonBuilder()
-            .disableHtmlEscaping()
-            .registerTypeAdapter(RelayInformationFee::class.java, RelayInformationFeeSerializer())
-            .create()
-
-        fun fromJson(json: String): RelayInformationFee = gson.fromJson(json, RelayInformationFee::class.java)
-    }
-}
-
-private class RelayInformationFeeSerializer : JsonSerializer<RelayInformationFee> {
-    override fun serialize(
-        src: RelayInformationFee,
-        typeOfSrc: Type?,
-        context: JsonSerializationContext?
-    ): JsonElement {
-        return JsonObject().apply {
-            addProperty("amount", src.amount)
-            addProperty("unit", src.unit)
-            addProperty("period", src.period)
-            add(
-                "kinds",
-                JsonArray().also { kinds ->
-                    src.kinds?.forEach { kind ->
-                        kinds.add(
-                            kind
-                        )
-                    }
-                }
-            )
-        }
-    }
-}
+)
 
 class RelayInformationFees(
     val admission: List<RelayInformationFee>?,
     val subscription: List<RelayInformationFee>?,
-    val publication: List<RelayInformationFee>?
-) {
-    companion object {
-        val gson: Gson = GsonBuilder()
-            .disableHtmlEscaping()
-            .registerTypeAdapter(RelayInformationFees::class.java, RelayInformationFeesSerializer())
-            .create()
-
-        fun fromJson(json: String): RelayInformationFees = gson.fromJson(json, RelayInformationFees::class.java)
-    }
-}
-
-private class RelayInformationFeesSerializer : JsonSerializer<RelayInformationFees> {
-    override fun serialize(
-        src: RelayInformationFees,
-        typeOfSrc: Type?,
-        context: JsonSerializationContext?
-    ): JsonElement {
-        return JsonObject().apply {
-            add(
-                "admission",
-                JsonArray().also { admissions ->
-                    src.admission?.forEach { admission ->
-                        admissions.add(
-                            admission.toString()
-                        )
-                    }
-                }
-            )
-            add(
-                "publication",
-                JsonArray().also { publications ->
-                    src.publication?.forEach { publication ->
-                        publications.add(
-                            publication.toString()
-                        )
-                    }
-                }
-            )
-            add(
-                "subscription",
-                JsonArray().also { subscriptions ->
-                    src.subscription?.forEach { subscription ->
-                        subscriptions.add(
-                            subscription.toString()
-                        )
-                    }
-                }
-            )
-        }
-    }
-}
+    val publication: List<RelayInformationFee>?,
+    val retention: List<RelayInformationFee>?
+)
 
 class RelayInformationLimitation(
     val max_message_length: Int?,
@@ -150,104 +57,4 @@ class RelayInformationLimitation(
     val min_pow_difficulty: Int?,
     val auth_required: Boolean?,
     val payment_required: Boolean?
-) {
-    companion object {
-        val gson: Gson = GsonBuilder()
-            .disableHtmlEscaping()
-            .registerTypeAdapter(RelayInformationLimitation::class.java, RelayInformationLimitationSerializer())
-            .create()
-
-        fun fromJson(json: String): RelayInformationLimitation = gson.fromJson(json, RelayInformationLimitation::class.java)
-    }
-}
-
-private class RelayInformationLimitationSerializer : JsonSerializer<RelayInformationLimitation> {
-    override fun serialize(
-        src: RelayInformationLimitation,
-        typeOfSrc: Type?,
-        context: JsonSerializationContext?
-    ): JsonElement {
-        return JsonObject().apply {
-            addProperty("max_message_length", src.max_message_length)
-            addProperty("max_subscriptions", src.max_subscriptions)
-            addProperty("max_filters", src.max_filters)
-            addProperty("max_limit", src.max_limit)
-            addProperty("max_subid_length", src.max_subid_length)
-            addProperty("min_prefix", src.min_prefix)
-            addProperty("max_event_tags", src.max_event_tags)
-            addProperty("max_content_length", src.max_content_length)
-            addProperty("min_pow_difficulty", src.min_pow_difficulty)
-            addProperty("auth_required", src.auth_required)
-            addProperty("payment_required", src.payment_required)
-        }
-    }
-}
-
-private class RelayInformationSerializer : JsonSerializer<RelayInformation> {
-    override fun serialize(
-        src: RelayInformation,
-        typeOfSrc: Type?,
-        context: JsonSerializationContext?
-    ): JsonElement {
-        return JsonObject().apply {
-            addProperty("name", src.name)
-            addProperty("description", src.description)
-            addProperty("pubkey", src.pubkey)
-            addProperty("contact", src.contact)
-            add(
-                "supported_nip_extensions",
-                JsonArray().also { supported_nip_extensions ->
-                    src.supported_nip_extensions?.forEach { nip ->
-                        supported_nip_extensions.add(
-                            nip
-                        )
-                    }
-                }
-            )
-            add(
-                "supported_nips",
-                JsonArray().also { supported_nips ->
-                    src.supported_nips?.forEach { nip ->
-                        supported_nips.add(
-                            nip
-                        )
-                    }
-                }
-            )
-            addProperty("software", src.software)
-            addProperty("version", src.version)
-            add(
-                "relay_countries",
-                JsonArray().also { relay_countries ->
-                    src.relay_countries?.forEach { country ->
-                        relay_countries.add(
-                            country
-                        )
-                    }
-                }
-            )
-            add(
-                "language_tags",
-                JsonArray().also { language_tags ->
-                    src.language_tags?.forEach { language_tag ->
-                        language_tags.add(
-                            language_tag
-                        )
-                    }
-                }
-            )
-            add(
-                "tags",
-                JsonArray().also { tags ->
-                    src.tags?.forEach { tag ->
-                        tags.add(
-                            tag
-                        )
-                    }
-                }
-            )
-            addProperty("posting_policy", src.posting_policy)
-            addProperty("payments_url", src.payments_url)
-        }
-    }
-}
+)

app/src/main/java/com/vitorpamplona/amethyst/model/RelaySetupInfo.kt

@@ -14,4 +14,6 @@ data class RelaySetupInfo(
     val spamCount: Int = 0,
     val feedTypes: Set<FeedType>,
     val paidRelay: Boolean = false
-)
+) {
+    val briefInfo: RelayBriefInfo = RelayBriefInfo(url)
+}

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

@@ -1,9 +1,8 @@
 package com.vitorpamplona.amethyst.model
 
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.service.model.GenericRepostEvent
-import com.vitorpamplona.amethyst.service.model.RepostEvent
-import kotlin.time.ExperimentalTime
+import com.vitorpamplona.quartz.events.GenericRepostEvent
+import com.vitorpamplona.quartz.events.RepostEvent
 import kotlin.time.measureTimedValue
 
 class ThreadAssembler {
@@ -16,9 +15,14 @@ class ThreadAssembler {
         testedNotes.add(note)
 
         val markedAsRoot = note.event?.tags()?.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1)
-        if (markedAsRoot != null) return LocalCache.checkGetOrCreateNote(markedAsRoot)
+        if (markedAsRoot != null) {
+            // Check to ssee if there is an error in the tag and the root has replies
+            if (LocalCache.getNoteIfExists(markedAsRoot)?.replyTo?.isEmpty() == true) {
+                return LocalCache.checkGetOrCreateNote(markedAsRoot)
+            }
+        }
 
-        val hasNoReplyTo = note.replyTo?.firstOrNull { it.replyTo?.isEmpty() == true }
+        val hasNoReplyTo = note.replyTo?.reversed()?.firstOrNull { it.replyTo?.isEmpty() == true }
         if (hasNoReplyTo != null) return hasNoReplyTo
 
         // recursive
@@ -37,7 +41,6 @@ class ThreadAssembler {
         return null
     }
 
-    @OptIn(ExperimentalTime::class)
     fun findThreadFor(noteId: String): Set<Note> {
         checkNotInMainThread()
 

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

@@ -3,34 +3,29 @@ package com.vitorpamplona.amethyst.model
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
-import com.vitorpamplona.amethyst.service.Bech32
+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.model.BookmarkListEvent
-import com.vitorpamplona.amethyst.service.model.ContactListEvent
-import com.vitorpamplona.amethyst.service.model.LnZapEvent
-import com.vitorpamplona.amethyst.service.model.MetadataEvent
-import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.Relay
-import com.vitorpamplona.amethyst.service.toNpub
-import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
-import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
-import fr.acinq.secp256k1.Hex
-import kotlinx.collections.immutable.ImmutableSet
+import com.vitorpamplona.quartz.encoders.Hex
+import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.Lud06
+import com.vitorpamplona.quartz.encoders.toNpub
+import com.vitorpamplona.quartz.events.BookmarkListEvent
+import com.vitorpamplona.quartz.events.ChatroomKey
+import com.vitorpamplona.quartz.events.ContactListEvent
+import com.vitorpamplona.quartz.events.LnZapEvent
+import com.vitorpamplona.quartz.events.MetadataEvent
+import com.vitorpamplona.quartz.events.ReportEvent
+import com.vitorpamplona.quartz.events.UserMetadata
+import com.vitorpamplona.quartz.events.toImmutableListOfLists
 import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.coroutines.Dispatchers
 import java.math.BigDecimal
-import java.util.regex.Pattern
-
-val lnurlpPattern = Pattern.compile("(?i:http|https):\\/\\/((.+)\\/)*\\.well-known\\/lnurlp\\/(.*)")
-
-@Stable
-data class ChatroomKey(
-    val users: ImmutableSet<HexKey>
-)
 
 @Stable
 class User(val pubkeyHex: String) {
@@ -102,7 +97,11 @@ class User(val pubkeyHex: String) {
         if (event.id == latestBookmarkList?.id) return
 
         latestBookmarkList = event
-        liveSet?.bookmarks?.invalidateData()
+        liveSet?.innerBookmarks?.invalidateData()
+    }
+
+    fun clearEOSE() {
+        latestEOSEs = emptyMap()
     }
 
     fun updateContactList(event: ContactListEvent) {
@@ -112,18 +111,18 @@ class User(val pubkeyHex: String) {
         latestContactList = event
 
         // Update following of the current user
-        liveSet?.follows?.invalidateData()
+        liveSet?.innerFollows?.invalidateData()
 
         // Update Followers of the past user list
         // Update Followers of the new contact list
         (oldContactListEvent)?.unverifiedFollowKeySet()?.forEach {
-            LocalCache.users[it]?.liveSet?.followers?.invalidateData()
+            LocalCache.users[it]?.liveSet?.innerFollowers?.invalidateData()
         }
         (latestContactList)?.unverifiedFollowKeySet()?.forEach {
-            LocalCache.users[it]?.liveSet?.followers?.invalidateData()
+            LocalCache.users[it]?.liveSet?.innerFollowers?.invalidateData()
         }
 
-        liveSet?.relays?.invalidateData()
+        liveSet?.innerRelays?.invalidateData()
     }
 
     fun addReport(note: Note) {
@@ -131,10 +130,10 @@ class User(val pubkeyHex: String) {
 
         if (author !in reports.keys) {
             reports = reports + Pair(author, setOf(note))
-            liveSet?.reports?.invalidateData()
+            liveSet?.innerReports?.invalidateData()
         } else if (reports[author]?.contains(note) == false) {
             reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
-            liveSet?.reports?.invalidateData()
+            liveSet?.innerReports?.invalidateData()
         }
     }
 
@@ -144,7 +143,7 @@ class User(val pubkeyHex: String) {
         if (author in reports.keys && reports[author]?.contains(deleteNote) == true) {
             reports[author]?.let {
                 reports = reports + Pair(author, it.minus(deleteNote))
-                liveSet?.reports?.invalidateData()
+                liveSet?.innerReports?.invalidateData()
             }
         }
     }
@@ -152,20 +151,20 @@ class User(val pubkeyHex: String) {
     fun addZap(zapRequest: Note, zap: Note?) {
         if (zapRequest !in zaps.keys) {
             zaps = zaps + Pair(zapRequest, zap)
-            liveSet?.zaps?.invalidateData()
+            liveSet?.innerZaps?.invalidateData()
         } else if (zapRequest in zaps.keys && zaps[zapRequest] == null) {
             zaps = zaps + Pair(zapRequest, zap)
-            liveSet?.zaps?.invalidateData()
+            liveSet?.innerZaps?.invalidateData()
         }
     }
 
     fun removeZap(zapRequestOrZapEvent: Note) {
         if (zapRequestOrZapEvent in zaps.keys) {
             zaps = zaps.minus(zapRequestOrZapEvent)
-            liveSet?.zaps?.invalidateData()
+            liveSet?.innerZaps?.invalidateData()
         } else if (zapRequestOrZapEvent in zaps.values) {
             zaps = zaps.filter { it.value != zapRequestOrZapEvent }
-            liveSet?.zaps?.invalidateData()
+            liveSet?.innerZaps?.invalidateData()
         }
     }
 
@@ -219,7 +218,7 @@ class User(val pubkeyHex: String) {
         val privateChatroom = getOrCreatePrivateChatroom(room)
         if (msg !in privateChatroom.roomMessages) {
             privateChatroom.addMessageSync(msg)
-            liveSet?.messages?.invalidateData()
+            liveSet?.innerMessages?.invalidateData()
         }
     }
 
@@ -227,7 +226,7 @@ class User(val pubkeyHex: String) {
         val privateChatroom = getOrCreatePrivateChatroom(user)
         if (msg !in privateChatroom.roomMessages) {
             privateChatroom.addMessageSync(msg)
-            liveSet?.messages?.invalidateData()
+            liveSet?.innerMessages?.invalidateData()
         }
     }
 
@@ -241,7 +240,7 @@ class User(val pubkeyHex: String) {
         val privateChatroom = getOrCreatePrivateChatroom(user)
         if (msg in privateChatroom.roomMessages) {
             privateChatroom.removeMessageSync(msg)
-            liveSet?.messages?.invalidateData()
+            liveSet?.innerMessages?.invalidateData()
         }
     }
 
@@ -256,7 +255,7 @@ class User(val pubkeyHex: String) {
             here.counter++
         }
 
-        liveSet?.relayInfo?.invalidateData()
+        liveSet?.innerRelayInfo?.invalidateData()
     }
 
     fun updateUserInfo(newUserInfo: UserMetadata, latestMetadata: MetadataEvent) {
@@ -265,23 +264,15 @@ class User(val pubkeyHex: String) {
         info?.updatedMetadataAt = latestMetadata.createdAt
         info?.tags = latestMetadata.tags.toImmutableListOfLists()
 
-        if (newUserInfo.lud16.isNullOrBlank() && newUserInfo.lud06?.lowercase()?.startsWith("lnurl") == true) {
-            try {
-                val url = String(Bech32.decodeBytes(newUserInfo.lud06!!, false).second)
-
-                val matcher = lnurlpPattern.matcher(url)
-                while (matcher.find()) {
-                    val domain = matcher.group(2)
-                    val username = matcher.group(3)
-
-                    info?.lud16 = "$username@$domain"
+        if (newUserInfo.lud16.isNullOrBlank()) {
+            info?.lud06?.let {
+                if (it.lowercase().startsWith("lnurl")) {
+                    info?.lud16 = Lud06().toLud16(it)
                 }
-            } catch (t: Throwable) {
-                // Doesn't create errors.
             }
         }
 
-        liveSet?.metadata?.invalidateData()
+        liveSet?.innerMetadata?.invalidateData()
     }
 
     fun isFollowing(user: User): Boolean {
@@ -375,33 +366,78 @@ class User(val pubkeyHex: String) {
 
     fun clearLive() {
         if (liveSet != null && liveSet?.isInUse() == false) {
+            liveSet?.destroy()
             liveSet = null
         }
     }
 }
 
+@Stable
 class UserLiveSet(u: User) {
+    val innerMetadata = UserBundledRefresherLiveData(u)
+
     // UI Observers line up here.
-    val follows: UserLiveData = UserLiveData(u)
-    val followers: UserLiveData = UserLiveData(u)
-    val reports: UserLiveData = UserLiveData(u)
-    val messages: UserLiveData = UserLiveData(u)
-    val relays: UserLiveData = UserLiveData(u)
-    val relayInfo: UserLiveData = UserLiveData(u)
-    val metadata: UserLiveData = UserLiveData(u)
-    val zaps: UserLiveData = UserLiveData(u)
-    val bookmarks: UserLiveData = UserLiveData(u)
+    val innerFollows = UserBundledRefresherLiveData(u)
+    val innerFollowers = UserBundledRefresherLiveData(u)
+    val innerReports = UserBundledRefresherLiveData(u)
+    val innerMessages = UserBundledRefresherLiveData(u)
+    val innerRelays = UserBundledRefresherLiveData(u)
+    val innerRelayInfo = UserBundledRefresherLiveData(u)
+    val innerZaps = UserBundledRefresherLiveData(u)
+    val innerBookmarks = UserBundledRefresherLiveData(u)
+    val innerStatuses = UserBundledRefresherLiveData(u)
+
+    // UI Observers line up here.
+    val metadata = innerMetadata.map { it }
+    val follows = innerFollows.map { it }
+    val followers = innerFollowers.map { it }
+    val reports = innerReports.map { it }
+    val messages = innerMessages.map { it }
+    val relays = innerRelays.map { it }
+    val relayInfo = innerRelayInfo.map { it }
+    val zaps = innerZaps.map { it }
+    val bookmarks = innerBookmarks.map { it }
+    val statuses = innerStatuses.map { it }
+
+    val profilePictureChanges = innerMetadata.map {
+        it.user.profilePicture()
+    }.distinctUntilChanged()
+
+    val nip05Changes = innerMetadata.map {
+        it.user.nip05()
+    }.distinctUntilChanged()
+
+    val userMetadataInfo = innerMetadata.map {
+        it.user.info
+    }.distinctUntilChanged()
 
     fun isInUse(): Boolean {
-        return follows.hasObservers() ||
+        return metadata.hasObservers() ||
+            follows.hasObservers() ||
             followers.hasObservers() ||
             reports.hasObservers() ||
             messages.hasObservers() ||
             relays.hasObservers() ||
             relayInfo.hasObservers() ||
-            metadata.hasObservers() ||
             zaps.hasObservers() ||
-            bookmarks.hasObservers()
+            bookmarks.hasObservers() ||
+            statuses.hasObservers() ||
+            profilePictureChanges.hasObservers() ||
+            nip05Changes.hasObservers() ||
+            userMetadataInfo.hasObservers()
+    }
+
+    fun destroy() {
+        innerMetadata.destroy()
+        innerFollows.destroy()
+        innerFollowers.destroy()
+        innerReports.destroy()
+        innerMessages.destroy()
+        innerRelays.destroy()
+        innerRelayInfo.destroy()
+        innerZaps.destroy()
+        innerBookmarks.destroy()
+        innerStatuses.destroy()
     }
 }
 
@@ -412,139 +448,35 @@ data class RelayInfo(
     var counter: Long
 )
 
-@Stable
-class Chatroom() {
-    var roomMessages: Set<Note> = setOf()
-    var subject: String? = null
-    var subjectCreatedAt: Long? = null
-
-    @Synchronized
-    fun addMessageSync(msg: Note) {
-        checkNotInMainThread()
-
-        if (msg !in roomMessages) {
-            roomMessages = roomMessages + msg
-
-            val newSubject = msg.event?.subject()
-
-            if (newSubject != null && (msg.createdAt() ?: 0) > (subjectCreatedAt ?: 0)) {
-                subject = newSubject
-                subjectCreatedAt = msg.createdAt()
-            }
-        }
-    }
-
-    @Synchronized
-    fun removeMessageSync(msg: Note) {
-        checkNotInMainThread()
-
-        if (msg !in roomMessages) {
-            roomMessages = roomMessages + msg
-
-            roomMessages.filter { it.event?.subject() != null }.sortedBy { it.createdAt() }.lastOrNull()?.let {
-                subject = it.event?.subject()
-                subjectCreatedAt = it.createdAt()
-            }
-        }
-    }
-
-    fun senderIntersects(keySet: Set<HexKey>): Boolean {
-        return roomMessages.any { it.author?.pubkeyHex in keySet }
-    }
-
-    fun pruneMessagesToTheLatestOnly(): Set<Note> {
-        val sorted = roomMessages.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
-
-        val toKeep = if ((sorted.firstOrNull()?.createdAt() ?: 0) > TimeUtils.oneWeekAgo()) {
-            // Recent messages, keep last 100
-            sorted.take(100).toSet()
-        } else {
-            // Old messages, keep the last one.
-            sorted.take(1).toSet()
-        } + sorted.filter { it.liveSet?.isInUse() ?: false }
-
-        val toRemove = roomMessages.minus(toKeep)
-        roomMessages = toKeep
-        return toRemove
-    }
-}
-
-@Stable
-class UserMetadata {
-    var name: String? = null
-    var username: String? = null
-    var display_name: String? = null
-    var displayName: String? = null
-    var picture: String? = null
-    var banner: String? = null
-    var website: String? = null
-    var about: String? = null
-
-    var nip05: String? = null
-    var nip05Verified: Boolean = false
-    var nip05LastVerificationTime: Long? = 0
-
-    var domain: String? = null
-    var lud06: String? = null
-    var lud16: String? = null
-
-    var publish: String? = null
-    var iris: String? = null
-    var main_relay: String? = null
-    var twitter: String? = null
-
-    var updatedMetadataAt: Long = 0
-    var latestMetadata: MetadataEvent? = null
-    var tags: ImmutableListOfLists<String>? = null
-
-    fun anyName(): String? {
-        return display_name ?: displayName ?: name ?: username
-    }
-
-    fun anyNameStartsWith(prefix: String): Boolean {
-        return listOfNotNull(name, username, display_name, displayName, nip05, lud06, lud16)
-            .any { it.contains(prefix, true) }
-    }
-
-    fun lnAddress(): String? {
-        return (lud16?.trim() ?: lud06?.trim())?.ifBlank { null }
-    }
-
-    fun bestUsername(): String? {
-        return name?.ifBlank { null } ?: username?.ifBlank { null }
-    }
-
-    fun bestDisplayName(): String? {
-        return displayName?.ifBlank { null } ?: display_name?.ifBlank { null }
-    }
-
-    fun nip05(): String? {
-        return nip05?.ifBlank { null }
-    }
-
-    fun profilePicture(): String? {
-        if (picture.isNullOrBlank()) picture = null
-        return picture
-    }
-}
-
-class UserLiveData(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)
 
+    fun destroy() {
+        bundler.cancel()
+    }
+
     fun invalidateData() {
-        if (!hasObservers()) return
         checkNotInMainThread()
 
         bundler.invalidate() {
             checkNotInMainThread()
 
-            if (hasActiveObservers()) {
-                postValue(UserState(user))
-            }
+            postValue(UserState(user))
         }
     }
 
+    fun <Y> map(
+        transform: (UserState) -> Y
+    ): UserLoadingLiveData<Y> {
+        val initialValue = this.value?.let { transform(it) }
+        val result = UserLoadingLiveData(user, initialValue)
+        result.addSource(this) { x -> result.value = transform(x) }
+        return result
+    }
+}
+
+class UserLoadingLiveData<Y>(val user: User, initialValue: Y?) : MediatorLiveData<Y>(initialValue) {
     override fun onActive() {
         super.onActive()
         NostrSingleUserDataSource.add(user)

app/src/main/java/com/vitorpamplona/amethyst/service/CachedRichTextParser.kt

@@ -6,7 +6,6 @@ import android.util.Patterns
 import androidx.compose.runtime.Immutable
 import com.linkedin.urls.detection.UrlDetector
 import com.linkedin.urls.detection.UrlDetectorOptions
-import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.components.ZoomableUrlContent
 import com.vitorpamplona.amethyst.ui.components.ZoomableUrlImage
 import com.vitorpamplona.amethyst.ui.components.ZoomableUrlVideo
@@ -15,6 +14,7 @@ import com.vitorpamplona.amethyst.ui.components.imageExtensions
 import com.vitorpamplona.amethyst.ui.components.startsWithNIP19Scheme
 import com.vitorpamplona.amethyst.ui.components.tagIndex
 import com.vitorpamplona.amethyst.ui.components.videoExtensions
+import com.vitorpamplona.quartz.events.ImmutableListOfLists
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.ImmutableSet
@@ -59,7 +59,7 @@ val noProtocolUrlValidator = try {
     Pattern.compile("(([\\w\\d-]+\\.)*[a-zA-Z][\\w-]+[\\.\\:]\\w+([\\/\\?\\=\\&\\#\\.]?[\\w-]+)*\\/?)(.*)")
 }
 
-val HTTPRegex = "^((http|https)://)?([A-Za-z0-9-]+(\\.[A-Za-z0-9]+)+)(:[0-9]+)?(/[^?#]*)?(\\?[^#]*)?(#.*)?".toRegex(RegexOption.IGNORE_CASE)
+val HTTPRegex = "^((http|https)://)?([A-Za-z0-9-_]+(\\.[A-Za-z0-9-_]+)+)(:[0-9]+)?(/[^?#]*)?(\\?[^#]*)?(#.*)?".toRegex(RegexOption.IGNORE_CASE)
 
 class RichTextParser() {
     fun parseText(
@@ -183,7 +183,7 @@ class RichTextParser() {
         } else if (word.contains(".") && schemelessMatcher.find()) {
             val url = schemelessMatcher.group(1) // url
             val additionalChars = schemelessMatcher.group(4) // additional chars
-            val pattern = "^([A-Za-z0-9-_]+(\\.[A-Za-z0-9-_]+)+)(:[0-9]+)?(/[^?#]*)?(\\?[^#]*)?(#.*)?".toRegex(RegexOption.IGNORE_CASE)
+            val pattern = """^([A-Za-z0-9-_]+(\.[A-Za-z0-9-_]+)+)(:[0-9]+)?(/[^?#]*)?(\?[^#]*)?(#.*)?""".toRegex(RegexOption.IGNORE_CASE)
             if (pattern.find(word) != null) {
                 SchemelessUrlSegment(word, url, additionalChars)
             } else {

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

@@ -1,12 +1,11 @@
 package com.vitorpamplona.amethyst.service
 
 import androidx.compose.runtime.Immutable
+import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.google.gson.JsonArray
-import com.google.gson.JsonObject
-import com.google.gson.JsonParser
 import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
 import com.vitorpamplona.amethyst.ui.components.GenericLoadable
+import com.vitorpamplona.quartz.events.Event
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -19,7 +18,7 @@ data class CashuToken(
     val totalAmount: Long,
     val fees: Int,
     val redeemInvoiceAmount: Long,
-    val proofs: JsonArray
+    val proofs: JsonNode
 )
 
 class CashuProcessor {
@@ -28,14 +27,14 @@ class CashuProcessor {
 
         try {
             val base64token = cashuToken.replace("cashuA", "")
-            val cashu = JsonParser.parseString(String(Base64.getDecoder().decode(base64token)))
-            val token = cashu.asJsonObject.get("token").asJsonArray[0].asJsonObject
-            val proofs = token["proofs"].asJsonArray
-            val mint = token["mint"].asString
+            val cashu = jacksonObjectMapper().readTree(String(Base64.getDecoder().decode(base64token)))
+            val token = cashu.get("token").get(0)
+            val proofs = token.get("proofs")
+            val mint = token.get("mint").asText()
 
             var totalAmount = 0L
             for (proof in proofs) {
-                totalAmount += proof.asJsonObject["amount"].asLong
+                totalAmount += proof.get("amount").asLong()
             }
             val fees = Math.max(((totalAmount * 0.02).toInt()), 2)
             val redeemInvoiceAmount = totalAmount - fees
@@ -46,7 +45,7 @@ class CashuProcessor {
         }
     }
 
-    fun melt(token: CashuToken, lud16: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    suspend fun melt(token: CashuToken, lud16: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
         checkNotInMainThread()
 
         runCatching {
@@ -69,9 +68,11 @@ class CashuProcessor {
             val client = HttpClient.getHttpClient()
             val url = token.mint + "/melt" // Melt cashu tokens at Mint
 
-            val jsonObject = JsonObject()
-            jsonObject.add("proofs", token.proofs)
-            jsonObject.addProperty("pr", invoice)
+            val factory = Event.mapper.nodeFactory
+
+            val jsonObject = factory.objectNode()
+            jsonObject.put("proofs", token.proofs)
+            jsonObject.put("pr", invoice)
 
             val mediaType = "application/json; charset=utf-8".toMediaType()
             val requestBody = jsonObject.toString().toRequestBody(mediaType)

app/src/main/java/com/vitorpamplona/amethyst/service/CryptoUtils.kt

@@ -1,152 +0,0 @@
-package com.vitorpamplona.amethyst.service
-
-import com.goterl.lazysodium.SodiumAndroid
-import com.goterl.lazysodium.utils.Key
-import fr.acinq.secp256k1.Hex
-import fr.acinq.secp256k1.Secp256k1
-import java.security.MessageDigest
-import java.security.SecureRandom
-import java.util.Base64
-import javax.crypto.Cipher
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
-
-object CryptoUtils {
-    private val secp256k1 = Secp256k1.get()
-    private val libSodium = SodiumAndroid()
-    private val random = SecureRandom()
-
-    fun randomInt(bound: Int): Int {
-        return random.nextInt(bound)
-    }
-
-    /**
-     * Provides a 32B "private key" aka random number
-     */
-    fun privkeyCreate(): ByteArray {
-        val bytes = ByteArray(32)
-        random.nextBytes(bytes)
-        return bytes
-    }
-
-    fun pubkeyCreate(privKey: ByteArray) =
-        secp256k1.pubKeyCompress(secp256k1.pubkeyCreate(privKey)).copyOfRange(1, 33)
-
-    fun sign(data: ByteArray, privKey: ByteArray): ByteArray =
-        secp256k1.signSchnorr(data, privKey, null)
-
-    fun verifySignature(
-        signature: ByteArray,
-        hash: ByteArray,
-        pubKey: ByteArray
-    ): Boolean {
-        return secp256k1.verifySchnorr(signature, hash, pubKey)
-    }
-
-    fun sha256(data: ByteArray): ByteArray {
-        // Creates a new buffer every time
-        return MessageDigest.getInstance("SHA-256").digest(data)
-    }
-
-    /**
-     * @return 32B shared secret
-     */
-    fun getSharedSecretNIP04(privateKey: ByteArray, pubKey: ByteArray): ByteArray =
-        secp256k1.pubKeyTweakMul(Hex.decode("02") + pubKey, privateKey).copyOfRange(1, 33)
-
-    fun encryptNIP04(msg: String, privateKey: ByteArray, pubKey: ByteArray): String {
-        val encryptionInfo = encryptNIP04(msg, getSharedSecretNIP04(privateKey, pubKey))
-        return "${encryptionInfo.ciphertext}?iv=${encryptionInfo.nonce}"
-    }
-
-    fun encryptNIP04Json(msg: String, privateKey: ByteArray, pubKey: ByteArray): EncryptedInfo {
-        return encryptNIP04(msg, getSharedSecretNIP04(privateKey, pubKey))
-    }
-
-    fun encryptNIP04(msg: String, sharedSecret: ByteArray): EncryptedInfo {
-        val iv = ByteArray(16)
-        random.nextBytes(iv)
-        val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
-        cipher.init(Cipher.ENCRYPT_MODE, SecretKeySpec(sharedSecret, "AES"), IvParameterSpec(iv))
-        val ivBase64 = Base64.getEncoder().encodeToString(iv)
-        val encryptedMsg = cipher.doFinal(msg.toByteArray())
-        val encryptedMsgBase64 = Base64.getEncoder().encodeToString(encryptedMsg)
-        return EncryptedInfo(encryptedMsgBase64, ivBase64, Nip44Version.NIP04.versionCode)
-    }
-
-    fun decryptNIP04(msg: String, privateKey: ByteArray, pubKey: ByteArray): String {
-        val sharedSecret = getSharedSecretNIP04(privateKey, pubKey)
-        return decryptNIP04(msg, sharedSecret)
-    }
-
-    fun decryptNIP04(encryptedInfo: EncryptedInfo, privateKey: ByteArray, pubKey: ByteArray): String {
-        val sharedSecret = getSharedSecretNIP04(privateKey, pubKey)
-        return decryptNIP04(encryptedInfo.ciphertext, encryptedInfo.nonce, sharedSecret)
-    }
-
-    fun decryptNIP04(msg: String, sharedSecret: ByteArray): String {
-        val parts = msg.split("?iv=")
-        return decryptNIP04(parts[0], parts[1], sharedSecret)
-    }
-
-    private fun decryptNIP04(cipher: String, nonce: String, sharedSecret: ByteArray): String {
-        val iv = Base64.getDecoder().decode(nonce)
-        val encryptedMsg = Base64.getDecoder().decode(cipher)
-        val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
-        cipher.init(Cipher.DECRYPT_MODE, SecretKeySpec(sharedSecret, "AES"), IvParameterSpec(iv))
-        return String(cipher.doFinal(encryptedMsg))
-    }
-
-    fun encryptNIP24(msg: String, privateKey: ByteArray, pubKey: ByteArray): EncryptedInfo {
-        val sharedSecret = getSharedSecretNIP24(privateKey, pubKey)
-        return encryptNIP24(msg, sharedSecret)
-    }
-
-    fun encryptNIP24(msg: String, sharedSecret: ByteArray): EncryptedInfo {
-        val nonce = ByteArray(24)
-        random.nextBytes(nonce)
-
-        val cipher = cryptoStreamXChaCha20Xor(
-            libSodium = libSodium,
-            messageBytes = msg.toByteArray(),
-            nonce = nonce,
-            key = Key.fromBytes(sharedSecret)
-        )
-
-        val cipherBase64 = Base64.getEncoder().encodeToString(cipher)
-        val nonceBase64 = Base64.getEncoder().encodeToString(nonce)
-
-        return EncryptedInfo(
-            ciphertext = cipherBase64,
-            nonce = nonceBase64,
-            v = Nip44Version.NIP24.versionCode
-        )
-    }
-
-    fun decryptNIP24(encryptedInfo: EncryptedInfo, privateKey: ByteArray, pubKey: ByteArray): String? {
-        val sharedSecret = getSharedSecretNIP24(privateKey, pubKey)
-        return decryptNIP24(encryptedInfo, sharedSecret)
-    }
-
-    fun decryptNIP24(encryptedInfo: EncryptedInfo, sharedSecret: ByteArray): String? {
-        return cryptoStreamXChaCha20Xor(
-            libSodium = libSodium,
-            messageBytes = Base64.getDecoder().decode(encryptedInfo.ciphertext),
-            nonce = Base64.getDecoder().decode(encryptedInfo.nonce),
-            key = Key.fromBytes(sharedSecret)
-        )?.decodeToString()
-    }
-
-    /**
-     * @return 32B shared secret
-     */
-    fun getSharedSecretNIP24(privateKey: ByteArray, pubKey: ByteArray): ByteArray =
-        sha256(secp256k1.pubKeyTweakMul(Hex.decode("02") + pubKey, privateKey).copyOfRange(1, 33))
-}
-
-data class EncryptedInfo(val ciphertext: String, val nonce: String, val v: Int)
-
-enum class Nip44Version(val versionCode: Int) {
-    NIP04(0),
-    NIP24(1)
-}

app/src/main/java/com/vitorpamplona/amethyst/service/EmojiUtils.kt

@@ -1,6 +1,6 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
+import com.vitorpamplona.quartz.events.ImmutableListOfLists
 
 fun String.isUTF16Char(pos: Int): Boolean {
     return Character.charCount(this.codePointAt(pos)) == 2

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

@@ -3,8 +3,9 @@ package com.vitorpamplona.amethyst.service
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.util.Log
-import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.ui.actions.ImageDownloader
+import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.encoders.toHexKey
 import io.trbl.blurhash.BlurHash
 import kotlin.math.roundToInt
 

app/src/main/java/com/vitorpamplona/amethyst/service/HexValidator.kt

@@ -1,23 +0,0 @@
-package com.vitorpamplona.amethyst.service
-
-object HexValidator {
-
-    private fun isHex2(c: Char): Boolean {
-        return when (c) {
-            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'A', 'B', 'C', 'D', 'E', 'F', ' ' -> true
-            else -> false
-        }
-    }
-
-    fun isHex(hex: String?): Boolean {
-        if (hex == null) return false
-        var isHex = true
-        for (c in hex.toCharArray()) {
-            if (!isHex2(c)) {
-                isHex = false
-                break
-            }
-        }
-        return isHex
-    }
-}

app/src/main/java/com/vitorpamplona/amethyst/service/Nip05Verifier.kt

@@ -2,10 +2,7 @@ package com.vitorpamplona.amethyst.service
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import okhttp3.Call
 import okhttp3.Callback
@@ -26,55 +23,46 @@ class Nip05Verifier() {
         return null
     }
 
-    fun fetchNip05Json(nip05address: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-        val scope = CoroutineScope(Job() + Dispatchers.IO)
-        scope.launch {
-            fetchNip05JsonSuspend(nip05address, onSuccess, onError)
-        }
-    }
-
-    private suspend fun fetchNip05JsonSuspend(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    suspend fun fetchNip05Json(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) = withContext(Dispatchers.IO) {
         checkNotInMainThread()
 
         val url = assembleUrl(nip05)
 
         if (url == null) {
             onError("Could not assemble url from Nip05: \"${nip05}\". Check the user's setup")
-            return
+            return@withContext
         }
 
-        withContext(Dispatchers.IO) {
-            try {
-                val request = Request.Builder()
-                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-                    .url(url)
-                    .build()
+        try {
+            val request = Request.Builder()
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                .url(url)
+                .build()
 
-                HttpClient.getHttpClient().newCall(request).enqueue(object : Callback {
-                    override fun onResponse(call: Call, response: Response) {
-                        checkNotInMainThread()
+            HttpClient.getHttpClient().newCall(request).enqueue(object : Callback {
+                override fun onResponse(call: Call, response: Response) {
+                    checkNotInMainThread()
 
-                        response.use {
-                            if (it.isSuccessful) {
-                                onSuccess(it.body.string())
-                            } else {
-                                onError("Could not resolve $nip05. Error: ${it.code}. Check if the server up and if the address $nip05 is correct")
-                            }
+                    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 up and if the address $nip05 is correct")
-                        e.printStackTrace()
-                    }
-                })
-            } catch (e: java.lang.Exception) {
-                onError("Could not resolve '$url': ${e.message}")
-            }
+                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()
+                }
+            })
+        } catch (e: java.lang.Exception) {
+            onError("Could not resolve '$url': ${e.message}")
         }
     }
 
-    fun verifyNip05(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    suspend fun verifyNip05(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
         // check fails on tests
         checkNotInMainThread()
 

app/src/main/java/com/vitorpamplona/amethyst/service/Nip11Retriever.kt

@@ -0,0 +1,103 @@
+package com.vitorpamplona.amethyst.service
+
+import android.util.Log
+import android.util.LruCache
+import com.vitorpamplona.amethyst.model.RelayInformation
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.Request
+import okhttp3.Response
+import java.io.IOException
+
+object Nip11CachedRetriever {
+    val relayInformationDocumentCache = LruCache<String, RelayInformation>(100)
+    val retriever = Nip11Retriever()
+
+    suspend fun loadRelayInfo(
+        dirtyUrl: String,
+        onInfo: (RelayInformation) -> Unit,
+        onError: (String, Nip11Retriever.ErrorCode, String?) -> Unit
+    ) {
+        val url = retriever.cleanUrl(dirtyUrl)
+        val doc = relayInformationDocumentCache.get(url)
+
+        if (doc != null) {
+            onInfo(doc)
+        } else {
+            Nip11Retriever().loadRelayInfo(
+                url,
+                dirtyUrl,
+                onInfo = {
+                    relayInformationDocumentCache.put(url, it)
+                    onInfo(it)
+                },
+                onError
+            )
+        }
+    }
+}
+
+class Nip11Retriever {
+    enum class ErrorCode {
+        FAIL_TO_ASSEMBLE_URL,
+        FAIL_TO_REACH_SERVER,
+        FAIL_TO_PARSE_RESULT,
+        FAIL_WITH_HTTP_STATUS
+    }
+
+    fun cleanUrl(dirtyUrl: String): String {
+        return if (dirtyUrl.contains("://")) {
+            dirtyUrl
+                .replace("wss://", "https://")
+                .replace("ws://", "http://")
+        } else {
+            "https://$dirtyUrl"
+        }
+    }
+
+    suspend fun loadRelayInfo(
+        url: String,
+        dirtyUrl: String,
+        onInfo: (RelayInformation) -> Unit,
+        onError: (String, ErrorCode, String?) -> Unit
+    ) {
+        try {
+            val request: Request = Request
+                .Builder()
+                .header("Accept", "application/nostr+json")
+                .url(url)
+                .build()
+
+            HttpClient.getHttpClient()
+                .newCall(request)
+                .enqueue(
+                    object : Callback {
+                        override fun onResponse(call: Call, response: Response) {
+                            checkNotInMainThread()
+                            response.use {
+                                val body = it.body.string()
+                                try {
+                                    if (it.isSuccessful) {
+                                        onInfo(RelayInformation.fromJson(body))
+                                    } else {
+                                        onError(dirtyUrl, ErrorCode.FAIL_WITH_HTTP_STATUS, it.code.toString())
+                                    }
+                                } catch (e: Exception) {
+                                    Log.e("RelayInfoFail", "Resulting Message from Relay $dirtyUrl in not parseable: $body", e)
+                                    onError(dirtyUrl, ErrorCode.FAIL_TO_PARSE_RESULT, e.message)
+                                }
+                            }
+                        }
+
+                        override fun onFailure(call: Call, e: IOException) {
+                            Log.e("RelayInfoFail", "$dirtyUrl unavailable", e)
+                            onError(dirtyUrl, ErrorCode.FAIL_TO_REACH_SERVER, e.message)
+                        }
+                    }
+                )
+        } catch (e: Exception) {
+            Log.e("RelayInfoFail", "Invalid URL $dirtyUrl", e)
+            onError(dirtyUrl, ErrorCode.FAIL_TO_ASSEMBLE_URL, e.message)
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/Nip47.kt

@@ -2,8 +2,8 @@ package com.vitorpamplona.amethyst.ui.note
 
 import android.net.Uri
 import com.vitorpamplona.amethyst.model.Nip47URI
-import com.vitorpamplona.amethyst.model.decodePublicKey
-import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.quartz.encoders.decodePublicKey
+import com.vitorpamplona.quartz.encoders.toHexKey
 
 // Rename to the corect nip number when ready.
 object Nip47 {

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

@@ -2,24 +2,24 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.service.model.*
-import com.vitorpamplona.amethyst.service.model.BadgeAwardEvent
-import com.vitorpamplona.amethyst.service.model.BadgeProfilesEvent
-import com.vitorpamplona.amethyst.service.model.BookmarkListEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.model.ContactListEvent
-import com.vitorpamplona.amethyst.service.model.LnZapEvent
-import com.vitorpamplona.amethyst.service.model.MetadataEvent
-import com.vitorpamplona.amethyst.service.model.ReactionEvent
-import com.vitorpamplona.amethyst.service.model.ReportEvent
-import com.vitorpamplona.amethyst.service.model.RepostEvent
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 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.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.quartz.events.*
+import com.vitorpamplona.quartz.events.BadgeAwardEvent
+import com.vitorpamplona.quartz.events.BadgeProfilesEvent
+import com.vitorpamplona.quartz.events.BookmarkListEvent
+import com.vitorpamplona.quartz.events.ChannelMessageEvent
+import com.vitorpamplona.quartz.events.ContactListEvent
+import com.vitorpamplona.quartz.events.LnZapEvent
+import com.vitorpamplona.quartz.events.MetadataEvent
+import com.vitorpamplona.quartz.events.ReactionEvent
+import com.vitorpamplona.quartz.events.ReportEvent
+import com.vitorpamplona.quartz.events.RepostEvent
+import com.vitorpamplona.quartz.events.TextNoteEvent
 
 object NostrAccountDataSource : NostrDataSource("AccountData") {
     lateinit var account: Account
@@ -48,6 +48,17 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
         )
     }
 
+    fun createAccountRelayListFilter(): TypedFilter {
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter = JsonFilter(
+                kinds = listOf(AdvertisedRelayListEvent.kind, StatusEvent.kind),
+                authors = listOf(account.userProfile().pubkeyHex),
+                limit = 5
+            )
+        )
+    }
+
     fun createAccountAcceptedAwardsFilter(): TypedFilter {
         return TypedFilter(
             types = COMMON_FEED_TYPES,
@@ -155,6 +166,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
         accountChannel.typedFilters = listOf(
             createAccountMetadataFilter(),
             createAccountContactListFilter(),
+            createAccountRelayListFilter(),
             createNotificationFilter(),
             createGiftWrapsToMeFilter(),
             createAccountReportsFilter(),

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

@@ -4,11 +4,11 @@ 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.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.model.LiveActivitiesChatMessageEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.quartz.events.ChannelMessageEvent
+import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
 
 object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
     var account: Account? = null

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

@@ -1,12 +1,12 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.ChatroomKey
-import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 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.quartz.events.ChatroomKey
+import com.vitorpamplona.quartz.events.PrivateDmEvent
 
 object NostrChatroomDataSource : NostrDataSource("ChatroomFeed") {
     lateinit var account: Account

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

@@ -1,15 +1,15 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
-import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 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.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") {
     lateinit var account: Account

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

@@ -1,11 +1,11 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.AddressableNote
-import com.vitorpamplona.amethyst.service.model.CommunityDefinitionEvent
-import com.vitorpamplona.amethyst.service.model.CommunityPostApprovalEvent
 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.quartz.events.CommunityDefinitionEvent
+import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
 
 object NostrCommunityDataSource : NostrDataSource("SingleCommunityFeed") {
     private var communityToWatch: AddressableNote? = null

app/src/main/java/com/vitorpamplona/amethyst/service/NostrDataSource.kt

@@ -2,25 +2,29 @@ package com.vitorpamplona.amethyst.service
 
 import android.util.Log
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.TimeUtils
-import com.vitorpamplona.amethyst.service.model.*
-import com.vitorpamplona.amethyst.service.model.Event
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.service.relays.Subscription
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
+import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.utils.TimeUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import java.util.UUID
+import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.Error
 
 abstract class NostrDataSource(val debugName: String) {
+    private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+
     private var subscriptions = mapOf<String, Subscription>()
     data class Counter(var counter: Int)
 
     private var eventCounter = mapOf<String, Counter>()
+    var changingFilters = AtomicBoolean()
 
     fun printCounter() {
         eventCounter.forEach {
@@ -47,7 +51,7 @@ abstract class NostrDataSource(val debugName: String) {
             // Log.e("ERROR", "Relay ${relay.url}: ${error.message}")
         }
 
-        override fun onRelayStateChange(type: Relay.Type, relay: Relay, channel: String?) {
+        override fun onRelayStateChange(type: Relay.Type, relay: Relay, subscriptionId: String?) {
             // Log.d("RELAY", "Relay ${relay.url} ${when (type) {
             //  Relay.Type.CONNECT -> "connected."
             //  Relay.Type.DISCONNECT -> "disconnected."
@@ -55,13 +59,19 @@ abstract class NostrDataSource(val debugName: String) {
             //  Relay.Type.EOSE -> "sent all events it had stored."
             // }}")
 
-            if (type == Relay.Type.EOSE && channel != null) {
+            if (type == Relay.Type.EOSE && subscriptionId != null && subscriptionId in subscriptions.keys) {
                 // updates a per subscripton since date
-                subscriptions[channel]?.updateEOSE(TimeUtils.now(), relay.url)
+                subscriptions[subscriptionId]?.updateEOSE(
+                    TimeUtils.fiveMinutesAgo(), // in case people's clock is slighly off.
+                    relay.url
+                )
             }
         }
 
         override fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) {
+            if (success) {
+                markAsSeenOnRelay(eventId, relay)
+            }
         }
 
         override fun onAuth(relay: Relay, challenge: String) {
@@ -77,6 +87,8 @@ abstract class NostrDataSource(val debugName: String) {
     fun destroy() {
         stop()
         Client.unsubscribe(clientListener)
+        scope.cancel()
+        bundler.cancel()
     }
 
     open fun start() {
@@ -107,18 +119,19 @@ abstract class NostrDataSource(val debugName: String) {
     private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateFilters() {
-        bundler.invalidate() {
-            // println("DataSource: ${this.javaClass.simpleName} InvalidateFilters")
+        scope.launch(Dispatchers.IO) {
+            bundler.invalidate() {
+                // println("DataSource: ${this.javaClass.simpleName} InvalidateFilters")
 
-            // adds the time to perform the refresh into this delay
-            // holding off new updates in case of heavy refresh routines.
-            resetFiltersSuspend()
+                // adds the time to perform the refresh into this delay
+                // holding off new updates in case of heavy refresh routines.
+                resetFiltersSuspend()
+            }
         }
     }
 
     fun resetFilters() {
-        val scope = CoroutineScope(Job() + Dispatchers.IO)
-        scope.launch {
+        scope.launch(Dispatchers.IO) {
             resetFiltersSuspend()
         }
     }
@@ -131,6 +144,8 @@ abstract class NostrDataSource(val debugName: String) {
         // saves the current content to only update if it changes
         val currentFilters = activeSubscriptions.associate { it.id to it.toJson() }
 
+        changingFilters.getAndSet(true)
+
         updateChannelFilters()
 
         // Makes sure to only send an updated filter when it actually changes.
@@ -162,12 +177,18 @@ abstract class NostrDataSource(val debugName: String) {
                 }
             }
         }
+
+        changingFilters.getAndSet(false)
     }
 
     open fun consume(event: Event, relay: Relay) {
         LocalCache.verifyAndConsume(event, relay)
     }
 
+    open fun markAsSeenOnRelay(eventId: String, relay: Relay) {
+        LocalCache.getNoteIfExists(eventId)?.addRelay(relay)
+    }
+
     abstract fun updateChannelFilters()
     open fun auth(relay: Relay, challenge: String) = Unit
 }

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

@@ -1,70 +1,83 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
-import com.vitorpamplona.amethyst.service.model.CommunityDefinitionEvent
-import com.vitorpamplona.amethyst.service.model.CommunityPostApprovalEvent
-import com.vitorpamplona.amethyst.service.model.LiveActivitiesChatMessageEvent
-import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent
 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.quartz.events.ChannelCreateEvent
+import com.vitorpamplona.quartz.events.ChannelMessageEvent
+import com.vitorpamplona.quartz.events.ChannelMetadataEvent
+import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
+import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
+import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.quartz.events.LiveActivitiesEvent
 
 object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
     lateinit var account: Account
 
     val latestEOSEs = EOSEAccount()
 
-    fun createLiveStreamFilter(): TypedFilter {
-        val follows = account.selectedUsersFollowList(account.defaultDiscoveryFollowList)
+    fun createLiveStreamFilter(): List<TypedFilter> {
+        val follows = account.selectedUsersFollowList(account.defaultDiscoveryFollowList)?.toList()
 
-        val followKeys = follows?.map {
-            it.substring(0, 8)
-        }
-
-        return TypedFilter(
-            types = setOf(FeedType.GLOBAL),
-            filter = JsonFilter(
-                authors = followKeys,
-                kinds = listOf(LiveActivitiesChatMessageEvent.kind, LiveActivitiesEvent.kind),
-                limit = 300,
-                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
-            )
+        return listOfNotNull(
+            TypedFilter(
+                types = setOf(FeedType.GLOBAL),
+                filter = JsonFilter(
+                    authors = follows,
+                    kinds = listOf(LiveActivitiesChatMessageEvent.kind, LiveActivitiesEvent.kind),
+                    limit = 300,
+                    since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+                )
+            ),
+            follows?.let {
+                TypedFilter(
+                    types = setOf(FeedType.GLOBAL),
+                    filter = JsonFilter(
+                        tags = mapOf("p" to it),
+                        kinds = listOf(LiveActivitiesEvent.kind),
+                        limit = 100,
+                        since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+                    )
+                )
+            }
         )
     }
 
-    fun createPublicChatFilter(): TypedFilter {
-        val follows = account.selectedUsersFollowList(account.defaultDiscoveryFollowList)
+    fun createPublicChatFilter(): List<TypedFilter> {
+        val follows = account.selectedUsersFollowList(account.defaultDiscoveryFollowList)?.toList()
+        val followChats = account.selectedChatsFollowList().toList()
 
-        val followKeys = follows?.map {
-            it.substring(0, 8)
-        }
-
-        return TypedFilter(
-            types = setOf(FeedType.PUBLIC_CHATS),
-            filter = JsonFilter(
-                authors = followKeys,
-                kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind, ChannelMessageEvent.kind),
-                limit = 300,
-                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+        return listOf(
+            TypedFilter(
+                types = setOf(FeedType.PUBLIC_CHATS),
+                filter = JsonFilter(
+                    authors = follows,
+                    kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind, ChannelMessageEvent.kind),
+                    limit = 300,
+                    since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+                )
+            ),
+            TypedFilter(
+                types = setOf(FeedType.PUBLIC_CHATS),
+                filter = JsonFilter(
+                    ids = followChats,
+                    kinds = listOf(ChannelCreateEvent.kind),
+                    limit = 300,
+                    since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+                )
             )
         )
     }
 
     fun createCommunitiesFilter(): TypedFilter {
-        val follows = account.selectedUsersFollowList(account.defaultDiscoveryFollowList)
-
-        val followKeys = follows?.map {
-            it.substring(0, 8)
-        }
+        val follows = account.selectedUsersFollowList(account.defaultDiscoveryFollowList)?.toList()
 
         return TypedFilter(
             types = setOf(FeedType.GLOBAL),
             filter = JsonFilter(
-                authors = followKeys,
+                authors = follows,
                 kinds = listOf(CommunityDefinitionEvent.kind, CommunityPostApprovalEvent.kind),
                 limit = 300,
                 since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
@@ -197,16 +210,16 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
     }
 
     override fun updateChannelFilters() {
-        discoveryFeedChannel.typedFilters = listOfNotNull(
-            createLiveStreamFilter(),
-            createPublicChatFilter(),
-            createCommunitiesFilter(),
-            createLiveStreamTagsFilter(),
-            createPublicChatsTagsFilter(),
-            createCommunitiesTagsFilter(),
-            createCommunitiesGeohashesFilter(),
-            createPublicChatsGeohashesFilter(),
-            createLiveStreamGeohashesFilter()
+        discoveryFeedChannel.typedFilters = createLiveStreamFilter().plus(createPublicChatFilter()).plus(
+            listOfNotNull(
+                createLiveStreamTagsFilter(),
+                createLiveStreamGeohashesFilter(),
+                createCommunitiesFilter(),
+                createPublicChatsTagsFilter(),
+                createCommunitiesTagsFilter(),
+                createCommunitiesGeohashesFilter(),
+                createPublicChatsGeohashesFilter()
+            )
         ).ifEmpty { null }
     }
 }

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

@@ -1,16 +1,17 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.model.ClassifiedsEvent
-import com.vitorpamplona.amethyst.service.model.HighlightEvent
-import com.vitorpamplona.amethyst.service.model.LiveActivitiesChatMessageEvent
-import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
-import com.vitorpamplona.amethyst.service.model.PollNoteEvent
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 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.quartz.events.AudioHeaderEvent
+import com.vitorpamplona.quartz.events.AudioTrackEvent
+import com.vitorpamplona.quartz.events.ChannelMessageEvent
+import com.vitorpamplona.quartz.events.ClassifiedsEvent
+import com.vitorpamplona.quartz.events.HighlightEvent
+import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.quartz.events.LongTextNoteEvent
+import com.vitorpamplona.quartz.events.PollNoteEvent
+import com.vitorpamplona.quartz.events.TextNoteEvent
 
 object NostrGeohashDataSource : NostrDataSource("SingleGeoHashFeed") {
     private var geohashToWatch: String? = null
@@ -26,7 +27,7 @@ object NostrGeohashDataSource : NostrDataSource("SingleGeoHashFeed") {
                         hashToLoad
                     )
                 ),
-                kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind, LiveActivitiesChatMessageEvent.kind, ClassifiedsEvent.kind, HighlightEvent.kind, AudioTrackEvent.kind),
+                kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind, LiveActivitiesChatMessageEvent.kind, ClassifiedsEvent.kind, HighlightEvent.kind, AudioTrackEvent.kind, AudioHeaderEvent.kind),
                 limit = 200
             )
         )

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

@@ -1,17 +1,17 @@
 package com.vitorpamplona.amethyst.service
 
-import androidx.compose.ui.text.capitalize
-import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.model.ClassifiedsEvent
-import com.vitorpamplona.amethyst.service.model.HighlightEvent
-import com.vitorpamplona.amethyst.service.model.LiveActivitiesChatMessageEvent
-import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
-import com.vitorpamplona.amethyst.service.model.PollNoteEvent
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 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.quartz.events.AudioHeaderEvent
+import com.vitorpamplona.quartz.events.AudioTrackEvent
+import com.vitorpamplona.quartz.events.ChannelMessageEvent
+import com.vitorpamplona.quartz.events.ClassifiedsEvent
+import com.vitorpamplona.quartz.events.HighlightEvent
+import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.quartz.events.LongTextNoteEvent
+import com.vitorpamplona.quartz.events.PollNoteEvent
+import com.vitorpamplona.quartz.events.TextNoteEvent
 
 object NostrHashtagDataSource : NostrDataSource("SingleHashtagFeed") {
     private var hashtagToWatch: String? = null
@@ -30,7 +30,7 @@ object NostrHashtagDataSource : NostrDataSource("SingleHashtagFeed") {
                         hashToLoad.capitalize()
                     )
                 ),
-                kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind, LiveActivitiesChatMessageEvent.kind, ClassifiedsEvent.kind, HighlightEvent.kind, AudioTrackEvent.kind),
+                kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind, LiveActivitiesChatMessageEvent.kind, ClassifiedsEvent.kind, HighlightEvent.kind, AudioTrackEvent.kind, AudioHeaderEvent.kind),
                 limit = 200
             )
         )

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

@@ -2,22 +2,23 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.UserState
-import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
-import com.vitorpamplona.amethyst.service.model.ClassifiedsEvent
-import com.vitorpamplona.amethyst.service.model.CommunityPostApprovalEvent
-import com.vitorpamplona.amethyst.service.model.GenericRepostEvent
-import com.vitorpamplona.amethyst.service.model.HighlightEvent
-import com.vitorpamplona.amethyst.service.model.LiveActivitiesChatMessageEvent
-import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent
-import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
-import com.vitorpamplona.amethyst.service.model.PinListEvent
-import com.vitorpamplona.amethyst.service.model.PollNoteEvent
-import com.vitorpamplona.amethyst.service.model.RepostEvent
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 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.quartz.events.AudioHeaderEvent
+import com.vitorpamplona.quartz.events.AudioTrackEvent
+import com.vitorpamplona.quartz.events.ClassifiedsEvent
+import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
+import com.vitorpamplona.quartz.events.GenericRepostEvent
+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.PinListEvent
+import com.vitorpamplona.quartz.events.PollNoteEvent
+import com.vitorpamplona.quartz.events.RepostEvent
+import com.vitorpamplona.quartz.events.TextNoteEvent
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -54,12 +55,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
 
     fun createFollowAccountsFilter(): TypedFilter {
         val follows = account.selectedUsersFollowList(account.defaultHomeFollowList)
-
-        val followKeys = follows?.map {
-            it.substring(0, 6)
-        }
-
-        val followSet = followKeys?.plus(account.userProfile().pubkeyHex.substring(0, 6))
+        val followSet = follows?.plus(account.userProfile().pubkeyHex)?.toList()?.ifEmpty { null }
 
         return TypedFilter(
             types = setOf(FeedType.FOLLOWS),
@@ -73,6 +69,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
                     PollNoteEvent.kind,
                     HighlightEvent.kind,
                     AudioTrackEvent.kind,
+                    AudioHeaderEvent.kind,
                     PinListEvent.kind,
                     LiveActivitiesChatMessageEvent.kind,
                     LiveActivitiesEvent.kind
@@ -92,7 +89,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
         return TypedFilter(
             types = setOf(FeedType.FOLLOWS),
             filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, ClassifiedsEvent.kind, HighlightEvent.kind, AudioTrackEvent.kind, PinListEvent.kind),
+                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, ClassifiedsEvent.kind, HighlightEvent.kind, AudioHeaderEvent.kind, AudioTrackEvent.kind, PinListEvent.kind),
                 tags = mapOf(
                     "t" to hashToLoad.map {
                         listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
@@ -112,7 +109,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
         return TypedFilter(
             types = setOf(FeedType.FOLLOWS),
             filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, ClassifiedsEvent.kind, HighlightEvent.kind, AudioTrackEvent.kind, PinListEvent.kind),
+                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, ClassifiedsEvent.kind, HighlightEvent.kind, AudioHeaderEvent.kind, AudioTrackEvent.kind, PinListEvent.kind),
                 tags = mapOf(
                     "g" to hashToLoad.map {
                         listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
@@ -137,6 +134,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
                     LongTextNoteEvent.kind,
                     ClassifiedsEvent.kind,
                     HighlightEvent.kind,
+                    AudioHeaderEvent.kind,
                     AudioTrackEvent.kind,
                     PinListEvent.kind,
                     CommunityPostApprovalEvent.kind

app/src/main/java/com/vitorpamplona/amethyst/service/NostrLnZapPaymentResponseDataSource.kt

@@ -1,12 +1,12 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.service.model.LnZapPaymentResponseEvent
-import com.vitorpamplona.amethyst.service.model.RelayAuthEvent
 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.quartz.events.LnZapPaymentResponseEvent
+import com.vitorpamplona.quartz.events.RelayAuthEvent
 
 class NostrLnZapPaymentResponseDataSource(
     private val fromServiceHex: String,

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

@@ -1,13 +1,13 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.toHexKey
-import com.vitorpamplona.amethyst.service.model.*
-import com.vitorpamplona.amethyst.service.nip19.Nip19
 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 fr.acinq.secp256k1.Hex
+import com.vitorpamplona.quartz.encoders.Hex
+import com.vitorpamplona.quartz.encoders.Nip19
+import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.events.*
 
 object NostrSearchEventOrUserDataSource : NostrDataSource("SearchEventFeed") {
     private var searchString: String? = null
@@ -56,8 +56,9 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SearchEventFeed") {
                 filter = JsonFilter(
                     kinds = listOf(
                         TextNoteEvent.kind, LongTextNoteEvent.kind, BadgeDefinitionEvent.kind,
-                        PeopleListEvent.kind, BookmarkListEvent.kind, AudioTrackEvent.kind, PinListEvent.kind,
-                        PollNoteEvent.kind, ChannelCreateEvent.kind
+                        PeopleListEvent.kind, BookmarkListEvent.kind, AudioHeaderEvent.kind,
+                        AudioTrackEvent.kind, PinListEvent.kind, PollNoteEvent.kind,
+                        ChannelCreateEvent.kind
                     ),
                     search = mySearchString,
                     limit = 100

app/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleChannelDataSource.kt

@@ -1,20 +1,20 @@
 package com.vitorpamplona.amethyst.service
 
+import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LiveActivitiesChannel
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.PublicChatChannel
-import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 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.quartz.events.ChannelCreateEvent
+import com.vitorpamplona.quartz.events.ChannelMetadataEvent
 
 object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
-    private var channelsToWatch = setOf<String>()
+    private var channelsToWatch = setOf<Channel>()
 
-    private fun createRepliesAndReactionsFilter(): TypedFilter? {
-        val reactionsToWatch = channelsToWatch.map { it }
+    private fun createMetadataChangeFilter(): TypedFilter? {
+        val reactionsToWatch = channelsToWatch.filter { it is PublicChatChannel }.map { it.idHex }
 
         if (reactionsToWatch.isEmpty()) {
             return null
@@ -32,7 +32,6 @@ object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
 
     fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
         val directEventsToLoad = channelsToWatch
-            .mapNotNull { LocalCache.checkGetOrCreateChannel(it) }
             .filter { it.notes.isEmpty() && it is PublicChatChannel }
 
         val interestedEvents = (directEventsToLoad).map { it.idHex }.toSet()
@@ -53,7 +52,6 @@ object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
 
     fun createLoadStreamingIfNotLoadedFilter(): List<TypedFilter>? {
         val directEventsToLoad = channelsToWatch
-            .mapNotNull { LocalCache.checkGetOrCreateChannel(it) }
             .filterIsInstance<LiveActivitiesChannel>()
             .filter { it.info == null }
 
@@ -81,7 +79,7 @@ object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
     val singleChannelChannel = requestNewChannel()
 
     override fun updateChannelFilters() {
-        val reactions = createRepliesAndReactionsFilter()
+        val reactions = createMetadataChangeFilter()
         val missing = createLoadEventsIfNotLoadedFilter()
         val missingStreaming = createLoadStreamingIfNotLoadedFilter()
 
@@ -90,13 +88,17 @@ object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
             ).ifEmpty { null }
     }
 
-    fun add(eventId: String) {
-        channelsToWatch = channelsToWatch.plus(eventId)
-        invalidateFilters()
+    fun add(eventId: Channel) {
+        if (eventId !in channelsToWatch) {
+            channelsToWatch = channelsToWatch.plus(eventId)
+            invalidateFilters()
+        }
     }
 
-    fun remove(eventId: String) {
-        channelsToWatch = channelsToWatch.minus(eventId)
-        invalidateFilters()
+    fun remove(eventId: Channel) {
+        if (eventId in channelsToWatch) {
+            channelsToWatch = channelsToWatch.minus(eventId)
+            invalidateFilters()
+        }
     }
 }

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

@@ -2,11 +2,11 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.quartz.events.*
 
 object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
     private var eventsToWatch = setOf<Note>()
@@ -134,6 +134,9 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
     }
 
     val singleEventChannel = requestNewChannel { time, relayUrl ->
+        // Ignores EOSE if it is in the middle of a filter change.
+        if (changingFilters.get()) return@requestNewChannel
+
         checkNotInMainThread()
 
         eventsToWatch.forEach {

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

@@ -1,44 +1,71 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.service.model.MetadataEvent
-import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
+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>()
 
-    fun createUserFilter(): List<TypedFilter>? {
+    fun createUserMetadataFilter(): List<TypedFilter>? {
         if (usersToWatch.isEmpty()) return null
 
-        return usersToWatch.filter { it.info?.latestMetadata == null }.map {
+        val firstTimers = usersToWatch.filter { it.info?.latestMetadata == null }.map { it.pubkeyHex }
+
+        return listOf(
             TypedFilter(
                 types = COMMON_FEED_TYPES,
                 filter = JsonFilter(
-                    kinds = listOf(MetadataEvent.kind),
-                    authors = listOf(it.pubkeyHex),
-                    limit = 1
+                    kinds = listOf(MetadataEvent.kind, StatusEvent.kind),
+                    authors = firstTimers,
+                    limit = 10 * firstTimers.size
                 )
             )
-        }
+        )
     }
 
-    fun createUserReportFilter(): List<TypedFilter>? {
+    fun createUserMetadataFilter(minLatestEOSEs: Map<String, EOSETime>): TypedFilter? {
         if (usersToWatch.isEmpty()) return null
 
-        return usersToWatch.map {
-            TypedFilter(
-                types = COMMON_FEED_TYPES,
-                filter = JsonFilter(
-                    kinds = listOf(ReportEvent.kind),
-                    tags = mapOf("p" to listOf(it.pubkeyHex)),
-                    since = it.latestEOSEs
-                )
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter = JsonFilter(
+                kinds = listOf(StatusEvent.kind),
+                authors = usersToWatch.map { it.pubkeyHex },
+                since = minLatestEOSEs
             )
-        }
+        )
+    }
+
+    fun createUserStatusFilter(minLatestEOSEs: Map<String, EOSETime>): TypedFilter? {
+        if (usersToWatch.isEmpty()) return null
+
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter = JsonFilter(
+                kinds = listOf(StatusEvent.kind),
+                authors = usersToWatch.map { it.pubkeyHex },
+                since = minLatestEOSEs
+            )
+        )
+    }
+
+    fun createUserReportFilter(minLatestEOSEs: Map<String, EOSETime>): TypedFilter? {
+        if (usersToWatch.isEmpty()) return null
+
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter = JsonFilter(
+                kinds = listOf(ReportEvent.kind),
+                tags = mapOf("p" to usersToWatch.map { it.pubkeyHex }),
+                since = minLatestEOSEs
+            )
+        )
     }
 
     val userChannel = requestNewChannel() { time, relayUrl ->
@@ -50,17 +77,40 @@ object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
                 eose.time = time
             }
         }
+    }
 
+    val userChannelFirstTimers = requestNewChannel() { time, relayUrl ->
         // Many relays operate with limits in the amount of filters.
         // As information comes, the filters will be rotated to get more data.
         invalidateFilters()
     }
 
-    val userChannelOnce = requestNewChannel()
-
     override fun updateChannelFilters() {
-        userChannel.typedFilters = listOfNotNull(createUserFilter()).flatten().ifEmpty { null }
-        userChannelOnce.typedFilters = listOfNotNull(createUserReportFilter()).flatten().ifEmpty { null }
+        val minLatestEOSEs = mutableMapOf<String, EOSETime>()
+        val neverGottenAnEOSE = mutableSetOf<String>()
+        usersToWatch.forEach {
+            if (it.latestEOSEs.isEmpty()) { // first time
+                neverGottenAnEOSE.add(it.pubkeyHex)
+            } else {
+                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
+                    }
+                }
+            }
+        }
+
+        userChannel.typedFilters = listOfNotNull(
+            createUserMetadataFilter(minLatestEOSEs),
+            createUserStatusFilter(minLatestEOSEs),
+            createUserReportFilter(minLatestEOSEs)
+        ).ifEmpty { null }
+        userChannelFirstTimers.typedFilters = listOfNotNull(
+            createUserMetadataFilter()
+        ).flatten().ifEmpty { null }
     }
 
     fun add(user: User) {

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

@@ -36,8 +36,10 @@ object NostrThreadDataSource : NostrDataSource("SingleThreadFeed") {
     }
 
     fun loadThread(noteId: String?) {
-        eventToWatch = noteId
+        if (eventToWatch != noteId) {
+            eventToWatch = noteId
 
-        invalidateFilters()
+            invalidateFilters()
+        }
     }
 }

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

@@ -1,10 +1,10 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.service.model.*
 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.quartz.events.*
 
 object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
     var user: User? = null
@@ -34,6 +34,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
                     RepostEvent.kind,
                     LongTextNoteEvent.kind,
                     AudioTrackEvent.kind,
+                    AudioHeaderEvent.kind,
                     PinListEvent.kind,
                     PollNoteEvent.kind,
                     HighlightEvent.kind

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

@@ -1,12 +1,12 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.service.model.FileHeaderEvent
-import com.vitorpamplona.amethyst.service.model.FileStorageHeaderEvent
 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.quartz.events.FileHeaderEvent
+import com.vitorpamplona.quartz.events.FileStorageHeaderEvent
 
 object NostrVideoDataSource : NostrDataSource("VideoFeed") {
     lateinit var account: Account
@@ -14,16 +14,12 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
     val latestEOSEs = EOSEAccount()
 
     fun createContextualFilter(): TypedFilter? {
-        val follows = account.selectedUsersFollowList(account.defaultStoriesFollowList)
-
-        val followKeys = follows?.map {
-            it.substring(0, 6)
-        }
+        val follows = account.selectedUsersFollowList(account.defaultStoriesFollowList)?.toList()
 
         return TypedFilter(
             types = setOf(FeedType.GLOBAL),
             filter = JsonFilter(
-                authors = followKeys,
+                authors = follows,
                 kinds = listOf(FileHeaderEvent.kind, FileStorageHeaderEvent.kind),
                 limit = 200,
                 since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultStoriesFollowList)?.relayList

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

@@ -0,0 +1,207 @@
+package com.vitorpamplona.amethyst.service
+
+import android.content.Context
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.R
+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.lnurl.LightningAddressResolver
+import com.vitorpamplona.quartz.events.LnZapEvent
+import com.vitorpamplona.quartz.events.PayInvoiceErrorResponse
+import com.vitorpamplona.quartz.events.ZapSplitSetup
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlin.math.round
+
+class ZapPaymentHandler(val account: Account) {
+
+    @Immutable
+    data class Payable(
+        val info: ZapSplitSetup,
+        val user: User?,
+        val amountMilliSats: Long,
+        val invoice: String
+    )
+
+    suspend fun zap(
+        note: Note,
+        amountMilliSats: Long,
+        pollOption: Int?,
+        message: String,
+        context: Context,
+        onError: (String) -> Unit,
+        onProgress: (percent: Float) -> Unit,
+        onPayViaIntent: (ImmutableList<Payable>) -> Unit,
+        zapType: LnZapEvent.ZapType
+    ) = withContext(Dispatchers.IO) {
+        val zapSplitSetup = note.event?.zapSplitSetup()
+
+        val zapsToSend = if (!zapSplitSetup.isNullOrEmpty()) {
+            zapSplitSetup
+        } else {
+            val lud16 = note.author?.info?.lud16?.trim() ?: note.author?.info?.lud06?.trim()
+
+            if (lud16.isNullOrBlank()) {
+                onError(context.getString(R.string.user_does_not_have_a_lightning_address_setup_to_receive_sats))
+                return@withContext
+            }
+
+            listOf(ZapSplitSetup(lud16, null, weight = 1.0, true))
+        }
+
+        val totalWeight = zapsToSend.sumOf { it.weight }
+
+        val invoicesToPayOnIntent = mutableListOf<Payable>()
+
+        zapsToSend.forEachIndexed { index, value ->
+            val outerProgressMin = index / zapsToSend.size.toFloat()
+            val outerProgressMax = (index + 1) / zapsToSend.size.toFloat()
+
+            val zapValue =
+                round((amountMilliSats * value.weight / totalWeight) / 1000f).toLong() * 1000
+
+            if (value.isLnAddress) {
+                innerZap(
+                    lud16 = value.lnAddressOrPubKeyHex,
+                    note = note,
+                    amount = zapValue,
+                    pollOption = pollOption,
+                    message = message,
+                    context = context,
+                    onError = onError,
+                    onProgress = {
+                        onProgress((it * (outerProgressMax - outerProgressMin)) + outerProgressMin)
+                    },
+                    zapType = zapType,
+                    onPayInvoiceThroughIntent = {
+                        invoicesToPayOnIntent.add(
+                            Payable(
+                                info = value,
+                                user = null,
+                                amountMilliSats = zapValue,
+                                invoice = it
+                            )
+                        )
+                    }
+                )
+            } else {
+                val user = LocalCache.getUserIfExists(value.lnAddressOrPubKeyHex)
+                val lud16 = user?.info?.lnAddress()
+
+                if (lud16 != null) {
+                    innerZap(
+                        lud16 = lud16,
+                        note = note,
+                        amount = zapValue,
+                        pollOption = pollOption,
+                        message = message,
+                        context = context,
+                        onError = onError,
+                        onProgress = {
+                            onProgress((it * (outerProgressMax - outerProgressMin)) + outerProgressMin)
+                        },
+                        zapType = zapType,
+                        overrideUser = user,
+                        onPayInvoiceThroughIntent = {
+                            invoicesToPayOnIntent.add(
+                                Payable(
+                                    info = value,
+                                    user = user,
+                                    amountMilliSats = zapValue,
+                                    invoice = it
+                                )
+                            )
+                        }
+                    )
+                } else {
+                    onError(
+                        context.getString(
+                            R.string.user_x_does_not_have_a_lightning_address_setup_to_receive_sats,
+                            user?.toBestDisplayName() ?: value.lnAddressOrPubKeyHex
+                        )
+                    )
+                }
+            }
+        }
+
+        if (invoicesToPayOnIntent.isNotEmpty()) {
+            onPayViaIntent(invoicesToPayOnIntent.toImmutableList())
+            onProgress(1f)
+        } else {
+            launch(Dispatchers.IO) {
+                // Awaits for the event to come back to LocalCache.
+                delay(5000)
+                onProgress(1f)
+            }
+        }
+    }
+
+    private suspend fun innerZap(
+        lud16: String,
+        note: Note,
+        amount: Long,
+        pollOption: Int?,
+        message: String,
+        context: Context,
+        onError: (String) -> Unit,
+        onProgress: (percent: Float) -> Unit,
+        onPayInvoiceThroughIntent: (String) -> Unit,
+        zapType: LnZapEvent.ZapType,
+        overrideUser: User? = null
+    ) {
+        var zapRequestJson = ""
+
+        if (zapType != LnZapEvent.ZapType.NONZAP) {
+            val zapRequest = account.createZapRequestFor(note, pollOption, message, zapType, overrideUser)
+            if (zapRequest != null) {
+                zapRequestJson = zapRequest.toJson()
+            }
+        }
+
+        onProgress(0.10f)
+
+        LightningAddressResolver().lnAddressInvoice(
+            lud16,
+            amount,
+            message,
+            zapRequestJson,
+            onSuccess = {
+                onProgress(0.7f)
+                if (account.hasWalletConnectSetup()) {
+                    account.sendZapPaymentRequestFor(
+                        bolt11 = it,
+                        note,
+                        onResponse = { response ->
+                            if (response is PayInvoiceErrorResponse) {
+                                onProgress(0.0f)
+                                onError(
+                                    response.error?.message
+                                        ?: response.error?.code?.toString()
+                                        ?: "Error parsing error message"
+                                )
+                            } else {
+                                onProgress(1f)
+                            }
+                        }
+                    )
+                    onProgress(0.8f)
+                } else {
+                    try {
+                        onPayInvoiceThroughIntent(it)
+                    } catch (e: Exception) {
+                        onError(context.getString(R.string.lightning_wallets_not_found2))
+                    }
+                    onProgress(0f)
+                }
+            },
+            onError = onError,
+            onProgress = onProgress
+        )
+    }
+}

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

@@ -2,20 +2,16 @@ package com.vitorpamplona.amethyst.service.lnurl
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
-import com.vitorpamplona.amethyst.service.Bech32
 import com.vitorpamplona.amethyst.service.HttpClient
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.service.toLnUrl
-import kotlinx.coroutines.CoroutineScope
+import com.vitorpamplona.quartz.encoders.LnInvoiceUtil
+import com.vitorpamplona.quartz.encoders.Lud06
+import com.vitorpamplona.quartz.encoders.toLnUrl
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import okhttp3.Call
-import okhttp3.Callback
 import okhttp3.Request
-import okhttp3.Response
 import java.math.BigDecimal
+import java.math.RoundingMode
 import java.net.URLEncoder
 
 class LightningAddressResolver() {
@@ -29,106 +25,67 @@ class LightningAddressResolver() {
         }
 
         if (lnaddress.lowercase().startsWith("lnurl")) {
-            return try {
-                String(Bech32.decodeBytes(lnaddress, false).second)
-            } catch (e: Exception) {
-                null
-            }
+            return Lud06().toLnUrlp(lnaddress)
         }
 
         return null
     }
 
-    fun fetchLightningAddressJson(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-        val scope = CoroutineScope(Job() + Dispatchers.IO)
-        scope.launch {
-            fetchLightningAddressJsonSuspend(lnaddress, onSuccess, onError)
-        }
-    }
-
-    private suspend fun fetchLightningAddressJsonSuspend(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    private suspend fun fetchLightningAddressJson(lnaddress: String, onSuccess: suspend (String) -> Unit, onError: (String) -> Unit) = withContext(Dispatchers.IO) {
         checkNotInMainThread()
 
         val url = assembleUrl(lnaddress)
 
         if (url == null) {
             onError("Could not assemble LNUrl from Lightning Address \"${lnaddress}\". Check the user's setup")
-            return
+            return@withContext
         }
 
         try {
-            withContext(Dispatchers.IO) {
-                val request: Request = Request.Builder()
-                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-                    .url(url)
-                    .build()
-
-                client.newCall(request).enqueue(object : Callback {
-                    override fun onResponse(call: Call, response: Response) {
-                        response.use {
-                            if (it.isSuccessful) {
-                                onSuccess(it.body.string())
-                            } else {
-                                onError("Could not resolve $lnaddress. Error: ${it.code}. Check if the server up and if the lightning address $lnaddress is correct")
-                            }
-                        }
-                    }
-
-                    override fun onFailure(call: Call, e: java.io.IOException) {
-                        onError("Could not resolve $url. Check if the server up and if the lightning address $lnaddress is correct")
-                        e.printStackTrace()
-                    }
-                })
-            }
-        } catch (e: Exception) {
-            onError("Could not resolve $url. Check if the server up and if the lightning address $lnaddress is correct")
-        }
-    }
-
-    fun fetchLightningInvoice(lnCallback: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-        val scope = CoroutineScope(Job() + Dispatchers.IO)
-        scope.launch {
-            fetchLightningInvoiceSuspend(lnCallback, milliSats, message, nostrRequest, onSuccess, onError)
-        }
-    }
-
-    private suspend fun fetchLightningInvoiceSuspend(lnCallback: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-        withContext(Dispatchers.IO) {
-            val encodedMessage = URLEncoder.encode(message, "utf-8")
-
-            val urlBinder = if (lnCallback.contains("?")) "&" else "?"
-            var url = "$lnCallback${urlBinder}amount=$milliSats&comment=$encodedMessage"
-
-            if (nostrRequest != null) {
-                val encodedNostrRequest = URLEncoder.encode(nostrRequest, "utf-8")
-                url += "&nostr=$encodedNostrRequest"
-            }
-
             val request: Request = Request.Builder()
                 .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                 .url(url)
                 .build()
 
-            client.newCall(request).enqueue(object : Callback {
-                override fun onResponse(call: Call, response: Response) {
-                    response.use {
-                        if (it.isSuccessful) {
-                            onSuccess(response.body.string())
-                        } else {
-                            onError("Could not fetch invoice from $lnCallback")
-                        }
-                    }
+            client.newCall(request).execute().use {
+                if (it.isSuccessful) {
+                    onSuccess(it.body.string())
+                } else {
+                    onError("The receiver's lightning service at $url is not available. It was calculated from the lightning address \"${lnaddress}\". Error: ${it.code}. Check if the server is up and if the lightning address is correct")
                 }
-
-                override fun onFailure(call: Call, e: java.io.IOException) {
-                    onError("Could not fetch an invoice from $lnCallback. Message ${e.message}")
-                    e.printStackTrace()
-                }
-            })
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            onError("Could not resolve $url. Check if the server is up and if the lightning address $lnaddress is correct")
         }
     }
 
-    fun lnAddressToLnUrl(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    suspend fun fetchLightningInvoice(lnCallback: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: suspend (String) -> Unit, onError: (String) -> Unit) = withContext(Dispatchers.IO) {
+        val encodedMessage = URLEncoder.encode(message, "utf-8")
+
+        val urlBinder = if (lnCallback.contains("?")) "&" else "?"
+        var url = "$lnCallback${urlBinder}amount=$milliSats&comment=$encodedMessage"
+
+        if (nostrRequest != null) {
+            val encodedNostrRequest = URLEncoder.encode(nostrRequest, "utf-8")
+            url += "&nostr=$encodedNostrRequest"
+        }
+
+        val request: Request = Request.Builder()
+            .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+            .url(url)
+            .build()
+
+        client.newCall(request).execute().use {
+            if (it.isSuccessful) {
+                onSuccess(it.body.string())
+            } else {
+                onError("Could not fetch invoice from $lnCallback")
+            }
+        }
+    }
+
+    suspend fun lnAddressToLnUrl(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
         fetchLightningAddressJson(
             lnaddress,
             onSuccess = {
@@ -138,7 +95,15 @@ class LightningAddressResolver() {
         )
     }
 
-    fun lnAddressInvoice(lnaddress: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit, onProgress: (percent: Float) -> Unit) {
+    suspend fun lnAddressInvoice(
+        lnaddress: String,
+        milliSats: Long,
+        message: String,
+        nostrRequest: String? = null,
+        onSuccess: suspend (String) -> Unit,
+        onError: (String) -> Unit,
+        onProgress: (percent: Float) -> Unit
+    ) {
         val mapper = jacksonObjectMapper()
 
         fetchLightningAddressJson(
@@ -179,14 +144,22 @@ class LightningAddressResolver() {
 
                             lnInvoice?.get("pr")?.asText()?.ifBlank { null }?.let { pr ->
                                 // Forces LN Invoice amount to be the requested amount.
+                                val expectedAmountInSats = BigDecimal(milliSats).divide(BigDecimal(1000), RoundingMode.HALF_UP).toLong()
                                 val invoiceAmount = LnInvoiceUtil.getAmountInSats(pr)
-                                if (invoiceAmount.multiply(BigDecimal(1000)).toLong() == BigDecimal(milliSats).toLong()) {
+                                if (invoiceAmount.toLong() == expectedAmountInSats) {
                                     onProgress(0.7f)
                                     onSuccess(pr)
                                 } else {
-                                    onError("Incorrect invoice amount (${invoiceAmount.toLong()} sats) from server")
+                                    onProgress(0.0f)
+                                    onError("Incorrect invoice amount (${invoiceAmount.toLong()} sats) from $lnaddress. It should have been $expectedAmountInSats")
                                 }
-                            } ?: onError("Invoice Not Created (element pr not found in the resulting JSON)")
+                            } ?: lnInvoice?.get("reason")?.asText()?.ifBlank { null }?.let { reason ->
+                                onProgress(0.0f)
+                                onError("Unable to create a lightning invoice before sending the zap. The receiver's lightning wallet sent the following error: $reason")
+                            } ?: run {
+                                onProgress(0.0f)
+                                onError("nable to create a lightning invoice before sending the zap. Element pr not found in the resulting JSON.")
+                            }
                         },
                         onError = onError
                     )

app/src/main/java/com/vitorpamplona/amethyst/service/model/Event.kt

@@ -1,382 +0,0 @@
-package com.vitorpamplona.amethyst.service.model
-
-import android.util.Log
-import androidx.compose.runtime.Immutable
-import com.google.gson.*
-import com.google.gson.annotations.SerializedName
-import com.vitorpamplona.amethyst.model.HexKey
-import com.vitorpamplona.amethyst.model.TimeUtils
-import com.vitorpamplona.amethyst.model.toHexKey
-import com.vitorpamplona.amethyst.service.CryptoUtils
-import com.vitorpamplona.amethyst.service.nip19.Nip19
-import com.vitorpamplona.amethyst.service.relays.bytesUsedInMemory
-import fr.acinq.secp256k1.Hex
-import java.lang.reflect.Type
-import java.math.BigDecimal
-import java.util.*
-
-@Immutable
-open class Event(
-    val id: HexKey,
-    @SerializedName("pubkey") val pubKey: HexKey,
-    @SerializedName("created_at") val createdAt: Long,
-    val kind: Int,
-    val tags: List<List<String>>,
-    val content: String,
-    val sig: HexKey
-) : EventInterface {
-
-    override fun countMemory(): Long {
-        return 12L +
-            id.bytesUsedInMemory() +
-            pubKey.bytesUsedInMemory() +
-            tags.sumOf { it.sumOf { it.bytesUsedInMemory() } } +
-            content.bytesUsedInMemory() +
-            sig.bytesUsedInMemory()
-    }
-
-    override fun id(): HexKey = id
-
-    override fun pubKey(): HexKey = pubKey
-
-    override fun createdAt(): Long = createdAt
-
-    override fun kind(): Int = kind
-
-    override fun tags(): List<List<String>> = tags
-
-    override fun content(): String = content
-
-    override fun sig(): HexKey = sig
-
-    override fun toJson(): String = gson.toJson(this)
-
-    fun hasAnyTaggedUser() = tags.any { it.size > 1 && it[0] == "p" }
-
-    override fun taggedUsers() = tags.filter { it.size > 1 && it[0] == "p" }.map { it[1] }
-    override fun taggedEvents() = tags.filter { it.size > 1 && it[0] == "e" }.map { it[1] }
-
-    override fun taggedUrls() = tags.filter { it.size > 1 && it[0] == "r" }.map { it[1] }
-
-    override fun taggedEmojis() = tags.filter { it.size > 2 && it[0] == "emoji" }.map { EmojiUrl(it[1], it[2]) }
-
-    override fun isSensitive() = tags.any {
-        (it.size > 0 && it[0].equals("content-warning", true)) ||
-            (it.size > 1 && it[0] == "t" && it[1].equals("nsfw", true)) ||
-            (it.size > 1 && it[0] == "t" && it[1].equals("nude", true))
-    }
-
-    override fun subject() = tags.firstOrNull() { it.size > 1 && it[0] == "subject" }?.get(1)
-
-    override fun zapraiserAmount() = tags.firstOrNull() {
-        (it.size > 1 && it[0] == "zapraiser")
-    }?.get(1)?.toLongOrNull()
-
-    override fun zapAddress() = tags.firstOrNull { it.size > 1 && it[0] == "zap" }?.get(1)
-
-    override fun taggedAddresses() = tags.filter { it.size > 1 && it[0] == "a" }.mapNotNull {
-        val aTagValue = it[1]
-        val relay = it.getOrNull(2)
-
-        ATag.parse(aTagValue, relay)
-    }
-
-    override fun hashtags() = tags.filter { it.size > 1 && it[0] == "t" }.map { it[1] }
-    override fun geohashes() = tags.filter { it.size > 1 && it[0] == "g" }.map { it[1] }
-
-    override fun matchTag1With(text: String) = tags.any { it.size > 1 && it[1].contains(text, true) }
-
-    override fun isTaggedUser(idHex: String) = tags.any { it.size > 1 && it[0] == "p" && it[1] == idHex }
-
-    override fun isTaggedEvent(idHex: String) = tags.any { it.size > 1 && it[0] == "e" && it[1] == idHex }
-
-    override fun isTaggedAddressableNote(idHex: String) = tags.any { it.size > 1 && it[0] == "a" && it[1] == idHex }
-
-    override fun isTaggedAddressableNotes(idHexes: Set<String>) = tags.any { it.size > 1 && it[0] == "a" && it[1] in idHexes }
-
-    override fun isTaggedHash(hashtag: String) = tags.any { it.size > 1 && it[0] == "t" && it[1].equals(hashtag, true) }
-
-    override fun isTaggedGeoHash(hashtag: String) = tags.any { it.size > 1 && it[0] == "g" && it[1].startsWith(hashtag, true) }
-    override fun isTaggedHashes(hashtags: Set<String>) = tags.any { it.size > 1 && it[0] == "t" && it[1].lowercase() in hashtags }
-    override fun isTaggedGeoHashes(hashtags: Set<String>) = tags.any { it.size > 1 && it[0] == "g" && it[1].lowercase() in hashtags }
-    override fun firstIsTaggedHashes(hashtags: Set<String>) = tags.firstOrNull { it.size > 1 && it[0] == "t" && it[1].lowercase() in hashtags }?.getOrNull(1)
-
-    override fun firstIsTaggedAddressableNote(addressableNotes: Set<String>) = tags.firstOrNull { it.size > 1 && it[0] == "a" && it[1] in addressableNotes }?.getOrNull(1)
-
-    override fun isTaggedAddressableKind(kind: Int): Boolean {
-        val kindStr = kind.toString()
-        return tags.any { it.size > 1 && it[0] == "a" && it[1].startsWith(kindStr) }
-    }
-
-    override fun getTagOfAddressableKind(kind: Int): ATag? {
-        val kindStr = kind.toString()
-        val aTag = tags
-            .firstOrNull { it.size > 1 && it[0] == "a" && it[1].startsWith(kindStr) }
-            ?.getOrNull(1)
-            ?: return null
-
-        return ATag.parse(aTag, null)
-    }
-
-    override fun getPoWRank(): Int {
-        var rank = 0
-        for (i in 0..id.length) {
-            if (id[i] == '0') {
-                rank += 4
-            } else if (id[i] in '4'..'7') {
-                rank += 1
-                break
-            } else if (id[i] in '2'..'3') {
-                rank += 2
-                break
-            } else if (id[i] == '1') {
-                rank += 3
-                break
-            } else {
-                break
-            }
-        }
-        return rank
-    }
-
-    override fun getGeoHash(): String? {
-        return tags.firstOrNull { it.size > 1 && it[0] == "g" }?.get(1)?.ifBlank { null }
-    }
-
-    override fun getReward(): BigDecimal? {
-        return try {
-            tags.firstOrNull { it.size > 1 && it[0] == "reward" }?.get(1)?.let { BigDecimal(it) }
-        } catch (e: Exception) {
-            null
-        }
-    }
-
-    open fun toNIP19(): String {
-        return if (this is AddressableEvent) {
-            ATag(kind, pubKey, dTag(), null).toNAddr()
-        } else {
-            Nip19.createNEvent(id, pubKey, kind, null)
-        }
-    }
-
-    fun toNostrUri(): String {
-        return "nostr:${toNIP19()}"
-    }
-
-    /**
-     * Checks if the ID is correct and then if the pubKey's secret key signed the event.
-     */
-    override fun checkSignature() {
-        if (!id.contentEquals(generateId())) {
-            throw Exception(
-                """|Unexpected ID.
-                   |  Event: ${toJson()}
-                   |  Actual ID: $id
-                   |  Generated: ${generateId()}
-                """.trimIndent()
-            )
-        }
-        if (!CryptoUtils.verifySignature(Hex.decode(sig), Hex.decode(id), Hex.decode(pubKey))) {
-            throw Exception("""Bad signature!""")
-        }
-    }
-
-    override fun hasValidSignature(): Boolean {
-        return try {
-            id.contentEquals(generateId()) && CryptoUtils.verifySignature(Hex.decode(sig), Hex.decode(id), Hex.decode(pubKey))
-        } catch (e: Exception) {
-            Log.e("Event", "Fail checking if event $id has a valid signature", e)
-            false
-        }
-    }
-
-    private fun generateId(): String {
-        val rawEvent = listOf(0, pubKey, createdAt, kind, tags, content)
-
-        // GSON decided to hardcode these replacements.
-        // They break Nostr's hash check.
-        // These lines revert their code.
-        // https://github.com/google/gson/issues/2295
-        val rawEventJson = gson.toJson(rawEvent)
-            .replace("\\u2028", "\u2028")
-            .replace("\\u2029", "\u2029")
-
-        return CryptoUtils.sha256(rawEventJson.toByteArray()).toHexKey()
-    }
-
-    private class EventDeserializer : JsonDeserializer<Event> {
-        override fun deserialize(
-            json: JsonElement,
-            typeOfT: Type?,
-            context: JsonDeserializationContext?
-        ): Event {
-            val jsonObject = json.asJsonObject
-            return Event(
-                id = jsonObject.get("id").asString.intern(),
-                pubKey = jsonObject.get("pubkey").asString.intern(),
-                createdAt = jsonObject.get("created_at").asLong,
-                kind = jsonObject.get("kind").asInt,
-                tags = jsonObject.get("tags").asJsonArray.map {
-                    it.asJsonArray.mapNotNull { s -> if (s.isJsonNull) null else s.asString.intern() }
-                },
-                content = jsonObject.get("content").asString,
-                sig = jsonObject.get("sig").asString
-            )
-        }
-    }
-
-    private class GossipDeserializer : JsonDeserializer<Gossip> {
-        override fun deserialize(
-            json: JsonElement,
-            typeOfT: Type?,
-            context: JsonDeserializationContext?
-        ): Gossip {
-            val jsonObject = json.asJsonObject
-            return Gossip(
-                id = jsonObject.get("id")?.asString?.intern(),
-                pubKey = jsonObject.get("pubkey")?.asString?.intern(),
-                createdAt = jsonObject.get("created_at")?.asLong,
-                kind = jsonObject.get("kind")?.asInt,
-                tags = jsonObject.get("tags")?.asJsonArray?.mapNotNull {
-                    it?.asJsonArray?.mapNotNull { s -> if (s?.isJsonNull != false) null else s.asString.intern() }
-                },
-                content = jsonObject.get("content")?.asString
-            )
-        }
-    }
-
-    private class EventSerializer : JsonSerializer<Event> {
-        override fun serialize(
-            src: Event,
-            typeOfSrc: Type?,
-            context: JsonSerializationContext?
-        ): JsonElement {
-            return JsonObject().apply {
-                addProperty("id", src.id)
-                addProperty("pubkey", src.pubKey)
-                addProperty("created_at", src.createdAt)
-                addProperty("kind", src.kind)
-                add(
-                    "tags",
-                    JsonArray().also { jsonTags ->
-                        src.tags.forEach { tag ->
-                            jsonTags.add(
-                                JsonArray().also { jsonTagElement ->
-                                    tag.forEach { tagElement ->
-                                        jsonTagElement.add(tagElement)
-                                    }
-                                }
-                            )
-                        }
-                    }
-                )
-                addProperty("content", src.content)
-                addProperty("sig", src.sig)
-            }
-        }
-    }
-
-    private class GossipSerializer : JsonSerializer<Gossip> {
-        override fun serialize(
-            src: Gossip,
-            typeOfSrc: Type?,
-            context: JsonSerializationContext?
-        ): JsonElement {
-            return JsonObject().apply {
-                src.id?.let { addProperty("id", it) }
-                src.pubKey?.let { addProperty("pubkey", it) }
-                src.createdAt?.let { addProperty("created_at", it) }
-                src.kind?.let { addProperty("kind", it) }
-                src.tags?.let {
-                    add(
-                        "tags",
-                        JsonArray().also { jsonTags ->
-                            it.forEach { tag ->
-                                jsonTags.add(
-                                    JsonArray().also { jsonTagElement ->
-                                        tag.forEach { tagElement ->
-                                            jsonTagElement.add(tagElement)
-                                        }
-                                    }
-                                )
-                            }
-                        }
-                    )
-                }
-                src.content?.let { addProperty("content", it) }
-            }
-        }
-    }
-
-    private class ByteArrayDeserializer : JsonDeserializer<ByteArray> {
-        override fun deserialize(
-            json: JsonElement,
-            typeOfT: Type?,
-            context: JsonDeserializationContext?
-        ): ByteArray = Hex.decode(json.asString)
-    }
-
-    private class ByteArraySerializer : JsonSerializer<ByteArray> {
-        override fun serialize(
-            src: ByteArray,
-            typeOfSrc: Type?,
-            context: JsonSerializationContext?
-        ) = JsonPrimitive(src.toHexKey())
-    }
-
-    companion object {
-        val gson: Gson = GsonBuilder()
-            .disableHtmlEscaping()
-            .registerTypeAdapter(Event::class.java, EventSerializer())
-            .registerTypeAdapter(Event::class.java, EventDeserializer())
-            .registerTypeAdapter(Gossip::class.java, GossipSerializer())
-            .registerTypeAdapter(Gossip::class.java, GossipDeserializer())
-            .registerTypeAdapter(ByteArray::class.java, ByteArraySerializer())
-            .registerTypeAdapter(ByteArray::class.java, ByteArrayDeserializer())
-            .registerTypeAdapter(Response::class.java, ResponseDeserializer())
-            .registerTypeAdapter(Request::class.java, RequestDeserializer())
-            .create()
-
-        fun fromJson(json: String, lenient: Boolean = false): Event = gson.fromJson(json, Event::class.java).getRefinedEvent(lenient)
-
-        fun fromJson(json: JsonElement, lenient: Boolean = false): Event = gson.fromJson(json, Event::class.java).getRefinedEvent(lenient)
-
-        fun Event.getRefinedEvent(lenient: Boolean = false): Event {
-            return EventFactory.create(id, pubKey, createdAt, kind, tags, content, sig, lenient)
-        }
-
-        fun generateId(pubKey: HexKey, createdAt: Long, kind: Int, tags: List<List<String>>, content: String): ByteArray {
-            val rawEvent = listOf(
-                0,
-                pubKey,
-                createdAt,
-                kind,
-                tags,
-                content
-            )
-
-            // GSON decided to hardcode these replacements.
-            // They break Nostr's hash check.
-            // These lines revert their code.
-            // https://github.com/google/gson/issues/2295
-            val rawEventJson = gson.toJson(rawEvent)
-                .replace("\\u2028", "\u2028")
-                .replace("\\u2029", "\u2029")
-
-            return CryptoUtils.sha256(rawEventJson.toByteArray())
-        }
-
-        fun create(privateKey: ByteArray, kind: Int, tags: List<List<String>> = emptyList(), content: String = "", createdAt: Long = TimeUtils.now()): Event {
-            val pubKey = CryptoUtils.pubkeyCreate(privateKey).toHexKey()
-            val id = Companion.generateId(pubKey, createdAt, kind, tags, content)
-            val sig = CryptoUtils.sign(id, privateKey).toHexKey()
-            return Event(id.toHexKey(), pubKey, createdAt, kind, tags, content, sig)
-        }
-    }
-}
-
-@Immutable
-interface AddressableEvent {
-    fun dTag(): String
-    fun address(): ATag
-}

app/src/main/java/com/vitorpamplona/amethyst/service/model/zaps/UserZaps.kt

@@ -1,8 +1,8 @@
-package com.vitorpamplona.amethyst.service.model.zaps
+package com.vitorpamplona.quartz.events.zaps
 
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.service.model.LnZapEventInterface
 import com.vitorpamplona.amethyst.ui.screen.ZapReqResponse
+import com.vitorpamplona.quartz.events.LnZapEventInterface
 
 object UserZaps {
     fun forProfileFeed(zaps: Map<Note, Note?>?): List<ZapReqResponse> {

app/src/main/java/com/vitorpamplona/amethyst/service/nip19/Nip19.kt

@@ -1,179 +0,0 @@
-package com.vitorpamplona.amethyst.service.nip19
-
-import android.util.Log
-import androidx.compose.runtime.Immutable
-import com.vitorpamplona.amethyst.model.hexToByteArray
-import com.vitorpamplona.amethyst.model.toHexKey
-import com.vitorpamplona.amethyst.service.bechToBytes
-import com.vitorpamplona.amethyst.service.toNEvent
-import java.util.regex.Pattern
-
-object Nip19 {
-    enum class Type {
-        USER, NOTE, EVENT, RELAY, ADDRESS
-    }
-
-    val nip19regex = Pattern.compile("(nostr:)?@?(nsec1|npub1|nevent1|naddr1|note1|nprofile1|nrelay1)([qpzry9x8gf2tvdw0s3jn54khce6mua7l]+)([\\S]*)", Pattern.CASE_INSENSITIVE)
-
-    @Immutable
-    data class Return(
-        val type: Type,
-        val hex: String,
-        val relay: String? = null,
-        val author: String? = null,
-        val kind: Int? = null,
-        val additionalChars: String = ""
-    )
-
-    fun uriToRoute(uri: String?): Return? {
-        if (uri == null) return null
-
-        try {
-            val matcher = nip19regex.matcher(uri)
-            if (!matcher.find()) {
-                return null
-            }
-
-            val uriScheme = matcher.group(1) // nostr:
-            val type = matcher.group(2) // npub1
-            val key = matcher.group(3) // bech32
-            val additionalChars = matcher.group(4) // additional chars
-
-            return parseComponents(uriScheme, type, key, additionalChars)
-        } catch (e: Throwable) {
-            Log.e("NIP19 Parser", "Issue trying to Decode NIP19 $uri: ${e.message}", e)
-        }
-
-        return null
-    }
-
-    fun parseComponents(
-        uriScheme: String?,
-        type: String,
-        key: String?,
-        additionalChars: String?
-    ): Return? {
-        return try {
-            val bytes = (type + key).bechToBytes()
-            val parsed = when (type.lowercase()) {
-                "npub1" -> npub(bytes)
-                "note1" -> note(bytes)
-                "nprofile1" -> nprofile(bytes)
-                "nevent1" -> nevent(bytes)
-                "nrelay1" -> nrelay(bytes)
-                "naddr1" -> naddr(bytes)
-                else -> null
-            }
-            parsed?.copy(additionalChars = additionalChars ?: "")
-        } catch (e: Throwable) {
-            Log.w("NIP19 Parser", "Issue trying to Decode NIP19 $key: ${e.message}", e)
-            null
-        }
-    }
-
-    private fun npub(bytes: ByteArray): Return {
-        return Return(Type.USER, bytes.toHexKey())
-    }
-
-    private fun note(bytes: ByteArray): Return {
-        return Return(Type.NOTE, bytes.toHexKey())
-    }
-
-    private fun nprofile(bytes: ByteArray): Return? {
-        val tlv = Tlv.parse(bytes)
-
-        val hex = tlv.get(Tlv.Type.SPECIAL.id)
-            ?.get(0)
-            ?.toHexKey() ?: return null
-
-        val relay = tlv.get(Tlv.Type.RELAY.id)
-            ?.get(0)
-            ?.toString(Charsets.UTF_8)
-
-        return Return(Type.USER, hex, relay)
-    }
-
-    private fun nevent(bytes: ByteArray): Return? {
-        val tlv = Tlv.parse(bytes)
-
-        val hex = tlv.get(Tlv.Type.SPECIAL.id)
-            ?.get(0)
-            ?.toHexKey() ?: return null
-
-        val relay = tlv.get(Tlv.Type.RELAY.id)
-            ?.get(0)
-            ?.toString(Charsets.UTF_8)
-
-        val author = tlv.get(Tlv.Type.AUTHOR.id)
-            ?.get(0)
-            ?.toHexKey()
-
-        val kind = tlv.get(Tlv.Type.KIND.id)
-            ?.get(0)
-            ?.let { Tlv.toInt32(it) }
-
-        return Return(Type.EVENT, hex, relay, author, kind)
-    }
-
-    private fun nrelay(bytes: ByteArray): Return? {
-        val relayUrl = Tlv.parse(bytes)
-            .get(Tlv.Type.SPECIAL.id)
-            ?.get(0)
-            ?.toString(Charsets.UTF_8) ?: return null
-
-        return Return(Type.RELAY, relayUrl)
-    }
-
-    private fun naddr(bytes: ByteArray): Return? {
-        val tlv = Tlv.parse(bytes)
-
-        val d = tlv.get(Tlv.Type.SPECIAL.id)
-            ?.get(0)
-            ?.toString(Charsets.UTF_8) ?: return null
-
-        val relay = tlv.get(Tlv.Type.RELAY.id)
-            ?.get(0)
-            ?.toString(Charsets.UTF_8)
-
-        val author = tlv.get(Tlv.Type.AUTHOR.id)
-            ?.get(0)
-            ?.toHexKey()
-
-        val kind = tlv.get(Tlv.Type.KIND.id)
-            ?.get(0)
-            ?.let { Tlv.toInt32(it) }
-
-        return Return(Type.ADDRESS, "$kind:$author:$d", relay, author, kind)
-    }
-
-    public fun createNEvent(idHex: String, author: String?, kind: Int?, relay: String?): String {
-        val kind = kind?.toByteArray()
-        val author = author?.hexToByteArray()
-        val idHex = idHex.hexToByteArray()
-        val relay = relay?.toByteArray(Charsets.UTF_8)
-
-        var fullArray = byteArrayOf(Tlv.Type.SPECIAL.id, idHex.size.toByte()) + idHex
-
-        if (relay != null) {
-            fullArray = fullArray + byteArrayOf(Tlv.Type.RELAY.id, relay.size.toByte()) + relay
-        }
-
-        if (author != null) {
-            fullArray = fullArray + byteArrayOf(Tlv.Type.AUTHOR.id, author.size.toByte()) + author
-        }
-
-        if (kind != null) {
-            fullArray = fullArray + byteArrayOf(Tlv.Type.KIND.id, kind.size.toByte()) + kind
-        }
-
-        return fullArray.toNEvent()
-    }
-}
-
-fun Int.toByteArray(): ByteArray {
-    val bytes = ByteArray(4)
-    (0..3).forEach {
-        bytes[3 - it] = ((this ushr (8 * it)) and 0xFFFF).toByte()
-    }
-    return bytes
-}

app/src/main/java/com/vitorpamplona/amethyst/service/nip19/Tlv.kt

@@ -1,36 +0,0 @@
-package com.vitorpamplona.amethyst.service.nip19
-
-import java.nio.ByteBuffer
-import java.nio.ByteOrder
-
-object Tlv {
-    enum class Type(val id: Byte) {
-        SPECIAL(0),
-        RELAY(1),
-        AUTHOR(2),
-        KIND(3);
-    }
-
-    fun toInt32(bytes: ByteArray): Int {
-        require(bytes.size == 4) { "length must be 4, got: ${bytes.size}" }
-        return ByteBuffer.wrap(bytes, 0, 4).order(ByteOrder.BIG_ENDIAN).int
-    }
-
-    fun parse(data: ByteArray): Map<Byte, List<ByteArray>> {
-        val result = mutableMapOf<Byte, MutableList<ByteArray>>()
-        var rest = data
-        while (rest.isNotEmpty()) {
-            val t = rest[0]
-            val l = rest[1].toUByte().toInt()
-            val v = rest.sliceArray(IntRange(2, (2 + l) - 1))
-            rest = rest.sliceArray(IntRange(2 + l, rest.size - 1))
-            if (v.size < l) continue
-
-            if (!result.containsKey(t)) {
-                result[t] = mutableListOf()
-            }
-            result[t]?.add(v)
-        }
-        return result
-    }
-}

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

@@ -6,58 +6,71 @@ import androidx.core.content.ContextCompat
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.ChatroomKey
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.toHexKey
-import com.vitorpamplona.amethyst.service.model.ChatMessageEvent
-import com.vitorpamplona.amethyst.service.model.Event
-import com.vitorpamplona.amethyst.service.model.GiftWrapEvent
-import com.vitorpamplona.amethyst.service.model.LnZapEvent
-import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
-import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
-import com.vitorpamplona.amethyst.service.model.SealedGossipEvent
 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.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.events.ChatMessageEvent
+import com.vitorpamplona.quartz.events.ChatroomKey
+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.utils.TimeUtils
 import kotlinx.collections.immutable.persistentSetOf
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
+import java.math.BigDecimal
 
 class EventNotificationConsumer(private val applicationContext: Context) {
-    fun consume(event: Event) {
-        val scope = CoroutineScope(Job() + Dispatchers.IO)
-        scope.launch {
-            if (LocalCache.notes[event.id] == null) {
-                if (LocalCache.justVerify(event)) {
-                    LocalCache.justConsume(event, null)
+    suspend fun consume(event: GiftWrapEvent) {
+        if (!LocalCache.justVerify(event)) return
+        if (!notificationManager().areNotificationsEnabled()) return
 
-                    val manager = notificationManager()
-                    if (manager.areNotificationsEnabled()) {
-                        when (event) {
-                            is PrivateDmEvent -> notify(event)
-                            is LnZapEvent -> notify(event)
-                            is GiftWrapEvent -> unwrapAndNotify(event)
-                        }
-                    }
+        // PushNotification Wraps don't include a receiver.
+        // Test with all logged in accounts
+        LocalPreferences.allSavedAccounts().forEach {
+            val acc = LocalPreferences.loadFromEncryptedStorage(it.npub)
+            if (acc != null && acc.keyPair.privKey != null) {
+                consumeIfMatchesAccount(event, acc)
+            }
+        }
+    }
+
+    private suspend fun consumeIfMatchesAccount(pushWrappedEvent: GiftWrapEvent, account: Account) {
+        val key = account.keyPair.privKey ?: return
+        pushWrappedEvent.unwrap(key)?.let { notificationEvent ->
+            if (!LocalCache.justVerify(notificationEvent)) return // invalid event
+            if (LocalCache.notes[notificationEvent.id] != null) return // already processed
+
+            LocalCache.justConsume(notificationEvent, null)
+
+            unwrapAndConsume(notificationEvent, account)?.let { innerEvent ->
+                if (innerEvent is PrivateDmEvent) {
+                    notify(innerEvent, account)
+                } else if (innerEvent is LnZapEvent) {
+                    notify(innerEvent, account)
+                } else if (innerEvent is ChatMessageEvent) {
+                    notify(innerEvent, account)
                 }
             }
         }
     }
 
-    fun unwrapAndConsume(event: Event, account: Account): Event? {
-        if (account.keyPair.privKey == null) return null
+    private fun unwrapAndConsume(event: Event, account: Account): Event? {
         if (!LocalCache.justVerify(event)) return null
 
         return when (event) {
             is GiftWrapEvent -> {
-                event.cachedGift(account.keyPair.privKey)?.let {
+                val key = account.keyPair.privKey ?: return null
+                event.cachedGift(key)?.let {
                     unwrapAndConsume(it, account)
                 }
             }
             is SealedGossipEvent -> {
-                event.cachedGossip(account.keyPair.privKey)?.let {
+                val key = account.keyPair.privKey ?: return null
+                event.cachedGossip(key)?.let {
                     // this is not verifiable
                     LocalCache.justConsume(it, null)
                     it
@@ -70,106 +83,106 @@ class EventNotificationConsumer(private val applicationContext: Context) {
         }
     }
 
-    private fun unwrapAndNotify(giftWrap: GiftWrapEvent) {
-        val giftWrapNote = LocalCache.notes[giftWrap.id] ?: return
+    private fun notify(event: ChatMessageEvent, acc: Account) {
+        if (event.createdAt > TimeUtils.fiveMinutesAgo() && // old event being re-broadcasted
+            event.pubKey != acc.userProfile().pubkeyHex
+        ) { // from the user
 
-        LocalPreferences.allSavedAccounts().forEach {
-            val acc = LocalPreferences.loadFromEncryptedStorage(it.npub)
+            val chatNote = LocalCache.notes[event.id] ?: return
+            val chatRoom = event.chatroomKey(acc.keyPair.pubKey.toHexKey())
 
-            if (acc != null && acc.userProfile().pubkeyHex == giftWrap.recipientPubKey()) {
-                val chatEvent = unwrapAndConsume(giftWrap, account = acc)
+            val followingKeySet = acc.followingKeySet()
 
-                if (chatEvent is ChatMessageEvent && acc.keyPair.privKey != null) {
-                    val chatNote = LocalCache.notes[chatEvent.id] ?: return
-                    val chatRoom = chatEvent.chatroomKey(acc.keyPair.pubKey.toHexKey())
+            val isKnownRoom = (
+                acc.userProfile().privateChatrooms[chatRoom]?.senderIntersects(followingKeySet) == true ||
+                    acc.userProfile().hasSentMessagesTo(chatRoom)
+                ) && !acc.isAllHidden(chatRoom.users)
 
-                    val followingKeySet = acc.followingKeySet()
-
-                    val isKnownRoom = (
-                        acc.userProfile().privateChatrooms[chatRoom]?.senderIntersects(followingKeySet) == true ||
-                            acc.userProfile().hasSentMessagesTo(chatRoom)
-                        ) && !acc.isAllHidden(chatRoom.users)
-
-                    if (isKnownRoom) {
-                        val content = chatNote.event?.content() ?: ""
-                        val user = chatNote.author?.toBestDisplayName() ?: ""
-                        val userPicture = chatNote.author?.profilePicture()
-                        val noteUri = chatNote.toNEvent()
-                        notificationManager().sendDMNotification(chatEvent.id, content, user, userPicture, noteUri, applicationContext)
-                    }
-                }
+            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,
+                    userPicture,
+                    noteUri,
+                    applicationContext
+                )
             }
         }
     }
 
-    private fun notify(event: PrivateDmEvent) {
+    private fun notify(event: PrivateDmEvent, acc: Account) {
         val note = LocalCache.notes[event.id] ?: return
 
-        LocalPreferences.allSavedAccounts().forEach {
-            val acc = LocalPreferences.loadFromEncryptedStorage(it.npub)
+        // old event being re-broadcast
+        if (event.createdAt < TimeUtils.fiveMinutesAgo()) return
 
-            if (acc != null && acc.userProfile().pubkeyHex == event.verifiedRecipientPubKey()) {
-                val followingKeySet = acc.followingKeySet()
+        if (acc != null && acc.userProfile().pubkeyHex == event.verifiedRecipientPubKey()) {
+            val followingKeySet = acc.followingKeySet()
 
-                val knownChatrooms = acc.userProfile().privateChatrooms.keys.filter {
-                    (
-                        acc.userProfile().privateChatrooms[it]?.senderIntersects(followingKeySet) == true ||
-                            acc.userProfile().hasSentMessagesTo(it)
-                        ) && !acc.isAllHidden(it.users)
-                }.toSet()
+            val knownChatrooms = acc.userProfile().privateChatrooms.keys.filter {
+                (
+                    acc.userProfile().privateChatrooms[it]?.senderIntersects(followingKeySet) == true ||
+                        acc.userProfile().hasSentMessagesTo(it)
+                    ) && !acc.isAllHidden(it.users)
+            }.toSet()
 
-                note.author?.let {
-                    if (ChatroomKey(persistentSetOf(it.pubkeyHex)) in knownChatrooms) {
-                        val content = acc.decryptContent(note) ?: ""
-                        val user = note.author?.toBestDisplayName() ?: ""
-                        val userPicture = note.author?.profilePicture()
-                        val noteUri = note.toNEvent()
-                        notificationManager().sendDMNotification(event.id, content, user, userPicture, noteUri, applicationContext)
-                    }
+            note.author?.let {
+                if (ChatroomKey(persistentSetOf(it.pubkeyHex)) in knownChatrooms) {
+                    val content = acc.decryptContent(note) ?: ""
+                    val user = note.author?.toBestDisplayName() ?: ""
+                    val userPicture = note.author?.profilePicture()
+                    val noteUri = note.toNEvent()
+                    notificationManager().sendDMNotification(event.id, content, user, userPicture, noteUri, applicationContext)
                 }
             }
         }
     }
 
-    private fun notify(event: LnZapEvent) {
+    private fun notify(event: LnZapEvent, acc: Account) {
         val noteZapEvent = LocalCache.notes[event.id] ?: return
 
-        val noteZapRequest = event.zapRequest?.id?.let { LocalCache.checkGetOrCreateNote(it) }
+        // old event being re-broadcast
+        if (event.createdAt < TimeUtils.fiveMinutesAgo()) return
+
+        val noteZapRequest = event.zapRequest?.id?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
         val noteZapped = event.zappedPost().firstOrNull()?.let { LocalCache.checkGetOrCreateNote(it) }
 
-        LocalPreferences.allSavedAccounts().forEach {
-            val acc = LocalPreferences.loadFromEncryptedStorage(it.npub)
+        if ((event.amount ?: BigDecimal.ZERO) < BigDecimal.TEN) return
 
-            if (acc != null && acc.userProfile().pubkeyHex == event.zappedAuthor().firstOrNull()) {
-                val amount = showAmount(event.amount)
-                val senderInfo = (noteZapRequest?.event as? LnZapRequestEvent)?.let {
-                    val decryptedContent = acc.decryptZapContentAuthor(noteZapRequest)
-                    if (decryptedContent != null) {
-                        val author = LocalCache.getOrCreateUser(decryptedContent.pubKey)
-                        Pair(author, decryptedContent.content)
-                    } else if (!noteZapRequest.event?.content().isNullOrBlank()) {
-                        Pair(noteZapRequest.author, noteZapRequest.event?.content())
-                    } else {
-                        Pair(noteZapRequest.author, null)
-                    }
+        if (acc.userProfile().pubkeyHex == event.zappedAuthor().firstOrNull()) {
+            val amount = showAmount(event.amount)
+            val senderInfo = (noteZapRequest.event as? LnZapRequestEvent)?.let {
+                val decryptedContent = acc.decryptZapContentAuthor(noteZapRequest)
+                if (decryptedContent != null) {
+                    val author = LocalCache.getOrCreateUser(decryptedContent.pubKey)
+                    Pair(author, decryptedContent.content)
+                } else if (!noteZapRequest.event?.content().isNullOrBlank()) {
+                    Pair(noteZapRequest.author, noteZapRequest.event?.content())
+                } else {
+                    Pair(noteZapRequest.author, null)
                 }
-
-                val zappedContent =
-                    noteZapped?.let { it1 -> acc.decryptContent(it1)?.split("\n")?.get(0) }
-
-                val user = senderInfo?.first?.toBestDisplayName() ?: ""
-                var title = applicationContext.getString(R.string.app_notification_zaps_channel_message, amount)
-                senderInfo?.second?.ifBlank { null }?.let {
-                    title += " ($it)"
-                }
-                var content = applicationContext.getString(R.string.app_notification_zaps_channel_message_from, user)
-                zappedContent?.let {
-                    content += " " + applicationContext.getString(R.string.app_notification_zaps_channel_message_for, zappedContent)
-                }
-                val userPicture = senderInfo?.first?.profilePicture()
-                val noteUri = "nostr:Notifications"
-                notificationManager().sendZapNotification(event.id, content, title, userPicture, noteUri, applicationContext)
             }
+
+            val zappedContent =
+                noteZapped?.let { it1 -> acc.decryptContent(it1)?.split("\n")?.get(0) }
+
+            val user = senderInfo?.first?.toBestDisplayName() ?: ""
+            var title = applicationContext.getString(R.string.app_notification_zaps_channel_message, amount)
+            senderInfo?.second?.ifBlank { null }?.let {
+                title += " ($it)"
+            }
+            var content = applicationContext.getString(R.string.app_notification_zaps_channel_message_from, user)
+            zappedContent?.let {
+                content += " " + applicationContext.getString(R.string.app_notification_zaps_channel_message_for, zappedContent)
+            }
+            val userPicture = senderInfo?.first?.profilePicture()
+            val noteUri = "nostr:Notifications"
+            notificationManager().sendZapNotification(event.id, content, title, userPicture, noteUri, applicationContext)
         }
     }
 

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

@@ -5,11 +5,9 @@ import com.vitorpamplona.amethyst.AccountInfo
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.service.HttpClient
-import com.vitorpamplona.amethyst.service.model.RelayAuthEvent
-import kotlinx.coroutines.CoroutineScope
+import com.vitorpamplona.quartz.events.RelayAuthEvent
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -25,7 +23,7 @@ class RegisterAccounts(
     ): List<RelayAuthEvent> {
         return accounts.mapNotNull {
             val acc = LocalPreferences.loadFromEncryptedStorage(it.npub)
-            if (acc != null) {
+            if (acc != null && acc.isWriteable()) {
                 val relayToUse = acc.activeRelays()?.firstOrNull { it.read }
                 if (relayToUse != null) {
                     acc.createAuthEvent(relayToUse, notificationToken)
@@ -64,12 +62,9 @@ class RegisterAccounts(
         }
     }
 
-    fun go(notificationToken: String) {
-        val scope = CoroutineScope(Job() + Dispatchers.IO)
-        scope.launch {
-            postRegistrationEvent(
-                signEventsToProveControlOfAccounts(accounts, notificationToken)
-            )
-        }
+    suspend fun go(notificationToken: String) = withContext(Dispatchers.IO) {
+        postRegistrationEvent(
+            signEventsToProveControlOfAccounts(accounts, notificationToken)
+        )
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/service/relays/Client.kt

@@ -2,8 +2,8 @@ package com.vitorpamplona.amethyst.service.relays
 
 import com.vitorpamplona.amethyst.service.HttpClient
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.service.model.Event
-import com.vitorpamplona.amethyst.service.model.EventInterface
+import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.events.EventInterface
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -17,16 +17,6 @@ import java.util.UUID
  * Events are stored with their respective persona.
  */
 object Client : RelayPool.Listener {
-    /**
-     * Lenient mode:
-     *
-     * true: For maximum compatibility. If you want to play ball with sloppy counterparts, use
-     *       this.
-     * false: For developers who want to make protocol compliant counterparts. If your software
-     *        produces events that fail to deserialize in strict mode, you should probably fix
-     *        something.
-     **/
-    var lenient: Boolean = false
     private var listeners = setOf<Listener>()
     private var relays = Constants.convertDefaultRelays()
     private var subscriptions = mapOf<String, List<TypedFilter>>()

app/src/main/java/com/vitorpamplona/amethyst/service/relays/Constants.kt

@@ -16,9 +16,7 @@ object Constants {
     }
 
     val defaultRelays = arrayOf(
-        // Free relays for DMs and Follows
-        RelaySetupInfo("wss://no.str.cr", read = true, write = true, feedTypes = activeTypes),
-        RelaySetupInfo("wss://relay.snort.social", read = true, write = true, feedTypes = activeTypes),
+        // Free relays for only DMs and Follows due to the amount of spam
         RelaySetupInfo("wss://relay.damus.io", read = true, write = true, feedTypes = activeTypes),
 
         // Chats
@@ -40,6 +38,7 @@ object Constants {
         // NewRelayListViewModel.Relay("wss://brb.io", read = true, write = true, feedTypes = activeTypes),
 
         // Paid relays
+        RelaySetupInfo("wss://relay.snort.social", read = true, write = false, feedTypes = activeTypesGlobalChats),
         RelaySetupInfo("wss://relay.nostr.com.au", read = true, write = false, feedTypes = activeTypesGlobalChats),
         RelaySetupInfo("wss://eden.nostr.land", read = true, write = false, feedTypes = activeTypesGlobalChats),
         RelaySetupInfo("wss://nostr.milou.lol", read = true, write = false, feedTypes = activeTypesGlobalChats),
@@ -51,8 +50,15 @@ object Constants {
         RelaySetupInfo("wss://relay.nostrati.com", read = true, write = false, feedTypes = activeTypesGlobalChats),
 
         // Supporting NIP-50
-        RelaySetupInfo("wss://relay.nostr.band", read = true, write = false, feedTypes = activeTypesSearch)
+        RelaySetupInfo("wss://relay.nostr.band", read = true, write = false, feedTypes = activeTypesSearch),
+        RelaySetupInfo("wss://filter.nostr.wine", read = true, write = false, feedTypes = activeTypesSearch),
+        RelaySetupInfo("wss://relay.noswhere.com", read = true, write = false, feedTypes = activeTypesSearch)
     )
 
-    val forcedRelayForSearch = RelaySetupInfo("wss://relay.nostr.band", read = true, write = false, feedTypes = activeTypesSearch)
+    val forcedRelayForSearch = arrayOf(
+        RelaySetupInfo("wss://relay.nostr.band", read = true, write = false, feedTypes = activeTypesSearch),
+        RelaySetupInfo("wss://filter.nostr.wine", read = true, write = false, feedTypes = activeTypesSearch),
+        RelaySetupInfo("wss://relay.noswhere.com", read = true, write = false, feedTypes = activeTypesSearch)
+    )
+    val forcedRelaysForSearchSet = forcedRelayForSearch.map { it.url }
 }

app/src/main/java/com/vitorpamplona/amethyst/service/relays/JsonFilter.kt

@@ -1,9 +1,6 @@
 package com.vitorpamplona.amethyst.service.relays
 
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import com.google.gson.JsonArray
-import com.google.gson.JsonObject
+import com.vitorpamplona.quartz.events.Event
 
 class JsonFilter(
     val ids: List<String>? = null,
@@ -15,51 +12,64 @@ class JsonFilter(
     val limit: Int? = null,
     val search: String? = null
 ) {
+
     fun toJson(forRelay: String? = null): String {
-        val jsonObject = JsonObject()
-        ids?.run {
-            jsonObject.add("ids", JsonArray().apply { ids.forEach { add(it) } })
-        }
-        authors?.run {
-            jsonObject.add("authors", JsonArray().apply { authors.forEach { add(it) } })
-        }
-        kinds?.run {
-            jsonObject.add("kinds", JsonArray().apply { kinds.forEach { add(it) } })
-        }
-        tags?.run {
-            entries.forEach { kv ->
-                jsonObject.add("#${kv.key}", JsonArray().apply { kv.value.forEach { add(it) } })
+        val factory = Event.mapper.nodeFactory
+        val filter = factory.objectNode().apply {
+            ids?.run {
+                put(
+                    "ids",
+                    factory.arrayNode(ids.size).apply {
+                        ids.forEach { add(it) }
+                    }
+                )
             }
-        }
-        since?.run {
-            if (!isEmpty()) {
-                if (forRelay != null) {
-                    val relaySince = get(forRelay)
-                    if (relaySince != null) {
-                        jsonObject.addProperty("since", relaySince.time)
+            authors?.run {
+                put(
+                    "authors",
+                    factory.arrayNode(authors.size).apply {
+                        authors.forEach { add(it) }
                     }
-                } else {
-                    val jsonObjectSince = JsonObject()
-                    entries.forEach { sincePairs ->
-                        jsonObjectSince.addProperty(sincePairs.key, "${sincePairs.value}")
+                )
+            }
+            kinds?.run {
+                put(
+                    "kinds",
+                    factory.arrayNode(kinds.size).apply {
+                        kinds.forEach { add(it) }
                     }
-                    jsonObject.add("since", jsonObjectSince)
+                )
+            }
+            tags?.run {
+                entries.forEach { kv ->
+                    put(
+                        "#${kv.key}",
+                        factory.arrayNode(kv.value.size).apply {
+                            kv.value.forEach { add(it) }
+                        }
+                    )
                 }
             }
+            since?.run {
+                if (!isEmpty()) {
+                    if (forRelay != null) {
+                        val relaySince = get(forRelay)
+                        if (relaySince != null) {
+                            put("since", relaySince.time)
+                        }
+                    } else {
+                        val jsonObjectSince = factory.objectNode()
+                        entries.forEach { sincePairs ->
+                            jsonObjectSince.put(sincePairs.key, "${sincePairs.value}")
+                        }
+                        put("since", jsonObjectSince)
+                    }
+                }
+            }
+            until?.run { put("until", until) }
+            limit?.run { put("limit", limit) }
+            search?.run { put("search", search) }
         }
-        until?.run {
-            jsonObject.addProperty("until", until)
-        }
-        limit?.run {
-            jsonObject.addProperty("limit", limit)
-        }
-        search?.run {
-            jsonObject.addProperty("search", search)
-        }
-        return gson.toJson(jsonObject)
-    }
-
-    companion object {
-        val gson: Gson = GsonBuilder().create()
+        return Event.mapper.writeValueAsString(filter)
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt

@@ -1,13 +1,13 @@
 package com.vitorpamplona.amethyst.service.relays
 
 import android.util.Log
-import com.google.gson.JsonElement
 import com.vitorpamplona.amethyst.BuildConfig
-import com.vitorpamplona.amethyst.model.TimeUtils
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.service.model.Event
-import com.vitorpamplona.amethyst.service.model.EventInterface
-import com.vitorpamplona.amethyst.service.model.RelayAuthEvent
+import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.events.EventInterface
+import com.vitorpamplona.quartz.events.RelayAuthEvent
+import com.vitorpamplona.quartz.events.bytesUsedInMemory
+import com.vitorpamplona.quartz.utils.TimeUtils
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -47,6 +47,7 @@ class Relay(
     private var listeners = setOf<Listener>()
     private var socket: WebSocket? = null
     private var isReady: Boolean = false
+    private var usingCompression: Boolean = false
 
     var eventDownloadCounterInBytes = 0
     var eventUploadCounterInBytes = 0
@@ -85,6 +86,9 @@ class Relay(
     private var connectingBlock = AtomicBoolean()
 
     fun connectAndRun(onConnected: (Relay) -> Unit) {
+        // BRB is crashing OkHttp Deflater object :(
+        if (url.contains("brb.io")) return
+
         // If there is a connection, don't wait.
         if (connectingBlock.getAndSet(true)) {
             return
@@ -115,7 +119,10 @@ class Relay(
         override fun onOpen(webSocket: WebSocket, response: Response) {
             checkNotInMainThread()
 
-            markConnectionAsReady(response.receivedResponseAtMillis - response.sentRequestAtMillis)
+            markConnectionAsReady(
+                pingInMs = response.receivedResponseAtMillis - response.sentRequestAtMillis,
+                usingCompression = response.headers.get("Sec-WebSocket-Extensions")?.contains("permessage-deflate") ?: false
+            )
 
             // Log.w("Relay", "Relay OnOpen, Loading All subscriptions $url")
             onConnected(this@Relay)
@@ -175,27 +182,29 @@ class Relay(
         }
     }
 
-    fun markConnectionAsReady(pingInMs: Long) {
+    fun markConnectionAsReady(pingInMs: Long, usingCompression: Boolean) {
         this.afterEOSE = false
         this.isReady = true
         this.pingInMs = pingInMs
+        this.usingCompression = usingCompression
     }
 
     fun markConnectionAsClosed() {
         this.socket = null
         this.isReady = false
+        this.usingCompression = false
         this.afterEOSE = false
         this.closingTimeInSeconds = TimeUtils.now()
     }
 
     fun processNewRelayMessage(newMessage: String) {
-        val msgArray = Event.gson.fromJson(newMessage, JsonElement::class.java).asJsonArray
-        val type = msgArray[0].asString
-        val channel = msgArray[1].asString
+        val msgArray = Event.mapper.readTree(newMessage)
+        val type = msgArray.get(0).asText()
+        val channel = msgArray.get(1).asText()
 
         when (type) {
             "EVENT" -> {
-                val event = Event.fromJson(msgArray[2], Client.lenient)
+                val event = Event.fromJson(msgArray.get(2))
 
                 // Log.w("Relay", "Relay onEVENT $url, $channel")
                 listeners.forEach {
@@ -215,12 +224,12 @@ class Relay(
                 it.onError(this@Relay, channel, Error("Relay sent notice: " + channel))
             }
             "OK" -> listeners.forEach {
-                Log.w("Relay", "Relay on OK $url, ${msgArray[1].asString}, ${msgArray[2].asBoolean}, ${msgArray[3].asString}")
-                it.onSendResponse(this@Relay, msgArray[1].asString, msgArray[2].asBoolean, msgArray[3].asString)
+                Log.w("Relay", "Relay on OK $url, ${msgArray[1].asText()}, ${msgArray[2].asBoolean()}, ${msgArray[3].asText()}")
+                it.onSendResponse(this@Relay, msgArray[1].asText(), msgArray[2].asBoolean(), msgArray[3].asText())
             }
             "AUTH" -> listeners.forEach {
                 // Log.w("Relay", "Relay$url, ${msg[1].asString}")
-                it.onAuth(this@Relay, msgArray[1].asString)
+                it.onAuth(this@Relay, msgArray[1].asText())
             }
             else -> listeners.forEach {
                 // Log.w("Relay", "Relay something else $url, $channel")
@@ -239,6 +248,7 @@ class Relay(
         socket?.close(1000, "Normal close")
         socket = null
         isReady = false
+        usingCompression = false
         afterEOSE = false
     }
 
@@ -284,16 +294,36 @@ class Relay(
         checkNotInMainThread()
 
         if (signedEvent is RelayAuthEvent) {
+            // specific protocol for this event.
             val event = """["AUTH",${signedEvent.toJson()}]"""
             socket?.send(event)
             eventUploadCounterInBytes += event.bytesUsedInMemory()
-        }
+        } else {
+            if (write) {
+                if (isConnected()) {
+                    if (isReady) {
+                        val event = """["EVENT",${signedEvent.toJson()}]"""
+                        socket?.send(event)
+                        eventUploadCounterInBytes += event.bytesUsedInMemory()
+                    }
+                } else {
+                    // waits 60 seconds to reconnect after disconnected.
+                    if (TimeUtils.now() > closingTimeInSeconds + RECONNECTING_IN_SECONDS) {
+                        // sends all filters after connection is successful.
+                        connectAndRun {
+                            checkNotInMainThread()
 
-        if (write) {
-            if (signedEvent !is RelayAuthEvent) {
-                val event = """["EVENT",${signedEvent.toJson()}]"""
-                socket?.send(event)
-                eventUploadCounterInBytes += event.bytesUsedInMemory()
+                            val event = """["EVENT",${signedEvent.toJson()}]"""
+                            socket?.send(event)
+                            eventUploadCounterInBytes += event.bytesUsedInMemory()
+
+                            // Sends everything.
+                            Client.allSubscriptions().forEach {
+                                sendFilter(requestId = it)
+                            }
+                        }
+                    }
+                }
             }
         }
     }
@@ -343,7 +373,3 @@ class Relay(
         fun onRelayStateChange(relay: Relay, type: Type, channel: String?)
     }
 }
-
-fun String.bytesUsedInMemory(): Int {
-    return (8 * ((((this.length) * 2) + 45) / 8))
-}

app/src/main/java/com/vitorpamplona/amethyst/service/relays/RelayPool.kt

@@ -1,24 +1,26 @@
 package com.vitorpamplona.amethyst.service.relays
 
-import androidx.lifecycle.LiveData
+import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.service.model.Event
-import com.vitorpamplona.amethyst.service.model.EventInterface
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
+import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.events.EventInterface
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
 
 /**
  * RelayPool manages the connection to multiple Relays and lets consumers deal with simple events.
  */
 object RelayPool : Relay.Listener {
-
-    val scope = CoroutineScope(Job() + Dispatchers.IO)
-
     private var relays = listOf<Relay>()
     private var listeners = setOf<Listener>()
 
+    // Backing property to avoid flow emissions from other classes
+    private var _lastStatus = RelayPoolStatus(0, 0)
+    private val _statusFlow = MutableSharedFlow<RelayPoolStatus>(1, 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
+    val statusFlow: SharedFlow<RelayPoolStatus> = _statusFlow.asSharedFlow()
+
     fun availableRelays(): Int {
         return relays.size
     }
@@ -83,11 +85,13 @@ object RelayPool : Relay.Listener {
     fun addRelay(relay: Relay) {
         relay.register(this)
         relays += relay
+        updateStatus()
     }
 
     fun removeRelay(relay: Relay) {
         relay.unregister(this)
         relays = relays.minus(relay)
+        updateStatus()
     }
 
     fun register(listener: Listener) {
@@ -116,12 +120,14 @@ object RelayPool : Relay.Listener {
 
     override fun onError(relay: Relay, subscriptionId: String, error: Error) {
         listeners.forEach { it.onError(error, subscriptionId, relay) }
-        refreshObservers()
+        updateStatus()
     }
 
     override fun onRelayStateChange(relay: Relay, type: Relay.Type, channel: String?) {
         listeners.forEach { it.onRelayStateChange(type, relay, channel) }
-        refreshObservers()
+        if (type != Relay.Type.EOSE) {
+            updateStatus()
+        }
     }
 
     override fun onSendResponse(relay: Relay, eventId: String, success: Boolean, message: String) {
@@ -132,20 +138,15 @@ object RelayPool : Relay.Listener {
         listeners.forEach { it.onAuth(relay, challenge) }
     }
 
-    // Observers line up here.
-    val live: RelayPoolLiveData = RelayPoolLiveData(this)
-
-    private fun refreshObservers() {
-        scope.launch {
-            live.refresh()
+    private fun updateStatus() {
+        val connected = connectedRelays()
+        val available = availableRelays()
+        if (_lastStatus.connected != connected || _lastStatus.available != available) {
+            _lastStatus = RelayPoolStatus(connected, available)
+            _statusFlow.tryEmit(_lastStatus)
         }
     }
 }
 
-class RelayPoolLiveData(val relays: RelayPool) : LiveData<RelayPoolState>(RelayPoolState(relays)) {
-    fun refresh() {
-        postValue(RelayPoolState(relays))
-    }
-}
-
-class RelayPoolState(val relays: RelayPool)
+@Immutable
+data class RelayPoolStatus(val connected: Int, val available: Int, val isConnected: Boolean = connected > 0)

app/src/main/java/com/vitorpamplona/amethyst/service/relays/Subscription.kt

@@ -1,8 +1,7 @@
 package com.vitorpamplona.amethyst.service.relays
 
-import com.google.gson.GsonBuilder
-import com.google.gson.JsonArray
-import com.google.gson.JsonObject
+import com.fasterxml.jackson.databind.JsonNode
+import com.vitorpamplona.quartz.events.Event
 import java.util.UUID
 
 data class Subscription(
@@ -16,15 +15,24 @@ data class Subscription(
     }
 
     fun toJson(): String {
-        return GsonBuilder().create().toJson(toJsonObject())
+        return Event.mapper.writeValueAsString(toJsonObject())
     }
 
-    fun toJsonObject(): JsonObject {
-        val jsonObject = JsonObject()
-        jsonObject.addProperty("id", id)
-        typedFilters?.run {
-            jsonObject.add("typedFilters", JsonArray().apply { typedFilters?.forEach { add(it.toJsonObject()) } })
+    fun toJsonObject(): JsonNode {
+        val factory = Event.mapper.nodeFactory
+
+        return factory.objectNode().apply {
+            put("id", id)
+            typedFilters?.also { filters ->
+                put(
+                    "typedFilters",
+                    factory.arrayNode(filters.size).apply {
+                        filters.forEach { filter ->
+                            add(filter.toJsonObject())
+                        }
+                    }
+                )
+            }
         }
-        return jsonObject
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/service/relays/TypedFilter.kt

@@ -1,8 +1,8 @@
 package com.vitorpamplona.amethyst.service.relays
 
-import com.google.gson.GsonBuilder
-import com.google.gson.JsonArray
-import com.google.gson.JsonObject
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.databind.node.ArrayNode
+import com.vitorpamplona.quartz.events.Event
 
 class TypedFilter(
     val types: Set<FeedType>,
@@ -10,54 +10,74 @@ class TypedFilter(
 ) {
 
     fun toJson(): String {
-        return GsonBuilder().create().toJson(toJsonObject())
+        return Event.mapper.writeValueAsString(toJsonObject())
     }
 
-    fun toJsonObject(): JsonObject {
-        val jsonObject = JsonObject()
-        jsonObject.add("types", typesToJson(types))
-        jsonObject.add("filter", filterToJson(filter))
-        return jsonObject
+    fun toJsonObject(): JsonNode {
+        val factory = Event.mapper.nodeFactory
+
+        return factory.objectNode().apply {
+            put("types", typesToJson(types))
+            put("filter", filterToJson(filter))
+        }
     }
 
-    fun typesToJson(types: Set<FeedType>): JsonArray {
-        return JsonArray().apply { types.forEach { add(it.name.lowercase()) } }
+    fun typesToJson(types: Set<FeedType>): ArrayNode {
+        val factory = Event.mapper.nodeFactory
+        return factory.arrayNode(types.size).apply {
+            types.forEach { add(it.name.lowercase()) }
+        }
     }
 
-    fun filterToJson(filter: JsonFilter): JsonObject {
-        val jsonObject = JsonObject()
-        filter.ids?.run {
-            jsonObject.add("ids", JsonArray().apply { filter.ids.forEach { add(it) } })
-        }
-        filter.authors?.run {
-            jsonObject.add("authors", JsonArray().apply { filter.authors.forEach { add(it) } })
-        }
-        filter.kinds?.run {
-            jsonObject.add("kinds", JsonArray().apply { filter.kinds.forEach { add(it) } })
-        }
-        filter.tags?.run {
-            entries.forEach { kv ->
-                jsonObject.add("#${kv.key}", JsonArray().apply { kv.value.forEach { add(it) } })
+    fun filterToJson(filter: JsonFilter): JsonNode {
+        val factory = Event.mapper.nodeFactory
+        return factory.objectNode().apply {
+            filter.ids?.run {
+                put(
+                    "ids",
+                    factory.arrayNode(filter.ids.size).apply {
+                        filter.ids.forEach { add(it) }
+                    }
+                )
             }
-        }
-        /*
-        Does not include since in the json comparison
-        filter.since?.run {
-            val jsonObjectSince = JsonObject()
-            entries.forEach { sincePairs ->
-                jsonObjectSince.addProperty(sincePairs.key, "${sincePairs.value}")
+            filter.authors?.run {
+                put(
+                    "authors",
+                    factory.arrayNode(filter.authors.size).apply {
+                        filter.authors.forEach { add(it) }
+                    }
+                )
             }
-            jsonObject.add("since", jsonObjectSince)
-        }*/
-        filter.until?.run {
-            jsonObject.addProperty("until", filter.until)
+            filter.kinds?.run {
+                put(
+                    "kinds",
+                    factory.arrayNode(filter.kinds.size).apply {
+                        filter.kinds.forEach { add(it) }
+                    }
+                )
+            }
+            filter.tags?.run {
+                entries.forEach { kv ->
+                    put(
+                        "#${kv.key}",
+                        factory.arrayNode(kv.value.size).apply {
+                            kv.value.forEach { add(it) }
+                        }
+                    )
+                }
+            }
+            /*
+            Does not include since in the json comparison
+            filter.since?.run {
+                val jsonObjectSince = JsonObject()
+                entries.forEach { sincePairs ->
+                    jsonObjectSince.addProperty(sincePairs.key, "${sincePairs.value}")
+                }
+                jsonObject.add("since", jsonObjectSince)
+            }*/
+            filter.until?.run { put("until", filter.until) }
+            filter.limit?.run { put("limit", filter.limit) }
+            filter.search?.run { put("search", filter.search) }
         }
-        filter.limit?.run {
-            jsonObject.addProperty("limit", filter.limit)
-        }
-        filter.search?.run {
-            jsonObject.addProperty("search", filter.search)
-        }
-        return jsonObject
     }
 }

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.net.ConnectivityManager
@@ -17,24 +18,13 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.viewmodel.compose.viewModel
-import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
 import com.vitorpamplona.amethyst.service.connectivitystatus.ConnectivityStatus
-import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
-import com.vitorpamplona.amethyst.service.model.CommunityDefinitionEvent
-import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent
-import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
-import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.notifications.PushNotificationUtils
-import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.ui.components.DefaultMutedSetting
 import com.vitorpamplona.amethyst.ui.components.keepPlayingMutex
 import com.vitorpamplona.amethyst.ui.navigation.Route
@@ -44,6 +34,13 @@ import com.vitorpamplona.amethyst.ui.screen.AccountScreen
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.screen.ThemeViewModel
 import com.vitorpamplona.amethyst.ui.theme.AmethystTheme
+import com.vitorpamplona.quartz.encoders.Nip19
+import com.vitorpamplona.quartz.events.ChannelCreateEvent
+import com.vitorpamplona.quartz.events.ChannelMessageEvent
+import com.vitorpamplona.quartz.events.ChannelMetadataEvent
+import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
+import com.vitorpamplona.quartz.events.LiveActivitiesEvent
+import com.vitorpamplona.quartz.events.PrivateDmEvent
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -69,7 +66,10 @@ class MainActivity : AppCompatActivity() {
             themeViewModel.onChange(LocalPreferences.getTheme())
             AmethystTheme(themeViewModel) {
                 // A surface container using the 'background' color from the theme
-                Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    color = MaterialTheme.colors.background
+                ) {
                     val accountStateViewModel: AccountStateViewModel = viewModel {
                         AccountStateViewModel(this@MainActivity)
                     }
@@ -85,10 +85,9 @@ class MainActivity : AppCompatActivity() {
             .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
             .build()
 
-        val connectivityManager = getSystemService(ConnectivityManager::class.java) as ConnectivityManager
+        val connectivityManager =
+            getSystemService(ConnectivityManager::class.java) as ConnectivityManager
         connectivityManager.requestNetwork(networkRequest, networkCallback)
-
-        Client.lenient = true
     }
 
     @OptIn(DelicateCoroutinesApi::class)
@@ -103,13 +102,16 @@ class MainActivity : AppCompatActivity() {
             ServiceManager.start(this@MainActivity)
         }
 
-        PushNotificationUtils().init(LocalPreferences.allSavedAccounts())
+        GlobalScope.launch(Dispatchers.IO) {
+            PushNotificationUtils().init(LocalPreferences.allSavedAccounts())
+        }
     }
 
     override fun onPause() {
-        if (BuildConfig.DEBUG) {
-            debugState(this)
-        }
+        ServiceManager.cleanObservers()
+        // if (BuildConfig.DEBUG) {
+        debugState(this)
+        // }
 
         ServiceManager.pause()
         super.onPause()
@@ -131,7 +133,7 @@ class MainActivity : AppCompatActivity() {
         super.onTrimMemory(level)
         println("Trim Memory $level")
         GlobalScope.launch(Dispatchers.Default) {
-            ServiceManager.cleanUp()
+            ServiceManager.trimMemory()
         }
     }
 
@@ -156,7 +158,8 @@ class MainActivity : AppCompatActivity() {
             super.onCapabilitiesChanged(network, networkCapabilities)
 
             GlobalScope.launch(Dispatchers.IO) {
-                val hasMobileData = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
+                val hasMobileData =
+                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
                 val hasWifi = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
                 Log.d("NETWORKCALLBACK", "onCapabilitiesChanged: hasMobileData $hasMobileData")
                 Log.d("NETWORKCALLBACK", "onCapabilitiesChanged: hasWifi $hasWifi")
@@ -181,9 +184,15 @@ class MainActivity : AppCompatActivity() {
 
 class GetMediaActivityResultContract : ActivityResultContracts.GetContent() {
 
+    @SuppressLint("MissingSuperCall")
     override fun createIntent(context: Context, input: String): Intent {
-        return super.createIntent(context, input).apply {
+        // Force only images and videos to be selectable
+        // Force OPEN Document because of the resulting URI must be passed to the
+        // Playback service and the picker's permissions only allow the activity to read the URI
+        return Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+            addCategory(Intent.CATEGORY_OPENABLE)
             // Force only images and videos to be selectable
+            type = "*/*"
             putExtra(Intent.EXTRA_MIME_TYPES, arrayOf("image/*", "video/*"))
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt

@@ -141,6 +141,7 @@ object ImageUploader {
 
     fun NIP98Header(url: String, method: String, body: String): String {
         val noteJson = account.createHTTPAuthorization(url, method, body)?.toJson() ?: ""
+
         val encodedNIP98Event: String = Base64.getEncoder().encodeToString(noteJson.toByteArray())
         return "Nostr " + encodedNIP98Event
     }

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/JoinUserOrChannelView.kt

@@ -54,7 +54,6 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.ChatroomKey
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
@@ -68,6 +67,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.SearchBarViewModel
 import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size55dp
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import com.vitorpamplona.quartz.events.ChatroomKey
 import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.Channel
@@ -120,7 +120,7 @@ fun JoinUserOrChannelView(searchBarViewModel: SearchBarViewModel, onClose: () ->
                     horizontalArrangement = Arrangement.SpaceBetween,
                     verticalAlignment = Alignment.CenterVertically
                 ) {
-                    CloseButton(onCancel = {
+                    CloseButton(onPress = {
                         searchBarViewModel.clear()
                         NostrSearchEventOrUserDataSource.clear()
                         onClose()

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewChannelView.kt

@@ -51,7 +51,7 @@ fun NewChannelView(onClose: () -> Unit, accountViewModel: AccountViewModel, chan
                     horizontalArrangement = Arrangement.SpaceBetween,
                     verticalAlignment = Alignment.CenterVertically
                 ) {
-                    CloseButton(onCancel = {
+                    CloseButton(onPress = {
                         postViewModel.clear()
                         onClose()
                     })

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.ui.actions
 import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Build
+import android.util.Log
 import android.util.Size
 import android.widget.Toast
 import androidx.compose.foundation.Image
@@ -79,13 +80,7 @@ fun NewMediaView(uri: Uri, onClose: () -> Unit, postViewModel: NewMediaModel, ac
     var showRelaysDialog by remember {
         mutableStateOf(false)
     }
-    var relayList = account.activeRelays()?.filter {
-        it.write
-    }?.map {
-        it
-    } ?: account.convertLocalRelays().filter {
-        it.write
-    }
+    var relayList = account.activeWriteRelays()
 
     Dialog(
         onDismissRequest = { onClose() },
@@ -101,7 +96,7 @@ fun NewMediaView(uri: Uri, onClose: () -> Unit, postViewModel: NewMediaModel, ac
         ) {
             if (showRelaysDialog) {
                 RelaySelectionDialog(
-                    list = relayList,
+                    preSelectedList = relayList,
                     onClose = {
                         showRelaysDialog = false
                     },
@@ -123,7 +118,7 @@ fun NewMediaView(uri: Uri, onClose: () -> Unit, postViewModel: NewMediaModel, ac
                     horizontalArrangement = Arrangement.SpaceBetween,
                     verticalAlignment = Alignment.CenterVertically
                 ) {
-                    CloseButton(onCancel = {
+                    CloseButton(onPress = {
                         postViewModel.cancel()
                         onClose()
                     })
@@ -221,7 +216,8 @@ fun ImageVideoPost(postViewModel: NewMediaModel, accountViewModel: AccountViewMo
                         try {
                             bitmap = resolver.loadThumbnail(it, Size(1200, 1000), null)
                         } catch (e: Exception) {
-                            postViewModel.imageUploadingError.emit("Unable to load file")
+                            postViewModel.imageUploadingError.emit("Unable to load thumbnail, but the video can be uploaded")
+                            Log.w("NewPostView", "Couldn't create thumbnail, but the video can be uploaded", e)
                         }
                     }
                 }
@@ -241,6 +237,7 @@ fun ImageVideoPost(postViewModel: NewMediaModel, accountViewModel: AccountViewMo
             postViewModel.galleryUri?.let {
                 VideoView(
                     videoUri = it.toString(),
+                    roundedCorner = false,
                     accountViewModel = accountViewModel
                 )
             }

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

@@ -1,13 +1,13 @@
 package com.vitorpamplona.amethyst.ui.actions
 
-import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.service.KeyPair
-import com.vitorpamplona.amethyst.service.bechToBytes
-import com.vitorpamplona.amethyst.service.nip19.Nip19
-import com.vitorpamplona.amethyst.service.toNpub
+import com.vitorpamplona.quartz.crypto.KeyPair
+import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.Nip19
+import com.vitorpamplona.quartz.encoders.bechToBytes
+import com.vitorpamplona.quartz.encoders.toNpub
 
 class NewMessageTagger(
     var message: String,
@@ -101,37 +101,50 @@ class NewMessageTagger(
 
         key = key.removePrefix("@")
 
-        if (key.length < 63) {
-            return null
-        }
-
         try {
-            val keyB32 = key.substring(0, 63)
-            val restOfWord = key.substring(63)
-
             if (key.startsWith("nsec1", true)) {
+                if (key.length < 63) {
+                    return null
+                }
+
+                val keyB32 = key.substring(0, 63)
+                val restOfWord = key.substring(63)
                 // Converts to npub
                 val pubkey = Nip19.uriToRoute(KeyPair(privKey = keyB32.bechToBytes()).pubKey.toNpub()) ?: return null
 
                 return DirtyKeyInfo(pubkey, restOfWord)
             } else if (key.startsWith("npub1", true)) {
+                if (key.length < 63) {
+                    return null
+                }
+
+                val keyB32 = key.substring(0, 63)
+                val restOfWord = key.substring(63)
+
                 val pubkey = Nip19.uriToRoute(keyB32) ?: return null
 
                 return DirtyKeyInfo(pubkey, restOfWord)
             } else if (key.startsWith("note1", true)) {
+                if (key.length < 63) {
+                    return null
+                }
+
+                val keyB32 = key.substring(0, 63)
+                val restOfWord = key.substring(63)
+
                 val noteId = Nip19.uriToRoute(keyB32) ?: return null
 
                 return DirtyKeyInfo(noteId, restOfWord)
             } else if (key.startsWith("nprofile", true)) {
-                val pubkeyRelay = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
+                val pubkeyRelay = Nip19.uriToRoute(key) ?: return null
 
                 return DirtyKeyInfo(pubkeyRelay, pubkeyRelay.additionalChars)
             } else if (key.startsWith("nevent1", true)) {
-                val noteRelayId = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
+                val noteRelayId = Nip19.uriToRoute(key) ?: return null
 
                 return DirtyKeyInfo(noteRelayId, noteRelayId.additionalChars)
             } else if (key.startsWith("naddr1", true)) {
-                val address = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
+                val address = Nip19.uriToRoute(key) ?: return null
 
                 return DirtyKeyInfo(address, address.additionalChars) // no way to know when they address ends and dirt begins
             }

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollVoteValueRange.kt

@@ -1,9 +1,11 @@
 package com.vitorpamplona.amethyst.ui.actions
 
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedTextField
@@ -11,8 +13,6 @@ import androidx.compose.material.Text
 import androidx.compose.material.TextFieldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -21,51 +21,11 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 
 @Composable
 fun NewPollVoteValueRange(pollViewModel: NewPostViewModel) {
-    var textMax by rememberSaveable { mutableStateOf("") }
-    var textMin by rememberSaveable { mutableStateOf("") }
-
-    // check for zapMax amounts < 1
-    pollViewModel.isValidvalueMaximum.value = true
-    if (textMax.isNotEmpty()) {
-        try {
-            val int = textMax.toInt()
-            if (int < 1) {
-                pollViewModel.isValidvalueMaximum.value = false
-            } else { pollViewModel.valueMaximum = int }
-        } catch (e: Exception) { pollViewModel.isValidvalueMaximum.value = false }
-    }
-
-    // check for minZap amounts < 1
-    pollViewModel.isValidvalueMinimum.value = true
-    if (textMin.isNotEmpty()) {
-        try {
-            val int = textMin.toInt()
-            if (int < 1) {
-                pollViewModel.isValidvalueMinimum.value = false
-            } else { pollViewModel.valueMinimum = int }
-        } catch (e: Exception) { pollViewModel.isValidvalueMinimum.value = false }
-    }
-
-    // check for zapMin > zapMax
-    if (textMin.isNotEmpty() && textMax.isNotEmpty()) {
-        try {
-            val intMin = textMin.toInt()
-            val intMax = textMax.toInt()
-
-            if (intMin > intMax) {
-                pollViewModel.isValidvalueMinimum.value = false
-                pollViewModel.isValidvalueMaximum.value = false
-            }
-        } catch (e: Exception) {
-            pollViewModel.isValidvalueMinimum.value = false
-            pollViewModel.isValidvalueMaximum.value = false
-        }
-    }
-
     val colorInValid = TextFieldDefaults.outlinedTextFieldColors(
         focusedBorderColor = MaterialTheme.colors.error,
         unfocusedBorderColor = Color.Red
@@ -80,10 +40,10 @@ fun NewPollVoteValueRange(pollViewModel: NewPostViewModel) {
         horizontalArrangement = Arrangement.Center
     ) {
         OutlinedTextField(
-            value = textMin,
-            onValueChange = { textMin = it },
+            value = pollViewModel.valueMinimum?.toString() ?: "",
+            onValueChange = { pollViewModel.updateMinZapAmountForPoll(it) },
             keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
-            modifier = Modifier.width(150.dp),
+            modifier = Modifier.weight(1f),
             colors = if (pollViewModel.isValidvalueMinimum.value) colorValid else colorInValid,
             label = {
                 Text(
@@ -98,11 +58,14 @@ fun NewPollVoteValueRange(pollViewModel: NewPostViewModel) {
                 )
             }
         )
+
+        Spacer(modifier = DoubleHorzSpacer)
+
         OutlinedTextField(
-            value = textMax,
-            onValueChange = { textMax = it },
+            value = pollViewModel.valueMaximum?.toString() ?: "",
+            onValueChange = { pollViewModel.updateMaxZapAmountForPoll(it) },
             keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
-            modifier = Modifier.width(150.dp),
+            modifier = Modifier.weight(1f),
             colors = if (pollViewModel.isValidvalueMaximum.value) colorValid else colorInValid,
             label = {
                 Text(
@@ -118,10 +81,25 @@ fun NewPollVoteValueRange(pollViewModel: NewPostViewModel) {
             }
         )
     }
+
+    Row(
+        Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.Center
+    ) {
+        Text(
+            text = stringResource(R.string.poll_zap_value_min_max_explainer),
+            color = MaterialTheme.colors.placeholderText,
+            modifier = Modifier.padding(vertical = 10.dp)
+        )
+    }
 }
 
 @Preview
 @Composable
 fun NewPollVoteValueRangePreview() {
-    NewPollVoteValueRange(NewPostViewModel())
+    Column(
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        NewPollVoteValueRange(NewPostViewModel())
+    }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt

@@ -9,6 +9,7 @@ import android.util.Size
 import android.widget.Toast
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
@@ -34,7 +35,6 @@ import androidx.compose.material.icons.rounded.Warning
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.Stable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
@@ -43,6 +43,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
@@ -82,26 +83,32 @@ import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
 import com.vitorpamplona.amethyst.service.ReverseGeoLocationUtil
 import com.vitorpamplona.amethyst.service.noProtocolUrlValidator
 import com.vitorpamplona.amethyst.ui.components.*
+import com.vitorpamplona.amethyst.ui.note.BaseUserPicture
 import com.vitorpamplona.amethyst.ui.note.CancelIcon
 import com.vitorpamplona.amethyst.ui.note.CloseIcon
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.note.PollIcon
 import com.vitorpamplona.amethyst.ui.note.RegularPostIcon
+import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.MyTextField
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.UserLine
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
+import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
 import com.vitorpamplona.amethyst.ui.theme.Size10dp
+import com.vitorpamplona.amethyst.ui.theme.Size55dp
 import com.vitorpamplona.amethyst.ui.theme.Size5dp
 import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.mediumImportanceLink
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.amethyst.ui.theme.replyModifier
 import com.vitorpamplona.amethyst.ui.theme.subtleBorder
+import com.vitorpamplona.quartz.events.toImmutableListOfLists
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
@@ -109,8 +116,8 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.lang.Math.round
 
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun NewPostView(
     onClose: () -> Unit,
@@ -132,13 +139,7 @@ fun NewPostView(
     var showRelaysDialog by remember {
         mutableStateOf(false)
     }
-    var relayList = account.activeRelays()?.filter {
-        it.write
-    }?.map {
-        it
-    } ?: account.convertLocalRelays().filter {
-        it.write
-    }
+    var relayList = account.activeWriteRelays()
 
     LaunchedEffect(Unit) {
         postViewModel.load(account, baseReplyTo, quote)
@@ -166,314 +167,340 @@ fun NewPostView(
             decorFitsSystemWindows = false
         )
     ) {
-        Surface(
-            modifier = Modifier
-                .fillMaxWidth()
-                .fillMaxHeight()
-        ) {
-            if (showRelaysDialog) {
-                RelaySelectionDialog(
-                    list = relayList,
-                    onClose = {
-                        showRelaysDialog = false
-                    },
-                    onPost = {
-                        relayList = it
-                    },
-                    accountViewModel = accountViewModel,
-                    nav = nav
-                )
-            }
+        if (showRelaysDialog) {
+            RelaySelectionDialog(
+                preSelectedList = relayList,
+                onClose = {
+                    showRelaysDialog = false
+                },
+                onPost = {
+                    relayList = it
+                },
+                accountViewModel = accountViewModel,
+                nav = nav
+            )
+        }
 
-            Column(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .fillMaxHeight()
-            ) {
-                Column(
-                    modifier = Modifier
-                        .padding(start = 10.dp, end = 10.dp, top = 10.dp)
-                        .imePadding()
-                        .weight(1f)
-                ) {
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.SpaceBetween,
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        CloseButton(onCancel = {
+        Scaffold(
+            topBar = {
+                TopAppBar(
+                    title = {
+                        Row(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(end = 10.dp),
+                            horizontalArrangement = Arrangement.SpaceBetween,
+                            verticalAlignment = Alignment.CenterVertically
+                        ) {
+                            Spacer(modifier = StdHorzSpacer)
+
+                            Box {
+                                IconButton(
+                                    modifier = Modifier.align(Alignment.Center),
+                                    onClick = {
+                                        showRelaysDialog = true
+                                    }
+                                ) {
+                                    Icon(
+                                        painter = painterResource(R.drawable.relays),
+                                        contentDescription = null,
+                                        modifier = Modifier.height(25.dp),
+                                        tint = MaterialTheme.colors.onBackground
+                                    )
+                                }
+                            }
+                            PostButton(
+                                onPost = {
+                                    scope.launch(Dispatchers.IO) {
+                                        postViewModel.sendPost(relayList = relayList)
+                                        onClose()
+                                    }
+                                },
+                                isActive = postViewModel.canPost()
+                            )
+                        }
+                    },
+                    navigationIcon = {
+                        Spacer(modifier = StdHorzSpacer)
+                        CloseButton(onPress = {
                             postViewModel.cancel()
                             onClose()
                         })
-
-                        Box {
-                            IconButton(
-                                modifier = Modifier.align(Alignment.Center),
-                                onClick = {
-                                    showRelaysDialog = true
-                                }
-                            ) {
-                                Icon(
-                                    painter = painterResource(R.drawable.relays),
-                                    contentDescription = null,
-                                    modifier = Modifier.height(25.dp),
-                                    tint = MaterialTheme.colors.onBackground
-                                )
-                            }
-                        }
-                        PostButton(
-                            onPost = {
-                                scope.launch(Dispatchers.IO) {
-                                    postViewModel.sendPost(relayList = relayList)
-                                    onClose()
-                                }
-                            },
-                            isActive = postViewModel.canPost()
-                        )
-                    }
-
-                    Row(
+                    },
+                    backgroundColor = MaterialTheme.colors.surface,
+                    elevation = 0.dp
+                )
+            }
+        ) { pad ->
+            Surface(
+                modifier = Modifier
+                    .padding(
+                        start = Size10dp,
+                        top = pad.calculateTopPadding(),
+                        end = Size10dp,
+                        bottom = pad.calculateBottomPadding()
+                    )
+                    .fillMaxSize()
+            ) {
+                Column(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .fillMaxHeight()
+                ) {
+                    Column(
                         modifier = Modifier
-                            .fillMaxWidth()
+                            .padding(top = 10.dp)
+                            .imePadding()
                             .weight(1f)
                     ) {
-                        Column(
+                        Row(
                             modifier = Modifier
                                 .fillMaxWidth()
-                                .verticalScroll(scrollState)
+                                .weight(1f)
                         ) {
-                            postViewModel.originalNote?.let {
-                                NoteCompose(
-                                    baseNote = it,
-                                    makeItShort = true,
-                                    unPackReply = false,
-                                    isQuotedNote = true,
-                                    modifier = MaterialTheme.colors.replyModifier,
-                                    accountViewModel = accountViewModel,
-                                    nav = nav
-                                )
-                            }
-
-                            Notifying(postViewModel.mentions?.toImmutableList()) {
-                                postViewModel.removeFromReplyList(it)
-                            }
-
-                            if (enableMessageInterface) {
-                                Row(
-                                    verticalAlignment = Alignment.CenterVertically,
-                                    modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)
-                                ) {
-                                    SendDirectMessageTo(postViewModel = postViewModel)
+                            Column(
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .verticalScroll(scrollState)
+                            ) {
+                                postViewModel.originalNote?.let {
+                                    Row(Modifier.heightIn(max = 200.dp)) {
+                                        NoteCompose(
+                                            baseNote = it,
+                                            makeItShort = true,
+                                            unPackReply = false,
+                                            isQuotedNote = true,
+                                            modifier = MaterialTheme.colors.replyModifier,
+                                            accountViewModel = accountViewModel,
+                                            nav = nav
+                                        )
+                                        Spacer(modifier = StdVertSpacer)
+                                    }
                                 }
-                            }
 
-                            MessageField(postViewModel)
-
-                            if (postViewModel.wantsPoll) {
-                                Row(
-                                    verticalAlignment = Alignment.CenterVertically,
-                                    modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)
-                                ) {
-                                    PollField(postViewModel)
+                                Row() {
+                                    Notifying(postViewModel.mentions?.toImmutableList()) {
+                                        postViewModel.removeFromReplyList(it)
+                                    }
                                 }
-                            }
 
-                            if (postViewModel.wantsToMarkAsSensitive) {
-                                Row(
-                                    verticalAlignment = Alignment.CenterVertically,
-                                    modifier = Modifier
-                                        .padding(vertical = Size5dp, horizontal = Size10dp)
-                                ) {
-                                    ContentSensitivityExplainer(postViewModel)
+                                if (enableMessageInterface) {
+                                    Row(
+                                        verticalAlignment = Alignment.CenterVertically,
+                                        modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)
+                                    ) {
+                                        SendDirectMessageTo(postViewModel = postViewModel)
+                                    }
                                 }
-                            }
 
-                            if (postViewModel.wantsToAddGeoHash) {
-                                Row(
-                                    verticalAlignment = Alignment.CenterVertically,
-                                    modifier = Modifier
-                                        .padding(vertical = Size5dp, horizontal = Size10dp)
-                                ) {
-                                    LocationAsHash(postViewModel)
+                                MessageField(postViewModel)
+
+                                if (postViewModel.wantsPoll) {
+                                    Row(
+                                        verticalAlignment = Alignment.CenterVertically,
+                                        modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)
+                                    ) {
+                                        PollField(postViewModel)
+                                    }
                                 }
-                            }
 
-                            if (postViewModel.wantsForwardZapTo) {
-                                Row(
-                                    verticalAlignment = Alignment.CenterVertically,
-                                    modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)
-                                ) {
-                                    FowardZapTo(postViewModel)
+                                if (postViewModel.wantsToMarkAsSensitive) {
+                                    Row(
+                                        verticalAlignment = Alignment.CenterVertically,
+                                        modifier = Modifier
+                                            .padding(vertical = Size5dp, horizontal = Size10dp)
+                                    ) {
+                                        ContentSensitivityExplainer(postViewModel)
+                                    }
                                 }
-                            }
 
-                            val url = postViewModel.contentToAddUrl
-                            if (url != null) {
-                                Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)) {
-                                    ImageVideoDescription(
-                                        url,
-                                        account.defaultFileServer,
-                                        onAdd = { description, server, sensitiveContent ->
-                                            postViewModel.upload(url, description, sensitiveContent, server, context, relayList)
-                                            account.changeDefaultFileServer(server)
-                                        },
-                                        onCancel = {
-                                            postViewModel.contentToAddUrl = null
-                                        },
-                                        onError = {
-                                            scope.launch {
-                                                postViewModel.imageUploadingError.emit(it)
-                                            }
-                                        },
-                                        accountViewModel = accountViewModel
-                                    )
+                                if (postViewModel.wantsToAddGeoHash) {
+                                    Row(
+                                        verticalAlignment = Alignment.CenterVertically,
+                                        modifier = Modifier
+                                            .padding(vertical = Size5dp, horizontal = Size10dp)
+                                    ) {
+                                        LocationAsHash(postViewModel)
+                                    }
                                 }
-                            }
 
-                            val user = postViewModel.account?.userProfile()
-                            val lud16 = user?.info?.lnAddress()
+                                if (postViewModel.wantsForwardZapTo) {
+                                    Row(
+                                        verticalAlignment = Alignment.CenterVertically,
+                                        modifier = Modifier.padding(top = Size5dp, bottom = Size5dp, start = Size10dp)
+                                    ) {
+                                        FowardZapTo(postViewModel, accountViewModel)
+                                    }
+                                }
 
-                            if (lud16 != null && postViewModel.wantsInvoice) {
-                                Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)) {
-                                    Column(Modifier.fillMaxWidth()) {
-                                        InvoiceRequest(
-                                            lud16,
-                                            user.pubkeyHex,
-                                            account,
-                                            stringResource(id = R.string.lightning_invoice),
-                                            stringResource(id = R.string.lightning_create_and_add_invoice),
-                                            onSuccess = {
-                                                postViewModel.message = TextFieldValue(postViewModel.message.text + "\n\n" + it)
-                                                postViewModel.wantsInvoice = false
+                                val url = postViewModel.contentToAddUrl
+                                if (url != null) {
+                                    Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)) {
+                                        ImageVideoDescription(
+                                            url,
+                                            account.defaultFileServer,
+                                            onAdd = { description, server, sensitiveContent ->
+                                                postViewModel.upload(url, description, sensitiveContent, server, context, relayList)
+                                                account.changeDefaultFileServer(server)
                                             },
-                                            onClose = {
-                                                postViewModel.wantsInvoice = false
-                                            }
+                                            onCancel = {
+                                                postViewModel.contentToAddUrl = null
+                                            },
+                                            onError = {
+                                                scope.launch {
+                                                    postViewModel.imageUploadingError.emit(it)
+                                                }
+                                            },
+                                            accountViewModel = accountViewModel
                                         )
                                     }
                                 }
-                            }
 
-                            if (lud16 != null && postViewModel.wantsZapraiser) {
-                                Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)) {
-                                    ZapRaiserRequest(
-                                        stringResource(id = R.string.zapraiser),
-                                        postViewModel
-                                    )
-                                }
-                            }
+                                val user = postViewModel.account?.userProfile()
+                                val lud16 = user?.info?.lnAddress()
 
-                            val myUrlPreview = postViewModel.urlPreview
-                            if (myUrlPreview != null) {
-                                Row(modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)) {
-                                    if (isValidURL(myUrlPreview)) {
-                                        val removedParamsFromUrl =
-                                            myUrlPreview.split("?")[0].lowercase()
-                                        if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
-                                            AsyncImage(
-                                                model = myUrlPreview,
-                                                contentDescription = myUrlPreview,
-                                                contentScale = ContentScale.FillWidth,
-                                                modifier = Modifier
-                                                    .padding(top = 4.dp)
-                                                    .fillMaxWidth()
-                                                    .clip(shape = QuoteBorder)
-                                                    .border(
-                                                        1.dp,
-                                                        MaterialTheme.colors.subtleBorder,
-                                                        QuoteBorder
-                                                    )
+                                if (lud16 != null && postViewModel.wantsInvoice) {
+                                    Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)) {
+                                        Column(Modifier.fillMaxWidth()) {
+                                            InvoiceRequest(
+                                                lud16,
+                                                user.pubkeyHex,
+                                                account,
+                                                stringResource(id = R.string.lightning_invoice),
+                                                stringResource(id = R.string.lightning_create_and_add_invoice),
+                                                onSuccess = {
+                                                    postViewModel.message = TextFieldValue(postViewModel.message.text + "\n\n" + it)
+                                                    postViewModel.wantsInvoice = false
+                                                },
+                                                onClose = {
+                                                    postViewModel.wantsInvoice = false
+                                                }
                                             )
-                                        } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
-                                            VideoView(myUrlPreview, accountViewModel = accountViewModel)
-                                        } else {
-                                            UrlPreview(myUrlPreview, myUrlPreview, accountViewModel)
-                                        }
-                                    } else if (startsWithNIP19Scheme(myUrlPreview)) {
-                                        val bgColor = MaterialTheme.colors.background
-                                        val backgroundColor = remember {
-                                            mutableStateOf(bgColor)
                                         }
+                                    }
+                                }
 
-                                        BechLink(
-                                            myUrlPreview,
-                                            true,
-                                            backgroundColor,
-                                            accountViewModel,
-                                            nav
+                                if (lud16 != null && postViewModel.wantsZapraiser) {
+                                    Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)) {
+                                        ZapRaiserRequest(
+                                            stringResource(id = R.string.zapraiser),
+                                            postViewModel
                                         )
-                                    } else if (noProtocolUrlValidator.matcher(myUrlPreview).matches()) {
-                                        UrlPreview("https://$myUrlPreview", myUrlPreview, accountViewModel)
+                                    }
+                                }
+
+                                val myUrlPreview = postViewModel.urlPreview
+                                if (myUrlPreview != null) {
+                                    Row(modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)) {
+                                        if (isValidURL(myUrlPreview)) {
+                                            val removedParamsFromUrl =
+                                                myUrlPreview.split("?")[0].lowercase()
+                                            if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
+                                                AsyncImage(
+                                                    model = myUrlPreview,
+                                                    contentDescription = myUrlPreview,
+                                                    contentScale = ContentScale.FillWidth,
+                                                    modifier = Modifier
+                                                        .padding(top = 4.dp)
+                                                        .fillMaxWidth()
+                                                        .clip(shape = QuoteBorder)
+                                                        .border(
+                                                            1.dp,
+                                                            MaterialTheme.colors.subtleBorder,
+                                                            QuoteBorder
+                                                        )
+                                                )
+                                            } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
+                                                VideoView(myUrlPreview, roundedCorner = true, accountViewModel = accountViewModel)
+                                            } else {
+                                                UrlPreview(myUrlPreview, myUrlPreview, accountViewModel)
+                                            }
+                                        } else if (startsWithNIP19Scheme(myUrlPreview)) {
+                                            val bgColor = MaterialTheme.colors.background
+                                            val backgroundColor = remember {
+                                                mutableStateOf(bgColor)
+                                            }
+
+                                            BechLink(
+                                                myUrlPreview,
+                                                true,
+                                                backgroundColor,
+                                                accountViewModel,
+                                                nav
+                                            )
+                                        } else if (noProtocolUrlValidator.matcher(myUrlPreview).matches()) {
+                                            UrlPreview("https://$myUrlPreview", myUrlPreview, accountViewModel)
+                                        }
                                     }
                                 }
                             }
                         }
-                    }
 
-                    val userSuggestions = postViewModel.userSuggestions
-                    if (userSuggestions.isNotEmpty()) {
-                        LazyColumn(
-                            contentPadding = PaddingValues(
-                                top = 10.dp
-                            ),
-                            modifier = Modifier.heightIn(0.dp, 300.dp)
-                        ) {
-                            itemsIndexed(
-                                userSuggestions,
-                                key = { _, item -> item.pubkeyHex }
-                            ) { _, item ->
-                                UserLine(item, accountViewModel) {
-                                    postViewModel.autocompleteWithUser(item)
+                        val userSuggestions = postViewModel.userSuggestions
+                        if (userSuggestions.isNotEmpty()) {
+                            LazyColumn(
+                                contentPadding = PaddingValues(
+                                    top = 10.dp
+                                ),
+                                modifier = Modifier.heightIn(0.dp, 300.dp)
+                            ) {
+                                itemsIndexed(
+                                    userSuggestions,
+                                    key = { _, item -> item.pubkeyHex }
+                                ) { _, item ->
+                                    UserLine(item, accountViewModel) {
+                                        postViewModel.autocompleteWithUser(item)
+                                    }
                                 }
                             }
                         }
-                    }
 
-                    Row(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(50.dp),
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        UploadFromGallery(
-                            isUploading = postViewModel.isUploadingImage,
-                            tint = MaterialTheme.colors.onBackground,
+                        Row(
                             modifier = Modifier
+                                .fillMaxWidth()
+                                .height(50.dp),
+                            verticalAlignment = Alignment.CenterVertically
                         ) {
-                            postViewModel.selectImage(it)
-                        }
-
-                        if (postViewModel.canUsePoll) {
-                            // These should be hashtag recommendations the user selects in the future.
-                            // val hashtag = stringResource(R.string.poll_hashtag)
-                            // postViewModel.includePollHashtagInMessage(postViewModel.wantsPoll, hashtag)
-                            AddPollButton(postViewModel.wantsPoll) {
-                                postViewModel.wantsPoll = !postViewModel.wantsPoll
+                            UploadFromGallery(
+                                isUploading = postViewModel.isUploadingImage,
+                                tint = MaterialTheme.colors.onBackground,
+                                modifier = Modifier
+                            ) {
+                                postViewModel.selectImage(it)
                             }
-                        }
 
-                        if (postViewModel.canAddInvoice) {
-                            AddLnInvoiceButton(postViewModel.wantsInvoice) {
-                                postViewModel.wantsInvoice = !postViewModel.wantsInvoice
+                            if (postViewModel.canUsePoll) {
+                                // These should be hashtag recommendations the user selects in the future.
+                                // val hashtag = stringResource(R.string.poll_hashtag)
+                                // postViewModel.includePollHashtagInMessage(postViewModel.wantsPoll, hashtag)
+                                AddPollButton(postViewModel.wantsPoll) {
+                                    postViewModel.wantsPoll = !postViewModel.wantsPoll
+                                }
                             }
-                        }
 
-                        if (postViewModel.canAddZapRaiser) {
-                            AddZapraiserButton(postViewModel.wantsZapraiser) {
-                                postViewModel.wantsZapraiser = !postViewModel.wantsZapraiser
+                            if (postViewModel.canAddInvoice) {
+                                AddLnInvoiceButton(postViewModel.wantsInvoice) {
+                                    postViewModel.wantsInvoice = !postViewModel.wantsInvoice
+                                }
                             }
-                        }
 
-                        MarkAsSensitive(postViewModel) {
-                            postViewModel.wantsToMarkAsSensitive = !postViewModel.wantsToMarkAsSensitive
-                        }
+                            if (postViewModel.canAddZapRaiser) {
+                                AddZapraiserButton(postViewModel.wantsZapraiser) {
+                                    postViewModel.wantsZapraiser = !postViewModel.wantsZapraiser
+                                }
+                            }
 
-                        AddGeoHash(postViewModel) {
-                            postViewModel.wantsToAddGeoHash = !postViewModel.wantsToAddGeoHash
-                        }
+                            MarkAsSensitive(postViewModel) {
+                                postViewModel.wantsToMarkAsSensitive = !postViewModel.wantsToMarkAsSensitive
+                            }
 
-                        ForwardZapTo(postViewModel) {
-                            postViewModel.wantsForwardZapTo = !postViewModel.wantsForwardZapTo
+                            AddGeoHash(postViewModel) {
+                                postViewModel.wantsToAddGeoHash = !postViewModel.wantsToAddGeoHash
+                            }
+
+                            ForwardZapTo(postViewModel) {
+                                postViewModel.wantsForwardZapTo = !postViewModel.wantsForwardZapTo
+                            }
                         }
                     }
                 }
@@ -491,6 +518,8 @@ private fun PollField(postViewModel: NewPostViewModel) {
             NewPollOption(postViewModel, index)
         }
 
+        NewPollVoteValueRange(postViewModel)
+
         Button(
             onClick = {
                 postViewModel.pollOptions[postViewModel.pollOptions.size] =
@@ -698,7 +727,7 @@ fun SendDirectMessageTo(postViewModel: NewPostViewModel) {
 }
 
 @Composable
-fun FowardZapTo(postViewModel: NewPostViewModel) {
+fun FowardZapTo(postViewModel: NewPostViewModel, accountViewModel: AccountViewModel) {
     Column(
         modifier = Modifier.fillMaxWidth()
     ) {
@@ -732,7 +761,7 @@ fun FowardZapTo(postViewModel: NewPostViewModel) {
             }
 
             Text(
-                text = stringResource(R.string.zap_forward_title),
+                text = stringResource(R.string.zap_split_title),
                 fontSize = 20.sp,
                 fontWeight = FontWeight.W500,
                 modifier = Modifier.padding(start = 10.dp)
@@ -742,22 +771,52 @@ fun FowardZapTo(postViewModel: NewPostViewModel) {
         Divider()
 
         Text(
-            text = stringResource(R.string.zap_forward_explainer),
+            text = stringResource(R.string.zap_split_explainer),
             color = MaterialTheme.colors.placeholderText,
             modifier = Modifier.padding(vertical = 10.dp)
         )
 
+        postViewModel.forwardZapTo.items.forEachIndexed { index, splitItem ->
+            Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = Size10dp)) {
+                BaseUserPicture(splitItem.key, Size55dp, accountViewModel = accountViewModel)
+
+                Spacer(modifier = DoubleHorzSpacer)
+
+                Column(modifier = Modifier.weight(1f)) {
+                    UsernameDisplay(splitItem.key, showPlayButton = false)
+                    Text(
+                        text = String.format("%.0f%%", splitItem.percentage * 100),
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                        fontWeight = FontWeight.Bold,
+                        fontSize = 18.sp
+                    )
+                }
+
+                Spacer(modifier = DoubleHorzSpacer)
+
+                Slider(
+                    value = splitItem.percentage,
+                    onValueChange = { sliderValue ->
+                        val rounded = (round(sliderValue * 20)) / 20.0f
+                        postViewModel.updateZapPercentage(index, rounded)
+                    },
+                    modifier = Modifier
+                        .weight(1.5f)
+                )
+            }
+        }
+
         OutlinedTextField(
             value = postViewModel.forwardZapToEditting,
             onValueChange = {
                 postViewModel.updateZapForwardTo(it)
             },
-
-            label = { Text(text = stringResource(R.string.zap_forward_lnAddress)) },
+            label = { Text(text = stringResource(R.string.zap_split_serarch_and_add_user)) },
             modifier = Modifier.fillMaxWidth(),
             placeholder = {
                 Text(
-                    text = stringResource(R.string.zap_forward_lnAddress),
+                    text = stringResource(R.string.zap_split_serarch_and_add_user_placeholder),
                     color = MaterialTheme.colors.placeholderText
                 )
             },
@@ -887,19 +946,18 @@ fun DisplayLocationInTitle(geohash: String) {
 fun Notifying(baseMentions: ImmutableList<User>?, onClick: (User) -> Unit) {
     val mentions = baseMentions?.toSet()
 
-    FlowRow(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(horizontal = 10.dp)) {
+    FlowRow(horizontalArrangement = Arrangement.spacedBy(5.dp)) {
         if (!mentions.isNullOrEmpty()) {
             Text(
                 stringResource(R.string.reply_notify),
                 fontWeight = FontWeight.Bold,
-                color = MaterialTheme.colors.placeholderText
+                color = MaterialTheme.colors.placeholderText,
+                modifier = Modifier.align(CenterVertically)
             )
 
             mentions.forEachIndexed { idx, user ->
                 val innerUserState by user.live().metadata.observeAsState()
                 innerUserState?.user?.let { myUser ->
-                    Spacer(modifier = Modifier.width(5.dp))
-
                     val tags = remember(innerUserState) {
                         myUser.info?.latestMetadata?.tags?.toImmutableListOfLists()
                     }
@@ -1160,10 +1218,10 @@ private fun MarkAsSensitive(
 }
 
 @Composable
-fun CloseButton(onCancel: () -> Unit) {
+fun CloseButton(onPress: () -> Unit) {
     Button(
         onClick = {
-            onCancel()
+            onPress()
         },
         shape = ButtonBorder,
         colors = ButtonDefaults
@@ -1348,8 +1406,8 @@ fun ImageVideoDescription(
                             try {
                                 bitmap = resolver.loadThumbnail(uri, Size(1200, 1000), null)
                             } catch (e: Exception) {
-                                onError("Unable to load file")
-                                Log.e("NewPostView", "Couldn't create thumbnail for $uri")
+                                onError("Unable to load thumbnail")
+                                Log.w("NewPostView", "Couldn't create thumbnail, but the video can be uploaded", e)
                             }
                         }
                     }
@@ -1365,7 +1423,7 @@ fun ImageVideoDescription(
                         )
                     }
                 } else {
-                    VideoView(uri.toString(), accountViewModel = accountViewModel)
+                    VideoView(uri.toString(), roundedCorner = true, accountViewModel = accountViewModel)
                 }
             }
 
@@ -1446,13 +1504,6 @@ fun ImageVideoDescription(
     }
 }
 
-@Stable
-data class ImmutableListOfLists<T>(val lists: List<List<T>> = emptyList())
-
-fun List<List<String>>.toImmutableListOfLists(): ImmutableListOfLists<String> {
-    return ImmutableListOfLists(this)
-}
-
 @Composable
 fun SettingSwitchItem(
     modifier: Modifier = Modifier,

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

@@ -18,16 +18,19 @@ import com.vitorpamplona.amethyst.model.*
 import com.vitorpamplona.amethyst.service.FileHeader
 import com.vitorpamplona.amethyst.service.LocationUtil
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
-import com.vitorpamplona.amethyst.service.model.AddressableEvent
-import com.vitorpamplona.amethyst.service.model.BaseTextNoteEvent
-import com.vitorpamplona.amethyst.service.model.ChatMessageEvent
-import com.vitorpamplona.amethyst.service.model.CommunityDefinitionEvent
-import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.service.noProtocolUrlValidator
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.MediaCompressor
+import com.vitorpamplona.amethyst.ui.components.Split
 import com.vitorpamplona.amethyst.ui.components.isValidURL
+import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.events.AddressableEvent
+import com.vitorpamplona.quartz.events.BaseTextNoteEvent
+import com.vitorpamplona.quartz.events.ChatMessageEvent
+import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
+import com.vitorpamplona.quartz.events.PrivateDmEvent
+import com.vitorpamplona.quartz.events.TextNoteEvent
+import com.vitorpamplona.quartz.events.ZapSplitSetup
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -72,8 +75,8 @@ open class NewPostViewModel() : ViewModel() {
     var wantsPoll by mutableStateOf(false)
     var zapRecipients = mutableStateListOf<HexKey>()
     var pollOptions = newStateMapPollOptions()
-    var valueMaximum: Int? = null
-    var valueMinimum: Int? = null
+    var valueMaximum by mutableStateOf<Int?>(null)
+    var valueMinimum by mutableStateOf<Int?>(null)
     var consensusThreshold: Int? = null
     var closedAt: Int? = null
 
@@ -87,9 +90,13 @@ open class NewPostViewModel() : ViewModel() {
     var canAddInvoice by mutableStateOf(false)
     var wantsInvoice by mutableStateOf(false)
 
+    data class ForwardZapSetup(val user: User) {
+        var percentage by mutableStateOf(100)
+    }
+
     // Forward Zap to
     var wantsForwardZapTo by mutableStateOf(false)
-    var forwardZapTo by mutableStateOf<User?>(null)
+    var forwardZapTo by mutableStateOf<Split<User>>(Split())
     var forwardZapToEditting by mutableStateOf(TextFieldValue(""))
 
     // NSFW, Sensitive
@@ -150,7 +157,7 @@ open class NewPostViewModel() : ViewModel() {
         wantsToAddGeoHash = false
         wantsZapraiser = false
         zapRaiserAmount = null
-        forwardZapTo = null
+        forwardZapTo = Split()
         forwardZapToEditting = TextFieldValue("")
 
         this.account = account
@@ -165,10 +172,13 @@ open class NewPostViewModel() : ViewModel() {
         val dmUsers = toUsersTagger.mentions
 
         val zapReceiver = if (wantsForwardZapTo) {
-            if (forwardZapTo != null) {
-                forwardZapTo?.info?.lud16 ?: forwardZapTo?.info?.lud06
-            } else {
-                forwardZapToEditting.text
+            forwardZapTo?.items?.map {
+                ZapSplitSetup(
+                    lnAddressOrPubKeyHex = it.key.pubkeyHex,
+                    relay = it.key.relaysBeingUsed.keys.firstOrNull(),
+                    weight = it.percentage.toDouble(),
+                    isLnAddress = false
+                )
             }
         } else {
             null
@@ -354,7 +364,7 @@ open class NewPostViewModel() : ViewModel() {
         wantsForwardZapTo = false
         wantsToMarkAsSensitive = false
         wantsToAddGeoHash = false
-        forwardZapTo = null
+        forwardZapTo = Split()
         forwardZapToEditting = TextFieldValue("")
 
         userSuggestions = emptyList()
@@ -426,10 +436,10 @@ open class NewPostViewModel() : ViewModel() {
     open fun updateZapForwardTo(it: TextFieldValue) {
         forwardZapToEditting = it
         if (it.selection.collapsed) {
-            val lastWord = it.text.substring(0, it.selection.end).substringAfterLast("\n").substringAfterLast(" ")
+            val lastWord = it.text
             userSuggestionAnchor = it.selection
             userSuggestionsMainMessage = UserSuggestionAnchor.FORWARD_ZAPS
-            if (lastWord.startsWith("@") && lastWord.length > 2) {
+            if (lastWord.length > 2) {
                 NostrSearchEventOrUserDataSource.search(lastWord.removePrefix("@"))
                 viewModelScope.launch(Dispatchers.IO) {
                     userSuggestions = LocalCache.findUsersStartingWith(lastWord.removePrefix("@"))
@@ -459,6 +469,9 @@ open class NewPostViewModel() : ViewModel() {
                     TextRange(lastWordStart + wordToInsert.length, lastWordStart + wordToInsert.length)
                 )
             } else if (userSuggestionsMainMessage == UserSuggestionAnchor.FORWARD_ZAPS) {
+                forwardZapTo?.addItem(item)
+                forwardZapToEditting = TextFieldValue("")
+                /*
                 val lastWord = forwardZapToEditting.text.substring(0, it.end).substringAfterLast("\n").substringAfterLast(" ")
                 val lastWordStart = it.end - lastWord.length
                 val wordToInsert = "@${item.pubkeyNpub()}"
@@ -467,7 +480,7 @@ open class NewPostViewModel() : ViewModel() {
                 forwardZapToEditting = TextFieldValue(
                     forwardZapToEditting.text.replaceRange(lastWordStart, it.end, wordToInsert),
                     TextRange(lastWordStart + wordToInsert.length, lastWordStart + wordToInsert.length)
-                )
+                )*/
             } else if (userSuggestionsMainMessage == UserSuggestionAnchor.TO_USERS) {
                 val lastWord = toUsers.text.substring(0, it.end).substringAfterLast("\n").substringAfterLast(" ")
                 val lastWordStart = it.end - lastWord.length
@@ -493,7 +506,7 @@ open class NewPostViewModel() : ViewModel() {
         return message.text.isNotBlank() && !isUploadingImage && !wantsInvoice &&
             (!wantsZapraiser || zapRaiserAmount != null) &&
             (!wantsDirectMessage || !toUsers.text.isNullOrBlank()) &&
-            (!wantsPoll || pollOptions.values.all { it.isNotEmpty() }) &&
+            (!wantsPoll || (pollOptions.values.all { it.isNotEmpty() } && isValidvalueMinimum.value && isValidvalueMaximum.value)) &&
             contentToAddUrl == null
     }
 
@@ -611,6 +624,54 @@ open class NewPostViewModel() : ViewModel() {
             nip24 = !nip24
         }
     }
+
+    fun updateMinZapAmountForPoll(textMin: String) {
+        if (textMin.isNotEmpty()) {
+            try {
+                val int = textMin.toInt()
+                if (int < 1) {
+                    valueMinimum = null
+                } else {
+                    valueMinimum = int
+                }
+            } catch (e: Exception) {}
+        } else {
+            valueMinimum = null
+        }
+
+        checkMinMax()
+    }
+
+    fun updateMaxZapAmountForPoll(textMax: String) {
+        if (textMax.isNotEmpty()) {
+            try {
+                val int = textMax.toInt()
+                if (int < 1) {
+                    valueMaximum = null
+                } else {
+                    valueMaximum = int
+                }
+            } catch (e: Exception) {}
+        } else {
+            valueMaximum = null
+        }
+
+        checkMinMax()
+    }
+
+    fun checkMinMax() {
+        if ((valueMinimum ?: 0) > (valueMaximum ?: Int.MAX_VALUE)) {
+            isValidvalueMinimum.value = false
+            isValidvalueMaximum.value = false
+        } else {
+            isValidvalueMinimum.value = true
+            isValidvalueMaximum.value = true
+        }
+    }
+
+    fun updateZapPercentage(index: Int, sliderValue: Float) {
+        forwardZapTo?.updatePercentage(index, sliderValue)
+    }
 }
 
 enum class GeohashPrecision(val digits: Int) {

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListViewModel.kt

@@ -4,10 +4,11 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
-import com.vitorpamplona.amethyst.service.model.ContactListEvent
+import com.vitorpamplona.amethyst.service.Nip11CachedRetriever
 import com.vitorpamplona.amethyst.service.relays.Constants
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.RelayPool
+import com.vitorpamplona.quartz.events.ContactListEvent
 import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -24,6 +25,7 @@ class NewRelayListViewModel : ViewModel() {
     fun load(account: Account) {
         this.account = account
         clear()
+        loadRelayDocuments()
     }
 
     fun create() {
@@ -36,17 +38,34 @@ class NewRelayListViewModel : ViewModel() {
         clear()
     }
 
+    fun loadRelayDocuments() {
+        viewModelScope.launch(Dispatchers.IO) {
+            _relays.value.forEach { item ->
+                Nip11CachedRetriever.loadRelayInfo(
+                    dirtyUrl = item.url,
+                    onInfo = {
+                        togglePaidRelay(item, it.limitation?.payment_required ?: false)
+                    },
+                    onError = { url, errorCode, exceptionMessage ->
+                    }
+                )
+            }
+        }
+    }
+
     fun clear() {
         _relays.update {
             var relayFile = account.userProfile().latestContactList?.relays()
 
             // Ugly, but forces nostr.band as the only search-supporting relay today.
             // TODO: Remove when search becomes more available.
-            if (relayFile?.none { it.key == Constants.forcedRelayForSearch.url } == true) {
-                relayFile = relayFile + Pair(
-                    Constants.forcedRelayForSearch.url,
-                    ContactListEvent.ReadWrite(Constants.forcedRelayForSearch.read, Constants.forcedRelayForSearch.write)
-                )
+            if (relayFile?.none { it.key.removeSuffix("/") in Constants.forcedRelaysForSearchSet } == true) {
+                relayFile = relayFile + Constants.forcedRelayForSearch.map {
+                    Pair(
+                        it.url,
+                        ContactListEvent.ReadWrite(it.read, it.write)
+                    )
+                }
             }
 
             if (relayFile != null) {

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

@@ -67,7 +67,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                     horizontalArrangement = Arrangement.SpaceBetween,
                     verticalAlignment = Alignment.CenterVertically
                 ) {
-                    CloseButton(onCancel = {
+                    CloseButton(onPress = {
                         postViewModel.clear()
                         onClose()
                     })

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

@@ -10,11 +10,10 @@ import androidx.lifecycle.viewModelScope
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.node.ObjectNode
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.service.model.GitHubIdentity
-import com.vitorpamplona.amethyst.service.model.MastodonIdentity
-import com.vitorpamplona.amethyst.service.model.TwitterIdentity
 import com.vitorpamplona.amethyst.ui.components.MediaCompressor
-import id.zelory.compressor.Compressor.compress
+import com.vitorpamplona.quartz.events.GitHubIdentity
+import com.vitorpamplona.quartz.events.MastodonIdentity
+import com.vitorpamplona.quartz.events.TwitterIdentity
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch

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

@@ -1,8 +1,5 @@
 package com.vitorpamplona.amethyst.ui.actions
 
-import android.content.Context
-import android.util.Log
-import android.widget.Toast
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -28,27 +25,24 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.RelayBriefInfo
 import com.vitorpamplona.amethyst.model.RelayInformation
-import com.vitorpamplona.amethyst.service.HttpClient
-import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.components.ClickableEmail
 import com.vitorpamplona.amethyst.ui.components.ClickableUrl
 import com.vitorpamplona.amethyst.ui.note.LoadUser
+import com.vitorpamplona.amethyst.ui.note.RenderRelayIcon
 import com.vitorpamplona.amethyst.ui.note.UserCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import okhttp3.Call
-import okhttp3.Callback
-import okhttp3.Request
-import okhttp3.Response
-import java.io.IOException
+import com.vitorpamplona.amethyst.ui.theme.Size55dp
+import com.vitorpamplona.amethyst.ui.theme.StdPadding
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun RelayInformationDialog(
     onClose: () -> Unit,
+    relayBriefInfo: RelayBriefInfo,
     relayInfo: RelayInformation,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
@@ -74,23 +68,30 @@ fun RelayInformationDialog(
                     horizontalArrangement = Arrangement.SpaceBetween,
                     verticalAlignment = Alignment.CenterVertically
                 ) {
-                    CloseButton(onCancel = {
+                    CloseButton(onPress = {
                         onClose()
                     })
                 }
 
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.Center
-                ) {
-                    Title(relayInfo.name ?: "")
-                }
+                Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center, modifier = StdPadding.fillMaxWidth()) {
+                    Column() {
+                        RenderRelayIcon(
+                            relayBriefInfo.favIcon,
+                            Size55dp
+                        )
+                    }
 
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.Center
-                ) {
-                    SectionContent(relayInfo.description ?: "")
+                    Spacer(modifier = DoubleHorzSpacer)
+
+                    Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                        Row() {
+                            Title(relayInfo.name?.trim() ?: "")
+                        }
+
+                        Row() {
+                            SubtitleContent(relayInfo.description?.trim() ?: "")
+                        }
+                    }
                 }
 
                 Section(stringResource(R.string.owner))
@@ -212,7 +213,7 @@ private fun DisplaySupportedNips(relayInfo: RelayInformation) {
             val text = item.toString().padStart(2, '0')
             Box(Modifier.padding(10.dp)) {
                 ClickableUrl(
-                    urlText = "$text",
+                    urlText = text,
                     url = "https://github.com/nostr-protocol/nips/blob/master/$text.md"
                 )
             }
@@ -222,7 +223,7 @@ private fun DisplaySupportedNips(relayInfo: RelayInformation) {
             val text = item.padStart(2, '0')
             Box(Modifier.padding(10.dp)) {
                 ClickableUrl(
-                    urlText = "$text",
+                    urlText = text,
                     url = "https://github.com/nostr-protocol/nips/blob/master/$text.md"
                 )
             }
@@ -258,13 +259,18 @@ private fun DisplayOwnerInformation(
 
 @Composable
 fun Title(text: String) {
-    Spacer(modifier = DoubleVertSpacer)
     Text(
         text = text,
         fontWeight = FontWeight.Bold,
         fontSize = 24.sp
     )
-    Spacer(modifier = DoubleVertSpacer)
+}
+
+@Composable
+fun SubtitleContent(text: String) {
+    Text(
+        text = text
+    )
 }
 
 @Composable
@@ -285,85 +291,3 @@ fun SectionContent(text: String) {
         text = text
     )
 }
-
-fun loadRelayInfo(
-    dirtyUrl: String,
-    context: Context,
-    scope: CoroutineScope,
-    onInfo: (RelayInformation) -> Unit
-) {
-    try {
-        val url = if (dirtyUrl.contains("://")) {
-            dirtyUrl
-                .replace("wss://", "https://")
-                .replace("ws://", "http://")
-        } else {
-            "https://$dirtyUrl"
-        }
-
-        val request: Request = Request
-            .Builder()
-            .header("Accept", "application/nostr+json")
-            .url(url)
-            .build()
-
-        HttpClient.getHttpClient()
-            .newCall(request)
-            .enqueue(
-                object : Callback {
-                    override fun onResponse(call: Call, response: Response) {
-                        checkNotInMainThread()
-                        response.use {
-                            val body = it.body.string()
-                            try {
-                                if (it.isSuccessful) {
-                                    onInfo(RelayInformation.fromJson(body))
-                                } else {
-                                    scope.launch {
-                                        Toast
-                                            .makeText(
-                                                context,
-                                                context.getString(R.string.an_error_occurred_trying_to_get_relay_information, dirtyUrl),
-                                                Toast.LENGTH_SHORT
-                                            ).show()
-                                    }
-                                }
-                            } catch (e: Exception) {
-                                Log.e("RelayInfoFail", "Resulting Message from Relay $dirtyUrl in not parseable: $body", e)
-                                scope.launch {
-                                    Toast
-                                        .makeText(
-                                            context,
-                                            context.getString(R.string.an_error_occurred_trying_to_get_relay_information, dirtyUrl),
-                                            Toast.LENGTH_SHORT
-                                        ).show()
-                                }
-                            }
-                        }
-                    }
-
-                    override fun onFailure(call: Call, e: IOException) {
-                        Log.e("RelayInfoFail", "Resulting Message from Relay in not parseable $dirtyUrl", e)
-                        scope.launch {
-                            Toast
-                                .makeText(
-                                    context,
-                                    context.getString(R.string.an_error_occurred_trying_to_get_relay_information, dirtyUrl),
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                        }
-                    }
-                }
-            )
-    } catch (e: Exception) {
-        Log.e("RelayInfoFail", "Invalid URL $dirtyUrl", e)
-        scope.launch {
-            Toast
-                .makeText(
-                    context,
-                    context.getString(R.string.an_error_occurred_trying_to_get_relay_information, dirtyUrl),
-                    Toast.LENGTH_SHORT
-                ).show()
-        }
-    }
-}

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/RelaySelectionDialog.kt

@@ -29,19 +29,27 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.RelayBriefInfo
 import com.vitorpamplona.amethyst.model.RelayInformation
+import com.vitorpamplona.amethyst.service.Nip11Retriever
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import kotlinx.coroutines.launch
 
 data class RelayList(
     val relay: Relay,
+    val relayInfo: RelayBriefInfo,
     val isSelected: Boolean
 )
 
+data class RelayInfoDialog(
+    val relayBriefInfo: RelayBriefInfo,
+    val relayInfo: RelayInformation
+)
+
 @Composable
 fun RelaySelectionDialog(
-    list: List<Relay>,
+    preSelectedList: List<Relay>,
     onClose: () -> Unit,
     onPost: (list: List<Relay>) -> Unit,
     accountViewModel: AccountViewModel,
@@ -49,34 +57,29 @@ fun RelaySelectionDialog(
 ) {
     val scope = rememberCoroutineScope()
     val context = LocalContext.current
-    val relayList = accountViewModel.account.activeRelays()?.filter {
-        it.write
-    }?.map {
-        it
-    } ?: accountViewModel.account.convertLocalRelays().filter {
-        it.write
-    }
 
     var relays by remember {
         mutableStateOf(
-            relayList.map {
+            accountViewModel.account.activeWriteRelays().map {
                 RelayList(
-                    it,
-                    list.any { relay -> it.url == relay.url }
+                    relay = it,
+                    relayInfo = RelayBriefInfo(it.url),
+                    isSelected = preSelectedList.any { relay -> it.url == relay.url }
                 )
             }
         )
     }
-    var relayInfo: RelayInformation? by remember { mutableStateOf(null) }
+    var relayInfo: RelayInfoDialog? by remember { mutableStateOf(null) }
 
-    if (relayInfo != null) {
+    relayInfo?.let {
         RelayInformationDialog(
             onClose = {
                 relayInfo = null
             },
-            relayInfo = relayInfo!!,
-            accountViewModel,
-            nav
+            relayInfo = it.relayInfo,
+            relayBriefInfo = it.relayBriefInfo,
+            accountViewModel = accountViewModel,
+            nav = nav
         )
     }
 
@@ -110,19 +113,19 @@ fun RelaySelectionDialog(
                     verticalAlignment = Alignment.CenterVertically
                 ) {
                     CloseButton(
-                        onCancel = {
+                        onPress = {
                             onClose()
                         }
                     )
 
-                    PostButton(
+                    SaveButton(
                         onPost = {
                             val selectedRelays = relays.filter { it.isSelected }
                             if (selectedRelays.isEmpty()) {
                                 scope.launch {
                                     Toast.makeText(context, context.getString(R.string.select_a_relay_to_continue), Toast.LENGTH_SHORT).show()
                                 }
-                                return@PostButton
+                                return@SaveButton
                             }
                             onPost(selectedRelays.map { it.relay })
                             onClose()
@@ -153,10 +156,7 @@ fun RelaySelectionDialog(
                         key = { _, item -> item.relay.url }
                     ) { index, item ->
                         RelaySwitch(
-                            text = item.relay.url
-                                .removePrefix("ws://")
-                                .removePrefix("wss://")
-                                .removeSuffix("/"),
+                            text = item.relayInfo.displayUrl,
                             checked = item.isSelected,
                             onClick = {
                                 relays = relays.mapIndexed { j, item ->
@@ -168,9 +168,30 @@ fun RelaySelectionDialog(
                                 }
                             },
                             onLongPress = {
-                                loadRelayInfo(item.relay.url, context, scope) {
-                                    relayInfo = it
-                                }
+                                accountViewModel.retrieveRelayDocument(
+                                    item.relay.url,
+                                    onInfo = {
+                                        relayInfo = RelayInfoDialog(RelayBriefInfo(item.relay.url), it)
+                                    },
+                                    onError = { url, errorCode, exceptionMessage ->
+                                        val msg = when (errorCode) {
+                                            Nip11Retriever.ErrorCode.FAIL_TO_ASSEMBLE_URL -> context.getString(R.string.relay_information_document_error_assemble_url, url, exceptionMessage)
+                                            Nip11Retriever.ErrorCode.FAIL_TO_REACH_SERVER -> context.getString(R.string.relay_information_document_error_assemble_url, url, exceptionMessage)
+                                            Nip11Retriever.ErrorCode.FAIL_TO_PARSE_RESULT -> context.getString(R.string.relay_information_document_error_assemble_url, url, exceptionMessage)
+                                            Nip11Retriever.ErrorCode.FAIL_WITH_HTTP_STATUS -> context.getString(R.string.relay_information_document_error_assemble_url, url, exceptionMessage)
+                                        }
+
+                                        scope.launch {
+                                            Toast
+                                                .makeText(
+                                                    context,
+                                                    msg,
+                                                    Toast.LENGTH_SHORT
+                                                )
+                                                .show()
+                                        }
+                                    }
+                                )
                             }
                         )
                     }

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/UrlUserTagTransformation.kt

@@ -11,8 +11,8 @@ import androidx.compose.ui.text.input.TransformedText
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextDecoration
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.decodePublicKey
-import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.quartz.encoders.decodePublicKey
+import com.vitorpamplona.quartz.encoders.toHexKey
 import kotlin.math.roundToInt
 
 data class RangesChanges(val original: TextRange, val modified: TextRange)
@@ -43,7 +43,8 @@ fun buildAnnotatedStringWithUrlHighlighting(text: AnnotatedString, color: Color)
 
                             val endIndex = startIndex + keyB32.length
 
-                            val key = decodePublicKey(keyB32.removePrefix("@"))
+                            val key =
+                                decodePublicKey(keyB32.removePrefix("@"))
                             val user = LocalCache.getOrCreateUser(key.toHexKey())
 
                             val newWord = "@${user.toBestDisplayName()}"
@@ -58,38 +59,38 @@ fun buildAnnotatedStringWithUrlHighlighting(text: AnnotatedString, color: Color)
                                 )
                             )
                             newWord + restOfWord
+                        } else if (Patterns.WEB_URL.matcher(word).matches()) {
+                            val startIndex = builderBefore.toString().length
+                            val endIndex = startIndex + word.length
+
+                            val startNew = builderAfter.toString().length
+                            val endNew = startNew + word.length
+
+                            substitutions.add(
+                                RangesChanges(
+                                    TextRange(startIndex, endIndex),
+                                    TextRange(startNew, endNew)
+                                )
+                            )
+
+                            builderBefore.append("$word ")
+                            builderAfter.append("$word ")
+                            word
                         } else {
-                            builderBefore.append(word + " ")
-                            builderAfter.append(word + " ")
+                            builderBefore.append("$word ")
+                            builderAfter.append("$word ")
                             word
                         }
                     } catch (e: Exception) {
                         // if it can't parse the key, don't try to change.
-                        builderBefore.append(word + " ")
-                        builderAfter.append(word + " ")
+                        builderBefore.append("$word ")
+                        builderAfter.append("$word ")
                         word
                     }
                 }.joinToString(" ")
             }.joinToString("\n")
         )
 
-        val newText = toAnnotatedString()
-
-        newText.split("\\s+".toRegex()).filter { word ->
-            Patterns.WEB_URL.matcher(word).matches()
-        }.forEach {
-            val startIndex = text.indexOf(it)
-            val endIndex = startIndex + it.length
-            addStyle(
-                style = SpanStyle(
-                    color = color,
-                    textDecoration = TextDecoration.None
-                ),
-                start = startIndex,
-                end = endIndex
-            )
-        }
-
         substitutions.forEach {
             addStyle(
                 style = SpanStyle(

app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewImageButton.kt

@@ -48,7 +48,7 @@ import kotlinx.coroutines.withContext
 
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
-fun NewImageButton(accountViewModel: AccountViewModel, nav: (String) -> Unit) {
+fun NewImageButton(accountViewModel: AccountViewModel, nav: (String) -> Unit, navScrollToTop: (Route, Boolean) -> Unit) {
     var wantsToPost by remember {
         mutableStateOf(false)
     }
@@ -62,11 +62,9 @@ fun NewImageButton(accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     val postViewModel: NewMediaModel = viewModel()
     postViewModel.onceUploaded {
         scope.launch(Dispatchers.Default) {
-            // awaits an refresh on the list
-            delay(250)
+            delay(500)
             withContext(Dispatchers.Main) {
-                val route = Route.Video.route.replace("{scrollToTop}", "true")
-                nav(route)
+                navScrollToTop(Route.Video, true)
             }
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/ui/components/AudioWaveformReadOnly.kt

@@ -0,0 +1,160 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.animation.core.AnimationSpec
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.requiredHeight
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.*
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.*
+import androidx.compose.ui.graphics.drawscope.DrawStyle
+import androidx.compose.ui.graphics.drawscope.Fill
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.coerceIn
+import androidx.compose.ui.unit.dp
+import com.linc.audiowaveform.model.AmplitudeType
+import com.linc.audiowaveform.model.WaveformAlignment
+import kotlin.math.ceil
+import kotlin.math.roundToInt
+
+private val MinSpikeWidthDp: Dp = 1.dp
+private val MaxSpikeWidthDp: Dp = 24.dp
+private val MinSpikePaddingDp: Dp = 0.dp
+private val MaxSpikePaddingDp: Dp = 12.dp
+private val MinSpikeRadiusDp: Dp = 0.dp
+private val MaxSpikeRadiusDp: Dp = 12.dp
+
+private const val MinProgress: Float = 0F
+private const val MaxProgress: Float = 1F
+
+private const val MinSpikeHeight: Float = 1F
+private const val DefaultGraphicsLayerAlpha: Float = 0.99F
+
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+fun AudioWaveformReadOnly(
+    modifier: Modifier = Modifier,
+    style: DrawStyle = Fill,
+    waveformBrush: Brush = SolidColor(Color.White),
+    progressBrush: Brush = SolidColor(Color.Blue),
+    waveformAlignment: WaveformAlignment = WaveformAlignment.Center,
+    amplitudeType: AmplitudeType = AmplitudeType.Avg,
+    onProgressChangeFinished: (() -> Unit)? = null,
+    spikeAnimationSpec: AnimationSpec<Float> = tween(500),
+    spikeWidth: Dp = 3.dp,
+    spikeRadius: Dp = 2.dp,
+    spikePadding: Dp = 2.dp,
+    progress: Float = 0F,
+    amplitudes: List<Int>,
+    onProgressChange: (Float) -> Unit
+) {
+    val backgroundColor = MaterialTheme.colors.background
+    val _progress = remember(progress) { progress.coerceIn(MinProgress, MaxProgress) }
+    val _spikeWidth = remember(spikeWidth) { spikeWidth.coerceIn(MinSpikeWidthDp, MaxSpikeWidthDp) }
+    val _spikePadding = remember(spikePadding) { spikePadding.coerceIn(MinSpikePaddingDp, MaxSpikePaddingDp) }
+    val _spikeRadius = remember(spikeRadius) { spikeRadius.coerceIn(MinSpikeRadiusDp, MaxSpikeRadiusDp) }
+    val _spikeTotalWidth = remember(spikeWidth, spikePadding) { _spikeWidth + _spikePadding }
+    var canvasSize by remember { mutableStateOf(Size(0f, 0f)) }
+    var spikes by remember { mutableStateOf(0F) }
+    val spikesAmplitudes = remember(amplitudes, spikes, amplitudeType) {
+        amplitudes.toDrawableAmplitudes(
+            amplitudeType = amplitudeType,
+            spikes = spikes.toInt(),
+            minHeight = MinSpikeHeight,
+            maxHeight = canvasSize.height.coerceAtLeast(MinSpikeHeight)
+        )
+    }.map { animateFloatAsState(it, spikeAnimationSpec).value }
+    Canvas(
+        modifier = Modifier
+            .fillMaxWidth()
+            .requiredHeight(48.dp)
+            .graphicsLayer(alpha = DefaultGraphicsLayerAlpha)
+            .then(modifier)
+    ) {
+        canvasSize = size
+        spikes = size.width / _spikeTotalWidth.toPx()
+        spikesAmplitudes.forEachIndexed { index, amplitude ->
+            drawRoundRect(
+                brush = waveformBrush,
+                topLeft = Offset(
+                    x = index * _spikeTotalWidth.toPx(),
+                    y = when (waveformAlignment) {
+                        WaveformAlignment.Top -> 0F
+                        WaveformAlignment.Bottom -> size.height - amplitude
+                        WaveformAlignment.Center -> size.height / 2F - amplitude / 2F
+                    }
+                ),
+                size = Size(
+                    width = _spikeWidth.toPx(),
+                    height = amplitude
+                ),
+                cornerRadius = CornerRadius(_spikeRadius.toPx(), _spikeRadius.toPx()),
+                style = style
+            )
+            drawRect(
+                brush = progressBrush,
+                size = Size(
+                    width = _progress * size.width,
+                    height = size.height
+                ),
+                blendMode = BlendMode.SrcAtop
+            )
+        }
+    }
+}
+
+private fun List<Int>.toDrawableAmplitudes(
+    amplitudeType: AmplitudeType,
+    spikes: Int,
+    minHeight: Float,
+    maxHeight: Float
+): List<Float> {
+    val amplitudes = map(Int::toFloat)
+    if (amplitudes.isEmpty() || spikes == 0) {
+        return List(spikes) { minHeight }
+    }
+    val transform = { data: List<Float> ->
+        when (amplitudeType) {
+            AmplitudeType.Avg -> data.average()
+            AmplitudeType.Max -> data.max()
+            AmplitudeType.Min -> data.min()
+        }.toFloat().coerceIn(minHeight, maxHeight)
+    }
+    return when {
+        spikes > amplitudes.count() -> amplitudes.fillToSize(spikes, transform)
+        else -> amplitudes.chunkToSize(spikes, transform)
+    }.normalize(minHeight, maxHeight)
+}
+
+internal fun <T> Iterable<T>.fillToSize(size: Int, transform: (List<T>) -> T): List<T> {
+    val capacity = ceil(size.safeDiv(count())).roundToInt()
+    return map { data -> List(capacity) { data } }.flatten().chunkToSize(size, transform)
+}
+
+internal fun <T> Iterable<T>.chunkToSize(size: Int, transform: (List<T>) -> T): List<T> {
+    val chunkSize = count() / size
+    val remainder = count() % size
+    val remainderIndex = ceil(count().safeDiv(remainder)).roundToInt()
+    val chunkIteration = filterIndexed { index, _ ->
+        remainderIndex == 0 || index % remainderIndex != 0
+    }.chunked(chunkSize, transform)
+    return when (size) {
+        chunkIteration.count() -> chunkIteration
+        else -> chunkIteration.chunkToSize(size, transform)
+    }
+}
+
+internal fun Iterable<Float>.normalize(min: Float, max: Float): List<Float> {
+    return map { (max - min) * ((it - min()) / (max() - min())) + min }
+}
+
+private fun Int.safeDiv(value: Int): Float {
+    return if (value == 0) return 0F else this / value.toFloat()
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/components/BundledUpdate.kt

@@ -5,8 +5,9 @@ import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -21,6 +22,8 @@ class BundledUpdate(
     val delay: Long,
     val dispatcher: CoroutineDispatcher = Dispatchers.Default
 ) {
+    val scope = CoroutineScope(dispatcher + SupervisorJob())
+
     private var onlyOneInBlock = AtomicBoolean()
     private var invalidatesAgain = false
 
@@ -32,8 +35,7 @@ class BundledUpdate(
             return
         }
 
-        val scope = CoroutineScope(Job() + dispatcher)
-        scope.launch {
+        scope.launch(dispatcher) {
             try {
                 onUpdate()
                 delay(delay)
@@ -48,6 +50,10 @@ class BundledUpdate(
             }
         }
     }
+
+    fun cancel() {
+        scope.cancel()
+    }
 }
 
 /**
@@ -58,6 +64,8 @@ class BundledInsert<T>(
     val delay: Long,
     val dispatcher: CoroutineDispatcher = Dispatchers.Default
 ) {
+    val scope = CoroutineScope(dispatcher + SupervisorJob())
+
     private var onlyOneInBlock = AtomicBoolean()
     private var queue = LinkedBlockingQueue<T>()
 
@@ -69,8 +77,7 @@ class BundledInsert<T>(
             return
         }
 
-        val scope = CoroutineScope(Job() + dispatcher)
-        scope.launch(Dispatchers.IO) {
+        scope.launch(dispatcher) {
             try {
                 val mySet = mutableSetOf<T>()
                 queue.drainTo(mySet)
@@ -88,4 +95,8 @@ class BundledInsert<T>(
             }
         }
     }
+
+    fun cancel() {
+        scope.cancel()
+    }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt

@@ -44,13 +44,13 @@ import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NIP30Parser
-import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
-import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
-import com.vitorpamplona.amethyst.service.nip19.Nip19
-import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
-import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.note.LoadChannel
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
+import com.vitorpamplona.quartz.encoders.Nip19
+import com.vitorpamplona.quartz.events.ChannelCreateEvent
+import com.vitorpamplona.quartz.events.ImmutableListOfLists
+import com.vitorpamplona.quartz.events.PrivateDmEvent
+import com.vitorpamplona.quartz.events.toImmutableListOfLists
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.persistentListOf

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableWithdrawal.kt

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.components
 
 import android.content.Intent
 import android.net.Uri
+import android.widget.Toast
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.LocalTextStyle
@@ -12,7 +13,8 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextDirection
 import androidx.core.content.ContextCompat
-import com.vitorpamplona.amethyst.service.lnurl.LnWithdrawalUtil
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.quartz.encoders.LnWithdrawalUtil
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
@@ -41,10 +43,7 @@ fun MayBeWithdrawal(lnurlWord: String) {
 @Composable
 fun ClickableWithdrawal(withdrawalString: String) {
     val context = LocalContext.current
-
-    val uri = remember(withdrawalString) {
-        Uri.parse("lightning:$withdrawalString")
-    }
+    val scope = rememberCoroutineScope()
 
     val withdraw = remember(withdrawalString) {
         AnnotatedString("$withdrawalString ")
@@ -53,9 +52,18 @@ fun ClickableWithdrawal(withdrawalString: String) {
     ClickableText(
         text = withdraw,
         onClick = {
-            runCatching {
-                val intent = Intent(Intent.ACTION_VIEW, uri)
+            try {
+                val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$withdrawalString"))
+                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                 ContextCompat.startActivity(context, intent, null)
+            } catch (e: Exception) {
+                scope.launch {
+                    Toast.makeText(
+                        context,
+                        context.getString(R.string.lightning_wallets_not_found),
+                        Toast.LENGTH_LONG
+                    ).show()
+                }
             }
         },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ExpandableRichTextViewer.kt

@@ -24,11 +24,11 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.note.getGradient
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.secondaryButtonBackground
+import com.vitorpamplona.quartz.events.ImmutableListOfLists
 
 const val SHORT_TEXT_LENGTH = 350
 

app/src/main/java/com/vitorpamplona/amethyst/ui/components/InvoicePreview.kt

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.components
 
 import android.content.Intent
 import android.net.Uri
+import android.widget.Toast
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Column
@@ -24,9 +25,9 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat.startActivity
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
 import com.vitorpamplona.amethyst.ui.theme.subtleBorder
+import com.vitorpamplona.quartz.encoders.LnInvoiceUtil
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.text.NumberFormat
@@ -66,6 +67,7 @@ fun MayBeInvoicePreview(lnbcWord: String) {
 @Composable
 fun InvoicePreview(lnInvoice: String, amount: String?) {
     val context = LocalContext.current
+    val scope = rememberCoroutineScope()
 
     Column(
         modifier = Modifier
@@ -118,9 +120,18 @@ fun InvoicePreview(lnInvoice: String, amount: String?) {
                     .fillMaxWidth()
                     .padding(vertical = 10.dp),
                 onClick = {
-                    runCatching {
+                    try {
                         val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$lnInvoice"))
+                        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                         startActivity(context, intent, null)
+                    } catch (e: Exception) {
+                        scope.launch {
+                            Toast.makeText(
+                                context,
+                                context.getString(R.string.lightning_wallets_not_found),
+                                Toast.LENGTH_LONG
+                            ).show()
+                        }
                     }
                 },
                 shape = QuoteBorder,

app/src/main/java/com/vitorpamplona/amethyst/ui/components/InvoiceRequest.kt

@@ -39,6 +39,7 @@ import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
 import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.amethyst.ui.theme.subtleBorder
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 @Composable
@@ -152,23 +153,25 @@ fun InvoiceRequest(
     Button(
         modifier = Modifier.fillMaxWidth().padding(vertical = 10.dp),
         onClick = {
-            val zapRequest = account.createZapRequestFor(toUserPubKeyHex, message, account.defaultZapType)
+            scope.launch(Dispatchers.IO) {
+                val zapRequest = account.createZapRequestFor(toUserPubKeyHex, message, account.defaultZapType)
 
-            LightningAddressResolver().lnAddressInvoice(
-                lud16,
-                amount * 1000,
-                message,
-                zapRequest?.toJson(),
-                onSuccess = onSuccess,
-                onError = {
-                    scope.launch {
-                        Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
-                        onClose()
+                LightningAddressResolver().lnAddressInvoice(
+                    lud16,
+                    amount * 1000,
+                    message,
+                    zapRequest?.toJson(),
+                    onSuccess = onSuccess,
+                    onError = {
+                        scope.launch {
+                            Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+                            onClose()
+                        }
+                    },
+                    onProgress = {
                     }
-                },
-                onProgress = {
-                }
-            )
+                )
+            }
         },
         shape = QuoteBorder,
         colors = ButtonDefaults.buttonColors(

app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt

@@ -30,8 +30,6 @@ import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.em
-import androidx.lifecycle.distinctUntilChanged
-import androidx.lifecycle.map
 import com.halilibo.richtext.markdown.Markdown
 import com.halilibo.richtext.markdown.MarkdownParseOptions
 import com.halilibo.richtext.ui.material.MaterialRichText
@@ -57,8 +55,6 @@ import com.vitorpamplona.amethyst.service.RichTextViewerState
 import com.vitorpamplona.amethyst.service.SchemelessUrlSegment
 import com.vitorpamplona.amethyst.service.Segment
 import com.vitorpamplona.amethyst.service.WithdrawSegment
-import com.vitorpamplona.amethyst.service.nip19.Nip19
-import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.note.LoadUser
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
@@ -70,6 +66,8 @@ import com.vitorpamplona.amethyst.ui.theme.innerPostModifier
 import com.vitorpamplona.amethyst.ui.theme.markdownStyle
 import com.vitorpamplona.amethyst.ui.theme.replyModifier
 import com.vitorpamplona.amethyst.ui.uriToRoute
+import com.vitorpamplona.quartz.encoders.Nip19
+import com.vitorpamplona.quartz.events.ImmutableListOfLists
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.net.MalformedURLException
@@ -287,7 +285,7 @@ private fun ZoomableContentView(
 ) {
     state.imagesForPager[word]?.let {
         Box(modifier = HalfVertPadding) {
-            ZoomableContentView(it, state.imageList, accountViewModel)
+            ZoomableContentView(it, state.imageList, roundedCorner = true, accountViewModel)
         }
     }
 }
@@ -421,9 +419,7 @@ private fun ObserveNIP19Event(
 
 @Composable
 fun ObserveNote(note: Note, onRefresh: () -> Unit) {
-    val loadedNoteId by note.live().metadata.map {
-        it.note.event?.id()
-    }.distinctUntilChanged().observeAsState(note.event?.id())
+    val loadedNoteId by note.live().metadata.observeAsState()
 
     LaunchedEffect(key1 = loadedNoteId) {
         if (loadedNoteId != null) {
@@ -460,9 +456,7 @@ private fun ObserveNIP19User(
 
 @Composable
 private fun ObserveUser(user: User, onRefresh: () -> Unit) {
-    val loadedUserMetaId by user.live().metadata.map {
-        it.user.info?.latestMetadata?.id
-    }.distinctUntilChanged().observeAsState(user.info?.latestMetadata?.id)
+    val loadedUserMetaId by user.live().metadata.observeAsState()
 
     LaunchedEffect(key1 = loadedUserMetaId) {
         if (loadedUserMetaId != null) {
@@ -854,9 +848,7 @@ private fun DisplayUserFromTag(
     val route = remember { "User/${baseUser.pubkeyHex}" }
     val hex = remember { baseUser.pubkeyDisplayHex() }
 
-    val meta by baseUser.live().metadata.map {
-        it.user.info
-    }.distinctUntilChanged().observeAsState(baseUser.info)
+    val meta by baseUser.live().userMetadataInfo.observeAsState(baseUser.info)
 
     Crossfade(targetState = meta) {
         Row() {

app/src/main/java/com/vitorpamplona/amethyst/ui/components/Robohash.kt

@@ -13,9 +13,9 @@ import coil.fetch.Fetcher
 import coil.fetch.SourceResult
 import coil.request.ImageRequest
 import coil.request.Options
-import com.vitorpamplona.amethyst.model.toHexKey
-import com.vitorpamplona.amethyst.service.CryptoUtils
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.encoders.toHexKey
 import okio.Buffer
 
 private fun toHex(color: Color): String {

app/src/main/java/com/vitorpamplona/amethyst/ui/components/SelectTextDialog.kt

@@ -48,7 +48,7 @@ fun SelectTextDialog(text: String, onDismiss: () -> Unit) {
                     IconButton(
                         onClick = onDismiss
                     ) {
-                        ArrowBackIcon(Size24dp)
+                        ArrowBackIcon()
                     }
                     Text(text = stringResource(R.string.select_text_dialog_top))
                 }