v0.77.4

New Crowdin Translations

.github/workflows/create-release.yml

@@ -76,7 +76,7 @@ jobs:
           tag_name: ${{ github.ref }}
           release_name: Release ${{ github.ref }}
           draft: false
-          prerelease: false
+          prerelease: true
 
       # Google Play APK
       - name: Upload Play APK Universal Asset
@@ -85,7 +85,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} 
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: app/build/outputs/apk/play/release/app-play-universal-release-unsigned-signed.apk
           asset_name: amethyst-googleplay-universal-${{ github.ref_name }}.apk
           asset_content_type: application/zip
@@ -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

@@ -3,38 +3,30 @@
     <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>

.idea/kotlinc.xml

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

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,33 +1,33 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id 'org.jlleitschuh.gradle.ktlint' version "11.3.1"
+    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 257
-        versionName "0.70.0"
+        targetSdk 34
+        versionCode 301
+        versionName "0.77.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary true
         }
-        resConfigs("ar", "cs", "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 {
         release {
-            // TODO: Make sure all of JSON parsers work when activating these.
-            //minifyEnabled true
-            //proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            //signingConfig signingConfigs.debug
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), 'proguard-rules.pro'
+            minifyEnabled true
             resValue "string", "app_name", "@string/app_name_release"
         }
         debug {
@@ -37,7 +37,7 @@ android {
         }
     }
 
-    flavorDimensions "channel"
+    flavorDimensions = ["channel"]
 
     productFlavors {
         play {
@@ -54,7 +54,7 @@ android {
         abi {
             enable true
             reset()
-            include "x86", "x86_64"
+            include "x86", "x86_64", "arm64-v8a", "armeabi-v7a"
             universalApk true
         }
     }
@@ -73,7 +73,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "1.4.7"
+        kotlinCompilerExtensionVersion "1.5.1"
     }
 
     packagingOptions {
@@ -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"
@@ -96,7 +97,7 @@ dependencies {
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
 
     // Navigation
-    implementation("androidx.navigation:navigation-compose:$nav_version")
+    implementation "androidx.navigation:navigation-compose:$nav_version"
 
     // Observe Live data as State
     implementation "androidx.compose.runtime:runtime-livedata:$compose_ui_version"
@@ -108,31 +109,18 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-livedata:$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'
-
-    // Nostr Base Protocol
-    implementation('com.github.vitorpamplona.NostrPostr:nostrpostrlib:master-SNAPSHOT') {
-        exclude group:'fr.acinq.secp256k1'
-        exclude module: 'guava'
-        exclude module: 'guava-testlib'
-    }
-
     // 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
@@ -156,11 +144,8 @@ 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.1'
+    implementation 'com.google.zxing:core:3.5.2'
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
 
     // Markdown
@@ -175,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'
@@ -186,7 +171,7 @@ dependencies {
     playImplementation 'com.google.mlkit:translate:17.0.1'
 
     // PushNotifications
-    playImplementation platform('com.google.firebase:firebase-bom:32.1.1')
+    playImplementation platform('com.google.firebase:firebase-bom:32.2.3')
     playImplementation 'com.google.firebase:firebase-messaging-ktx'
 
     // Charts
@@ -195,19 +180,19 @@ 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'
+
+    // Waveform visualizer
+    implementation 'com.github.lincollincol:compose-audiowaveform:1.1.1'
 
     // Video compression lib
     implementation 'com.github.AbedElazizShe:LightCompressor:1.3.1'
     // Image compression lib
     implementation 'id.zelory:compressor:3.0.1'
 
-    // Automatic memory leak detection
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
-
     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

@@ -5,33 +5,56 @@
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
-# For the Secp256k1 library
+# preserve the line number information for debugging stack traces.
+-dontobfuscate
+-keepattributes LocalVariableTable
+-keepattributes LocalVariableTypeTable
+-keepattributes *Annotation*
+-keepattributes SourceFile
+-keepattributes LineNumberTable
+-keepattributes Signature
+-keepattributes Exceptions
 -keepattributes InnerClasses
+-keepattributes EnclosingMethod
+-keepattributes MethodParameters
+-keepparameternames
 
--keep class fr.acinq.secp256k1.jni.** { *; }
-# For the NostrPostr library
--keep class nostr.postr.** { *; }
--keep class com.vitorpamplona.amethyst.service.model.** { *; }
-# Json parsing
--keep class com.google.gson.reflect.** { *; }
--keep class * extends com.google.gson.reflect.TypeToken
--keep public class * implements java.lang.reflect.Type
+-keepdirectories libs
 
--keep class com.vitorpamplona.amethyst.lnurl.** { *; }
+# Keep all names
+-keepnames class ** { *; }
+
+# Keep All enums
+-keep enum ** { *; }
+
+# preserve access to native classses
+-keep class fr.acinq.secp256k1.** { *; }
+
+# JNA For Libsodium
+-keep class com.goterl.lazysodium.** { *; }
+
+# JNA also requires AWT, which Android does not have. So the classes are broken down to filter AWT out
+-keep class com.sun.jna.ToNativeConverter { *; }
+-keep class com.sun.jna.NativeMapped { *; }
+-keep class com.sun.jna.CallbackReference { *; }
+-keep class com.sun.jna.ptr.IntByReference { *; }
+-keep class com.sun.jna.NativeLong { *; }
+-keep class com.sun.jna.Structure { *; }
+-keep class com.sun.jna.Structure$* { *; }
+-keep class com.sun.jna.Native$ffi_callback { *; }
+-keep class * implements com.sun.jna.Structure$* { *; }
+-keep class * implements com.sun.jna.Native$* { *; }
+-keep class com.sun.jna.Native {
+    private static com.sun.jna.NativeMapped fromNative(java.lang.Class, java.lang.Object);
+    private static com.sun.jna.NativeMapped fromNative(java.lang.reflect.Method, java.lang.Object);
+    private static java.lang.Class nativeType(java.lang.Class);
+    private static java.lang.Object toNative(com.sun.jna.ToNativeConverter, java.lang.Object);
+    private static java.lang.Object fromNative(com.sun.jna.FromNativeConverter, java.lang.Object, java.lang.reflect.Method);
+}
+
+# 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.** { *; }
--keep class com.vitorpamplona.amethyst.ui.** { *; }

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.EmptyTagList
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -666,9 +666,9 @@ class RichTextParserTest {
 
     @Test
     fun testTextToParse() {
-        val state = RichTextParser().parseText(textToParse, ImmutableListOfLists())
+        val state = RichTextParser().parseText(textToParse, EmptyTagList)
         Assert.assertEquals(
-            "relay.shitforce.one, relayable.org, universe.nostrich.land, nos.lol, universe.nostrich.land?lang=zh, universe.nostrich.land?lang=en, relay.damus.io, relay.nostr.wirednet.jp, offchain.pub, nostr.rocks, relay.wellorder.net, nostr.oxtr.dev, universe.nostrich.land?lang=ja, relay.mostr.pub, nostr.bitcoiner.social, ⚡41.7M, Nostr-Check.com, MR.Rabbit, Ancap.su, ⚡️satscoinsv@getalby.com, miceliomad@miceliomad.github.io/nostr/, zapper.lol, smies.me, baller.hodl",
+            "relay.shitforce.one, relayable.org, universe.nostrich.land, nos.lol, universe.nostrich.land?lang=zh, universe.nostrich.land?lang=en, relay.damus.io, relay.nostr.wirednet.jp, offchain.pub, nostr.rocks, relay.wellorder.net, nostr.oxtr.dev, universe.nostrich.land?lang=ja, relay.mostr.pub, nostr.bitcoiner.social, Nostr-Check.com, MR.Rabbit, Ancap.su, zapper.lol, smies.me, baller.hodl",
             state.urlSet.joinToString(", ")
         )
 
@@ -806,134 +806,101 @@ class RichTextParserTest {
             "HashTag(#bitcoin,)",
             "RegularText(1.7K,)",
             "RegularText(109)",
-            "RegularText()",
             "HashTag(#concussion,)",
             "RegularText(1.1K,)",
             "RegularText(25)",
-            "RegularText()",
             "HashTag(#press,)",
             "RegularText(0.9K,)",
             "RegularText(65)",
-            "RegularText()",
             "HashTag(#france,)",
             "RegularText(492,)",
             "RegularText(46)",
-            "RegularText()",
             "HashTag(#presse,)",
             "RegularText(480,)",
             "RegularText(42)",
-            "RegularText()",
             "HashTag(#covid19,)",
             "RegularText(465,)",
             "RegularText(65)",
-            "RegularText()",
             "HashTag(#nostr,)",
             "RegularText(414,)",
             "RegularText(109)",
-            "RegularText()",
             "HashTag(#zapathon,)",
             "RegularText(386,)",
             "RegularText(76)",
-            "RegularText()",
             "HashTag(#rssfeed,)",
             "RegularText(309,)",
             "RegularText(53)",
-            "RegularText()",
             "HashTag(#btc,)",
             "RegularText(299,)",
             "RegularText(109)",
-            "RegularText()",
             "HashTag(#news,)",
             "RegularText(294,)",
             "RegularText(91)",
-            "RegularText()",
             "HashTag(#zap,)",
             "RegularText(283,)",
             "RegularText(109)",
-            "RegularText()",
             "HashTag(#linux,)",
             "RegularText(253,)",
             "RegularText(88)",
-            "RegularText()",
             "HashTag(#respond,)",
             "RegularText(246,)",
             "RegularText(90)",
-            "RegularText()",
             "HashTag(#kompost,)",
             "RegularText(240,)",
             "RegularText(31)",
-            "RegularText()",
             "HashTag(#plebchain,)",
             "RegularText(236,)",
             "RegularText(109)",
-            "RegularText()",
             "HashTag(#gardenaward,)",
             "RegularText(236,)",
             "RegularText(31)",
-            "RegularText()",
             "HashTag(#start,)",
             "RegularText(236,)",
             "RegularText(31)",
-            "RegularText()",
             "HashTag(#unicef,)",
             "RegularText(233,)",
             "RegularText(32)",
-            "RegularText()",
             "HashTag(#coronavirus,)",
             "RegularText(233,)",
             "RegularText(33)",
-            "RegularText()",
             "HashTag(#bew,)",
             "RegularText(229,)",
             "RegularText(31)",
-            "RegularText()",
             "HashTag(#balkon,)",
             "RegularText(229,)",
             "RegularText(31)",
-            "RegularText()",
             "HashTag(#terrasse,)",
             "RegularText(229,)",
             "RegularText(31)",
-            "RegularText()",
             "HashTag(#braininjuryawareness,)",
             "RegularText(229,)",
             "RegularText(24)",
-            "RegularText()",
             "HashTag(#garten,)",
             "RegularText(220,)",
             "RegularText(21)",
-            "RegularText()",
             "HashTag(#smart,)",
             "RegularText(220,)",
             "RegularText(21)",
-            "RegularText()",
             "HashTag(#nsfw,)",
             "RegularText(211,)",
             "RegularText(85)",
-            "RegularText()",
             "HashTag(#protoncalendar,)",
             "RegularText(206,)",
             "RegularText(31)",
-            "RegularText()",
             "HashTag(#stacksats,)",
             "RegularText(195,)",
             "RegularText(99)",
-            "RegularText()",
             "HashTag(#nokyc,)",
             "RegularText(179,)",
             "RegularText(98)",
             "RegularText()",
-            "RegularText()",
             "RegularText(Emoji sentiment today)",
             "RegularText()",
             "RegularText(⚡ (1.6K) 👉 (1.4K) 🇪🇺 (1.2K) 🫂 (1.2K) 🇺🇸 (1.1K) 💜 (875) 🧠 (858) 😂 (830) 🔥 (690) 🤣 (566) 🤙 (525) ☕ (444) 👇 (443) 🙌🏻 (425) ☀ (307) 😎 (305) 🥳 (301) 🤔 (276) 🌻 (270) 🧡 (270) 🥇 (269) 🗓 (269) 🙏 (268) 🏆 (267) 🌱 (264) 📰 (230) 🏉 (221) 😭 (220) 💰 (219) 🔗 (209) 👀 (201) 😅 (199) ✨ (193) 🇷🇺 (182) 💪 (167) ✅ (164) 💤 (163) 🐶 (151) 🇨🇭 (141) 📝 (137) 😁 (136) 🌞 (136) 🐾 (136) ❤ (132) 💻 (126) 🚀 (125) 👍 (125) 🇧🇷 (125) 😊 (121) 📚 (120) ➡ (120) 👏 (118) 🎉 (117) 🎮 (115) 🤷 (113) 👋 (112) 💃 (108) 🕺🏻 (106) 💡 (104) 🚨 (99) 😆 (97) 💯 (95) ⚠ (92) 📢 (92) 🤗 (89) 😴 (87) 🔁 (83) 🐰 (81) 😀 (79) 🎟 (78) ⛏ (78) 🐦 (76) 💸 (76) ✌🏻 (75) 🤍 (73) 🇬🇧 (73) 🌽 (70) 🤡 (69) 🤮 (69) ❗ (66) 🤝 (65) 😉 (65) 🙇 (65) 🍻 (64) 🌍 (64) 💕 (63) 🌸 (62) 💬 (61) ☺ (61) 🇦🇷 (59) 🇮🇩 (57) 😳 (57) 😄 (57) 🎶 (57) 🥷🏻 (56) 🎵 (56) 😃 (56) 🔍 (55) 💥 (55) 🎲 (54) ✍ (54) 🕒 (53) ⬇ (53) 💙 (51) 🔒 (50) 📈 (50) 🪙 (50) 🌧 (50) 🥰 (50) 🕸 (50) 🌐 (50) 💭 (49) 🌙 (49) 😍 (49) 📱 (48) 🌟 (48) 🤩 (48) 💔 (47) 🔌 (47) 😋 (47) 🎖 (47) 🍣 (46) 📷 (46) 💼 (45) ⭐ (45) 🥔 (45) 🥺 (45) 👌 (44) 👷🏼 (43) 😱 (43) 📅 (43) 🤖 (43) 📸 (42) 📊 (42) 🦑 (40) 💵 (40) 🤦 (39) ❣ (38) 💎 (38) 🖤 (38) 📺 (37) 🇵🇱 (37) 🇯🇵 (36) 🔧 (36) 🤘 (36) 💖 (36) ‼ (35) 😢 (35) 😺 (34) 🔊 (34) 😏 (34) 🇸🇰 (34) 🏃 (34) 👩‍👧 (34) ⏰ (33) 👨‍💻 (33) 👑 (33) 👥 (32) 🖥 (32) 💨 (32) 💗 (31) 🇲🇽 (31) 📖 (31) 🚫 (31) 👊🏻 (31) 😡 (31) 🌎 (31) 👁 (30) 🗞 (30) 🍀 (30) 🍽 (29) 🐸 (29) 🥚 (29) 💩 (29) ✊🏾 (29) 😮 (29) 🌡 (29) 🙃 (28) 🔔 (28) 🇻🇪 (28) 💦 (28) 🎯 (28) 🎨 (28) 🍛 (28) 🖼 (27) ☝🏻 (27) 🛑 (27) 🙄 (27) 🧑🏻‍🤝‍🧑🏽 (27) 🌈 (27) 🥂 (26) 🇫🇮 (26) 🎥 (26) 😬 (26) 🥲 (25) 🦾 (24) 🤜 (24) 🙂 (24) 🖕 (24) 😩 (24) )",
             "RegularText()",
             "RegularText(Zap economy)",
             "RegularText()",
-            "Link(⚡41.7M)",
-            "RegularText(sats)",
-            "RegularText((₿0.417))",
-            "RegularText()",
+            "RegularText(⚡41.7M sats (₿0.417) )",
             "RegularText(1,816 zappers & 920 zapped (unique pubkeys))",
             "RegularText(🌩️ 33,248 zaps, 1,253 sats per zap (avg))",
             "RegularText()",
@@ -2248,7 +2215,7 @@ class RichTextParserTest {
             "HashTag(#214)",
             "RegularText(2%)",
             "RegularText(Satscoinsv,)",
-            "Link(⚡️satscoinsv@getalby.com)",
+            "RegularText(⚡️satscoinsv@getalby.com)",
             "RegularText(-)",
             "RegularText(80db64657ea0358c5332c5cca01565eeddd4b8799688b1c46d3cb2d7c966671f)",
             "HashTag(#215)",
@@ -2458,7 +2425,7 @@ class RichTextParserTest {
             "HashTag(#249)",
             "RegularText(2%)",
             "RegularText(micmad,)",
-            "Link(miceliomad@miceliomad.github.io/nostr/)",
+            "RegularText(miceliomad@miceliomad.github.io/nostr/)",
             "RegularText(-)",
             "RegularText(cd806edcf8ff40ea94fa574ea9cd97da16e5beb2b85aac6e1d648b8388504343)",
             "HashTag(#250)",
@@ -3805,7 +3772,7 @@ class RichTextParserTest {
             "HashTag(#471)",
             "RegularText(1%)",
             "RegularText(leonwankum,)",
-            "SchemelessUrl(@leonawankum@BitcoinNostr.com)",
+            "RegularText(@leonawankum@BitcoinNostr.com)",
             "RegularText()",
             "RegularText(-)",
             "RegularText(652d58acafa105af8475c0fe8029a52e7ddbc337b2bd9c98bb17a111dc4cde60)",
@@ -4022,7 +3989,7 @@ class RichTextParserTest {
 
     @Test
     fun testShortTextToParse() {
-        val state = RichTextParser().parseText("Hi, how are you doing? ", ImmutableListOfLists())
+        val state = RichTextParser().parseText("Hi, how are you doing? ", EmptyTagList)
         Assert.assertTrue(state.urlSet.isEmpty())
         Assert.assertTrue(state.imagesForPager.isEmpty())
         Assert.assertTrue(state.imageList.isEmpty())
@@ -4032,7 +3999,7 @@ class RichTextParserTest {
 
     @Test
     fun testShortNewLinesTextToParse() {
-        val state = RichTextParser().parseText("\nHi, \nhow\n\n\n are you doing? \n", ImmutableListOfLists())
+        val state = RichTextParser().parseText("\nHi, \nhow\n\n\n are you doing? \n", EmptyTagList)
         Assert.assertTrue(state.urlSet.isEmpty())
         Assert.assertTrue(state.imagesForPager.isEmpty())
         Assert.assertTrue(state.imageList.isEmpty())
@@ -4052,7 +4019,7 @@ See how it can be done here: https://lnshort.it/live-stream-embeds/
 https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db214e8a.jpg
         """.trimIndent()
 
-        val state = RichTextParser().parseText(text, ImmutableListOfLists())
+        val state = RichTextParser().parseText(text, EmptyTagList)
         Assert.assertEquals("https://lnshort.it/live-stream-embeds/", state.urlSet.firstOrNull())
         Assert.assertEquals("https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db214e8a.jpg", state.imagesForPager.keys.firstOrNull())
         Assert.assertEquals("https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db214e8a.jpg", state.imageList.firstOrNull()?.url)
@@ -4098,7 +4065,6 @@ https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db
             "RegularText(here:)",
             "Link(https://lnshort.it/live-stream-embeds/)",
             "RegularText()",
-            "RegularText()",
             "Image(https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db214e8a.jpg)"
         )
 
@@ -4110,8 +4076,59 @@ https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db
         }
     }
 
+    @Test
+    fun testNewLineAfterImage() {
+        val text = "That’s it ! That’s the #note https://cdn.nostr.build/i/1dc0726b6cb0f94a92bd66765ffb90f6c67e90c17bb957fc3d5d4782cbd73de7.jpg "
+
+        val state = RichTextParser().parseText(text, EmptyTagList)
+
+        printStateForDebug(state)
+
+        val expectedResult = listOf<String>(
+            "RegularText(That’s)",
+            "RegularText(it)",
+            "RegularText(!)",
+            "RegularText(That’s)",
+            "RegularText(the)",
+            "HashTag(#note)",
+            "Image(https://cdn.nostr.build/i/1dc0726b6cb0f94a92bd66765ffb90f6c67e90c17bb957fc3d5d4782cbd73de7.jpg)"
+        )
+
+        state.paragraphs.map { it.words }.flatten().forEachIndexed { index, seg ->
+            Assert.assertEquals(
+                expectedResult[index],
+                "${seg.javaClass.simpleName.replace("Segment", "")}(${seg.segmentText})"
+            )
+        }
+    }
+
+    @Test
+    fun testSapceAfterImage() {
+        val text = "That’s it! https://cdn.nostr.build/i/1dc0726b6cb0f94a92bd66765ffb90f6c67e90c17bb957fc3d5d4782cbd73de7.jpg That’s the #note"
+
+        val state = RichTextParser().parseText(text, EmptyTagList)
+
+        printStateForDebug(state)
+
+        val expectedResult = listOf<String>(
+            "RegularText(That’s)",
+            "RegularText(it!)",
+            "Image(https://cdn.nostr.build/i/1dc0726b6cb0f94a92bd66765ffb90f6c67e90c17bb957fc3d5d4782cbd73de7.jpg)",
+            "RegularText(That’s)",
+            "RegularText(the)",
+            "HashTag(#note)"
+        )
+
+        state.paragraphs.map { it.words }.flatten().forEachIndexed { index, seg ->
+            Assert.assertEquals(
+                expectedResult[index],
+                "${seg.javaClass.simpleName.replace("Segment", "")}(${seg.segmentText})"
+            )
+        }
+    }
+
     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/androidTestPlay/java/com/vitorpamplona/amethyst/TranslationsTest.kt

@@ -99,4 +99,13 @@ class TranslationsTest {
             "en"
         )
     }
+
+    @Test
+    fun testEmoji() {
+        assertTranslateContains(
+            "https://cdn.nostr.build/i/df3783dcdf7dd289ba02ba538dc039c8fe1d4db055e580b81604ed88c6af4ee0.jpg",
+            "\uD83E\uDD23 https://cdn.nostr.build/i/df3783dcdf7dd289ba02ba538dc039c8fe1d4db055e580b81604ed88c6af4ee0.jpg ",
+            "pt"
+        )
+    }
 }

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

@@ -2,7 +2,8 @@ package com.vitorpamplona.amethyst.service.notifications
 
 import com.vitorpamplona.amethyst.AccountInfo
 
-class PushNotificationUtils {
-    fun init(accounts: List<AccountInfo>) {
+object PushNotificationUtils {
+    var hasInit: Boolean = true
+    suspend fun init(accounts: List<AccountInfo>) {
     }
 }

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

@@ -3,6 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools">
     <queries>
         <package android:name="org.torproject.android"/>
+        <package android:name="com.greenart7c3.nostrsigner"/>
+        <package android:name="com.greenart7c3.nostrsigner.debug"/>
     </queries>
 
     <!-- Doesn't require a camera -->
@@ -32,7 +34,13 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
 
     <!-- Keeps screen on while playing videos -->
-    <uses-permission android:name="android.Manifest.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <!-- This notification permission is needed for some phones -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
+    <!-- Adds Geohash to posts if active -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <!-- Old permission to access media -->
     <uses-permission
@@ -54,7 +62,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/Amethyst.kt

@@ -1,11 +1,38 @@
 package com.vitorpamplona.amethyst
 
 import android.app.Application
+import android.os.StrictMode
+import android.os.StrictMode.ThreadPolicy
+import android.os.StrictMode.VmPolicy
 
 class Amethyst : Application() {
+    @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
     override fun onCreate() {
         super.onCreate()
         instance = this
+
+        VideoCache.initFileCache(instance)
+
+        if (BuildConfig.DEBUG) {
+            StrictMode.setThreadPolicy(
+                ThreadPolicy.Builder()
+                    .detectAll()
+                    .penaltyLog()
+                    .build()
+            )
+            StrictMode.setVmPolicy(
+                VmPolicy.Builder()
+                    .detectActivityLeaks()
+                    .detectFileUriExposure()
+                    .detectContentUriWithoutPermission()
+                    .detectLeakedClosableObjects()
+                    .detectLeakedRegistrationObjects()
+                    .detectLeakedSqlLiteObjects()
+                    .penaltyLog()
+                    // .penaltyDeath()
+                    .build()
+            )
+        }
     }
 
     companion object {

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

@@ -3,26 +3,27 @@ package com.vitorpamplona.amethyst
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
+import android.util.Log
 import androidx.compose.runtime.Immutable
-import com.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.DefaultReactions
+import com.vitorpamplona.amethyst.model.DefaultZapAmounts
 import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
+import com.vitorpamplona.amethyst.model.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.service.HttpClient
-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.ui.actions.ServersAvailable
-import com.vitorpamplona.amethyst.ui.note.Nip47URI
-import fr.acinq.secp256k1.Hex
-import nostr.postr.Persona
-import nostr.postr.toHex
-import nostr.postr.toNpub
+import com.vitorpamplona.quartz.crypto.KeyPair
+import com.vitorpamplona.quartz.encoders.hexToByteArray
+import com.vitorpamplona.quartz.encoders.toHexKey
+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
 
@@ -35,7 +36,8 @@ private const val DEBUG_PREFERENCES_NAME = "debug_prefs"
 @Immutable
 data class AccountInfo(
     val npub: String,
-    val hasPrivKey: Boolean = false
+    val hasPrivKey: Boolean,
+    val loggedInWithExternalSigner: Boolean
 )
 
 private object PrefKeys {
@@ -62,6 +64,7 @@ private object PrefKeys {
     const val LATEST_CONTACT_LIST = "latestContactList"
     const val HIDE_DELETE_REQUEST_DIALOG = "hide_delete_request_dialog"
     const val HIDE_BLOCK_ALERT_DIALOG = "hide_block_alert_dialog"
+    const val HIDE_NIP_24_WARNING_DIALOG = "hide_nip24_warning_dialog"
     const val USE_PROXY = "use_proxy"
     const val PROXY_PORT = "proxy_port"
     const val SHOW_SENSITIVE_CONTENT = "show_sensitive_content"
@@ -73,17 +76,15 @@ private object PrefKeys {
     const val THEME = "theme"
     const val PREFERRED_LANGUAGE = "preferred_Language"
     const val AUTOMATICALLY_LOAD_URL_PREVIEW = "automatically_load_url_preview"
-    val LAST_READ: (String) -> String = { route -> "last_read_route_$route" }
+    const val LOGIN_WITH_EXTERNAL_SIGNER = "login_with_external_signer"
 }
 
-private val gson = GsonBuilder().create()
-
 object LocalPreferences {
     private const val comma = ","
 
     private var _currentAccount: String? = null
 
-    private fun currentAccount(): String? {
+    fun currentAccount(): String? {
         if (_currentAccount == null) {
             _currentAccount = encryptedPreferences().getString(PrefKeys.CURRENT_ACCOUNT, null)
         }
@@ -202,64 +203,74 @@ object LocalPreferences {
 
     fun allSavedAccounts(): List<AccountInfo> {
         return savedAccounts().map { npub ->
-            AccountInfo(npub = npub)
+            AccountInfo(
+                npub,
+                hasPrivKey(npub),
+                getLoggedInWithExternalSigner(npub)
+            )
         }
     }
 
+    fun allLocalAccountNPubs(): Set<String> {
+        return savedAccounts().toSet()
+    }
+
     fun saveToEncryptedStorage(account: Account) {
         val prefs = encryptedPreferences(account.userProfile().pubkeyNpub())
         prefs.edit().apply {
-            account.loggedIn.privKey?.let { putString(PrefKeys.NOSTR_PRIVKEY, it.toHex()) }
-            account.loggedIn.pubKey.let { putString(PrefKeys.NOSTR_PUBKEY, it.toHex()) }
+            account.keyPair.privKey?.let { putString(PrefKeys.NOSTR_PRIVKEY, it.toHexKey()) }
+            account.keyPair.pubKey.let { putString(PrefKeys.NOSTR_PUBKEY, it.toHexKey()) }
             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)
             putBoolean(PrefKeys.USE_PROXY, account.proxy != null)
             putInt(PrefKeys.PROXY_PORT, account.proxyPort)
             putBoolean(PrefKeys.WARN_ABOUT_REPORTS, account.warnAboutPostsWithReports)
             putBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, account.filterSpamFromStrangers)
-            putString(PrefKeys.LAST_READ_PER_ROUTE, gson.toJson(account.lastReadPerRoute))
+            putString(PrefKeys.LAST_READ_PER_ROUTE, Event.mapper.writeValueAsString(account.lastReadPerRoute))
 
             if (account.showSensitiveContent == null) {
                 remove(PrefKeys.SHOW_SENSITIVE_CONTENT)
             } else {
                 putBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, account.showSensitiveContent!!)
             }
+            putBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, account.loginWithExternalSigner)
         }.apply()
 
         val globalPrefs = encryptedPreferences()
         globalPrefs.edit().apply {
-            if (account.settings.automaticallyShowImages == null) {
+            if (account.settings.automaticallyShowImages.prefCode == null) {
                 remove(PrefKeys.AUTOMATICALLY_SHOW_IMAGES)
             } else {
-                putBoolean(PrefKeys.AUTOMATICALLY_SHOW_IMAGES, account.settings.automaticallyShowImages!!)
+                putBoolean(PrefKeys.AUTOMATICALLY_SHOW_IMAGES, account.settings.automaticallyShowImages.prefCode!!)
             }
 
-            if (account.settings.automaticallyStartPlayback == null) {
+            if (account.settings.automaticallyStartPlayback.prefCode == null) {
                 remove(PrefKeys.AUTOMATICALLY_START_PLAYBACK)
             } else {
-                putBoolean(PrefKeys.AUTOMATICALLY_START_PLAYBACK, account.settings.automaticallyStartPlayback!!)
+                putBoolean(PrefKeys.AUTOMATICALLY_START_PLAYBACK, account.settings.automaticallyStartPlayback.prefCode!!)
             }
-            if (account.settings.automaticallyShowUrlPreview == null) {
+            if (account.settings.automaticallyShowUrlPreview.prefCode == null) {
                 remove(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW)
             } else {
-                putBoolean(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW, account.settings.automaticallyShowUrlPreview!!)
+                putBoolean(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW, account.settings.automaticallyShowUrlPreview.prefCode!!)
             }
             putString(PrefKeys.PREFERRED_LANGUAGE, account.settings.preferredLanguage ?: "")
         }.apply()
@@ -272,17 +283,19 @@ object LocalPreferences {
     }
 
     fun getTheme(): Int {
-        encryptedPreferences().apply {
-            return getInt(PrefKeys.THEME, 0)
-        }
+        return encryptedPreferences().getInt(PrefKeys.THEME, 0)
     }
 
     fun getPreferredLanguage(): String {
-        var language = ""
-        encryptedPreferences().apply {
-            language = getString(PrefKeys.PREFERRED_LANGUAGE, "") ?: ""
-        }
-        return language
+        return encryptedPreferences().getString(PrefKeys.PREFERRED_LANGUAGE, "") ?: ""
+    }
+
+    private fun getLoggedInWithExternalSigner(npub: String): Boolean {
+        return encryptedPreferences(npub).getBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, false)
+    }
+
+    private fun hasPrivKey(npub: String): Boolean {
+        return (encryptedPreferences(npub).getString(PrefKeys.NOSTR_PRIVKEY, "") ?: "").isNotBlank()
     }
 
     fun loadFromEncryptedStorage(): Account? {
@@ -298,10 +311,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
@@ -310,62 +323,63 @@ 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 { DefaultZapAmounts } ?: DefaultZapAmounts
 
-            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 { DefaultReactions } ?: DefaultReactions
 
-            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) {
+                Log.w("LocalPreferences", "Error Decoding Zap Payment Request Server ${getString(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, null)}", e)
                 e.printStackTrace()
                 null
             }
 
             val latestContactList = try {
                 getString(PrefKeys.LATEST_CONTACT_LIST, null)?.let {
-                    Event.gson.fromJson(it, Event::class.java)
-                        .getRefinedEvent(true) as ContactListEvent
+                    println("Decoding Contact List: " + it)
+                    if (it != null) {
+                        Event.fromJson(it) as ContactListEvent?
+                    } else {
+                        null
+                    }
                 }
             } catch (e: Throwable) {
-                e.printStackTrace()
+                Log.w("LocalPreferences", "Error Decoding Contact List ${getString(PrefKeys.LATEST_CONTACT_LIST, null)}", e)
                 null
             }
 
             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) {
+                Log.w("LocalPreferences", "Error Decoding Language Preferences ${getString(PrefKeys.LANGUAGE_PREFS, null)}", e)
                 e.printStackTrace()
                 mapOf()
             }
 
             val hideDeleteRequestDialog = getBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, false)
             val hideBlockAlertDialog = getBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, false)
+            val hideNIP24WarningDialog = getBoolean(PrefKeys.HIDE_NIP_24_WARNING_DIALOG, false)
             val useProxy = getBoolean(PrefKeys.USE_PROXY, false)
             val proxyPort = getInt(PrefKeys.PROXY_PORT, 9050)
             val proxy = HttpClient.initProxy(useProxy, "127.0.0.1", proxyPort)
+            val loginWithExternalSigner = getBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, false)
 
             val showSensitiveContent = if (contains(PrefKeys.SHOW_SENSITIVE_CONTENT)) {
                 getBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, false)
@@ -377,12 +391,10 @@ 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) {
+                Log.w("LocalPreferences", "Error Decoding Last Read per route ${getString(PrefKeys.LAST_READ_PER_ROUTE, null)}", e)
                 e.printStackTrace()
                 mapOf()
             }
@@ -390,27 +402,27 @@ object LocalPreferences {
             val settings = Settings()
             encryptedPreferences().apply {
                 settings.automaticallyShowImages = if (contains(PrefKeys.AUTOMATICALLY_SHOW_IMAGES)) {
-                    getBoolean(PrefKeys.AUTOMATICALLY_SHOW_IMAGES, false)
+                    parseConnectivityType(getBoolean(PrefKeys.AUTOMATICALLY_SHOW_IMAGES, false))
                 } else {
-                    null
+                    ConnectivityType.ALWAYS
                 }
 
                 settings.automaticallyStartPlayback = if (contains(PrefKeys.AUTOMATICALLY_START_PLAYBACK)) {
-                    getBoolean(PrefKeys.AUTOMATICALLY_START_PLAYBACK, false)
+                    parseConnectivityType(getBoolean(PrefKeys.AUTOMATICALLY_START_PLAYBACK, false))
                 } else {
-                    null
+                    ConnectivityType.ALWAYS
                 }
                 settings.automaticallyShowUrlPreview = if (contains(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW)) {
-                    getBoolean(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW, false)
+                    parseConnectivityType(getBoolean(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW, false))
                 } else {
-                    null
+                    ConnectivityType.ALWAYS
                 }
 
                 settings.preferredLanguage = getString(PrefKeys.PREFERRED_LANGUAGE, "")
             }
 
             val a = Account(
-                loggedIn = Persona(privKey = privKey?.hexToByteArray(), pubKey = pubKey.hexToByteArray()),
+                keyPair = KeyPair(privKey = privKey?.hexToByteArray(), pubKey = pubKey.hexToByteArray()),
                 followingChannels = followingChannels,
                 followingCommunities = followingCommunities,
                 hiddenUsers = hiddenUsers,
@@ -429,6 +441,7 @@ object LocalPreferences {
                 zapPaymentRequest = zapPaymentRequestServer,
                 hideDeleteRequestDialog = hideDeleteRequestDialog,
                 hideBlockAlertDialog = hideBlockAlertDialog,
+                hideNIP24WarningDialog = hideNIP24WarningDialog,
                 backupContactList = latestContactList,
                 proxy = proxy,
                 proxyPort = proxyPort,
@@ -436,51 +449,11 @@ object LocalPreferences {
                 warnAboutPostsWithReports = warnAboutReports,
                 filterSpamFromStrangers = filterSpam,
                 lastReadPerRoute = lastReadPerRoute,
-                settings = settings
+                settings = settings,
+                loginWithExternalSigner = loginWithExternalSigner
             )
 
             return a
         }
     }
-
-    fun migrateSingleUserPrefs() {
-        if (currentAccount() != null) return
-
-        val pubkey = encryptedPreferences().getString(PrefKeys.NOSTR_PUBKEY, null) ?: return
-        val npub = Hex.decode(pubkey).toNpub()
-
-        val stringPrefs = listOf(
-            PrefKeys.NOSTR_PRIVKEY,
-            PrefKeys.NOSTR_PUBKEY,
-            PrefKeys.RELAYS,
-            PrefKeys.LANGUAGE_PREFS,
-            PrefKeys.TRANSLATE_TO,
-            PrefKeys.ZAP_AMOUNTS,
-            PrefKeys.LATEST_CONTACT_LIST
-        )
-
-        val stringSetPrefs = listOf(
-            PrefKeys.FOLLOWING_CHANNELS,
-            PrefKeys.HIDDEN_USERS,
-            PrefKeys.DONT_TRANSLATE_FROM
-        )
-
-        encryptedPreferences().apply {
-            val appPrefs = this
-            encryptedPreferences(npub).edit().apply {
-                val userPrefs = this
-
-                stringPrefs.forEach { userPrefs.putString(it, appPrefs.getString(it, null)) }
-                stringSetPrefs.forEach { userPrefs.putStringSet(it, appPrefs.getStringSet(it, null)) }
-                userPrefs.putBoolean(
-                    PrefKeys.HIDE_DELETE_REQUEST_DIALOG,
-                    appPrefs.getBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, false)
-                )
-            }.apply()
-        }
-
-        encryptedPreferences().edit().clear().apply()
-        addAccount(npub)
-        updateCurrentAccount(npub)
-    }
 }

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

@@ -12,11 +12,16 @@ import androidx.media3.common.Player.STATE_READY
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.session.MediaSession
 import com.vitorpamplona.amethyst.ui.MainActivity
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import kotlin.math.abs
 
-class MultiPlayerPlaybackManager(private val dataSourceFactory: androidx.media3.exoplayer.source.MediaSource.Factory? = null) {
-    private val cachedPositions = LruCache<String, Long>(100)
-
+class MultiPlayerPlaybackManager(
+    private val dataSourceFactory: androidx.media3.exoplayer.source.MediaSource.Factory? = null,
+    private val cachedPositions: VideoViewedPositionCache
+) {
     // protects from LruCache killing playing sessions
     private val playingMap = mutableMapOf<String, MediaSession>()
 
@@ -62,7 +67,6 @@ class MultiPlayerPlaybackManager(private val dataSourceFactory: androidx.media3.
             repeatMode = Player.REPEAT_MODE_ALL
             videoScalingMode = C.VIDEO_SCALING_MODE_SCALE_TO_FIT
             volume = 0f
-            setWakeMode(C.WAKE_MODE_NETWORK)
         }
 
         val mediaSession = MediaSession.Builder(context, player).run {
@@ -76,8 +80,10 @@ class MultiPlayerPlaybackManager(private val dataSourceFactory: androidx.media3.
         player.addListener(object : Player.Listener {
             override fun onIsPlayingChanged(isPlaying: Boolean) {
                 if (isPlaying) {
+                    player.setWakeMode(C.WAKE_MODE_NETWORK)
                     playingMap.put(id, mediaSession)
                 } else {
+                    player.setWakeMode(C.WAKE_MODE_NONE)
                     cache.put(id, mediaSession)
                     playingMap.remove(id, mediaSession)
                 }
@@ -86,9 +92,7 @@ class MultiPlayerPlaybackManager(private val dataSourceFactory: androidx.media3.
             override fun onPlaybackStateChanged(playbackState: Int) {
                 when (playbackState) {
                     STATE_IDLE -> {
-                        if (player.currentPosition > 5 * 60) { // 5 seconds
-                            cachedPositions.put(uri, player.currentPosition)
-                        }
+                        cachedPositions.add(uri, player.currentPosition)
                     }
                     STATE_READY -> {
                         cachedPositions.get(uri)?.let { lastPosition ->
@@ -98,9 +102,7 @@ class MultiPlayerPlaybackManager(private val dataSourceFactory: androidx.media3.
                         }
                     }
                     else -> {
-                        if (player.currentPosition > 5 * 60) { // 5 seconds
-                            cachedPositions.put(uri, player.currentPosition)
-                        }
+                        cachedPositions.add(uri, player.currentPosition)
                     }
                 }
             }
@@ -111,8 +113,16 @@ class MultiPlayerPlaybackManager(private val dataSourceFactory: androidx.media3.
         return mediaSession
     }
 
+    @OptIn(DelicateCoroutinesApi::class)
     fun releaseAppPlayers() {
-        cache.evictAll()
+        GlobalScope.launch(Dispatchers.Main) {
+            cache.evictAll()
+            playingMap.forEach {
+                it.value.player.release()
+                it.value.release()
+            }
+            playingMap.clear()
+        }
     }
 
     fun playingContent(): Collection<MediaSession> {

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst
 import android.content.ComponentName
 import android.content.Context
 import android.os.Bundle
+import android.util.Log
 import androidx.media3.session.MediaController
 import androidx.media3.session.SessionToken
 import com.google.common.util.concurrent.MoreExecutors
@@ -16,25 +17,32 @@ object PlaybackClientController {
         context: Context,
         onReady: (MediaController) -> Unit
     ) {
-        // creating a bundle object
-        // creating a bundle object
-        val bundle = Bundle()
-        bundle.putString("id", controllerID)
-        bundle.putString("uri", videoUri)
-        bundle.putString("callbackUri", callbackUri)
+        try {
+            // creating a bundle object
+            // creating a bundle object
+            val bundle = Bundle()
+            bundle.putString("id", controllerID)
+            bundle.putString("uri", videoUri)
+            bundle.putString("callbackUri", callbackUri)
 
-        val sessionTokenLocal = SessionToken(context, ComponentName(context, PlaybackService::class.java))
-        val controllerFuture = MediaController
-            .Builder(context, sessionTokenLocal)
-            .setConnectionHints(bundle)
-            .buildAsync()
+            val sessionTokenLocal = SessionToken(context, ComponentName(context, PlaybackService::class.java))
+            val controllerFuture = MediaController
+                .Builder(context, sessionTokenLocal)
+                .setConnectionHints(bundle)
+                .buildAsync()
 
-        controllerFuture.addListener(
-            {
-                val controller = controllerFuture.get()
-                onReady(controller)
-            },
-            MoreExecutors.directExecutor()
-        )
+            controllerFuture.addListener(
+                {
+                    try {
+                        onReady(controllerFuture.get())
+                    } catch (e: Exception) {
+                        Log.e("Playback Client", "Failed to load Playback Client for $videoUri", e)
+                    }
+                },
+                MoreExecutors.directExecutor()
+            )
+        } catch (e: Exception) {
+            Log.e("Playback Client", "Failed to load Playback Client for $videoUri", e)
+        }
     }
 }

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

@@ -4,45 +4,89 @@ import androidx.annotation.OptIn
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.datasource.okhttp.OkHttpDataSource
 import androidx.media3.exoplayer.hls.HlsMediaSource
+import androidx.media3.exoplayer.source.MediaSource
 import androidx.media3.exoplayer.source.ProgressiveMediaSource
-import androidx.media3.session.DefaultMediaNotificationProvider
 import androidx.media3.session.MediaSession
 import androidx.media3.session.MediaSessionService
 import com.vitorpamplona.amethyst.service.HttpClient
 
 @UnstableApi // Extend MediaSessionService
 class PlaybackService : MediaSessionService() {
-    private val managerHls = MultiPlayerPlaybackManager(HlsMediaSource.Factory(OkHttpDataSource.Factory(HttpClient.getHttpClient())))
-    private val managerProgressive = MultiPlayerPlaybackManager(ProgressiveMediaSource.Factory(VideoCache.get()))
-    private val managerLocal = MultiPlayerPlaybackManager()
+    private var videoViewedPositionCache = VideoViewedPositionCache()
+
+    private var managerHls: MultiPlayerPlaybackManager? = null
+    private var managerProgressive: MultiPlayerPlaybackManager? = null
+    private var managerLocal: MultiPlayerPlaybackManager? = null
+
+    fun newHslDataSource(): MediaSource.Factory {
+        return HlsMediaSource.Factory(OkHttpDataSource.Factory(HttpClient.getHttpClient()))
+    }
+
+    fun newProgressiveDataSource(): MediaSource.Factory {
+        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()
 
-        setMediaNotificationProvider(
-            DefaultMediaNotificationProvider.Builder(applicationContext)
-                // .setNotificationIdProvider { session -> session.id.hashCode() }
-                .build()
-        )
+        // Stop all videos and recreates all managers when the proxy changes.
+        HttpClient.proxyChangeListeners.add(this@PlaybackService::onProxyUpdated)
+    }
+
+    private fun onProxyUpdated() {
+        val toDestroyHls = managerHls
+        val toDestroyProgressive = managerProgressive
+
+        managerHls = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
+        managerProgressive = MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
+
+        toDestroyHls?.releaseAppPlayers()
+        toDestroyProgressive?.releaseAppPlayers()
     }
 
     override fun onDestroy() {
-        managerHls.releaseAppPlayers()
-        managerLocal.releaseAppPlayers()
-        managerProgressive.releaseAppPlayers()
+        HttpClient.proxyChangeListeners.remove(this@PlaybackService::onProxyUpdated)
+
+        managerHls?.releaseAppPlayers()
+        managerLocal?.releaseAppPlayers()
+        managerProgressive?.releaseAppPlayers()
 
         super.onDestroy()
     }
 
-    fun getAppropriateMediaSessionManager(fileName: String): MultiPlayerPlaybackManager {
+    fun getAppropriateMediaSessionManager(fileName: String): MultiPlayerPlaybackManager? {
         return if (fileName.startsWith("file")) {
-            managerLocal
+            lazyLocalDS()
         } else if (fileName.endsWith("m3u8")) {
-            managerHls
+            lazyHlsDS()
         } else {
-            managerProgressive
+            lazyProgressiveDS()
         }
     }
 
@@ -51,34 +95,34 @@ class PlaybackService : MediaSessionService() {
         super.onUpdateNotification(session, startInForegroundRequired)
 
         // Overrides the notification with any player actually playing
-        managerHls.playingContent().forEach {
+        managerHls?.playingContent()?.forEach {
             if (it.player.isPlaying) {
                 super.onUpdateNotification(it, startInForegroundRequired)
             }
         }
-        managerLocal.playingContent().forEach {
+        managerLocal?.playingContent()?.forEach {
             if (it.player.isPlaying) {
                 super.onUpdateNotification(session, startInForegroundRequired)
             }
         }
-        managerProgressive.playingContent().forEach {
+        managerProgressive?.playingContent()?.forEach {
             if (it.player.isPlaying) {
                 super.onUpdateNotification(session, startInForegroundRequired)
             }
         }
 
         // Overrides again with playing with audio
-        managerHls.playingContent().forEach {
+        managerHls?.playingContent()?.forEach {
             if (it.player.isPlaying && it.player.volume > 0) {
                 super.onUpdateNotification(it, startInForegroundRequired)
             }
         }
-        managerLocal.playingContent().forEach {
+        managerLocal?.playingContent()?.forEach {
             if (it.player.isPlaying && it.player.volume > 0) {
                 super.onUpdateNotification(session, startInForegroundRequired)
             }
         }
-        managerProgressive.playingContent().forEach {
+        managerProgressive?.playingContent()?.forEach {
             if (it.player.isPlaying && it.player.volume > 0) {
                 super.onUpdateNotification(session, startInForegroundRequired)
             }
@@ -94,6 +138,6 @@ class PlaybackService : MediaSessionService() {
 
         val manager = getAppropriateMediaSessionManager(uri)
 
-        return manager.getMediaSession(id, uri, callbackUri, context = this, applicationContext = applicationContext)
+        return manager?.getMediaSession(id, uri, callbackUri, context = this, applicationContext = applicationContext)
     }
 }

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

@@ -8,8 +8,11 @@ import coil.ImageLoader
 import coil.decode.GifDecoder
 import coil.decode.ImageDecoderDecoder
 import coil.decode.SvgDecoder
+import coil.disk.DiskCache
+import coil.util.DebugLogger
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.service.ExternalSignerUtils
 import com.vitorpamplona.amethyst.service.HttpClient
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
@@ -17,6 +20,7 @@ import com.vitorpamplona.amethyst.service.NostrChatroomDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
 import com.vitorpamplona.amethyst.service.NostrCommunityDataSource
 import com.vitorpamplona.amethyst.service.NostrDiscoveryDataSource
+import com.vitorpamplona.amethyst.service.NostrGeohashDataSource
 import com.vitorpamplona.amethyst.service.NostrHashtagDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
@@ -28,17 +32,25 @@ 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 {
+    var shouldPauseService: Boolean = true // to not open amber in a loop trying to use auth relays and registering for notifications
+    private var isStarted: Boolean = false // to not open amber in a loop trying to use auth relays and registering for notifications
     private var account: Account? = null
 
     fun start(account: Account, context: Context) {
         this.account = account
+        ExternalSignerUtils.account = account
         start(context)
     }
 
     @Synchronized
     fun start(context: Context) {
+        if (isStarted && account != null) {
+            return
+        }
         Log.d("ServiceManager", "Starting Relay Services")
 
         val myAccount = account
@@ -54,15 +66,13 @@ object ServiceManager {
                     add(GifDecoder.Factory())
                 }
                 add(SvgDecoder.Factory())
-            } // .logger(DebugLogger())
+            }.logger(DebugLogger())
+                .diskCache { SingletonDiskCache.get(context.applicationContext) }
                 .okHttpClient { HttpClient.getHttpClient() }
                 .respectCacheHeaders(false)
                 .build()
         }
 
-        // Initializes video cache.
-        VideoCache.init(context.applicationContext)
-
         if (myAccount != null) {
             Client.connect(myAccount.activeRelays() ?: myAccount.convertLocalRelays())
 
@@ -85,6 +95,7 @@ object ServiceManager {
             NostrSingleEventDataSource.start()
             NostrSingleChannelDataSource.start()
             NostrSingleUserDataSource.start()
+            isStarted = true
         }
     }
 
@@ -100,6 +111,7 @@ object ServiceManager {
 
         NostrCommunityDataSource.stop()
         NostrHashtagDataSource.stop()
+        NostrGeohashDataSource.stop()
         NostrSearchEventOrUserDataSource.stop()
         NostrSingleChannelDataSource.stop()
         NostrSingleEventDataSource.stop()
@@ -109,16 +121,50 @@ object ServiceManager {
         NostrVideoDataSource.stop()
 
         Client.disconnect()
+        isStarted = false
     }
 
-    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.pruneNonFollows(it)
+            LocalCache.pruneContactLists(accounts)
+            LocalCache.pruneRepliesAndReactions(accounts)
+            LocalCache.prunePastVersionsOfReplaceables()
+            LocalCache.pruneExpiredEvents()
         }
     }
 }
+
+object SingletonDiskCache {
+
+    private const val DIRECTORY = "image_cache"
+    private var instance: DiskCache? = null
+
+    @Synchronized
+    fun get(context: Context): DiskCache {
+        return instance ?: run {
+            // Create the singleton disk cache instance.
+            DiskCache.Builder()
+                .directory(context.safeCacheDir.resolve(DIRECTORY))
+                .maxSizePercent(0.2)
+                .maximumMaxSizeBytes(500L * 1024 * 1024) // 250MB
+                .build()
+                .also { instance = it }
+        }
+    }
+}
+
+internal val Context.safeCacheDir: File
+    get() {
+        val cacheDir = checkNotNull(cacheDir) { "cacheDir == null" }
+        return cacheDir.apply { mkdirs() }
+    }

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

@@ -7,7 +7,8 @@ import androidx.media3.datasource.cache.CacheDataSource
 import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor
 import androidx.media3.datasource.cache.SimpleCache
 import androidx.media3.datasource.okhttp.OkHttpDataSource
-import com.vitorpamplona.amethyst.service.HttpClient
+import okhttp3.OkHttpClient
+import java.io.File
 
 @UnstableApi object VideoCache {
 
@@ -21,34 +22,34 @@ import com.vitorpamplona.amethyst.service.HttpClient
     lateinit var cacheDataSourceFactory: CacheDataSource.Factory
 
     @Synchronized
-    @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
-    fun init(context: Context) {
-        if (!this::simpleCache.isInitialized) {
-            exoDatabaseProvider = StandaloneDatabaseProvider(context)
+    fun initFileCache(context: Context) {
+        exoDatabaseProvider = StandaloneDatabaseProvider(context)
 
-            simpleCache = SimpleCache(
-                context.cacheDir,
-                leastRecentlyUsedCacheEvictor,
-                exoDatabaseProvider
-            )
-
-            cacheDataSourceFactory = CacheDataSource.Factory()
-                .setCache(simpleCache)
-                .setUpstreamDataSourceFactory(
-                    OkHttpDataSource.Factory(HttpClient.getHttpClient())
-                )
-                .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
-        } else {
-            cacheDataSourceFactory = CacheDataSource.Factory()
-                .setCache(simpleCache)
-                .setUpstreamDataSourceFactory(
-                    OkHttpDataSource.Factory(HttpClient.getHttpClient())
-                )
-                .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
-        }
+        simpleCache = SimpleCache(
+            File(context.cacheDir, "exoplayer"),
+            leastRecentlyUsedCacheEvictor,
+            exoDatabaseProvider
+        )
     }
 
-    fun get(): CacheDataSource.Factory {
+    // This method should be called when proxy setting changes.
+    fun renewCacheFactory(client: OkHttpClient) {
+        cacheDataSourceFactory = CacheDataSource.Factory()
+            .setCache(simpleCache)
+            .setUpstreamDataSourceFactory(
+                OkHttpDataSource.Factory(client)
+            )
+            .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
+    }
+
+    fun get(context: Context, client: OkHttpClient): CacheDataSource.Factory {
+        if (!this::simpleCache.isInitialized) {
+            initFileCache(context)
+        }
+
+        // Renews the factory because OkHttpMight have changed.
+        renewCacheFactory(client)
+
         return cacheDataSourceFactory
     }
 }

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

@@ -2,8 +2,8 @@ package com.vitorpamplona.amethyst
 
 import android.util.LruCache
 
-object VideoViewedPositionCache {
-    val cachedPosition = LruCache<String, Long>(10)
+class VideoViewedPositionCache {
+    val cachedPosition = LruCache<String, Long>(100)
 
     fun add(uri: String, position: Long) {
         cachedPosition.put(uri, position)

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,12 +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.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
 
@@ -162,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/Hex.kt

@@ -1,119 +0,0 @@
-package com.vitorpamplona.amethyst.model
-
-import com.vitorpamplona.amethyst.service.nip19.Nip19
-import com.vitorpamplona.amethyst.ui.note.toShortenHex
-import fr.acinq.secp256k1.Hex
-import nostr.postr.Bech32
-import nostr.postr.Persona
-import nostr.postr.bechToBytes
-import nostr.postr.toHex
-import nostr.postr.toNpub
-
-/** Makes the distinction between String and Hex **/
-typealias HexKey = String
-
-typealias NPubKey = String
-typealias NoteId = String
-
-fun NPubKey.toDisplayKey(): String {
-    return this.toShortenHex()
-}
-
-fun NoteId.toDisplayId(): String {
-    return this.toShortenHex()
-}
-
-fun ByteArray.toNote() = Bech32.encodeBytes(hrp = "note", this, Bech32.Encoding.Bech32)
-
-fun ByteArray.toHexKey(): HexKey {
-    return toHex()
-}
-
-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")) {
-        Persona(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")) {
-            Persona(privKey = key.bechToBytes()).pubKey.toHexKey()
-        } else if (pubKeyParsed != null) {
-            pubKeyParsed
-        } else {
-            Hex.decode(key).toHexKey()
-        }
-    } catch (e: Exception) {
-        null
-    }
-}
-
-data class DirtyKeyInfo(val key: Nip19.Return, val restOfWord: String)
-
-fun parseDirtyWordForKey(mightBeAKey: String): DirtyKeyInfo? {
-    var key = mightBeAKey
-    if (key.startsWith("nostr:", true)) {
-        key = key.substring("nostr:".length)
-    }
-
-    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)) {
-            // Converts to npub
-            val pubkey = Nip19.uriToRoute(Persona(privKey = keyB32.bechToBytes()).pubKey.toNpub()) ?: return null
-
-            return DirtyKeyInfo(pubkey, restOfWord)
-        } else if (key.startsWith("npub1", true)) {
-            val pubkey = Nip19.uriToRoute(keyB32) ?: return null
-
-            return DirtyKeyInfo(pubkey, restOfWord)
-        } else if (key.startsWith("note1", true)) {
-            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
-
-            return DirtyKeyInfo(pubkeyRelay, pubkeyRelay.additionalChars)
-        } else if (key.startsWith("nevent1", true)) {
-            val noteRelayId = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
-
-            return DirtyKeyInfo(noteRelayId, noteRelayId.additionalChars)
-        } else if (key.startsWith("naddr1", true)) {
-            val address = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
-
-            return DirtyKeyInfo(address, address.additionalChars) // no way to know when they address ends and dirt begins
-        }
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-
-    return null
-}

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

@@ -3,13 +3,24 @@ 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.LocalPreferences
+import com.vitorpamplona.amethyst.service.ExternalSignerUtils
 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.bechToBytes
+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
 import kotlinx.coroutines.flow.asSharedFlow
@@ -45,6 +56,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
         }
@@ -90,6 +105,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
         }
@@ -190,6 +209,14 @@ object LocalCache {
         val user = getOrCreateUser(event.pubKey)
         if (user.latestBookmarkList == null || event.createdAt > user.latestBookmarkList!!.createdAt) {
             if (event.dTag() == "bookmark") {
+                val loggedInUser = LocalPreferences.currentAccount()
+                val hexKey = loggedInUser?.bechToBytes()
+                if (hexKey != null) {
+                    val pubKey = Hex.encode(hexKey)
+                    if (pubKey == event.pubKey) {
+                        ExternalSignerUtils.content.remove(event.id)
+                    }
+                }
                 user.updateBookmark(event)
             }
             // Log.d("MT", "New User Metadata ${oldUser.pubkeyDisplayHex} ${oldUser.toBestDisplayName()}")
@@ -198,26 +225,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"))
@@ -323,25 +330,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())
@@ -366,102 +354,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)
@@ -477,30 +379,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())
@@ -515,7 +401,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)
@@ -545,7 +431,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)
@@ -565,45 +458,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) {
@@ -703,7 +558,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)
 
@@ -725,7 +580,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)
 
@@ -814,7 +669,7 @@ object LocalCache {
 
             mentions.forEach {
                 // doesn't add to reports, but triggers recounts
-                it.liveSet?.reports?.invalidateData()
+                it.liveSet?.innerReports?.invalidateData()
             }
         }
 
@@ -971,23 +826,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 {
@@ -1025,6 +880,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)
@@ -1086,7 +958,7 @@ object LocalCache {
         }
 
         try {
-            val cachePath = File(Amethyst.instance.applicationContext.externalCacheDir, "NIP95")
+            val cachePath = File(Amethyst.instance.applicationContext.cacheDir, "NIP95")
             cachePath.mkdirs()
             val file = File(cachePath, event.id)
             if (!file.exists()) {
@@ -1110,6 +982,79 @@ object LocalCache {
         refreshObservers(note)
     }
 
+    private fun consume(event: ChatMessageEvent, relay: Relay?) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        val recipientsHex = event.recipientsPubKey().plus(event.pubKey).toSet()
+        val recipients = recipientsHex.mapNotNull { checkGetOrCreateUser(it) }.toSet()
+
+        // Log.d("PM", "${author.toBestDisplayName()} to ${recipient?.toBestDisplayName()}")
+
+        val repliesTo = event.taggedEvents().mapNotNull { checkGetOrCreateNote(it) }
+
+        note.loadEvent(event, author, repliesTo)
+
+        if (recipients.isNotEmpty()) {
+            recipients.forEach {
+                val groupMinusRecipient = recipientsHex.minus(it.pubkeyHex)
+
+                val authorGroup = if (groupMinusRecipient.isEmpty()) {
+                    // note to self
+                    ChatroomKey(persistentSetOf(it.pubkeyHex))
+                } else {
+                    ChatroomKey(groupMinusRecipient.toImmutableSet())
+                }
+
+                it.addMessage(authorGroup, note)
+            }
+        }
+
+        refreshObservers(note)
+    }
+
+    private fun consume(event: SealedGossipEvent, 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: GiftWrapEvent, 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: LnZapPaymentRequestEvent) {
         // Does nothing without a response callback.
     }
@@ -1185,15 +1130,20 @@ object LocalCache {
         }
 
         return notes.values.filter {
-            (it.event is TextNoteEvent && it.event?.content()?.contains(text, true) ?: false) ||
-                (it.event is PollNoteEvent && it.event?.content()?.contains(text, true) ?: false) ||
-                (it.event is ChannelMessageEvent && it.event?.content()?.contains(text, true) ?: false) ||
-                it.idHex.startsWith(text, true) ||
-                it.idNote().startsWith(text, true)
+            (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 ||
+                        it.idHex.startsWith(text, true) ||
+                        it.idNote().startsWith(text, true)
+                    )
         } + addressables.values.filter {
-            (it.event as? LongTextNoteEvent)?.content?.contains(text, true) ?: false ||
-                it.event?.matchTag1With(text) ?: false ||
-                it.idHex.startsWith(text, true)
+            (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 ||
+                        it.idHex.startsWith(text, true)
+                    )
         }
     }
 
@@ -1217,11 +1167,27 @@ 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()
         }
 
+        addressables.forEach {
+            it.value.clearLive()
+        }
+
         users.forEach {
             it.value.clearLive()
         }
@@ -1233,25 +1199,197 @@ object LocalCache {
         channels.forEach { it ->
             val toBeRemoved = it.value.pruneOldAndHiddenMessages(account)
 
-            toBeRemoved.forEach {
-                notes.remove(it.idHex)
-                // Doesn't need to clean up the replies and mentions.. Too small to matter.
+            val childrenToBeRemoved = mutableListOf<Note>()
 
-                // Counts the replies
-                it.replyTo?.forEach { _ ->
-                    it.removeReply(it)
-                }
+            toBeRemoved.forEach {
+                removeFromCache(it)
+
+                childrenToBeRemoved.addAll(it.removeAllChildNotes())
             }
 
+            removeChildrenOf(childrenToBeRemoved)
+
             if (toBeRemoved.size > 100 || it.value.notes.size > 100) {
                 println("PRUNE: ${toBeRemoved.size} messages removed from ${it.value.toBestDisplayName()}. ${it.value.notes.size} kept")
             }
         }
+
+        users.forEach { userPair ->
+            userPair.value.privateChatrooms.values.map {
+                val toBeRemoved = it.pruneMessagesToTheLatestOnly()
+
+                val childrenToBeRemoved = mutableListOf<Note>()
+
+                toBeRemoved.forEach {
+                    removeFromCache(it)
+
+                    childrenToBeRemoved.addAll(it.removeAllChildNotes())
+                }
+
+                removeChildrenOf(childrenToBeRemoved)
+
+                if (toBeRemoved.size > 1) {
+                    println("PRUNE: ${toBeRemoved.size} private messages with ${userPair.value.toBestDisplayName()} removed. ${it.roomMessages.size} kept")
+                }
+            }
+        }
+    }
+
+    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 toBeRemoved = notes.filter {
+            (
+                (it.value.event is TextNoteEvent && !it.value.isNewThread()) ||
+                    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?.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 {
+            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.")
+        }
     }
 
     fun pruneHiddenMessages(account: Account) {
         checkNotInMainThread()
 
+        val childrenToBeRemoved = mutableListOf<Note>()
+
         val toBeRemoved = account.hiddenUsers.map { userHex ->
             (
                 notes.values.filter {
@@ -1263,27 +1401,24 @@ 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())
         }
 
+        removeChildrenOf(childrenToBeRemoved)
+
         println("PRUNE: ${toBeRemoved.size} messages removed because they were Hidden")
     }
 
-    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++
             }
@@ -1300,31 +1435,50 @@ object LocalCache {
     }
 
     fun verifyAndConsume(event: Event, relay: Relay?) {
+        if (justVerify(event)) {
+            justConsume(event, relay)
+        }
+    }
+
+    fun justVerify(event: Event): Boolean {
         checkNotInMainThread()
 
-        if (!event.hasValidSignature()) {
+        return if (!event.hasValidSignature()) {
             try {
                 event.checkSignature()
             } catch (e: Exception) {
                 Log.w("Event failed retest ${event.kind}", e.message ?: "")
             }
-            return
+            false
+        } else {
+            true
         }
+    }
+
+    fun justConsume(event: Event, relay: Relay?) {
+        checkNotInMainThread()
 
         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)
                 is ChannelMetadataEvent -> consume(event)
                 is ChannelMuteUserEvent -> consume(event)
+                is ChatMessageEvent -> consume(event, relay)
                 is ClassifiedsEvent -> consume(event)
                 is CommunityDefinitionEvent -> consume(event, relay)
                 is CommunityPostApprovalEvent -> {
@@ -1337,18 +1491,21 @@ object LocalCache {
                 is DeletionEvent -> consume(event)
                 is EmojiPackEvent -> consume(event)
                 is EmojiPackSelectionEvent -> consume(event)
+                is SealedGossipEvent -> consume(event, relay)
 
                 is FileHeaderEvent -> consume(event, relay)
                 is FileStorageEvent -> consume(event, relay)
                 is FileStorageHeaderEvent -> consume(event, relay)
+                is GiftWrapEvent -> consume(event, relay)
                 is HighlightEvent -> consume(event, relay)
                 is LiveActivitiesEvent -> consume(event, relay)
                 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)
@@ -1359,6 +1516,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)
@@ -1375,8 +1533,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

@@ -0,0 +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,27 +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.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()) {
@@ -39,6 +43,10 @@ class AddressableNote(val address: ATag) : Note(address.toTag()) {
 
         return minOf(publishedAt, lastCreatedAt)
     }
+
+    fun dTag(): String? {
+        return (event as? AddressableEvent)?.dTag()
+    }
 }
 
 @Stable
@@ -50,20 +58,20 @@ open class Note(val idHex: String) {
     var replyTo: List<Note>? = null
 
     // These fields are updated every time an event related to this note is received.
-    var replies = setOf<Note>()
+    var replies = listOf<Note>()
         private set
-    var reactions = mapOf<String, Set<Note>>()
+    var reactions = mapOf<String, List<Note>>()
         private set
-    var boosts = setOf<Note>()
+    var boosts = listOf<Note>()
         private set
-    var reports = mapOf<User, Set<Note>>()
+    var reports = mapOf<User, List<Note>>()
         private set
     var zaps = mapOf<Note, Note?>()
         private set
     var zapPayments = mapOf<Note, Note?>()
         private set
 
-    var relays = setOf<String>()
+    var relays = listOf<String>()
         private set
 
     var lastReactionsDownloadTime: Map<String, EOSETime> = emptyMap()
@@ -72,7 +80,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 {
@@ -103,11 +126,13 @@ open class Note(val idHex: String) {
     open fun createdAt() = event?.createdAt()
 
     fun loadEvent(event: Event, author: User, replyTo: List<Note>) {
-        this.event = event
-        this.author = author
-        this.replyTo = replyTo
+        if (this.event?.id() != event.id()) {
+            this.event = event
+            this.author = author
+            this.replyTo = replyTo
 
-        liveSet?.metadata?.invalidateData()
+            liveSet?.innerMetadata?.invalidateData()
+        }
     }
 
     fun formattedDateTime(timestamp: Long): String {
@@ -115,20 +140,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 {
@@ -145,32 +213,68 @@ 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) {
-        replies = replies - note
-        liveSet?.replies?.invalidateData()
+        if (note in replies) {
+            replies = replies - note
+            liveSet?.innerReplies?.invalidateData()
+        }
     }
+
     fun removeBoost(note: Note) {
-        boosts = boosts - note
-        liveSet?.boosts?.invalidateData()
+        if (note in boosts) {
+            boosts = boosts - note
+            liveSet?.innerBoosts?.invalidateData()
+        }
     }
+
+    fun removeAllChildNotes(): List<Note> {
+        val toBeRemoved = replies +
+            reactions.values.flatten() +
+            boosts +
+            reports.values.flatten() +
+            zaps.keys +
+            zaps.values.filterNotNull() +
+            zapPayments.keys +
+            zapPayments.values.filterNotNull()
+
+        replies = listOf<Note>()
+        reactions = mapOf<String, List<Note>>()
+        boosts = listOf<Note>()
+        reports = mapOf<User, List<Note>>()
+        zaps = mapOf<Note, Note?>()
+        zapPayments = mapOf<Note, Note?>()
+        relays = listOf<String>()
+        lastReactionsDownloadTime = emptyMap()
+
+        liveSet?.innerReplies?.invalidateData()
+        liveSet?.innerReactions?.invalidateData()
+        liveSet?.innerBoosts?.invalidateData()
+        liveSet?.innerReports?.invalidateData()
+        liveSet?.innerZaps?.invalidateData()
+
+        return toBeRemoved
+    }
+
     fun removeReaction(note: Note) {
         val tags = note.event?.tags() ?: emptyList()
         val reaction = note.event?.content()?.firstFullCharOrEmoji(ImmutableListOfLists(tags)) ?: "+"
 
         if (reaction in reactions.keys && reactions[reaction]?.contains(note) == true) {
             reactions[reaction]?.let {
-                val newList = it.minus(note)
-                if (newList.isEmpty()) {
-                    reactions = reactions.minus(reaction)
-                } else {
-                    reactions = reactions + Pair(reaction, newList)
-                }
+                if (note in it) {
+                    val newList = it.minus(note)
+                    if (newList.isEmpty()) {
+                        reactions = reactions.minus(reaction)
+                    } else {
+                        reactions = reactions + Pair(reaction, newList)
+                    }
 
-                liveSet?.reactions?.invalidateData()
+                    liveSet?.innerReactions?.invalidateData()
+                }
             }
         }
     }
@@ -181,7 +285,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()
             }
         }
     }
@@ -189,29 +293,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()
         }
     }
 
@@ -233,12 +336,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()
             }
         }
     }
@@ -261,12 +364,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()
             }
         }
     }
@@ -276,11 +379,11 @@ open class Note(val idHex: String) {
         val reaction = note.event?.content()?.firstFullCharOrEmoji(ImmutableListOfLists(tags)) ?: "+"
 
         if (reaction !in reactions.keys) {
-            reactions = reactions + Pair(reaction, setOf(note))
-            liveSet?.reactions?.invalidateData()
+            reactions = reactions + Pair(reaction, listOf(note))
+            liveSet?.innerReactions?.invalidateData()
         } else if (reactions[reaction]?.contains(note) == false) {
             reactions = reactions + Pair(reaction, (reactions[reaction] ?: emptySet()) + note)
-            liveSet?.reactions?.invalidateData()
+            liveSet?.innerReactions?.invalidateData()
         }
     }
 
@@ -288,18 +391,18 @@ open class Note(val idHex: String) {
         val author = note.author ?: return
 
         if (author !in reports.keys) {
-            reports = reports + Pair(author, setOf(note))
-            liveSet?.reports?.invalidateData()
+            reports = reports + Pair(author, listOf(note))
+            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()
         }
     }
 
@@ -381,8 +484,8 @@ open class Note(val idHex: String) {
         return boosts.any { it.author?.pubkeyHex == user.pubkeyHex }
     }
 
-    fun reportsBy(user: User): Set<Note> {
-        return reports[user] ?: emptySet()
+    fun hasReportsBy(user: User): Boolean {
+        return reports[user]?.isNotEmpty() ?: false
     }
 
     fun reportAuthorsBy(users: Set<HexKey>): List<User> {
@@ -399,10 +502,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()
@@ -546,13 +645,17 @@ open class Note(val idHex: String) {
         }
 
         replyTo = null
-        replies = emptySet()
+        replies = emptyList()
         reactions = emptyMap()
-        boosts = emptySet()
+        boosts = emptyList()
         reports = emptyMap()
         zaps = emptyMap()
     }
 
+    fun clearEOSE() {
+        lastReactionsDownloadTime = emptyMap()
+    }
+
     var liveSet: NoteLiveSet? = null
 
     fun live(): NoteLiveSet {
@@ -564,6 +667,7 @@ open class Note(val idHex: String) {
 
     fun clearLive() {
         if (liveSet != null && liveSet?.isInUse() == false) {
+            liveSet?.destroy()
             liveSet = null
         }
     }
@@ -571,23 +675,74 @@ open class Note(val idHex: String) {
     fun isHiddenFor(accountChoices: Account.LiveHiddenUsers): Boolean {
         if (event == null) return false
 
+        val isBoostedNoteHidden = if (event is GenericRepostEvent || event is RepostEvent || event is CommunityPostApprovalEvent) {
+            replyTo?.lastOrNull()?.isHiddenFor(accountChoices) ?: false
+        } else {
+            false
+        }
+
         val isSensitive = event?.isSensitive() ?: false
-        return accountChoices.hiddenUsers.contains(author?.pubkeyHex) ||
+        return isBoostedNoteHidden ||
+            accountChoices.hiddenUsers.contains(author?.pubkeyHex) ||
             accountChoices.spammers.contains(author?.pubkeyHex) ||
             (isSensitive && accountChoices.showSensitiveContent == false)
     }
 }
 
+@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() ||
@@ -596,26 +751,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 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) {
@@ -637,3 +822,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,15 +1,12 @@
 package com.vitorpamplona.amethyst.model
 
-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 androidx.compose.runtime.Stable
+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?,
@@ -27,113 +24,26 @@ 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)
     }
 }
 
+@Stable
 class RelayInformationFee(
     val amount: Int?,
     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?,
@@ -147,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/ServersAvailable.kt

@@ -0,0 +1,16 @@
+package com.vitorpamplona.amethyst.model
+
+enum class ServersAvailable {
+    // IMGUR,
+    NOSTR_BUILD,
+    NOSTRIMG,
+    NOSTRFILES_DEV,
+    NOSTRCHECK_ME,
+
+    // IMGUR_NIP_94,
+    NOSTRIMG_NIP_94,
+    NOSTR_BUILD_NIP_94,
+    NOSTRFILES_DEV_NIP_94,
+    NOSTRCHECK_ME_NIP_94,
+    NIP95
+}

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

@@ -1,11 +1,40 @@
 package com.vitorpamplona.amethyst.model
 
 import androidx.compose.runtime.Stable
+import com.vitorpamplona.amethyst.R
 
 @Stable
 class Settings(
-    var automaticallyShowImages: Boolean? = null,
-    var automaticallyStartPlayback: Boolean? = null,
     var preferredLanguage: String? = null,
-    var automaticallyShowUrlPreview: Boolean? = null
+    var automaticallyShowImages: ConnectivityType = ConnectivityType.ALWAYS,
+    var automaticallyStartPlayback: ConnectivityType = ConnectivityType.ALWAYS,
+    var automaticallyShowUrlPreview: ConnectivityType = ConnectivityType.ALWAYS
 )
+
+enum class ConnectivityType(val prefCode: Boolean?, val screenCode: Int, val reourceId: Int) {
+    ALWAYS(null, 0, R.string.connectivity_type_always),
+    WIFI_ONLY(true, 1, R.string.connectivity_type_wifi_only),
+    NEVER(false, 2, R.string.connectivity_type_never)
+}
+
+fun parseConnectivityType(code: Boolean?): ConnectivityType {
+    return when (code) {
+        ConnectivityType.ALWAYS.prefCode -> ConnectivityType.ALWAYS
+        ConnectivityType.WIFI_ONLY.prefCode -> ConnectivityType.WIFI_ONLY
+        ConnectivityType.NEVER.prefCode -> ConnectivityType.NEVER
+        else -> {
+            ConnectivityType.ALWAYS
+        }
+    }
+}
+
+fun parseConnectivityType(screenCode: Int): ConnectivityType {
+    return when (screenCode) {
+        ConnectivityType.ALWAYS.screenCode -> ConnectivityType.ALWAYS
+        ConnectivityType.WIFI_ONLY.screenCode -> ConnectivityType.WIFI_ONLY
+        ConnectivityType.NEVER.screenCode -> ConnectivityType.NEVER
+        else -> {
+            ConnectivityType.ALWAYS
+        }
+    }
+}

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

@@ -1,13 +0,0 @@
-package com.vitorpamplona.amethyst.model
-
-object TimeUtils {
-    const val fiveMinutes = 60 * 5
-    const val oneHour = 60 * 60
-    const val oneDay = 24 * 60 * 60
-
-    fun now() = System.currentTimeMillis() / 1000
-    fun fiveMinutesAgo() = now() - fiveMinutes
-    fun oneHourAgo() = now() - oneHour
-    fun oneDayAgo() = now() - oneDay
-    fun eightHoursAgo() = now() - (oneHour * 8)
-}

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

@@ -2,33 +2,35 @@ package com.vitorpamplona.amethyst.model
 
 import android.util.LruCache
 import androidx.compose.runtime.Stable
-import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.previews.BahaUrlPreview
 import com.vitorpamplona.amethyst.service.previews.IUrlPreviewCallback
 import com.vitorpamplona.amethyst.service.previews.UrlInfoItem
 import com.vitorpamplona.amethyst.ui.components.UrlPreviewState
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 @Stable
 object UrlCachedPreviewer {
     var cache = LruCache<String, UrlPreviewState>(100)
         private set
 
-    fun previewInfo(url: String, onReady: (UrlPreviewState) -> Unit) {
-        checkNotInMainThread()
-
+    suspend fun previewInfo(
+        url: String,
+        onReady: suspend (UrlPreviewState) -> Unit
+    ) = withContext(Dispatchers.IO) {
         cache[url]?.let {
             onReady(it)
-            return
+            return@withContext
         }
 
         BahaUrlPreview(
             url,
             object : IUrlPreviewCallback {
-                override fun onComplete(urlInfo: UrlInfoItem) {
+                override suspend fun onComplete(urlInfo: UrlInfoItem) = withContext(Dispatchers.IO) {
                     cache[url]?.let {
                         if (it is UrlPreviewState.Loaded || it is UrlPreviewState.Empty) {
                             onReady(it)
-                            return
+                            return@withContext
                         }
                     }
 
@@ -42,10 +44,10 @@ object UrlCachedPreviewer {
                     onReady(state)
                 }
 
-                override fun onFailed(throwable: Throwable) {
+                override suspend fun onFailed(throwable: Throwable) = withContext(Dispatchers.IO) {
                     cache[url]?.let {
                         onReady(it)
-                        return
+                        return@withContext
                     }
 
                     val state = UrlPreviewState.Error(throwable.message ?: "Error Loading url preview")

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

@@ -3,27 +3,29 @@ 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.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.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 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 nostr.postr.Bech32
-import nostr.postr.toNpub
 import java.math.BigDecimal
-import java.util.regex.Pattern
-
-val lnurlpPattern = Pattern.compile("(?i:http|https):\\/\\/((.+)\\/)*\\.well-known\\/lnurlp\\/(.*)")
 
 @Stable
 class User(val pubkeyHex: String) {
@@ -43,7 +45,7 @@ class User(val pubkeyHex: String) {
     var relaysBeingUsed = mapOf<String, RelayInfo>()
         private set
 
-    var privateChatrooms = mapOf<User, Chatroom>()
+    var privateChatrooms = mapOf<ChatroomKey, Chatroom>()
         private set
 
     fun pubkey() = Hex.decode(pubkeyHex)
@@ -55,6 +57,21 @@ class User(val pubkeyHex: String) {
 
     override fun toString(): String = pubkeyHex
 
+    fun toBestShortFirstName(): String {
+        val fullName = bestDisplayName() ?: bestUsername() ?: return pubkeyDisplayHex()
+
+        val names = fullName.split(' ')
+
+        val firstName = if (names[0].length <= 3) {
+            // too short. Remove Dr.
+            "${names[0]} ${names.getOrNull(1) ?: ""}"
+        } else {
+            names[0]
+        }
+
+        return firstName
+    }
+
     fun toBestDisplayName(): String {
         return bestDisplayName() ?: bestUsername() ?: pubkeyDisplayHex()
     }
@@ -80,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) {
@@ -90,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) {
@@ -109,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()
         }
     }
 
@@ -122,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()
             }
         }
     }
@@ -130,10 +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?.innerZaps?.invalidateData()
+        } else if (zapRequestOrZapEvent in zaps.values) {
+            zaps = zaps.filter { it.value != zapRequestOrZapEvent }
+            liveSet?.innerZaps?.invalidateData()
         }
     }
 
@@ -164,35 +195,52 @@ class User(val pubkeyHex: String) {
     }
 
     @Synchronized
-    private fun getOrCreatePrivateChatroomSync(user: User): Chatroom {
+    private fun getOrCreatePrivateChatroomSync(key: ChatroomKey): Chatroom {
         checkNotInMainThread()
 
-        return privateChatrooms[user] ?: run {
+        return privateChatrooms[key] ?: run {
             val privateChatroom = Chatroom()
-            privateChatrooms = privateChatrooms + Pair(user, privateChatroom)
+            privateChatrooms = privateChatrooms + Pair(key, privateChatroom)
             privateChatroom
         }
     }
 
     private fun getOrCreatePrivateChatroom(user: User): Chatroom {
-        return privateChatrooms[user] ?: getOrCreatePrivateChatroomSync(user)
+        val key = ChatroomKey(persistentSetOf(user.pubkeyHex))
+        return getOrCreatePrivateChatroom(key)
+    }
+
+    private fun getOrCreatePrivateChatroom(key: ChatroomKey): Chatroom {
+        return privateChatrooms[key] ?: getOrCreatePrivateChatroomSync(key)
+    }
+
+    fun addMessage(room: ChatroomKey, msg: Note) {
+        val privateChatroom = getOrCreatePrivateChatroom(room)
+        if (msg !in privateChatroom.roomMessages) {
+            privateChatroom.addMessageSync(msg)
+            liveSet?.innerMessages?.invalidateData()
+        }
     }
 
     fun addMessage(user: User, msg: Note) {
         val privateChatroom = getOrCreatePrivateChatroom(user)
         if (msg !in privateChatroom.roomMessages) {
             privateChatroom.addMessageSync(msg)
-            liveSet?.messages?.invalidateData()
+            liveSet?.innerMessages?.invalidateData()
         }
     }
 
+    fun createChatroom(withKey: ChatroomKey) {
+        getOrCreatePrivateChatroom(withKey)
+    }
+
     fun removeMessage(user: User, msg: Note) {
         checkNotInMainThread()
 
         val privateChatroom = getOrCreatePrivateChatroom(user)
         if (msg in privateChatroom.roomMessages) {
             privateChatroom.removeMessageSync(msg)
-            liveSet?.messages?.invalidateData()
+            liveSet?.innerMessages?.invalidateData()
         }
     }
 
@@ -207,7 +255,7 @@ class User(val pubkeyHex: String) {
             here.counter++
         }
 
-        liveSet?.relayInfo?.invalidateData()
+        liveSet?.innerRelayInfo?.invalidateData()
     }
 
     fun updateUserInfo(newUserInfo: UserMetadata, latestMetadata: MetadataEvent) {
@@ -216,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 {
@@ -249,6 +289,12 @@ class User(val pubkeyHex: String) {
         } ?: false
     }
 
+    fun isFollowingGeohashCached(geoTag: String): Boolean {
+        return latestContactList?.verifiedFollowGeohashSet?.let {
+            return geoTag.lowercase() in it
+        } ?: false
+    }
+
     fun isFollowingCached(user: User): Boolean {
         return latestContactList?.verifiedFollowKeySet?.let {
             return user.pubkeyHex in it
@@ -273,10 +319,14 @@ class User(val pubkeyHex: String) {
         return latestContactList?.verifiedFollowKeySet ?: emptySet()
     }
 
-    fun cachedFollowingTagSet(): Set<HexKey> {
+    fun cachedFollowingTagSet(): Set<String> {
         return latestContactList?.verifiedFollowTagSet ?: emptySet()
     }
 
+    fun cachedFollowingGeohashSet(): Set<HexKey> {
+        return latestContactList?.verifiedFollowGeohashSet ?: emptySet()
+    }
+
     fun cachedFollowingCommunitiesSet(): Set<HexKey> {
         return latestContactList?.verifiedFollowCommunitySet ?: emptySet()
     }
@@ -289,8 +339,8 @@ class User(val pubkeyHex: String) {
         return LocalCache.users.values.count { it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
     }
 
-    fun hasSentMessagesTo(user: User?): Boolean {
-        val messagesToUser = privateChatrooms[user] ?: return false
+    fun hasSentMessagesTo(key: ChatroomKey?): Boolean {
+        val messagesToUser = privateChatrooms[key] ?: return false
 
         return messagesToUser.roomMessages.any { this.pubkeyHex == it.author?.pubkeyHex }
     }
@@ -316,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()
     }
 }
 
@@ -353,103 +448,35 @@ data class RelayInfo(
     var counter: Long
 )
 
-class Chatroom() {
-    var roomMessages: Set<Note> = setOf()
-
-    @Synchronized
-    fun addMessageSync(msg: Note) {
-        checkNotInMainThread()
-
-        if (msg !in roomMessages) {
-            roomMessages = roomMessages + msg
-        }
-    }
-
-    @Synchronized
-    fun removeMessageSync(msg: Note) {
-        checkNotInMainThread()
-
-        if (msg !in roomMessages) {
-            roomMessages = roomMessages + msg
-        }
-    }
-}
-
-@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() {
         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
@@ -54,11 +54,13 @@ object CachedRichTextParser {
 
 // Android9 seems to have an issue starting this regex.
 val noProtocolUrlValidator = try {
-    Pattern.compile("(([\\w\\d-]+\\.)*[a-zA-Z][\\w-]+[\\.\\:]\\w+([\\/\\?\\=\\&\\#\\.]?[\\w-]*[^\\p{IsHan}\\p{IsHiragana}\\p{IsKatakana}])*\\/?)(.*)")
+    Pattern.compile("(([\\w\\d-]+\\.)*[a-zA-Z][\\w-]+[\\.\\:]\\w+([\\/\\?\\=\\&\\#\\.]?[\\w-]+[^\\p{IsHan}\\p{IsHiragana}\\p{IsKatakana}])*\\/?)(.*)")
 } catch (e: Exception) {
     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)
+
 class RichTextParser() {
     fun parseText(
         content: String,
@@ -75,8 +77,7 @@ class RichTextParser() {
             } else if (it.originalUrl.contains("。")) {
                 null
             } else {
-                val pattern = "^((http|https)://)?([A-Za-z0-9-]+(\\.[A-Za-z0-9]+)+)(:[0-9]+)?(/[^?#]*)?(\\?[^#]*)?(#.*)?".toRegex(RegexOption.IGNORE_CASE)
-                if (pattern.matches(it.originalUrl)) {
+                if (HTTPRegex.matches(it.originalUrl)) {
                     it.originalUrl
                 } else {
                     null
@@ -119,7 +120,7 @@ class RichTextParser() {
 
             val isRTL = isArabic(paragraph)
 
-            val wordList = paragraph.split(' ')
+            val wordList = paragraph.trimEnd().split(' ')
             wordList.forEach { word ->
                 val wordSegment = wordIdentifier(word, images, urls, emojis, tags)
                 if (wordSegment !is RegularTextSegment) {
@@ -179,11 +180,11 @@ class RichTextParser() {
             BechSegment(word)
         } else if (word.startsWith("#")) {
             parseHash(word, tags)
-        } else if (schemelessMatcher.find()) {
+        } 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)
-            if (pattern.matches(word)) {
+            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 {
                 RegularTextSegment(word)

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)
@@ -80,16 +81,17 @@ class CashuProcessor {
                 .post(requestBody)
                 .build()
 
-            val response = client.newCall(request).execute()
-            val body = response.body.string()
-            val tree = jacksonObjectMapper().readTree(body)
+            client.newCall(request).execute().use {
+                val body = it.body.string()
+                val tree = jacksonObjectMapper().readTree(body)
 
-            val successful = tree?.get("paid")?.asText() == "true"
+                val successful = tree?.get("paid")?.asText() == "true"
 
-            if (successful) {
-                onSuccess("Redeemed ${token.totalAmount} Sats" + " (Fees: ${token.fees} Sats)")
-            } else {
-                onError(tree?.get("detail")?.asText()?.split('.')?.getOrNull(0) ?: "Cashu: Tokens already spent.")
+                if (successful) {
+                    onSuccess("Redeemed ${token.totalAmount} Sats" + " (Fees: ${token.fees} Sats)")
+                } else {
+                    onError(tree?.get("detail")?.asText()?.split('.')?.getOrNull(0) ?: "Cashu: Tokens already spent.")
+                }
             }
         } catch (e: Exception) {
             onError("Token melt failure: " + e.message)

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

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

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

@@ -0,0 +1,311 @@
+package com.vitorpamplona.amethyst.service
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.util.Log
+import android.util.LruCache
+import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import com.vitorpamplona.amethyst.Amethyst
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ServiceManager
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.ui.MainActivity
+import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.toNpub
+import com.vitorpamplona.quartz.events.EventInterface
+import com.vitorpamplona.quartz.events.LnZapRequestEvent
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+
+enum class SignerType {
+    SIGN_EVENT,
+    NIP04_ENCRYPT,
+    NIP04_DECRYPT,
+    NIP44_ENCRYPT,
+    NIP44_DECRYPT,
+    GET_PUBLIC_KEY,
+    DECRYPT_ZAP_EVENT
+}
+
+object ExternalSignerUtils {
+    val content = LruCache<String, String>(10)
+    var isActivityRunning: Boolean = false
+    val cachedDecryptedContent = mutableMapOf<HexKey, String>()
+    lateinit var account: Account
+    private lateinit var activityResultLauncher: ActivityResultLauncher<Intent>
+    private lateinit var decryptResultLauncher: ActivityResultLauncher<Intent>
+    private lateinit var blockListResultLauncher: ActivityResultLauncher<Intent>
+
+    @OptIn(DelicateCoroutinesApi::class)
+    fun requestRejectedToast() {
+        GlobalScope.launch(Dispatchers.Main) {
+            Toast.makeText(
+                Amethyst.instance,
+                Amethyst.instance.getString(R.string.sign_request_rejected),
+                Toast.LENGTH_SHORT
+            ).show()
+        }
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    fun default() {
+        isActivityRunning = false
+        ServiceManager.shouldPauseService = true
+        GlobalScope.launch(Dispatchers.IO) {
+            isActivityRunning = false
+            ServiceManager.shouldPauseService = true
+        }
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    fun start(activity: MainActivity) {
+        activityResultLauncher = activity.registerForActivityResult(
+            ActivityResultContracts.StartActivityForResult()
+        ) {
+            if (it.resultCode != Activity.RESULT_OK) {
+                requestRejectedToast()
+            } else {
+                val event = it.data?.getStringExtra("signature") ?: ""
+                val id = it.data?.getStringExtra("id") ?: ""
+                if (id.isNotBlank()) {
+                    content.put(id, event)
+                }
+            }
+            default()
+        }
+
+        decryptResultLauncher = activity.registerForActivityResult(
+            ActivityResultContracts.StartActivityForResult()
+        ) {
+            if (it.resultCode != Activity.RESULT_OK) {
+                requestRejectedToast()
+            } else {
+                val event = it.data?.getStringExtra("signature") ?: ""
+                val id = it.data?.getStringExtra("id") ?: ""
+                if (id.isNotBlank()) {
+                    content.put(id, event)
+                    cachedDecryptedContent[id] = event
+                }
+            }
+            default()
+        }
+
+        blockListResultLauncher = activity.registerForActivityResult(
+            ActivityResultContracts.StartActivityForResult()
+        ) {
+            if (it.resultCode != Activity.RESULT_OK) {
+                requestRejectedToast()
+            } else {
+                val decryptedContent = it.data?.getStringExtra("signature") ?: ""
+                val id = it.data?.getStringExtra("id") ?: ""
+                if (id.isNotBlank()) {
+                    cachedDecryptedContent[id] = decryptedContent
+                    account.live.invalidateData()
+                }
+            }
+            default()
+        }
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    fun openSigner(
+        data: String,
+        type: SignerType,
+        intentResult: ActivityResultLauncher<Intent>,
+        pubKey: HexKey,
+        id: String
+    ) {
+        try {
+            ServiceManager.shouldPauseService = false
+            val intent = Intent(Intent.ACTION_VIEW, Uri.parse("nostrsigner:$data"))
+            val signerType = when (type) {
+                SignerType.SIGN_EVENT -> "sign_event"
+                SignerType.NIP04_ENCRYPT -> "nip04_encrypt"
+                SignerType.NIP04_DECRYPT -> "nip04_decrypt"
+                SignerType.NIP44_ENCRYPT -> "nip44_encrypt"
+                SignerType.NIP44_DECRYPT -> "nip44_decrypt"
+                SignerType.GET_PUBLIC_KEY -> "get_public_key"
+                SignerType.DECRYPT_ZAP_EVENT -> "decrypt_zap_event"
+            }
+            intent.putExtra("type", signerType)
+            intent.putExtra("pubKey", pubKey)
+            intent.putExtra("id", id)
+            if (type !== SignerType.GET_PUBLIC_KEY) {
+                intent.putExtra("current_user", account.keyPair.pubKey.toNpub())
+            }
+            intent.`package` = "com.greenart7c3.nostrsigner"
+            intentResult.launch(intent)
+        } catch (e: Exception) {
+            Log.e("Signer", "Error opening Signer app", e)
+            GlobalScope.launch(Dispatchers.Main) {
+                Toast.makeText(
+                    Amethyst.instance,
+                    Amethyst.instance.getString(R.string.error_opening_external_signer),
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+        }
+    }
+
+    fun openSigner(event: EventInterface, columnName: String = "signature") {
+        checkNotInMainThread()
+
+        val result = getDataFromResolver(SignerType.SIGN_EVENT, arrayOf(event.toJson(), event.pubKey()), columnName)
+        if (result !== null) {
+            content.put(event.id(), result)
+            return
+        }
+
+        ServiceManager.shouldPauseService = false
+        isActivityRunning = true
+        openSigner(
+            event.toJson(),
+            SignerType.SIGN_EVENT,
+            activityResultLauncher,
+            "",
+            event.id()
+        )
+        while (isActivityRunning) {
+            Thread.sleep(100)
+        }
+    }
+
+    fun decryptBlockList(encryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_DECRYPT) {
+        val result = getDataFromResolver(signerType, arrayOf(encryptedContent, pubKey))
+        if (result !== null) {
+            content.put(id, result)
+            cachedDecryptedContent[id] = result
+            return
+        }
+        isActivityRunning = true
+        openSigner(
+            encryptedContent,
+            signerType,
+            blockListResultLauncher,
+            pubKey,
+            id
+        )
+    }
+
+    fun getDataFromResolver(signerType: SignerType, data: Array<out String>, columnName: String = "signature"): String? {
+        val localData = if (signerType !== SignerType.GET_PUBLIC_KEY) {
+            data.toList().plus(account.keyPair.pubKey.toNpub()).toTypedArray()
+        } else {
+            data
+        }
+
+        Amethyst.instance.contentResolver.query(
+            Uri.parse("content://com.greenart7c3.nostrsigner.$signerType"),
+            localData,
+            null,
+            null,
+            null
+        ).use {
+            if (it !== null) {
+                if (it.moveToFirst()) {
+                    val index = it.getColumnIndex(columnName)
+                    if (index < 0) {
+                        Log.d("getDataFromResolver", "column '$columnName' not found")
+                        return null
+                    }
+                    return it.getString(index)
+                }
+            }
+        }
+        return null
+    }
+
+    fun decrypt(encryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_DECRYPT) {
+        val result = getDataFromResolver(signerType, arrayOf(encryptedContent, pubKey))
+        if (result !== null) {
+            content.put(id, result)
+            cachedDecryptedContent[id] = result
+            return
+        }
+
+        isActivityRunning = true
+        openSigner(
+            encryptedContent,
+            signerType,
+            decryptResultLauncher,
+            pubKey,
+            id
+        )
+        while (isActivityRunning) {
+            // do nothing
+        }
+    }
+
+    fun decryptDM(encryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_DECRYPT) {
+        val result = getDataFromResolver(signerType, arrayOf(encryptedContent, pubKey))
+        if (result !== null) {
+            content.put(id, result)
+            cachedDecryptedContent[id] = result
+            return
+        }
+        openSigner(
+            encryptedContent,
+            signerType,
+            decryptResultLauncher,
+            pubKey,
+            id
+        )
+    }
+
+    fun decryptBookmark(encryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_DECRYPT) {
+        val result = getDataFromResolver(signerType, arrayOf(encryptedContent, pubKey))
+        if (result !== null) {
+            content.put(id, result)
+            cachedDecryptedContent[id] = result
+            return
+        }
+        openSigner(
+            encryptedContent,
+            signerType,
+            decryptResultLauncher,
+            pubKey,
+            id
+        )
+    }
+
+    fun encrypt(decryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_ENCRYPT) {
+        val result = getDataFromResolver(signerType, arrayOf(decryptedContent, pubKey))
+        if (result !== null) {
+            content.put(id, result)
+            return
+        }
+
+        isActivityRunning = true
+        openSigner(
+            decryptedContent,
+            signerType,
+            activityResultLauncher,
+            pubKey,
+            id
+        )
+        while (isActivityRunning) {
+            Thread.sleep(100)
+        }
+    }
+
+    fun decryptZapEvent(event: LnZapRequestEvent) {
+        val result = getDataFromResolver(SignerType.DECRYPT_ZAP_EVENT, arrayOf(event.toJson(), event.pubKey))
+        if (result !== null) {
+            content.put(event.id, result)
+            cachedDecryptedContent[event.id] = result
+            return
+        }
+        openSigner(
+            event.toJson(),
+            SignerType.DECRYPT_ZAP_EVENT,
+            decryptResultLauncher,
+            event.pubKey,
+            event.id
+        )
+    }
+}

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

@@ -3,10 +3,10 @@ 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 java.security.MessageDigest
 import kotlin.math.roundToInt
 
 class FileHeader(
@@ -16,16 +16,16 @@ class FileHeader(
     val size: Int,
     val dim: String?,
     val blurHash: String?,
-    val description: String? = null,
+    val alt: String? = null,
     val sensitiveContent: Boolean = false
 ) {
     companion object {
-        suspend fun prepare(fileUrl: String, mimeType: String?, description: String?, sensitiveContent: Boolean, onReady: (FileHeader) -> Unit, onError: () -> Unit) {
+        suspend fun prepare(fileUrl: String, mimeType: String?, alt: String?, sensitiveContent: Boolean, onReady: (FileHeader) -> Unit, onError: () -> Unit) {
             try {
                 val imageData: ByteArray? = ImageDownloader().waitAndGetImage(fileUrl)
 
                 if (imageData != null) {
-                    prepare(imageData, fileUrl, mimeType, description, sensitiveContent, onReady, onError)
+                    prepare(imageData, fileUrl, mimeType, alt, sensitiveContent, onReady, onError)
                 } else {
                     onError()
                 }
@@ -39,15 +39,13 @@ class FileHeader(
             data: ByteArray,
             fileUrl: String,
             mimeType: String?,
-            description: String?,
+            alt: String?,
             sensitiveContent: Boolean,
             onReady: (FileHeader) -> Unit,
             onError: () -> Unit
         ) {
             try {
-                val sha256 = MessageDigest.getInstance("SHA-256")
-
-                val hash = sha256.digest(data).toHexKey()
+                val hash = CryptoUtils.sha256(data).toHexKey()
                 val size = data.size
 
                 val (blurHash, dim) = if (mimeType?.startsWith("image/") == true) {
@@ -81,7 +79,7 @@ class FileHeader(
                     Pair(null, null)
                 }
 
-                onReady(FileHeader(fileUrl, mimeType, hash, size, dim, blurHash, description, sensitiveContent))
+                onReady(FileHeader(fileUrl, mimeType, hash, size, dim, blurHash, alt, sensitiveContent))
             } catch (e: Exception) {
                 Log.e("ImageDownload", "Couldn't convert image in to File Header: ${e.message}")
                 onError()

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

@@ -5,19 +5,29 @@ import okhttp3.OkHttpClient
 import java.net.InetSocketAddress
 import java.net.Proxy
 import java.time.Duration
+import kotlin.properties.Delegates
 
 object HttpClient {
-    private var proxy: Proxy? = null
+    var proxyChangeListeners = ArrayList<() -> Unit>()
+
+    // fires off every time value of the property changes
+    private var internalProxy: Proxy? by Delegates.observable(null) { _, oldValue, newValue ->
+        if (oldValue != newValue) {
+            proxyChangeListeners.forEach {
+                it()
+            }
+        }
+    }
 
     fun start(account: Account?) {
-        this.proxy = account?.proxy
+        this.internalProxy = account?.proxy
     }
 
     fun getHttpClient(): OkHttpClient {
-        val seconds = if (proxy != null) 20L else 10L
+        val seconds = if (internalProxy != null) 20L else 10L
         val duration = Duration.ofSeconds(seconds)
         return OkHttpClient.Builder()
-            .proxy(proxy)
+            .proxy(internalProxy)
             .readTimeout(duration)
             .connectTimeout(duration)
             .writeTimeout(duration)
@@ -25,7 +35,7 @@ object HttpClient {
     }
 
     fun getProxy(): Proxy? {
-        return proxy
+        return internalProxy
     }
 
     fun initProxy(useProxy: Boolean, hostname: String, port: Int): Proxy? {

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

@@ -0,0 +1,79 @@
+package com.vitorpamplona.amethyst.service
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.location.Geocoder
+import android.location.Location
+import android.location.LocationListener
+import android.location.LocationManager
+import android.os.HandlerThread
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import kotlinx.coroutines.flow.MutableStateFlow
+
+class LocationUtil(context: Context) {
+    companion object {
+        const val MIN_TIME: Long = 1000L
+        const val MIN_DISTANCE: Float = 0.0f
+    }
+
+    private val locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
+    private var locationListener: LocationListener? = null
+
+    val locationStateFlow = MutableStateFlow<Location>(Location(LocationManager.NETWORK_PROVIDER))
+    val providerState = mutableStateOf(false)
+    val isStart: MutableState<Boolean> = mutableStateOf(false)
+
+    private val locHandlerThread = HandlerThread("LocationUtil Thread")
+
+    init {
+        locHandlerThread.start()
+    }
+
+    @SuppressLint("MissingPermission")
+    fun start(minTimeMs: Long = MIN_TIME, minDistanceM: Float = MIN_DISTANCE) {
+        locationListener().let {
+            locationListener = it
+            locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, minTimeMs, minDistanceM, it, locHandlerThread.looper)
+        }
+        providerState.value = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
+        isStart.value = true
+    }
+
+    fun stop() {
+        locationListener?.let {
+            locationManager.removeUpdates(it)
+        }
+        isStart.value = false
+    }
+
+    private fun locationListener() = object : LocationListener {
+        override fun onLocationChanged(location: Location) {
+            locationStateFlow.value = location
+        }
+
+        override fun onProviderEnabled(provider: String) {
+            providerState.value = true
+        }
+
+        override fun onProviderDisabled(provider: String) {
+            providerState.value = false
+        }
+    }
+}
+
+class ReverseGeoLocationUtil {
+    suspend fun execute(
+        location: Location,
+        context: Context
+    ): String? {
+        return try {
+            Geocoder(context).getFromLocation(location.latitude, location.longitude, 1)?.firstOrNull()?.let { address ->
+                listOfNotNull(address.locality ?: address.subAdminArea, address.countryCode).joinToString(", ")
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return null
+        }
+    }
+}

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

@@ -1,11 +1,9 @@
 package com.vitorpamplona.amethyst.ui.note
 
 import android.net.Uri
-import com.vitorpamplona.amethyst.model.HexKey
-import com.vitorpamplona.amethyst.model.decodePublicKey
-import com.vitorpamplona.amethyst.model.toHexKey
-
-data class Nip47URI(val pubKeyHex: HexKey, val relayUri: String?, val secret: HexKey?)
+import com.vitorpamplona.amethyst.model.Nip47URI
+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

@@ -1,24 +1,34 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-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.model.LocalCache
 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.AdvertisedRelayListEvent
+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.EmojiPackSelectionEvent
+import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.events.GenericRepostEvent
+import com.vitorpamplona.quartz.events.GiftWrapEvent
+import com.vitorpamplona.quartz.events.LnZapEvent
+import com.vitorpamplona.quartz.events.LnZapPaymentResponseEvent
+import com.vitorpamplona.quartz.events.MetadataEvent
+import com.vitorpamplona.quartz.events.PeopleListEvent
+import com.vitorpamplona.quartz.events.PollNoteEvent
+import com.vitorpamplona.quartz.events.ReactionEvent
+import com.vitorpamplona.quartz.events.ReportEvent
+import com.vitorpamplona.quartz.events.RepostEvent
+import com.vitorpamplona.quartz.events.SealedGossipEvent
+import com.vitorpamplona.quartz.events.StatusEvent
+import com.vitorpamplona.quartz.events.TextNoteEvent
 
 object NostrAccountDataSource : NostrDataSource("AccountData") {
     lateinit var account: Account
@@ -47,6 +57,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,
@@ -111,16 +132,80 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
         )
     )
 
+    fun createGiftWrapsToMeFilter() = TypedFilter(
+        types = COMMON_FEED_TYPES,
+        filter = JsonFilter(
+            kinds = listOf(GiftWrapEvent.kind),
+            tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
+        )
+    )
+
     val accountChannel = requestNewChannel { time, relayUrl ->
         latestEOSEs.addOrUpdate(account.userProfile(), account.defaultNotificationFollowList, relayUrl, time)
     }
 
+    override fun consume(event: Event, relay: Relay) {
+        if (LocalCache.justVerify(event)) {
+            if (event is GiftWrapEvent) {
+                val privateKey = account.keyPair.privKey
+                if (privateKey != null) {
+                    event.cachedGift(privateKey)?.let {
+                        this.consume(it, relay)
+                    }
+                } else if (account.loginWithExternalSigner) {
+                    var cached = ExternalSignerUtils.cachedDecryptedContent[event.id]
+                    if (cached == null) {
+                        ExternalSignerUtils.decrypt(
+                            event.content,
+                            event.pubKey,
+                            event.id,
+                            SignerType.NIP44_DECRYPT
+                        )
+                        cached = ExternalSignerUtils.cachedDecryptedContent[event.id] ?: ""
+                    }
+                    event.cachedGift(account.keyPair.pubKey, cached)?.let {
+                        this.consume(it, relay)
+                    }
+                }
+            }
+
+            if (event is SealedGossipEvent) {
+                val privateKey = account.keyPair.privKey
+                if (privateKey != null) {
+                    event.cachedGossip(privateKey)?.let {
+                        LocalCache.justConsume(it, relay)
+                    }
+                } else if (account.loginWithExternalSigner) {
+                    var cached = ExternalSignerUtils.cachedDecryptedContent[event.id]
+                    if (cached == null) {
+                        ExternalSignerUtils.decrypt(
+                            event.content,
+                            event.pubKey,
+                            event.id,
+                            SignerType.NIP44_DECRYPT
+                        )
+                        cached = ExternalSignerUtils.cachedDecryptedContent[event.id] ?: ""
+                    }
+                    event.cachedGossip(account.keyPair.pubKey, cached)?.let {
+                        LocalCache.justConsume(it, relay)
+                    }
+                }
+
+                // Don't store sealed gossips to avoid rebroadcasting by mistake.
+            } else {
+                LocalCache.justConsume(event, relay)
+            }
+        }
+    }
+
     override fun updateChannelFilters() {
         // gets everthing about the user logged in
         accountChannel.typedFilters = listOf(
             createAccountMetadataFilter(),
             createAccountContactListFilter(),
+            createAccountRelayListFilter(),
             createNotificationFilter(),
+            createGiftWrapsToMeFilter(),
             createAccountReportsFilter(),
             createAccountAcceptedAwardsFilter(),
             createAccountBookmarkListFilter(),
@@ -133,7 +218,6 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
 
         if (this::account.isInitialized) {
             val event = account.createAuthEvent(relay, challenge)
-
             if (event != null) {
                 Client.send(
                     event,

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,32 +1,36 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.User
-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
-    var withUser: User? = null
+    private var withRoom: ChatroomKey? = null
 
-    fun loadMessagesBetween(accountIn: Account, user: User) {
-        account = accountIn
-        withUser = user
+    private val latestEOSEs = EOSEAccount()
+
+    fun loadMessagesBetween(accountIn: Account, withRoom: ChatroomKey) {
+        this.account = accountIn
+        this.withRoom = withRoom
         resetFilters()
     }
 
     fun createMessagesToMeFilter(): TypedFilter? {
-        val myPeer = withUser
+        val myPeer = withRoom
 
         return if (myPeer != null) {
             TypedFilter(
                 types = setOf(FeedType.PRIVATE_DMS),
                 filter = JsonFilter(
                     kinds = listOf(PrivateDmEvent.kind),
-                    authors = listOf(myPeer.pubkeyHex),
-                    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
+                    authors = myPeer.users.map { it },
+                    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
+                    since = latestEOSEs.users[account.userProfile()]?.followList?.get(withRoom.hashCode().toString())?.relayList
                 )
             )
         } else {
@@ -35,7 +39,7 @@ object NostrChatroomDataSource : NostrDataSource("ChatroomFeed") {
     }
 
     fun createMessagesFromMeFilter(): TypedFilter? {
-        val myPeer = withUser
+        val myPeer = withRoom
 
         return if (myPeer != null) {
             TypedFilter(
@@ -43,7 +47,8 @@ object NostrChatroomDataSource : NostrDataSource("ChatroomFeed") {
                 filter = JsonFilter(
                     kinds = listOf(PrivateDmEvent.kind),
                     authors = listOf(account.userProfile().pubkeyHex),
-                    tags = mapOf("p" to listOf(myPeer.pubkeyHex))
+                    tags = mapOf("p" to myPeer.users.map { it }),
+                    since = latestEOSEs.users[account.userProfile()]?.followList?.get(withRoom.hashCode().toString())?.relayList
                 )
             )
         } else {
@@ -51,9 +56,14 @@ object NostrChatroomDataSource : NostrDataSource("ChatroomFeed") {
         }
     }
 
-    val inandoutChannel = requestNewChannel()
+    val inandoutChannel = requestNewChannel { time, relayUrl ->
+        latestEOSEs.addOrUpdate(account.userProfile(), withRoom.hashCode().toString(), relayUrl, time)
+    }
 
     override fun updateChannelFilters() {
-        inandoutChannel.typedFilters = listOfNotNull(createMessagesToMeFilter(), createMessagesFromMeFilter()).ifEmpty { null }
+        inandoutChannel.typedFilters = listOfNotNull(
+            createMessagesToMeFilter(),
+            createMessagesFromMeFilter()
+        ).ifEmpty { null }
     }
 }

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 {
@@ -39,7 +43,7 @@ abstract class NostrDataSource(val debugName: String) {
                     eventCounter = eventCounter + Pair(key, Counter(1))
                 }
 
-                LocalCache.verifyAndConsume(event, relay)
+                consume(event, relay)
             }
         }
 
@@ -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,6 +177,16 @@ 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()

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
@@ -92,6 +105,26 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
         )
     }
 
+    fun createLiveStreamGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultDiscoveryFollowList)
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter = JsonFilter(
+                kinds = listOf(LiveActivitiesChatMessageEvent.kind, LiveActivitiesEvent.kind),
+                tags = mapOf(
+                    "g" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 300,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+            )
+        )
+    }
+
     fun createPublicChatsTagsFilter(): TypedFilter? {
         val hashToLoad = account.selectedTagsFollowList(account.defaultDiscoveryFollowList)
 
@@ -112,6 +145,26 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
         )
     }
 
+    fun createPublicChatsGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultDiscoveryFollowList)
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.PUBLIC_CHATS),
+            filter = JsonFilter(
+                kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind, ChannelMessageEvent.kind),
+                tags = mapOf(
+                    "g" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 300,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+            )
+        )
+    }
+
     fun createCommunitiesTagsFilter(): TypedFilter? {
         val hashToLoad = account.selectedTagsFollowList(account.defaultDiscoveryFollowList)
 
@@ -132,18 +185,41 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
         )
     }
 
+    fun createCommunitiesGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultDiscoveryFollowList)
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter = JsonFilter(
+                kinds = listOf(CommunityDefinitionEvent.kind, CommunityPostApprovalEvent.kind),
+                tags = mapOf(
+                    "g" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 300,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+            )
+        )
+    }
+
     val discoveryFeedChannel = requestNewChannel() { time, relayUrl ->
         latestEOSEs.addOrUpdate(account.userProfile(), account.defaultDiscoveryFollowList, relayUrl, time)
     }
 
     override fun updateChannelFilters() {
-        discoveryFeedChannel.typedFilters = listOfNotNull(
-            createLiveStreamFilter(),
-            createPublicChatFilter(),
-            createCommunitiesFilter(),
-            createLiveStreamTagsFilter(),
-            createPublicChatsTagsFilter(),
-            createCommunitiesTagsFilter()
+        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

@@ -0,0 +1,47 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.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
+
+    fun createLoadHashtagFilter(): TypedFilter? {
+        val hashToLoad = geohashToWatch ?: return null
+
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter = JsonFilter(
+                tags = mapOf(
+                    "g" to listOf(
+                        hashToLoad
+                    )
+                ),
+                kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind, LiveActivitiesChatMessageEvent.kind, ClassifiedsEvent.kind, HighlightEvent.kind, AudioTrackEvent.kind, AudioHeaderEvent.kind),
+                limit = 200
+            )
+        )
+    }
+
+    val loadGeohashChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        loadGeohashChannel.typedFilters = listOfNotNull(createLoadHashtagFilter()).ifEmpty { null }
+    }
+
+    fun loadHashtag(tag: String?) {
+        geohashToWatch = tag
+
+        invalidateFilters()
+    }
+}

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

@@ -1,13 +1,17 @@
 package com.vitorpamplona.amethyst.service
 
-import androidx.compose.ui.text.capitalize
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-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
@@ -26,7 +30,7 @@ object NostrHashtagDataSource : NostrDataSource("SingleHashtagFeed") {
                         hashToLoad.capitalize()
                     )
                 ),
-                kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.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())
@@ -104,6 +101,26 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
         )
     }
 
+    fun createFollowGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultHomeFollowList) ?: emptySet()
+
+        if (hashToLoad.isEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.FOLLOWS),
+            filter = JsonFilter(
+                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())
+                    }.flatten()
+                ),
+                limit = 100,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultHomeFollowList)?.relayList
+            )
+        )
+    }
+
     fun createFollowCommunitiesFilter(): TypedFilter? {
         val communitiesToLoad = account.selectedCommunitiesFollowList(account.defaultHomeFollowList) ?: emptySet()
 
@@ -117,6 +134,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
                     LongTextNoteEvent.kind,
                     ClassifiedsEvent.kind,
                     HighlightEvent.kind,
+                    AudioHeaderEvent.kind,
                     AudioTrackEvent.kind,
                     PinListEvent.kind,
                     CommunityPostApprovalEvent.kind
@@ -135,6 +153,11 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
     }
 
     override fun updateChannelFilters() {
-        followAccountChannel.typedFilters = listOfNotNull(createFollowAccountsFilter(), createFollowCommunitiesFilter(), createFollowTagsFilter()).ifEmpty { null }
+        followAccountChannel.typedFilters = listOfNotNull(
+            createFollowAccountsFilter(),
+            createFollowCommunitiesFilter(),
+            createFollowTagsFilter(),
+            createFollowGeohashesFilter()
+        ).ifEmpty { null }
     }
 }

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,
@@ -44,7 +44,7 @@ class NostrLnZapPaymentResponseDataSource(
     override fun auth(relay: Relay, challenge: String) {
         super.auth(relay, challenge)
 
-        val event = RelayAuthEvent.create(relay.url, challenge, authSigningKey)
+        val event = RelayAuthEvent.create(relay.url, challenge, "", authSigningKey)
         Client.send(
             event,
             relay.url

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

@@ -1,15 +1,15 @@
 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("SingleEventFeed") {
+object NostrSearchEventOrUserDataSource : NostrDataSource("SearchEventFeed") {
     private var searchString: String? = null
 
     private fun createAnythingWithIDFilter(): List<TypedFilter>? {
@@ -54,6 +54,29 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
             TypedFilter(
                 types = setOf(FeedType.SEARCH),
                 filter = JsonFilter(
+                    kinds = listOf(
+                        TextNoteEvent.kind, LongTextNoteEvent.kind, BadgeDefinitionEvent.kind,
+                        PeopleListEvent.kind, BookmarkListEvent.kind, AudioHeaderEvent.kind,
+                        AudioTrackEvent.kind, PinListEvent.kind, PollNoteEvent.kind,
+                        ChannelCreateEvent.kind
+                    ),
+                    search = mySearchString,
+                    limit = 100
+                )
+            ),
+            TypedFilter(
+                types = setOf(FeedType.SEARCH),
+                filter = JsonFilter(
+                    kinds = listOf(
+                        ChannelMetadataEvent.kind,
+                        ClassifiedsEvent.kind,
+                        CommunityDefinitionEvent.kind,
+                        EmojiPackEvent.kind,
+                        HighlightEvent.kind,
+                        LiveActivitiesEvent.kind,
+                        PollNoteEvent.kind,
+                        NNSEvent.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,17 +2,17 @@ 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>()
     private var addressesToWatch = setOf<Note>()
 
-    private fun createTagToAddressFilter(): List<TypedFilter>? {
+    private fun createReactionsToWatchInAddressFilter(): List<TypedFilter>? {
         val addressesToWatch = eventsToWatch.filter { it.address() != null } + addressesToWatch
 
         if (addressesToWatch.isEmpty()) {
@@ -25,12 +25,15 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                     types = COMMON_FEED_TYPES,
                     filter = JsonFilter(
                         kinds = listOf(
-                            TextNoteEvent.kind, LongTextNoteEvent.kind,
-                            ReactionEvent.kind, RepostEvent.kind, GenericRepostEvent.kind, ReportEvent.kind,
-                            LnZapEvent.kind, LnZapRequestEvent.kind,
-                            BadgeAwardEvent.kind, BadgeDefinitionEvent.kind, BadgeProfilesEvent.kind,
-                            PollNoteEvent.kind, AudioTrackEvent.kind, PinListEvent.kind,
-                            PeopleListEvent.kind, BookmarkListEvent.kind
+                            TextNoteEvent.kind,
+                            ReactionEvent.kind,
+                            RepostEvent.kind,
+                            GenericRepostEvent.kind,
+                            ReportEvent.kind,
+                            LnZapEvent.kind,
+                            PollNoteEvent.kind,
+                            CommunityPostApprovalEvent.kind,
+                            LiveActivitiesChatMessageEvent.kind
                         ),
                         tags = mapOf("a" to listOf(aTag.toTag())),
                         since = it.lastReactionsDownloadTime,
@@ -55,7 +58,8 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                         types = COMMON_FEED_TYPES,
                         filter = JsonFilter(
                             kinds = listOf(aTag.kind),
-                            authors = listOf(aTag.pubKeyHex)
+                            authors = listOf(aTag.pubKeyHex),
+                            limit = 1000 // Max amount of "replies" to download on a specific event.
                         )
                     )
                 } else {
@@ -64,7 +68,8 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                         filter = JsonFilter(
                             kinds = listOf(aTag.kind),
                             tags = mapOf("d" to listOf(aTag.dTag)),
-                            authors = listOf(aTag.pubKeyHex)
+                            authors = listOf(aTag.pubKeyHex),
+                            limit = 1000 // Max amount of "replies" to download on a specific event.
                         )
                     )
                 }
@@ -85,17 +90,12 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                 filter = JsonFilter(
                     kinds = listOf(
                         TextNoteEvent.kind,
-                        LongTextNoteEvent.kind,
                         ReactionEvent.kind,
                         RepostEvent.kind,
                         GenericRepostEvent.kind,
                         ReportEvent.kind,
                         LnZapEvent.kind,
-                        LnZapRequestEvent.kind,
-                        PollNoteEvent.kind,
-                        HighlightEvent.kind,
-                        AudioTrackEvent.kind,
-                        PinListEvent.kind
+                        PollNoteEvent.kind
                     ),
                     tags = mapOf("e" to listOf(it.idHex)),
                     since = it.lastReactionsDownloadTime,
@@ -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 {
@@ -154,7 +157,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
         val reactions = createRepliesAndReactionsFilter()
         val missing = createLoadEventsIfNotLoadedFilter()
         val addresses = createAddressFilter()
-        val addressReactions = createTagToAddressFilter()
+        val addressReactions = createReactionsToWatchInAddressFilter()
 
         singleEventChannel.typedFilters = listOfNotNull(missing, addresses, reactions, addressReactions).flatten().ifEmpty { null }
     }

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
@@ -51,11 +47,35 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
         )
     }
 
+    fun createFollowGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultStoriesFollowList)
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter = JsonFilter(
+                kinds = listOf(FileHeaderEvent.kind, FileStorageHeaderEvent.kind),
+                tags = mapOf(
+                    "g" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 100,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultStoriesFollowList)?.relayList
+            )
+        )
+    }
+
     val videoFeedChannel = requestNewChannel() { time, relayUrl ->
         latestEOSEs.addOrUpdate(account.userProfile(), account.defaultStoriesFollowList, relayUrl, time)
     }
 
     override fun updateChannelFilters() {
-        videoFeedChannel.typedFilters = listOfNotNull(createContextualFilter(), createFollowTagsFilter()).ifEmpty { null }
+        videoFeedChannel.typedFilters = listOfNotNull(
+            createContextualFilter(),
+            createFollowTagsFilter(),
+            createFollowGeohashesFilter()
+        ).ifEmpty { null }
     }
 }

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

@@ -28,7 +28,9 @@ object OnlineChecker {
                 .get()
                 .build()
 
-            val result = HttpClient.getHttpClient().newCall(request).execute().code == 200
+            val result = HttpClient.getHttpClient().newCall(request).execute().use {
+                it.isSuccessful
+            }
             checkOnlineCache.put(url, OnlineCheckResult(System.currentTimeMillis(), result))
             result
         } catch (e: Exception) {

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

@@ -0,0 +1,17 @@
+package com.vitorpamplona.amethyst.service
+
+import android.content.Context
+
+object PackageUtils {
+    private fun isPackageInstalled(context: Context, target: String): Boolean {
+        return context.packageManager.getInstalledApplications(0).find { info -> info.packageName == target } != null
+    }
+
+    fun isOrbotInstalled(context: Context): Boolean {
+        return isPackageInstalled(context, "org.torproject.android")
+    }
+
+    fun isAmberInstalled(context: Context): Boolean {
+        return isPackageInstalled(context, "com.greenart7c3.nostrsigner")
+    }
+}

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/connectivitystatus/ConnectivityStatus.kt

@@ -7,16 +7,9 @@ object ConnectivityStatus {
     private val onMobileData = mutableStateOf(false)
     val isOnMobileData: MutableState<Boolean> = onMobileData
 
-    private val onWifi = mutableStateOf(false)
-    val isOnWifi: MutableState<Boolean> = onWifi
-
     fun updateConnectivityStatus(isOnMobileData: Boolean, isOnWifi: Boolean) {
         if (onMobileData.value != isOnMobileData) {
             onMobileData.value = isOnMobileData
         }
-
-        if (onWifi.value != isOnWifi) {
-            onWifi.value = isOnWifi
-        }
     }
 }

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

@@ -4,17 +4,14 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.service.HttpClient
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-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 nostr.postr.Bech32
-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() {
@@ -28,116 +25,85 @@ 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 = {
-                onSuccess(Bech32.encodeBytes("lnurl", it.toByteArray(), Bech32.Encoding.Bech32))
+                onSuccess(it.toByteArray().toLnUrl())
             },
             onError = onError
         )
     }
 
-    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(
@@ -178,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/AppDefinitionEvent.kt

@@ -1,41 +0,0 @@
-package com.vitorpamplona.amethyst.service.model
-
-import android.util.Log
-import androidx.compose.runtime.Immutable
-import com.vitorpamplona.amethyst.model.HexKey
-import com.vitorpamplona.amethyst.model.UserMetadata
-import java.io.ByteArrayInputStream
-
-@Immutable
-class AppDefinitionEvent(
-    id: HexKey,
-    pubKey: HexKey,
-    createdAt: Long,
-    tags: List<List<String>>,
-    content: String,
-    sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
-    override fun dTag() = tags.firstOrNull { it.size > 1 && it[0] == "d" }?.get(1) ?: ""
-    override fun address() = ATag(kind, pubKey, dTag(), null)
-
-    fun appMetaData() = try {
-        MetadataEvent.metadataParser.readValue(
-            ByteArrayInputStream(content.toByteArray(Charsets.UTF_8)),
-            UserMetadata::class.java
-        )
-    } catch (e: Exception) {
-        e.printStackTrace()
-        Log.w("MT", "Content Parse Error ${e.localizedMessage} $content")
-        null
-    }
-
-    fun supportedKinds() = tags.filter { it.size > 1 && it[0] == "k" }.mapNotNull {
-        runCatching { it[1].toInt() }.getOrNull()
-    }
-
-    fun publishedAt() = tags.firstOrNull { it.size > 1 && it[0] == "published_at" }?.get(1)
-
-    companion object {
-        const val kind = 31990
-    }
-}

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

@@ -1,56 +0,0 @@
-package com.vitorpamplona.amethyst.service.model
-
-import androidx.compose.runtime.Immutable
-import com.vitorpamplona.amethyst.model.HexKey
-import com.vitorpamplona.amethyst.model.TimeUtils
-import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
-
-@Immutable
-class BookmarkListEvent(
-    id: HexKey,
-    pubKey: HexKey,
-    createdAt: Long,
-    tags: List<List<String>>,
-    content: String,
-    sig: HexKey
-) : GeneralListEvent(id, pubKey, createdAt, kind, tags, content, sig) {
-    companion object {
-        const val kind = 30001
-
-        fun create(
-            name: String = "",
-
-            events: List<String>? = null,
-            users: List<String>? = null,
-            addresses: List<ATag>? = null,
-
-            privEvents: List<String>? = null,
-            privUsers: List<String>? = null,
-            privAddresses: List<ATag>? = null,
-
-            privateKey: ByteArray,
-            createdAt: Long = TimeUtils.now()
-        ): BookmarkListEvent {
-            val pubKey = Utils.pubkeyCreate(privateKey)
-            val content = createPrivateTags(privEvents, privUsers, privAddresses, privateKey, pubKey)
-
-            val tags = mutableListOf<List<String>>()
-            tags.add(listOf("d", name))
-
-            events?.forEach {
-                tags.add(listOf("e", it))
-            }
-            users?.forEach {
-                tags.add(listOf("p", it))
-            }
-            addresses?.forEach {
-                tags.add(listOf("a", it.toTag()))
-            }
-
-            val id = generateId(pubKey.toHexKey(), createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
-            return BookmarkListEvent(id.toHexKey(), pubKey.toHexKey(), createdAt, tags, content, sig.toHexKey())
-        }
-    }
-}

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

@@ -1,32 +0,0 @@
-package com.vitorpamplona.amethyst.service.model
-
-import androidx.compose.runtime.Immutable
-import com.vitorpamplona.amethyst.model.HexKey
-import com.vitorpamplona.amethyst.model.TimeUtils
-import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
-
-@Immutable
-class DeletionEvent(
-    id: HexKey,
-    pubKey: HexKey,
-    createdAt: Long,
-    tags: List<List<String>>,
-    content: String,
-    sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun deleteEvents() = tags.map { it[1] }
-
-    companion object {
-        const val kind = 5
-
-        fun create(deleteEvents: List<String>, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): DeletionEvent {
-            val content = ""
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
-            val tags = deleteEvents.map { listOf("e", it) }
-            val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
-            return DeletionEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
-        }
-    }
-}

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

@@ -1,43 +0,0 @@
-package com.vitorpamplona.amethyst.service.model
-
-import androidx.compose.runtime.Immutable
-import com.vitorpamplona.amethyst.model.HexKey
-import com.vitorpamplona.amethyst.model.TimeUtils
-import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
-
-@Immutable
-class EmojiPackSelectionEvent(
-    id: HexKey,
-    pubKey: HexKey,
-    createdAt: Long,
-    tags: List<List<String>>,
-    content: String,
-    sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
-
-    override fun dTag() = ""
-    override fun address() = ATag(kind, pubKey, dTag(), null)
-
-    companion object {
-        const val kind = 10030
-
-        fun create(
-            listOfEmojiPacks: List<ATag>?,
-            privateKey: ByteArray,
-            createdAt: Long = TimeUtils.now()
-        ): EmojiPackSelectionEvent {
-            val msg = ""
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
-            val tags = mutableListOf<List<String>>()
-
-            listOfEmojiPacks?.forEach {
-                tags.add(listOf("a", it.toTag()))
-            }
-
-            val id = generateId(pubKey, createdAt, kind, tags, msg)
-            val sig = Utils.sign(id, privateKey)
-            return EmojiPackSelectionEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
-        }
-    }
-}

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

@@ -1,356 +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.nip19.Nip19
-import fr.acinq.secp256k1.Hex
-import fr.acinq.secp256k1.Secp256k1
-import nostr.postr.Utils
-import nostr.postr.toHex
-import java.lang.reflect.Type
-import java.math.BigDecimal
-import java.security.MessageDigest
-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 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 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 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 isTaggedHashes(hashtags: Set<String>) = tags.any { it.size > 1 && it[0] == "t" && 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 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 (!secp256k1.verifySchnorr(Hex.decode(sig), Hex.decode(id), Hex.decode(pubKey))) {
-            throw Exception("""Bad signature!""")
-        }
-    }
-
-    override fun hasValidSignature(): Boolean {
-        return try {
-            id.contentEquals(generateId()) && secp256k1.verifySchnorr(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 MessageDigest.getInstance("SHA-256").digest(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,
-                pubKey = jsonObject.get("pubkey").asString,
-                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 }
-                },
-                content = jsonObject.get("content").asString,
-                sig = jsonObject.get("sig").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 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.toHex())
-    }
-
-    companion object {
-        private val secp256k1 = Secp256k1.get()
-
-        val gson: Gson = GsonBuilder()
-            .disableHtmlEscaping()
-            .registerTypeAdapter(Event::class.java, EventSerializer())
-            .registerTypeAdapter(Event::class.java, EventDeserializer())
-            .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 = when (kind) {
-            AppDefinitionEvent.kind -> AppDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
-            AppRecommendationEvent.kind -> AppRecommendationEvent(id, pubKey, createdAt, tags, content, sig)
-            AudioTrackEvent.kind -> AudioTrackEvent(id, pubKey, createdAt, tags, content, sig)
-            BadgeAwardEvent.kind -> BadgeAwardEvent(id, pubKey, createdAt, tags, content, sig)
-            BadgeDefinitionEvent.kind -> BadgeDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
-            BadgeProfilesEvent.kind -> BadgeProfilesEvent(id, pubKey, createdAt, tags, content, sig)
-            BookmarkListEvent.kind -> BookmarkListEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelCreateEvent.kind -> ChannelCreateEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelHideMessageEvent.kind -> ChannelHideMessageEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelMessageEvent.kind -> ChannelMessageEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelMetadataEvent.kind -> ChannelMetadataEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelMuteUserEvent.kind -> ChannelMuteUserEvent(id, pubKey, createdAt, tags, content, sig)
-            ClassifiedsEvent.kind -> ClassifiedsEvent(id, pubKey, createdAt, tags, content, sig)
-            CommunityDefinitionEvent.kind -> CommunityDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
-            CommunityPostApprovalEvent.kind -> CommunityPostApprovalEvent(id, pubKey, createdAt, tags, content, sig)
-            ContactListEvent.kind -> ContactListEvent(id, pubKey, createdAt, tags, content, sig)
-            DeletionEvent.kind -> DeletionEvent(id, pubKey, createdAt, tags, content, sig)
-            EmojiPackEvent.kind -> EmojiPackEvent(id, pubKey, createdAt, tags, content, sig)
-            EmojiPackSelectionEvent.kind -> EmojiPackSelectionEvent(id, pubKey, createdAt, tags, content, sig)
-
-            FileHeaderEvent.kind -> FileHeaderEvent(id, pubKey, createdAt, tags, content, sig)
-            FileStorageEvent.kind -> FileStorageEvent(id, pubKey, createdAt, tags, content, sig)
-            FileStorageHeaderEvent.kind -> FileStorageHeaderEvent(id, pubKey, createdAt, tags, content, sig)
-            GenericRepostEvent.kind -> GenericRepostEvent(id, pubKey, createdAt, tags, content, sig)
-            HighlightEvent.kind -> HighlightEvent(id, pubKey, createdAt, tags, content, sig)
-            LiveActivitiesEvent.kind -> LiveActivitiesEvent(id, pubKey, createdAt, tags, content, sig)
-            LiveActivitiesChatMessageEvent.kind -> LiveActivitiesChatMessageEvent(id, pubKey, createdAt, tags, content, sig)
-            LnZapEvent.kind -> LnZapEvent(id, pubKey, createdAt, tags, content, sig)
-            LnZapPaymentRequestEvent.kind -> LnZapPaymentRequestEvent(id, pubKey, createdAt, tags, content, sig)
-            LnZapPaymentResponseEvent.kind -> LnZapPaymentResponseEvent(id, pubKey, createdAt, tags, content, sig)
-            LnZapRequestEvent.kind -> LnZapRequestEvent(id, pubKey, createdAt, tags, content, sig)
-            LongTextNoteEvent.kind -> LongTextNoteEvent(id, pubKey, createdAt, tags, content, sig)
-            MetadataEvent.kind -> MetadataEvent(id, pubKey, createdAt, tags, content, sig)
-            NNSEvent.kind -> NNSEvent(id, pubKey, createdAt, tags, content, sig)
-            PeopleListEvent.kind -> PeopleListEvent(id, pubKey, createdAt, tags, content, sig)
-            PinListEvent.kind -> PinListEvent(id, pubKey, createdAt, tags, content, sig)
-            PollNoteEvent.kind -> PollNoteEvent(id, pubKey, createdAt, tags, content, sig)
-            PrivateDmEvent.kind -> PrivateDmEvent(id, pubKey, createdAt, tags, content, sig)
-            ReactionEvent.kind -> ReactionEvent(id, pubKey, createdAt, tags, content, sig)
-            RecommendRelayEvent.kind -> RecommendRelayEvent(id, pubKey, createdAt, tags, content, sig, lenient)
-            RelaySetEvent.kind -> RelaySetEvent(id, pubKey, createdAt, tags, content, sig)
-            ReportEvent.kind -> ReportEvent(id, pubKey, createdAt, tags, content, sig)
-            RepostEvent.kind -> RepostEvent(id, pubKey, createdAt, tags, content, sig)
-            TextNoteEvent.kind -> TextNoteEvent(id, pubKey, createdAt, tags, content, sig)
-            else -> this
-        }
-
-        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 MessageDigest.getInstance("SHA-256").digest(rawEventJson.toByteArray())
-        }
-
-        fun create(privateKey: ByteArray, kind: Int, tags: List<List<String>> = emptyList(), content: String = "", createdAt: Long = TimeUtils.now()): Event {
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
-            val id = Companion.generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.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/LnZapRequestEvent.kt

@@ -1,182 +0,0 @@
-package com.vitorpamplona.amethyst.service.model
-
-import androidx.compose.runtime.Immutable
-import com.vitorpamplona.amethyst.model.*
-import nostr.postr.Bech32
-import nostr.postr.Utils
-import java.nio.charset.Charset
-import java.security.MessageDigest
-import java.security.SecureRandom
-import java.util.*
-import javax.crypto.BadPaddingException
-import javax.crypto.Cipher
-import javax.crypto.spec.IvParameterSpec
-import javax.crypto.spec.SecretKeySpec
-
-@Immutable
-class LnZapRequestEvent(
-    id: HexKey,
-    pubKey: HexKey,
-    createdAt: Long,
-    tags: List<List<String>>,
-    content: String,
-    sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-
-    @Transient
-    private var privateZapEvent: Event? = null
-
-    fun zappedPost() = tags.filter { it.size > 1 && it[0] == "e" }.map { it[1] }
-
-    fun zappedAuthor() = tags.filter { it.size > 1 && it[0] == "p" }.map { it[1] }
-
-    fun isPrivateZap() = tags.any { t -> t.size >= 2 && t[0] == "anon" && t[1].isNotBlank() }
-
-    fun getPrivateZapEvent(loggedInUserPrivKey: ByteArray, pubKey: HexKey): Event? {
-        if (privateZapEvent != null) return privateZapEvent
-
-        val anonTag = tags.firstOrNull { t -> t.size >= 2 && t[0] == "anon" }
-        if (anonTag != null) {
-            val encnote = anonTag[1]
-            if (encnote.isNotBlank()) {
-                try {
-                    val note = decryptPrivateZapMessage(encnote, loggedInUserPrivKey, pubKey.hexToByteArray())
-                    val decryptedEvent = fromJson(note)
-                    if (decryptedEvent.kind == 9733) {
-                        privateZapEvent = decryptedEvent
-                        return privateZapEvent
-                    }
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                }
-            }
-        }
-        return null
-    }
-
-    companion object {
-        const val kind = 9734
-
-        fun create(
-            originalNote: EventInterface,
-            relays: Set<String>,
-            privateKey: ByteArray,
-            pollOption: Int?,
-            message: String,
-            zapType: LnZapEvent.ZapType,
-            createdAt: Long = TimeUtils.now()
-        ): LnZapRequestEvent {
-            var content = message
-            var privkey = privateKey
-            var pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
-            var tags = listOf(
-                listOf("e", originalNote.id()),
-                listOf("p", originalNote.pubKey()),
-                listOf("relays") + relays
-            )
-            if (originalNote is AddressableEvent) {
-                tags = tags + listOf(listOf("a", originalNote.address().toTag()))
-            }
-            if (pollOption != null && pollOption >= 0) {
-                tags = tags + listOf(listOf(POLL_OPTION, pollOption.toString()))
-            }
-            if (zapType == LnZapEvent.ZapType.ANONYMOUS) {
-                tags = tags + listOf(listOf("anon", ""))
-                privkey = Utils.privkeyCreate()
-                pubKey = Utils.pubkeyCreate(privkey).toHexKey()
-            } else if (zapType == LnZapEvent.ZapType.PRIVATE) {
-                var encryptionPrivateKey = createEncryptionPrivateKey(privateKey.toHexKey(), originalNote.id(), createdAt)
-                var noteJson = (create(privkey, 9733, listOf(tags[0], tags[1]), message)).toJson()
-                var encryptedContent = encryptPrivateZapMessage(noteJson, encryptionPrivateKey, originalNote.pubKey().hexToByteArray())
-                tags = tags + listOf(listOf("anon", encryptedContent))
-                content = "" // make sure public content is empty, as the content is encrypted
-                privkey = encryptionPrivateKey // sign event with generated privkey
-                pubKey = Utils.pubkeyCreate(encryptionPrivateKey).toHexKey() // updated event with according pubkey
-            }
-            val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privkey)
-            return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
-        }
-
-        fun create(
-            userHex: String,
-            relays: Set<String>,
-            privateKey: ByteArray,
-            message: String,
-            zapType: LnZapEvent.ZapType,
-            createdAt: Long = TimeUtils.now()
-        ): LnZapRequestEvent {
-            var content = message
-            var privkey = privateKey
-            var pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
-            var tags = listOf(
-                listOf("p", userHex),
-                listOf("relays") + relays
-            )
-            if (zapType == LnZapEvent.ZapType.ANONYMOUS) {
-                privkey = Utils.privkeyCreate()
-                pubKey = Utils.pubkeyCreate(privkey).toHexKey()
-                tags = tags + listOf(listOf("anon", ""))
-            } else if (zapType == LnZapEvent.ZapType.PRIVATE) {
-                var encryptionPrivateKey = createEncryptionPrivateKey(privateKey.toHexKey(), userHex, createdAt)
-                var noteJson = (create(privkey, 9733, listOf(tags[0], tags[1]), message)).toJson()
-                var encryptedContent = encryptPrivateZapMessage(noteJson, encryptionPrivateKey, userHex.hexToByteArray())
-                tags = tags + listOf(listOf("anon", encryptedContent))
-                content = ""
-                privkey = encryptionPrivateKey
-                pubKey = Utils.pubkeyCreate(encryptionPrivateKey).toHexKey()
-            }
-            val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privkey)
-            return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
-        }
-
-        fun createEncryptionPrivateKey(privkey: String, id: String, createdAt: Long): ByteArray {
-            var str = privkey + id + createdAt.toString()
-            var strbyte = str.toByteArray(Charset.forName("utf-8"))
-            return MessageDigest.getInstance("SHA-256").digest(strbyte)
-        }
-
-        private fun encryptPrivateZapMessage(msg: String, privkey: ByteArray, pubkey: ByteArray): String {
-            var sharedSecret = Utils.getSharedSecret(privkey, pubkey)
-            val iv = ByteArray(16)
-            SecureRandom().nextBytes(iv)
-
-            val keySpec = SecretKeySpec(sharedSecret, "AES")
-            val ivSpec = IvParameterSpec(iv)
-
-            var utf8message = msg.toByteArray(Charset.forName("utf-8"))
-            val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
-            cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec)
-            val encryptedMsg = cipher.doFinal(utf8message)
-
-            val encryptedMsgBech32 = Bech32.encode("pzap", Bech32.eight2five(encryptedMsg), Bech32.Encoding.Bech32)
-            val ivBech32 = Bech32.encode("iv", Bech32.eight2five(iv), Bech32.Encoding.Bech32)
-
-            return encryptedMsgBech32 + "_" + ivBech32
-        }
-
-        private fun decryptPrivateZapMessage(msg: String, privkey: ByteArray, pubkey: ByteArray): String {
-            var sharedSecret = Utils.getSharedSecret(privkey, pubkey)
-            if (sharedSecret.size != 16 && sharedSecret.size != 32) {
-                throw IllegalArgumentException("Invalid shared secret size")
-            }
-            val parts = msg.split("_")
-            if (parts.size != 2) {
-                throw IllegalArgumentException("Invalid message format")
-            }
-            val iv = parts[1].run { Bech32.decode(this).second }
-            val encryptedMsg = parts.first().run { Bech32.decode(this).second }
-            val encryptedBytes = Bech32.five2eight(encryptedMsg, 0)
-            val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
-            cipher.init(Cipher.DECRYPT_MODE, SecretKeySpec(sharedSecret, "AES"), IvParameterSpec(Bech32.five2eight(iv, 0)))
-
-            try {
-                val decryptedMsgBytes = cipher.doFinal(encryptedBytes)
-                return String(decryptedMsgBytes)
-            } catch (ex: BadPaddingException) {
-                throw IllegalArgumentException("Bad padding: ${ex.message}")
-            }
-        }
-    }
-}

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

@@ -1,36 +0,0 @@
-package com.vitorpamplona.amethyst.service.model
-
-import androidx.compose.runtime.Immutable
-import com.vitorpamplona.amethyst.model.HexKey
-import com.vitorpamplona.amethyst.model.TimeUtils
-import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
-
-@Immutable
-class RelayAuthEvent(
-    id: HexKey,
-    pubKey: HexKey,
-    createdAt: Long,
-    tags: List<List<String>>,
-    content: String,
-    sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun relay() = tags.firstOrNull() { it.size > 1 && it[0] == "relay" }?.get(1)
-    fun challenge() = tags.firstOrNull() { it.size > 1 && it[0] == "challenge" }?.get(1)
-
-    companion object {
-        const val kind = 22242
-
-        fun create(relay: String, challenge: String, privateKey: ByteArray, createdAt: Long = TimeUtils.now()): RelayAuthEvent {
-            val content = ""
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
-            val tags = listOf(
-                listOf("relay", relay),
-                listOf("challenge", challenge)
-            )
-            val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
-            return RelayAuthEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
-        }
-    }
-}

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,172 +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 nostr.postr.Bech32
-import nostr.postr.bechToBytes
-import nostr.postr.toByteArray
-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 Bech32.encodeBytes(hrp = "nevent", fullArray, Bech32.Encoding.Bech32)
-    }
-}

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]
-            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

@@ -5,52 +5,202 @@ import android.content.Context
 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.LocalCache
-import com.vitorpamplona.amethyst.service.model.Event
-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.ExternalSignerUtils
+import com.vitorpamplona.amethyst.service.SignerType
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendDMNotification
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendZapNotification
 import com.vitorpamplona.amethyst.ui.note.showAmount
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
+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 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) {
-                // adds to database
-                LocalCache.verifyAndConsume(event, null)
+    suspend fun consume(event: GiftWrapEvent) {
+        if (!LocalCache.justVerify(event)) return
+        if (!notificationManager().areNotificationsEnabled()) return
 
-                when (event) {
-                    is PrivateDmEvent -> notify(event)
-                    is LnZapEvent -> notify(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 || acc.loginWithExternalSigner)) {
+                consumeIfMatchesAccount(event, acc)
+            }
+        }
+    }
+
+    private suspend fun consumeIfMatchesAccount(pushWrappedEvent: GiftWrapEvent, account: Account) {
+        val key = account.keyPair.privKey
+        if (account.loginWithExternalSigner) {
+            var cached = ExternalSignerUtils.cachedDecryptedContent[pushWrappedEvent.id]
+            if (cached == null) {
+                ExternalSignerUtils.decrypt(
+                    pushWrappedEvent.content,
+                    pushWrappedEvent.pubKey,
+                    pushWrappedEvent.id,
+                    SignerType.NIP44_DECRYPT
+                )
+                cached = ExternalSignerUtils.cachedDecryptedContent[pushWrappedEvent.id] ?: ""
+            }
+            pushWrappedEvent.unwrap(cached)?.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)
+                    }
+                }
+            }
+        } else if (key != null) {
+            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)
+                    }
                 }
             }
         }
     }
 
-    private fun notify(event: PrivateDmEvent) {
+    private fun unwrapAndConsume(event: Event, account: Account): Event? {
+        if (!LocalCache.justVerify(event)) return null
+
+        return when (event) {
+            is GiftWrapEvent -> {
+                val key = account.keyPair.privKey
+                if (key != null) {
+                    event.cachedGift(key)?.let {
+                        unwrapAndConsume(it, account)
+                    }
+                } else if (account.loginWithExternalSigner) {
+                    var cached = ExternalSignerUtils.cachedDecryptedContent[event.id]
+                    if (cached == null) {
+                        ExternalSignerUtils.decrypt(
+                            event.content,
+                            event.pubKey,
+                            event.id,
+                            SignerType.NIP44_DECRYPT
+                        )
+                        cached = ExternalSignerUtils.cachedDecryptedContent[event.id] ?: ""
+                    }
+                    event.cachedGift(account.keyPair.pubKey, cached)?.let {
+                        unwrapAndConsume(it, account)
+                    }
+                } else {
+                    null
+                }
+            }
+            is SealedGossipEvent -> {
+                val key = account.keyPair.privKey
+                if (key != null) {
+                    event.cachedGossip(key)?.let {
+                        // this is not verifiable
+                        LocalCache.justConsume(it, null)
+                        it
+                    }
+                } else if (account.loginWithExternalSigner) {
+                    var cached = ExternalSignerUtils.cachedDecryptedContent[event.id]
+                    if (cached == null) {
+                        ExternalSignerUtils.decrypt(
+                            event.content,
+                            event.pubKey,
+                            event.id,
+                            SignerType.NIP44_DECRYPT
+                        )
+                        cached = ExternalSignerUtils.cachedDecryptedContent[event.id] ?: ""
+                    }
+                    event.cachedGossip(account.keyPair.pubKey, cached)?.let {
+                        LocalCache.justConsume(it, null)
+                        it
+                    }
+                } else {
+                    null
+                }
+            }
+            else -> {
+                LocalCache.justConsume(event, null)
+                event
+            }
+        }
+    }
+
+    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
+
+            val chatNote = LocalCache.notes[event.id] ?: return
+            val chatRoom = event.chatroomKey(acc.keyPair.pubKey.toHexKey())
+
+            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(
+                    event.id,
+                    content,
+                    user,
+                    userPicture,
+                    noteUri,
+                    applicationContext
+                )
+            }
+        }
+    }
+
+    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 messagingWith = acc.userProfile().privateChatrooms.keys.filter {
-                    (
-                        it.pubkeyHex in followingKeySet || acc.userProfile()
-                            .hasSentMessagesTo(it)
-                        ) && !acc.isHidden(it)
-                }.toSet()
+            val knownChatrooms = acc.userProfile().privateChatrooms.keys.filter {
+                (
+                    acc.userProfile().privateChatrooms[it]?.senderIntersects(followingKeySet) == true ||
+                        acc.userProfile().hasSentMessagesTo(it)
+                    ) && !acc.isAllHidden(it.users)
+            }.toSet()
 
-                if (note.author in messagingWith) {
+            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()
@@ -61,49 +211,50 @@ class EventNotificationConsumer(private val applicationContext: Context) {
         }
     }
 
-    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)
         }
     }
 
-    private fun notificationManager(): NotificationManager {
+    fun notificationManager(): NotificationManager {
         return ContextCompat.getSystemService(applicationContext, NotificationManager::class.java) as NotificationManager
     }
 }

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

@@ -18,8 +18,10 @@ import com.vitorpamplona.amethyst.ui.MainActivity
 object NotificationUtils {
     private var dmChannel: NotificationChannel? = null
     private var zapChannel: NotificationChannel? = null
+    private const val DM_GROUP_KEY = "com.vitorpamplona.amethyst.DM_NOTIFICATION"
+    private const val ZAP_GROUP_KEY = "com.vitorpamplona.amethyst.ZAP_NOTIFICATION"
 
-    private fun getOrCreateDMChannel(applicationContext: Context): NotificationChannel {
+    fun NotificationManager.getOrCreateDMChannel(applicationContext: Context): NotificationChannel {
         if (dmChannel != null) return dmChannel!!
 
         dmChannel = NotificationChannel(
@@ -39,7 +41,7 @@ object NotificationUtils {
         return dmChannel!!
     }
 
-    private fun getOrCreateZapChannel(applicationContext: Context): NotificationChannel {
+    fun NotificationManager.getOrCreateZapChannel(applicationContext: Context): NotificationChannel {
         if (zapChannel != null) return zapChannel!!
 
         zapChannel = NotificationChannel(
@@ -70,7 +72,7 @@ object NotificationUtils {
         val zapChannel = getOrCreateZapChannel(applicationContext)
         val channelId = applicationContext.getString(R.string.app_notification_zaps_channel_id)
 
-        sendNotification(id, messageBody, messageTitle, pictureUrl, uri, channelId, applicationContext)
+        sendNotification(id, messageBody, messageTitle, pictureUrl, uri, channelId, ZAP_GROUP_KEY, applicationContext)
     }
 
     fun NotificationManager.sendDMNotification(
@@ -84,7 +86,7 @@ object NotificationUtils {
         val dmChannel = getOrCreateDMChannel(applicationContext)
         val channelId = applicationContext.getString(R.string.app_notification_dms_channel_id)
 
-        sendNotification(id, messageBody, messageTitle, pictureUrl, uri, channelId, applicationContext)
+        sendNotification(id, messageBody, messageTitle, pictureUrl, uri, channelId, DM_GROUP_KEY, applicationContext)
     }
 
     fun NotificationManager.sendNotification(
@@ -94,6 +96,7 @@ object NotificationUtils {
         pictureUrl: String?,
         uri: String,
         channelId: String,
+        notificationGroupKey: String,
         applicationContext: Context
     ) {
         if (pictureUrl != null) {
@@ -110,6 +113,7 @@ object NotificationUtils {
                 picture = imageResult.drawable as? BitmapDrawable,
                 uri = uri,
                 channelId,
+                notificationGroupKey,
                 applicationContext = applicationContext
             )
         } else {
@@ -120,6 +124,7 @@ object NotificationUtils {
                 picture = null,
                 uri = uri,
                 channelId,
+                notificationGroupKey,
                 applicationContext = applicationContext
             )
         }
@@ -132,6 +137,7 @@ object NotificationUtils {
         picture: BitmapDrawable?,
         uri: String,
         channelId: String,
+        notificationGroupKey: String,
         applicationContext: Context
     ) {
         val notId = id.hashCode()
@@ -164,7 +170,8 @@ object NotificationUtils {
             .setContentTitle(messageTitle)
             .setContentText(applicationContext.getString(R.string.app_notification_private_message))
             .setLargeIcon(picture?.bitmap)
-            .setGroup(messageTitle)
+            // .setGroup(messageTitle)
+            // .setGroup(notificationGroupKey) //-> Might need a Group summary as well before we activate this
             .setContentIntent(contentPendingIntent)
             .setPriority(NotificationCompat.PRIORITY_HIGH)
             .setAutoCancel(true)
@@ -178,7 +185,8 @@ object NotificationUtils {
             .setContentTitle(messageTitle)
             .setContentText(messageBody)
             .setLargeIcon(picture?.bitmap)
-            .setGroup(messageTitle)
+            // .setGroup(messageTitle)
+            // .setGroup(notificationGroupKey)  //-> Might need a Group summary as well before we activate this
             .setContentIntent(contentPendingIntent)
             .setPublicVersion(builderPublic.build())
             .setPriority(NotificationCompat.PRIORITY_HIGH)

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)
@@ -38,7 +36,7 @@ class RegisterAccounts(
         }
     }
 
-    private fun postRegistrationEvent(events: List<RelayAuthEvent>) {
+    fun postRegistrationEvent(events: List<RelayAuthEvent>) {
         try {
             val jsonObject = """{
                 "events": [ ${events.joinToString(", ") { it.toJson() }} ]
@@ -56,18 +54,17 @@ class RegisterAccounts(
 
             val client = HttpClient.getHttpClient()
 
-            client.newCall(request).execute()
+            val isSucess = client.newCall(request).execute().use {
+                it.isSuccessful
+            }
         } catch (e: java.lang.Exception) {
             Log.e("FirebaseMsgService", "Unable to register with push server", e)
         }
     }
 
-    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/previews/BahaUrlPreview.kt

@@ -1,25 +1,21 @@
 package com.vitorpamplona.amethyst.service.previews
 
 import android.net.Uri
-import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import kotlinx.coroutines.*
 import java.util.*
 
 class BahaUrlPreview(val url: String, var callback: IUrlPreviewCallback?) {
-    val scope = CoroutineScope(Job() + Dispatchers.IO)
     private val imageExtensionArray = arrayOf(".gif", ".png", ".jpg", ".jpeg", ".bmp", ".webp")
 
-    fun fetchUrlPreview(timeOut: Int = 30000) {
-        val exceptionHandler = CoroutineExceptionHandler { coroutineContext, throwable ->
-            callback?.onFailed(throwable)
-        }
-        scope.launch(exceptionHandler) {
+    suspend fun fetchUrlPreview(timeOut: Int = 30000) = withContext(Dispatchers.IO) {
+        try {
             fetch(timeOut)
+        } catch (t: Throwable) {
+            callback?.onFailed(t)
         }
     }
 
     private suspend fun fetch(timeOut: Int = 30000) {
-        checkNotInMainThread()
         lateinit var urlInfoItem: UrlInfoItem
         if (checkIsImageUrl()) {
             urlInfoItem = UrlInfoItem(url = url, image = url)
@@ -43,7 +39,6 @@ class BahaUrlPreview(val url: String, var callback: IUrlPreviewCallback?) {
     }
 
     fun cleanUp() {
-        scope.cancel()
         callback = null
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/service/previews/IUrlPreviewCallback.kt

@@ -1,6 +1,6 @@
 package com.vitorpamplona.amethyst.service.previews
 
 interface IUrlPreviewCallback {
-    fun onComplete(urlInfo: UrlInfoItem)
-    fun onFailed(throwable: Throwable)
+    suspend fun onComplete(urlInfo: UrlInfoItem)
+    suspend fun onFailed(throwable: Throwable)
 }

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

@@ -3,8 +3,10 @@ package com.vitorpamplona.amethyst.service.previews
 import com.vitorpamplona.amethyst.service.HttpClient
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import okhttp3.Request
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
+import java.lang.IllegalArgumentException
 
 private const val ELEMENT_TAG_META = "meta"
 private const val ATTRIBUTE_VALUE_PROPERTY = "property"
@@ -61,10 +63,16 @@ private const val CONTENT = "content"
 
 suspend fun getDocument(url: String, timeOut: Int = 30000): Document =
     withContext(Dispatchers.IO) {
-        return@withContext Jsoup.connect(url)
-            .proxy(HttpClient.getProxy())
-            .timeout(timeOut)
-            .get()
+        val request: Request = Request.Builder().url(url).get().build()
+        val html = HttpClient.getHttpClient().newCall(request).execute().use {
+            if (it.isSuccessful) {
+                it.body.string()
+            } else {
+                throw IllegalArgumentException("Website returned: " + it.code)
+            }
+        }
+
+        Jsoup.parse(html)
     }
 
 suspend fun parseHtml(url: String, document: Document): UrlInfoItem =

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>>()
@@ -73,10 +63,18 @@ object Client : RelayPool.Listener {
         RelayPool.sendFilterOnlyIfDisconnected()
     }
 
-    fun send(signedEvent: EventInterface, relay: String? = null, feedTypes: Set<FeedType>? = null, onDone: (() -> Unit)? = null) {
+    fun send(
+        signedEvent: EventInterface,
+        relay: String? = null,
+        feedTypes: Set<FeedType>? = null,
+        relayList: List<Relay>? = null,
+        onDone: (() -> Unit)? = null
+    ) {
         checkNotInMainThread()
 
-        if (relay == null) {
+        if (relayList != null) {
+            RelayPool.sendToSelectedRelays(relayList, signedEvent)
+        } else if (relay == null) {
             RelayPool.send(signedEvent)
         } else {
             val useConnectedRelayIfPresent = RelayPool.getRelays(relay)
@@ -104,7 +102,7 @@ object Client : RelayPool.Listener {
         val relay = Relay(url, true, true, feedTypes ?: emptySet(), HttpClient.getProxy())
         RelayPool.addRelay(relay)
 
-        relay.requestAndWatch {
+        relay.connectAndRun {
             allSubscriptions().forEach {
                 relay.sendFilter(requestId = it)
             }
@@ -170,6 +168,7 @@ object Client : RelayPool.Listener {
         }
     }
 
+    @OptIn(DelicateCoroutinesApi::class)
     override fun onAuth(relay: Relay, challenge: String) {
         // Releases the Web thread for the new payload.
         // May need to add a processing queue if processing new events become too costly.

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
@@ -15,6 +15,7 @@ import okhttp3.WebSocket
 import okhttp3.WebSocketListener
 import java.net.Proxy
 import java.time.Duration
+import java.util.concurrent.atomic.AtomicBoolean
 
 enum class FeedType {
     FOLLOWS, PUBLIC_CHATS, PRIVATE_DMS, GLOBAL, SEARCH, WALLET_CONNECT
@@ -29,14 +30,16 @@ class Relay(
     var activeTypes: Set<FeedType> = FeedType.values().toSet(),
     proxy: Proxy?
 ) {
-    val seconds = if (proxy != null) 20L else 10L
-    val duration = Duration.ofSeconds(seconds)
+    companion object {
+        // waits 3 minutes to reconnect once things fail
+        const val RECONNECTING_IN_SECONDS = 60 * 3
+    }
 
     private val httpClient = OkHttpClient.Builder()
         .proxy(proxy)
-        .readTimeout(duration)
-        .connectTimeout(duration)
-        .writeTimeout(duration)
+        .readTimeout(Duration.ofSeconds(if (proxy != null) 20L else 10L))
+        .connectTimeout(Duration.ofSeconds(if (proxy != null) 20L else 10L))
+        .writeTimeout(Duration.ofSeconds(if (proxy != null) 20L else 10L))
         .followRedirects(true)
         .followSslRedirects(true)
         .build()
@@ -44,15 +47,16 @@ 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
 
     var spamCounter = 0
     var errorCounter = 0
-    var ping: Long? = null
+    var pingInMs: Long? = null
 
-    var closingTime = 0L
+    var closingTimeInSeconds = 0L
 
     var afterEOSE = false
 
@@ -68,10 +72,8 @@ class Relay(
         return socket != null
     }
 
-    @Synchronized
-    fun requestAndWatch() {
-        checkNotInMainThread()
-        requestAndWatch {
+    fun connect() {
+        connectAndRun {
             checkNotInMainThread()
 
             // Sends everything.
@@ -81,9 +83,19 @@ class Relay(
         }
     }
 
-    @Synchronized
-    fun requestAndWatch(onConnected: (Relay) -> Unit) {
+    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
+        }
+
         checkNotInMainThread()
+
         if (socket != null) return
 
         try {
@@ -91,135 +103,152 @@ class Relay(
                 .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                 .url(url.trim())
                 .build()
-            val listener = object : WebSocketListener() {
 
-                override fun onOpen(webSocket: WebSocket, response: Response) {
-                    checkNotInMainThread()
+            socket = httpClient.newWebSocket(request, RelayListener(onConnected))
+        } catch (e: Exception) {
+            errorCounter++
+            markConnectionAsClosed()
+            Log.e("Relay", "Relay Invalid $url")
+            e.printStackTrace()
+        } finally {
+            connectingBlock.set(false)
+        }
+    }
 
-                    afterEOSE = false
-                    isReady = true
-                    ping = response.receivedResponseAtMillis - response.sentRequestAtMillis
-                    // Log.w("Relay", "Relay OnOpen, Loading All subscriptions $url")
-                    onConnected(this@Relay)
+    inner class RelayListener(val onConnected: (Relay) -> Unit) : WebSocketListener() {
+        override fun onOpen(webSocket: WebSocket, response: Response) {
+            checkNotInMainThread()
 
-                    listeners.forEach { it.onRelayStateChange(this@Relay, Type.CONNECT, null) }
+            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)
+
+            listeners.forEach { it.onRelayStateChange(this@Relay, Type.CONNECT, null) }
+        }
+
+        override fun onMessage(webSocket: WebSocket, text: String) {
+            checkNotInMainThread()
+
+            eventDownloadCounterInBytes += text.bytesUsedInMemory()
+
+            try {
+                processNewRelayMessage(text)
+            } catch (t: Throwable) {
+                t.printStackTrace()
+                text.chunked(2000) { chunked ->
+                    listeners.forEach { it.onError(this@Relay, "", Error("Problem with $chunked")) }
                 }
+            }
+        }
 
-                override fun onMessage(webSocket: WebSocket, text: String) {
-                    checkNotInMainThread()
+        override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
+            checkNotInMainThread()
 
-                    eventDownloadCounterInBytes += text.bytesUsedInMemory()
+            listeners.forEach {
+                it.onRelayStateChange(
+                    this@Relay,
+                    Type.DISCONNECTING,
+                    null
+                )
+            }
+        }
 
-                    try {
-                        val msg = Event.gson.fromJson(text, JsonElement::class.java).asJsonArray
-                        val type = msg[0].asString
-                        val channel = msg[1].asString
+        override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
+            checkNotInMainThread()
 
-                        when (type) {
-                            "EVENT" -> {
-                                val event = Event.fromJson(msg[2], Client.lenient)
+            markConnectionAsClosed()
 
-                                // Log.w("Relay", "Relay onEVENT $url, $channel")
-                                listeners.forEach {
-                                    it.onEvent(this@Relay, channel, event)
-                                    if (afterEOSE) {
-                                        it.onRelayStateChange(this@Relay, Type.EOSE, channel)
-                                    }
-                                }
-                            }
-                            "EOSE" -> listeners.forEach {
-                                afterEOSE = true
-                                // Log.w("Relay", "Relay onEOSE $url, $channel")
-                                it.onRelayStateChange(this@Relay, Type.EOSE, channel)
-                            }
-                            "NOTICE" -> listeners.forEach {
-                                Log.w("Relay", "Relay onNotice $url, $channel")
-                                it.onError(this@Relay, channel, Error("Relay sent notice: " + channel))
-                            }
-                            "OK" -> listeners.forEach {
-                                Log.w("Relay", "Relay on OK $url, ${msg[1].asString}, ${msg[2].asBoolean}, ${msg[3].asString}")
-                                it.onSendResponse(this@Relay, msg[1].asString, msg[2].asBoolean, msg[3].asString)
-                            }
-                            "AUTH" -> listeners.forEach {
-                                // Log.w("Relay", "Relay$url, ${msg[1].asString}")
-                                it.onAuth(this@Relay, msg[1].asString)
-                            }
-                            else -> listeners.forEach {
-                                // Log.w("Relay", "Relay something else $url, $channel")
-                                it.onError(
-                                    this@Relay,
-                                    channel,
-                                    Error("Unknown type $type on channel $channel. Msg was $text")
-                                )
-                            }
-                        }
-                    } catch (t: Throwable) {
-                        t.printStackTrace()
-                        text.chunked(2000) { chunked ->
-                            listeners.forEach { it.onError(this@Relay, "", Error("Problem with $chunked")) }
-                        }
-                    }
-                }
+            listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECT, null) }
+        }
 
-                override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
-                    checkNotInMainThread()
+        override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+            checkNotInMainThread()
 
-                    listeners.forEach {
-                        it.onRelayStateChange(
-                            this@Relay,
-                            Type.DISCONNECTING,
-                            null
-                        )
-                    }
-                }
+            errorCounter++
 
-                override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
-                    checkNotInMainThread()
+            socket?.close(1000, "Normal close")
+            // Failures disconnect the relay.
+            markConnectionAsClosed()
 
-                    socket = null
-                    isReady = false
-                    afterEOSE = false
-                    closingTime = TimeUtils.now()
-                    listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECT, null) }
-                }
+            Log.w("Relay", "Relay onFailure $url, ${response?.message} $response")
+            t.printStackTrace()
+            listeners.forEach {
+                it.onError(this@Relay, "", Error("WebSocket Failure. Response: $response. Exception: ${t.message}", t))
+            }
+        }
+    }
 
-                override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
-                    checkNotInMainThread()
+    fun markConnectionAsReady(pingInMs: Long, usingCompression: Boolean) {
+        this.afterEOSE = false
+        this.isReady = true
+        this.pingInMs = pingInMs
+        this.usingCompression = usingCompression
+    }
 
-                    errorCounter++
+    fun markConnectionAsClosed() {
+        this.socket = null
+        this.isReady = false
+        this.usingCompression = false
+        this.afterEOSE = false
+        this.closingTimeInSeconds = TimeUtils.now()
+    }
 
-                    socket?.close(1000, "Normal close")
-                    // Failures disconnect the relay.
-                    socket = null
-                    isReady = false
-                    afterEOSE = false
-                    closingTime = TimeUtils.now()
+    fun processNewRelayMessage(newMessage: String) {
+        val msgArray = Event.mapper.readTree(newMessage)
+        val type = msgArray.get(0).asText()
+        val channel = msgArray.get(1).asText()
 
-                    Log.w("Relay", "Relay onFailure $url, ${response?.message} $response")
-                    t.printStackTrace()
-                    listeners.forEach {
-                        it.onError(this@Relay, "", Error("WebSocket Failure. Response: $response. Exception: ${t.message}", t))
+        when (type) {
+            "EVENT" -> {
+                val event = Event.fromJson(msgArray.get(2))
+
+                // Log.w("Relay", "Relay onEVENT $url, $channel")
+                listeners.forEach {
+                    it.onEvent(this@Relay, channel, event)
+                    if (afterEOSE) {
+                        it.onRelayStateChange(this@Relay, Type.EOSE, channel)
                     }
                 }
             }
-
-            socket = httpClient.newWebSocket(request, listener)
-        } catch (e: Exception) {
-            errorCounter++
-            isReady = false
-            afterEOSE = false
-            closingTime = TimeUtils.now()
-            Log.e("Relay", "Relay Invalid $url")
-            e.printStackTrace()
+            "EOSE" -> listeners.forEach {
+                afterEOSE = true
+                // Log.w("Relay", "Relay onEOSE $url, $channel")
+                it.onRelayStateChange(this@Relay, Type.EOSE, channel)
+            }
+            "NOTICE" -> listeners.forEach {
+                Log.w("Relay", "Relay onNotice $url, $channel")
+                it.onError(this@Relay, channel, Error("Relay sent notice: " + channel))
+            }
+            "OK" -> listeners.forEach {
+                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].asText())
+            }
+            else -> listeners.forEach {
+                // Log.w("Relay", "Relay something else $url, $channel")
+                it.onError(
+                    this@Relay,
+                    channel,
+                    Error("Unknown type $type on channel $channel. Msg was $newMessage")
+                )
+            }
         }
     }
 
     fun disconnect() {
         // httpClient.dispatcher.executorService.shutdown()
-        closingTime = TimeUtils.now()
+        closingTimeInSeconds = TimeUtils.now()
         socket?.close(1000, "Normal close")
         socket = null
         isReady = false
+        usingCompression = false
         afterEOSE = false
     }
 
@@ -241,9 +270,9 @@ class Relay(
                 }
             } else {
                 // waits 60 seconds to reconnect after disconnected.
-                if (TimeUtils.now() > closingTime + 60) {
+                if (TimeUtils.now() > closingTimeInSeconds + RECONNECTING_IN_SECONDS) {
                     // sends all filters after connection is successful.
-                    requestAndWatch()
+                    connect()
                 }
             }
         }
@@ -254,9 +283,9 @@ class Relay(
 
         if (socket == null) {
             // waits 60 seconds to reconnect after disconnected.
-            if (TimeUtils.now() > closingTime + 60) {
+            if (TimeUtils.now() > closingTimeInSeconds + RECONNECTING_IN_SECONDS) {
                 // println("sendfilter Only if Disconnected ${url} ")
-                requestAndWatch()
+                connect()
             }
         }
     }
@@ -265,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)
+                            }
+                        }
+                    }
+                }
             }
         }
     }
@@ -324,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,30 +1,32 @@
 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
     }
 
     fun connectedRelays(): Int {
-        return relays.filter { it.isConnected() }.size
+        return relays.count { it.isConnected() }
     }
 
     fun getRelay(url: String): Relay? {
@@ -51,7 +53,7 @@ object RelayPool : Relay.Listener {
     fun requestAndWatch() {
         checkNotInMainThread()
 
-        relays.forEach { it.requestAndWatch() }
+        relays.forEach { it.connect() }
     }
 
     fun sendFilter(subscriptionId: String) {
@@ -62,6 +64,12 @@ object RelayPool : Relay.Listener {
         relays.forEach { it.sendFilterOnlyIfDisconnected() }
     }
 
+    fun sendToSelectedRelays(list: List<Relay>, signedEvent: EventInterface) {
+        list.forEach { relay ->
+            relays.filter { it.url == relay.url }.forEach { it.send(signedEvent) }
+        }
+    }
+
     fun send(signedEvent: EventInterface) {
         relays.forEach { it.send(signedEvent) }
     }
@@ -77,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) {
@@ -110,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) {
@@ -126,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
@@ -14,43 +15,33 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.rememberNavController
-import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
+import com.vitorpamplona.amethyst.service.ExternalSignerUtils
 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
 import com.vitorpamplona.amethyst.ui.navigation.debugState
-import com.vitorpamplona.amethyst.ui.navigation.getRouteWithArguments
 import com.vitorpamplona.amethyst.ui.note.Nip47
 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
@@ -59,16 +50,12 @@ import java.net.URLEncoder
 import java.nio.charset.StandardCharsets
 
 class MainActivity : AppCompatActivity() {
-    lateinit var navController: NavHostController
-
     @RequiresApi(Build.VERSION_CODES.R)
     override fun onCreate(savedInstanceState: Bundle?) {
+        ExternalSignerUtils.start(this)
+
         super.onCreate(savedInstanceState)
 
-        val uri = intent?.data?.toString()
-        val startingPage = uriToRoute(uri)
-
-        LocalPreferences.migrateSingleUserPrefs()
         val language = LocalPreferences.getPreferredLanguage()
         if (language.isNotBlank()) {
             val appLocale: LocaleListCompat = LocaleListCompat.forLanguageTags(language)
@@ -76,28 +63,22 @@ class MainActivity : AppCompatActivity() {
         }
 
         setContent {
-            navController = rememberNavController()
             val themeViewModel: ThemeViewModel = viewModel()
 
             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)
                     }
 
-                    AccountScreen(accountStateViewModel, themeViewModel, navController)
+                    AccountScreen(accountStateViewModel, themeViewModel)
                 }
             }
-
-            var actionableNextPage by remember { mutableStateOf(startingPage) }
-            actionableNextPage?.let {
-                LaunchedEffect(it) {
-                    navController.navigate(it)
-                }
-                actionableNextPage = null
-            }
         }
 
         val networkRequest = NetworkRequest.Builder()
@@ -106,10 +87,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)
@@ -121,72 +101,49 @@ class MainActivity : AppCompatActivity() {
 
         // Only starts after login
         GlobalScope.launch(Dispatchers.IO) {
-            ServiceManager.start(this@MainActivity)
+            if (ServiceManager.shouldPauseService) {
+                ServiceManager.start(this@MainActivity)
+            }
         }
 
-        PushNotificationUtils().init(LocalPreferences.allSavedAccounts())
+        GlobalScope.launch(Dispatchers.IO) {
+            PushNotificationUtils.init(LocalPreferences.allSavedAccounts())
+        }
     }
 
     override fun onPause() {
-        ServiceManager.pause()
+        ServiceManager.cleanObservers()
+        // if (BuildConfig.DEBUG) {
+        debugState(this)
+        // }
 
-        if (BuildConfig.DEBUG) {
-            debugState(this)
+        if (ServiceManager.shouldPauseService) {
+            ServiceManager.pause()
         }
-
         super.onPause()
     }
 
     override fun onDestroy() {
         super.onDestroy()
         keepPlayingMutex?.stop()
+        keepPlayingMutex?.release()
+        keepPlayingMutex = null
     }
 
     /**
      * Release memory when the UI becomes hidden or when system resources become low.
      * @param level the memory-related event that was raised.
      */
+    @OptIn(DelicateCoroutinesApi::class)
     override fun onTrimMemory(level: Int) {
         super.onTrimMemory(level)
         println("Trim Memory $level")
         GlobalScope.launch(Dispatchers.Default) {
-            ServiceManager.cleanUp()
+            ServiceManager.trimMemory()
         }
     }
 
-    override fun onNewIntent(intent: Intent?) {
-        super.onNewIntent(intent)
-
-        val uri = intent?.data?.toString()
-        val startingPage = uriToRoute(uri)
-
-        startingPage?.let { route ->
-            val currentRoute = getRouteWithArguments(navController)
-            if (!isSameRoute(currentRoute, route)) {
-                navController.navigate(route) {
-                    popUpTo(Route.Home.route)
-                    launchSingleTop = true
-                }
-            }
-        }
-    }
-
-    private fun isSameRoute(currentRoute: String?, newRoute: String): Boolean {
-        if (currentRoute == null) return false
-
-        if (currentRoute == newRoute) {
-            return true
-        }
-
-        if (newRoute.startsWith("Event/") && currentRoute.contains("/")) {
-            if (newRoute.split("/")[1] == currentRoute.split("/")[1]) {
-                return true
-            }
-        }
-
-        return false
-    }
-
+    @OptIn(DelicateCoroutinesApi::class)
     private val networkCallback = object : ConnectivityManager.NetworkCallback() {
         // network is available for use
         override fun onAvailable(network: Network) {
@@ -194,8 +151,10 @@ class MainActivity : AppCompatActivity() {
             Log.d("NETWORKCALLBACK", "onAvailable: Disconnecting and connecting again")
             // Only starts after login
             GlobalScope.launch(Dispatchers.IO) {
-                ServiceManager.pause()
-                ServiceManager.start(this@MainActivity)
+                if (ServiceManager.shouldPauseService) {
+                    ServiceManager.pause()
+                    ServiceManager.start(this@MainActivity)
+                }
             }
         }
 
@@ -213,8 +172,8 @@ class MainActivity : AppCompatActivity() {
                 Log.d("NETWORKCALLBACK", "onCapabilitiesChanged: hasMobileData $hasMobileData")
                 Log.d("NETWORKCALLBACK", "onCapabilitiesChanged: hasWifi $hasWifi")
                 ConnectivityStatus.updateConnectivityStatus(
-                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR),
-                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+                    hasMobileData,
+                    hasWifi
                 )
             }
         }
@@ -225,7 +184,9 @@ class MainActivity : AppCompatActivity() {
             Log.d("NETWORKCALLBACK", "onLost: Disconnecting and pausing relay's connection")
             // Only starts after login
             GlobalScope.launch(Dispatchers.IO) {
-                ServiceManager.pause()
+                if (ServiceManager.shouldPauseService) {
+                    ServiceManager.pause()
+                }
             }
         }
     }
@@ -233,9 +194,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/*"))
         }
     }
@@ -254,7 +221,9 @@ fun uriToRoute(uri: String?): String? {
                 Nip19.Type.NOTE -> "Note/${nip19.hex}"
                 Nip19.Type.EVENT -> {
                     if (nip19.kind == PrivateDmEvent.kind) {
-                        "Room/${nip19.author}"
+                        nip19.author?.let {
+                            "RoomByAuthor/$it"
+                        }
                     } else if (nip19.kind == ChannelMessageEvent.kind || nip19.kind == ChannelCreateEvent.kind || nip19.kind == ChannelMetadataEvent.kind) {
                         "Channel/${nip19.hex}"
                     } else {