v0.86.2

New Crowdin Translations

.github/workflows/create-release.yml

@@ -227,4 +227,4 @@ jobs:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: app/build/outputs/bundle/fdroidRelease/app-fdroid-release.aab
           asset_name: amethyst-fdroid-${{ github.ref_name }}.aab
-          asset_content_type: application/zip
+          asset_content_type: application/zip

README.md

@@ -1,26 +1,46 @@
-# Amethyst: Nostr client for Android
+<div align="center">
 
-<img align="right" src="./docs/screenshots/home.png" data-canonical-src="./docs/screenshots/home.png" width="350px"/>
+<a href="https://amethyst.social">
+    <img src="./docs/design/3rd%20Logo%20-%20Zitron/amethyst.svg" alt="Amethyst Logo" title="Amethyst logo" width="80"/>
+</a>
 
-Amethyst brings the best social network to your Android phone. Just insert your Nostr private key and start posting.
+# Amethyst
+
+## Nostr Client for Android
+
+Join the social network you control.
+
+[![GitHub downloads](https://img.shields.io/github/downloads/vitorpamplona/amethyst/total?label=Downloads&labelColor=27303D&color=0D1117&logo=github&logoColor=FFFFFF&style=flat)](https://github.com/vitorpamplona/amethyst/releases)
+[![PlayStore downloads](https://img.shields.io/endpoint?color=green&logo=google-play&logoColor=green&url=https%3A%2F%2Fplay.cuzi.workers.dev%2Fplay%3Fi%3Dcom.vitorpamplona.amethyst%26gl%3DUS%26hl%3Den%26l%3DPlayStore%26m%3D%24shortinstalls)](https://play.google.com/store/apps/details?id=com.vitorpamplona.amethyst)
+
+[![Last Version](https://img.shields.io/github/release/vitorpamplona/amethyst.svg?maxAge=3600&label=Stable&labelColor=06599d&color=043b69)](https://github.com/vitorpamplona/amethyst)
+[![JitPack version](https://jitpack.io/v/vitorpamplona/amethyst.svg)](https://jitpack.io/#vitorpamplona/amethyst)
+[![CI](https://img.shields.io/github/actions/workflow/status/vitorpamplona/amethyst/build.yml?labelColor=27303D)](https://github.com/vitorpamplona/amethyst/actions/workflows/build.yml)
+[![License: Apache-2.0](https://img.shields.io/github/license/vitorpamplona/amethyst?labelColor=27303D&color=0877d2)](/LICENSE)
+
+## Download and Install
 
 [<img src="./docs/design/obtainium.png"
 alt="Get it on Obtaininum"
-height="80">](https://github.com/ImranR98/Obtainium)
+height="70">](https://github.com/ImranR98/Obtainium)
 [<img src="https://github.com/machiav3lli/oandbackupx/raw/034b226cea5c1b30eb4f6a6f313e4dadcbb0ece4/badge_github.png" alt="Get it on GitHub"
-height="80">](https://github.com/vitorpamplona/amethyst/releases)
+height="70">](https://github.com/vitorpamplona/amethyst/releases)
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
      alt="Get it on F-Droid"
-     height="80">](https://f-droid.org/packages/com.vitorpamplona.amethyst/)
+     height="70">](https://f-droid.org/packages/com.vitorpamplona.amethyst/)
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
      alt="Get it on Google Play"
-     height="80">](https://play.google.com/store/apps/details?id=com.vitorpamplona.amethyst)
+     height="70">](https://play.google.com/store/apps/details?id=com.vitorpamplona.amethyst)
 
-# Current Features
+</div>
+
+## Supported Features
+
+<img align="right" src="./docs/screenshots/home.png" data-canonical-src="./docs/screenshots/home.png" width="350px">
 
 - [x] Events / Relay Subscriptions (NIP-01)
 - [x] Follow List (NIP-02)
-- [ ] OpenTimestamps Attestations (NIP-03)
+- [x] OpenTimestamps Attestations (NIP-03)
 - [x] Private Messages (NIP-04)
 - [x] DNS Address (NIP-05)
 - [ ] Mnemonic seed phrase (NIP-06)
@@ -50,7 +70,9 @@ height="80">](https://github.com/vitorpamplona/amethyst/releases)
 - [x] Event kind summaries (NIP-31)
 - [ ] Labeling (NIP-32)
 - [x] Parameterized Replaceable Events (NIP-33)
+- [x] Git Stuff (NIP-34/Draft)
 - [x] Sensitive Content (NIP-36)
+- [x] Note Edits (NIP-37/Draft)
 - [x] User Status Event (NIP-38)
 - [x] External Identities (NIP-39)
 - [x] Expiration Support (NIP-40)
@@ -59,7 +81,7 @@ height="80">](https://github.com/vitorpamplona/amethyst/releases)
 - [ ] Nostr Connect (NIP-46)
 - [x] Wallet Connect API (NIP-47)
 - [ ] Proxy Tags (NIP-48, Not applicable)
-- [ ] Private key encryption for import/export (NIP-49)
+- [x] Private key encryption for import/export (NIP-49)
 - [x] Online Relay Search (NIP-50)
 - [x] Lists (NIP-51)
 - [ ] Calendar Events (NIP-52)
@@ -89,7 +111,7 @@ height="80">](https://github.com/vitorpamplona/amethyst/releases)
 - [x] Classifieds (NIP-99)
 - [x] Private Messages and Small Groups (NIP-24/Draft)
 - [x] Versioned Encrypted Payloads (NIP-44/Draft)
-- [x] Audio Tracks (zapstr.live) (Kind:31337)
+- [x] Audio Tracks (zapstr.live) (kind:31337)
 - [x] Push Notifications (Google and Unified Push)
 - [x] In-Device Automatic Translations
 - [x] Hashtag Following and Custom Hashtags
@@ -98,36 +120,49 @@ height="80">](https://github.com/vitorpamplona/amethyst/releases)
 - [x] De-googled F-Droid flavor
 - [x] Multiple Accounts
 - [x] Markdown Support
+- [x] FHIR Payloads (kind:82)
+- [ ] Decentralized Wiki (kind:30818)
+- [ ] Embed events
 - [ ] Image/Video Capture in the app
 - [ ] Local Database
 - [ ] Workspaces
 - [ ] Infinity Scroll
 
+## Privacy and Information Permanence
+
+Relays know your IP address, 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) except for Private Zaps and Private DMs. 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.
+
+If you want to improve your privacy, consider utilizing a service that masks your IP address (e.g. a VPN or Tor) from trackers online.
+
+The relay also learns which public keys you are requesting, meaning your public key will be tied to your IP address.
+
+Information shared on Nostr can be re-broadcasted to other servers and should be assumed permanent for privacy purposes. There is no way to guarantee the deletion of any content once posted.
+
 # Development Overview
 
-## Overall Architecture
+This repository is split between Amethyst and Quartz:
+- Amethyst is a native Android app made with Kotlin and Jetpack Compose.
+- Quartz is our own Nostr-commons library to host classes that are of interest to other Nostr Clients.
 
-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 of the UI, which uses the usual State/ViewModel/Composition, the service layer that connects with Nostr relays,
+The app 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
+The repository layer stores Nostr Events as Notes and Users separately. Those classes use LiveData and Flow objects to
 allow the UI and other parts of the app to subscribe to each Note/User and receive updates when they happen.
-They are also responsible for updating viewModels when needed. Filters react to changes in the screen. As the user
-sees different Events, the Datasource classes are used to receive more information about those particular Events.
+They are also responsible for updating viewModels when needed. As the user scrolls through Events, the Datasource classes
+are updated to receive more information about those particular Events.
 
 Most of the UI is reactive to changes in the repository classes. The service layer assembles Nostr filters for each need of the app,
 receives the data from the Relay, and sends it to the repository. Connection with relays is never closed during the use of the app.
 The UI receives a notification that objects have been updated. Instances of User and Notes are mutable directly.
 There will never be two Notes with the same ID or two User instances with the same pubkey.
 
-Lastly, the user's account information (priv key/pub key) is stored in the Android KeyStore for security.
+Lastly, the user's account information (private key/pub key) is stored in the Android KeyStore for security.
 
 ## Setup
 
 Make sure to have the following pre-requisites installed:
-1. Java 17
+1. Java 17+
 2. Android Studio
 3. Android 8.0+ Phone or Emulation setup
 
@@ -136,7 +171,7 @@ Fork and clone this repository and import it into Android Studio
 git clone https://github.com/vitorpamplona/amethyst.git
 ```
 
-Use one of the Android Studio builds to install and run the app in your device or a simulator.
+Use an Android Studio build action to install and run the app on your device or a simulator.
 
 ## Building
 Build the app:
@@ -168,15 +203,7 @@ For the Play build:
 ./gradlew installPlayDebug
 ```
 
-## Contributing
-
-[Issues](https://github.com/vitorpamplona/amethyst/issues) and [pull requests](https://github.com/vitorpamplona/amethyst/pulls) here are also very welcome.
-
-Translations can be provided via [Crowdin](https://crowdin.com/project/amethyst-social)
-
-You can also send patches through Nostr using [GitStr](https://github.com/fiatjaf/gitstr) to [this nostr address](https://patch34.pages.dev/naddr1qqyxzmt9w358jum5qyg8v6t5daezumn0wd68yvfwvdhk6qg7waehxw309ahx7um5wgkhqatz9emk2mrvdaexgetj9ehx2ap0qy2hwumn8ghj7un9d3shjtnwdaehgu3wvfnj7q3qgcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqxpqqqpmej720gac)
-
-## How to Deploy
+## Deploying
 
 1. Generate a new signing key
 ```
@@ -195,23 +222,37 @@ openssl base64 < <my-release-key.keystore> | tr -d '\n' | tee some_signing_key.j
 7. Add your CHANGE LOG to the description of the new release
 8. Download the `aab` file and upload it to the PlayStore.
 
-# Privacy on Relays & nostr
-Your internet protocol (IP) address is exposed to the relays you connect to. If you want to improve your privacy, consider utilizing a service that masks your IP address (e.g. a VPN) from trackers online.
+## Using the Quartz library
 
-The relay also learns which public keys you are requesting, meaning your public key will be tied to your IP address.
+Setup [JitPack.io](https://jitpack.io/#vitorpamplona/amethyst/v0.84.3) to your build file
 
-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.
+Add `maven { url 'https://jitpack.io' }` to settings.gradle at the end of repositories:
 
-# DM Privacy #
-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.
+```gradle
+dependencyResolutionManagement {
+  repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+  repositories {
+    mavenCentral()
+    maven { url 'https://jitpack.io' }
+  }
+}
+```
 
-# Visibility & Permanence of Your Content on nostr
-## Information Visibility ##
-Content that you share can be shared to other relays.
-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.
+Add the dependency
 
-## Information Permanence ##
-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.
+```gradle
+implementation('com.github.vitorpamplona.amethyst:quartz:v0.85.1')
+```
+
+## Contributing
+
+Issues can be logged on: [https://gitworkshop.dev/repo/amethyst](https://gitworkshop.dev/repo/amethyst)
+
+[GitHub issues](https://github.com/vitorpamplona/amethyst/issues) and [pull requests](https://github.com/vitorpamplona/amethyst/pulls) here are also welcome. Translations can be provided via [Crowdin](https://crowdin.com/project/amethyst-social)
+
+You can also send patches through Nostr using [GitStr](https://github.com/fiatjaf/gitstr) to [this nostr address](https://patch34.pages.dev/naddr1qqyxzmt9w358jum5qyg8v6t5daezumn0wd68yvfwvdhk6qg7waehxw309ahx7um5wgkhqatz9emk2mrvdaexgetj9ehx2ap0qy2hwumn8ghj7un9d3shjtnwdaehgu3wvfnj7q3qgcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqxpqqqpmej720gac)
+
+By contributing to this repository, you agree to license your work under the MIT license. Any work contributed where you are not the original author must contain its license header with the original author(s) and source.
 
 # Screenshots
 
@@ -219,7 +260,7 @@ Information shared on nostr should be assumed permanent for privacy purposes. Th
 |-------------------------------------------|----------------------------------------------|-------------------------------------------------|--------------------------------------------------------|
 | ![Home Feed](./docs/screenshots/home.png) | ![Messages](./docs/screenshots/messages.png) | ![Live Streams](./docs/screenshots/replies.png) | ![Notifications](./docs/screenshots/notifications.png) |
 
-## Contributors
+# Contributors
 
 <a align="center" href="https://github.com/vitorpamplona/amethyst/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=vitorpamplona/amethyst" />
@@ -227,6 +268,7 @@ Information shared on nostr should be assumed permanent for privacy purposes. Th
 
 # MIT License
 
+<pre>
 Copyright (c) 2023 Vitor Pamplona
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -246,3 +288,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+</pre>

app/build.gradle

@@ -1,7 +1,7 @@
 plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
-    id 'com.google.gms.google-services'
+    alias(libs.plugins.androidApplication)
+    alias(libs.plugins.jetbrainsKotlinAndroid)
+    alias(libs.plugins.googleServices)
 }
 
 android {
@@ -12,8 +12,9 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 34
-        versionCode 353
-        versionName "0.83.12"
+        versionCode 365
+        versionName "0.86.2"
+        buildConfigField "String", "RELEASE_NOTES_ID", "\"a704a11334ed4fe6fc6ee6f8856f6f005da33644770616f1437f8b2b488b52b1\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -144,13 +145,13 @@ android {
         // Should match compose version : https://developer.android.com/jetpack/androidx/releases/compose-kotlin
         kotlinCompilerExtensionVersion "1.5.8"
     }
-
     packagingOptions {
         resources {
-            excludes += '/META-INF/{AL2.0,LGPL2.1}'
+            excludes += ['/META-INF/{AL2.0,LGPL2.1}', '**/libscrypt.dylib']
         }
     }
 
+
     lint {
         disable 'MissingTranslation'
     }
@@ -161,77 +162,77 @@ android {
 }
 
 dependencies {
+    implementation platform(libs.androidx.compose.bom)
+
     implementation project(path: ':quartz')
     implementation project(path: ':commons')
-    implementation "androidx.core:core-ktx:$core_ktx_version"
-    implementation 'androidx.activity:activity-compose:1.8.2'
-    implementation "androidx.compose.ui:ui:$compose_ui_version"
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
+    implementation libs.androidx.core.ktx
+    implementation libs.androidx.activity.compose
+
+    implementation libs.androidx.ui
+    implementation libs.androidx.ui.graphics
+    implementation libs.androidx.ui.tooling.preview
 
     // Needs this to open gallery / image upload
-    implementation "androidx.fragment:fragment-ktx:$fragment_version"
+    implementation libs.androidx.fragment.ktx
 
     // Navigation
-    implementation "androidx.navigation:navigation-compose:$nav_version"
+    implementation libs.androidx.navigation.compose
 
     // Observe Live data as State
-    implementation "androidx.compose.runtime:runtime-livedata:$compose_ui_version"
+    implementation libs.androidx.runtime.livedata
 
     // Material 3 Design
-    implementation "androidx.compose.material3:material3:${material3_version}"
-    implementation "androidx.compose.material:material-icons-extended:$compose_ui_version"
+    implementation libs.androidx.material3
+    implementation libs.androidx.material.icons
 
     // Adaptive Layout / Two Pane
-    implementation "androidx.compose.material3:material3-window-size-class:${material3_version}"
-    implementation 'com.google.accompanist:accompanist-adaptive:0.34.0'
-
+    implementation libs.androidx.material3.windowSize
+    implementation libs.accompanist.adaptive
 
     // Lifecycle
-    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-ktx:$lifecycle_version"
+    implementation libs.androidx.lifecycle.runtime.ktx
+    implementation libs.androidx.lifecycle.runtime.compose
+    implementation libs.androidx.lifecycle.viewmodel.compose
+    implementation libs.androidx.lifecycle.livedata.ktx
 
     // Zoomable images
-    implementation 'net.engawapg.lib:zoomable:1.6.0'
+    implementation libs.zoomable
 
     // Biometrics
-    implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"
+    implementation libs.androidx.biometric.ktx
 
     // Websockets API
-    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.12'
-
-    // HTML Parsing for Link Preview
-    implementation 'org.jsoup:jsoup:1.17.2'
+    implementation libs.okhttp
 
     // Encrypted Key Storage
-    implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha06'
+    implementation libs.androidx.security.crypto.ktx
 
     // view videos
-    implementation "androidx.media3:media3-exoplayer:$media3_version"
-    implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
-    implementation "androidx.media3:media3-ui:$media3_version"
-    implementation "androidx.media3:media3-session:$media3_version"
+    implementation libs.androidx.media3.exoplayer
+    implementation libs.androidx.media3.exoplayer.hls
+    implementation libs.androidx.media3.ui
+    implementation libs.androidx.media3.session
 
     // important for proxy / tor
-    implementation "androidx.media3:media3-datasource-okhttp:$media3_version"
+    implementation libs.androidx.media3.datasource.okhttp
 
     // Load images from the web.
-    implementation "io.coil-kt:coil-compose:$coil_version"
+    implementation libs.coil.compose
     // view gifs
-    implementation "io.coil-kt:coil-gif:$coil_version"
+    implementation libs.coil.gif
     // view svgs
-    implementation "io.coil-kt:coil-svg:$coil_version"
+    implementation libs.coil.svg
 
     // create blurhash
-    implementation group: 'io.trbl', name: 'blurhash', version: '1.0.0'
+    implementation libs.trbl.blurhash
 
     // Permission to upload pictures:
-    implementation "com.google.accompanist:accompanist-permissions:$accompanist_version"
+    implementation libs.accompanist.permissions
 
     // For QR generation
-    implementation 'com.google.zxing:core:3.5.3'
-    implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
+    implementation libs.zxing
+    implementation libs.zxing.embedded
 
     // Markdown
     //implementation "com.halilibo.compose-richtext:richtext-ui:0.16.0"
@@ -239,51 +240,54 @@ dependencies {
     //implementation "com.halilibo.compose-richtext:richtext-commonmark:0.16.0"
 
     // Markdown (With fix for full-image bleeds)
-    implementation('com.github.vitorpamplona.compose-richtext:richtext-ui:48702a8ced')
-    implementation('com.github.vitorpamplona.compose-richtext:richtext-ui-material3:48702a8ced')
-    implementation('com.github.vitorpamplona.compose-richtext:richtext-commonmark:48702a8ced')
+    implementation libs.markdown.ui
+    implementation libs.markdown.ui.material3
+    implementation libs.markdown.commonmark
 
     // Language picker and Theme chooser
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation libs.androidx.appcompat
 
     // Local model for language identification
-    playImplementation 'com.google.mlkit:language-id:17.0.4'
+    playImplementation libs.google.mlkit.language.id
 
     // Google services model the translate text
-    playImplementation 'com.google.mlkit:translate:17.0.2'
+    playImplementation libs.google.mlkit.translate
 
     // PushNotifications
-    playImplementation platform('com.google.firebase:firebase-bom:32.7.1')
-    playImplementation 'com.google.firebase:firebase-messaging-ktx'
+    playImplementation platform(libs.firebase.bom)
+    playImplementation libs.firebase.messaging
 
     //PushNotifications(FDroid)
-    fdroidImplementation 'com.github.UnifiedPush:android-connector:2.2.0'
+    fdroidImplementation libs.unifiedpush
 
     // Charts
-    implementation "com.patrykandpatrick.vico:core:${vico_version}"
-    implementation "com.patrykandpatrick.vico:compose:${vico_version}"
-    implementation "com.patrykandpatrick.vico:views:${vico_version}"
-    implementation "com.patrykandpatrick.vico:compose-m2:${vico_version}"
+    implementation libs.vico.charts.core
+    implementation libs.vico.charts.compose
+    implementation libs.vico.charts.views
+    implementation libs.vico.charts.m3
 
     // GeoHash
-    implementation 'com.github.drfonfon:android-kotlin-geohash:1.0'
+    implementation libs.drfonfon.geohash
 
     // Waveform visualizer
-    implementation 'com.github.lincollincol:compose-audiowaveform:1.1.1'
+    implementation libs.audiowaveform
 
     // Video compression lib
-    implementation 'com.github.AbedElazizShe:LightCompressor:1.3.2'
+    implementation libs.abedElazizShe.image.compressor
     // Image compression lib
-    implementation 'id.zelory:compressor:3.0.1'
+    implementation libs.zelory.video.compressor
 
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'io.mockk:mockk:1.13.9'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.0-alpha03'
-    androidTestImplementation 'androidx.test.ext:junit-ktx:1.2.0-alpha03'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version"
-    debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version"
+    testImplementation libs.junit
+    testImplementation libs.mockk
+
+    androidTestImplementation platform(libs.androidx.compose.bom)
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.junit.ktx
+    androidTestImplementation libs.androidx.espresso.core
+
+    debugImplementation platform(libs.androidx.compose.bom)
+    debugImplementation libs.androidx.ui.tooling
+    debugImplementation libs.androidx.ui.test.manifest
 }
 
 // https://gitlab.com/fdroid/wiki/-/wikis/HOWTO:-diff-&-fix-APKs-for-Reproducible-Builds#differing-assetsdexoptbaselineprofm-easy-to-fix

app/proguard-rules.pro

@@ -33,6 +33,11 @@
 # JNA For Libsodium
 -keep class com.goterl.lazysodium.** { *; }
 
+# libscrypt
+-keep class com.lambdaworks.codec.** { *; }
+-keep class com.lambdaworks.crypto.** { *; }
+-keep class com.lambdaworks.jni.** { *; }
+
 # 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 { *; }

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -20,6 +20,8 @@
  */
 package com.vitorpamplona.amethyst
 
+import android.graphics.Bitmap
+import android.graphics.Color
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.FileHeader
@@ -29,70 +31,17 @@ import com.vitorpamplona.amethyst.service.Nip96Uploader
 import com.vitorpamplona.amethyst.ui.actions.ImageDownloader
 import com.vitorpamplona.quartz.crypto.KeyPair
 import junit.framework.TestCase.assertEquals
-import junit.framework.TestCase.assertTrue
 import junit.framework.TestCase.fail
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.util.Base64
+import java.io.ByteArrayOutputStream
+import kotlin.random.Random
 
 @RunWith(AndroidJUnit4::class)
 class ImageUploadTesting {
-    val contentType = "image/gif"
-    val image =
-        "R0lGODlhPQBEAPeoAJosM//AwO/AwHVYZ/z595kzAP/s7P+goOXMv8+fhw/v739/f+8PD98fH/8mJl+fn/9ZWb8/PzW" +
-            "lwv///6wWGbImAPgTEMImIN9gUFCEm/gDALULDN8PAD6atYdCTX9gUNKlj8wZAKUsAOzZz+UMAOsJAP/Z2c" +
-            "cMDA8PD/95eX5NWvsJCOVNQPtfX/8zM8+QePLl38MGBr8JCP+zs9myn/8GBqwpAP/GxgwJCPny78lzYLgjA" +
-            "J8vAP9fX/+MjMUcAN8zM/9wcM8ZGcATEL+QePdZWf/29uc/P9cmJu9MTDImIN+/r7+/vz8/P8VNQGNugV8A" +
-            "AF9fX8swMNgTAFlDOICAgPNSUnNWSMQ5MBAQEJE3QPIGAM9AQMqGcG9vb6MhJsEdGM8vLx8fH98AANIWAMu" +
-            "QeL8fABkTEPPQ0OM5OSYdGFl5jo+Pj/+pqcsTE78wMFNGQLYmID4dGPvd3UBAQJmTkP+8vH9QUK+vr8ZWSH" +
-            "pzcJMmILdwcLOGcHRQUHxwcK9PT9DQ0O/v70w5MLypoG8wKOuwsP/g4P/Q0IcwKEswKMl8aJ9fX2xjdOtGR" +
-            "s/Pz+Dg4GImIP8gIH0sKEAwKKmTiKZ8aB/f39Wsl+LFt8dgUE9PT5x5aHBwcP+AgP+WltdgYMyZfyywz78A" +
-            "AAAAAAD///8AAP9mZv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" +
-            "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" +
-            "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" +
-            "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" +
-            "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAKgALAAAAAA9AEQAAAj/AFEJHEiwoMGDCBMqXMi" +
-            "wocAbBww4nEhxoYkUpzJGrMixogkfGUNqlNixJEIDB0SqHGmyJSojM1bKZOmyop0gM3Oe2liTISKMOoPy7G" +
-            "nwY9CjIYcSRYm0aVKSLmE6nfq05QycVLPuhDrxBlCtYJUqNAq2bNWEBj6ZXRuyxZyDRtqwnXvkhACDV+euT" +
-            "eJm1Ki7A73qNWtFiF+/gA95Gly2CJLDhwEHMOUAAuOpLYDEgBxZ4GRTlC1fDnpkM+fOqD6DDj1aZpITp0dt" +
-            "GCDhr+fVuCu3zlg49ijaokTZTo27uG7Gjn2P+hI8+PDPERoUB318bWbfAJ5sUNFcuGRTYUqV/3ogfXp1rWl" +
-            "Mc6awJjiAAd2fm4ogXjz56aypOoIde4OE5u/F9x199dlXnnGiHZWEYbGpsAEA3QXYnHwEFliKAgswgJ8LPe" +
-            "iUXGwedCAKABACCN+EA1pYIIYaFlcDhytd51sGAJbo3onOpajiihlO92KHGaUXGwWjUBChjSPiWJuOO/LYI" +
-            "m4v1tXfE6J4gCSJEZ7YgRYUNrkji9P55sF/ogxw5ZkSqIDaZBV6aSGYq/lGZplndkckZ98xoICbTcIJGQAZ" +
-            "cNmdmUc210hs35nCyJ58fgmIKX5RQGOZowxaZwYA+JaoKQwswGijBV4C6SiTUmpphMspJx9unX4KaimjDv9" +
-            "aaXOEBteBqmuuxgEHoLX6Kqx+yXqqBANsgCtit4FWQAEkrNbpq7HSOmtwag5w57GrmlJBASEU18ADjUYb3A" +
-            "DTinIttsgSB1oJFfA63bduimuqKB1keqwUhoCSK374wbujvOSu4QG6UvxBRydcpKsav++Ca6G8A6Pr1x2kV" +
-            "MyHwsVxUALDq/krnrhPSOzXG1lUTIoffqGR7Goi2MAxbv6O2kEG56I7CSlRsEFKFVyovDJoIRTg7sugNRDG" +
-            "qCJzJgcKE0ywc0ELm6KBCCJo8DIPFeCWNGcyqNFE06ToAfV0HBRgxsvLThHn1oddQMrXj5DyAQgjEHSAJMW" +
-            "ZwS3HPxT/QMbabI/iBCliMLEJKX2EEkomBAUCxRi42VDADxyTYDVogV+wSChqmKxEKCDAYFDFj4OmwbY7bD" +
-            "GdBhtrnTQYOigeChUmc1K3QTnAUfEgGFgAWt88hKA6aCRIXhxnQ1yg3BCayK44EWdkUQcBByEQChFXfCB77" +
-            "6aQsG0BIlQgQgE8qO26X1h8cEUep8ngRBnOy74E9QgRgEAC8SvOfQkh7FDBDmS43PmGoIiKUUEGkMEC/PJH" +
-            "gxw0xH74yx/3XnaYRJgMB8obxQW6kL9QYEJ0FIFgByfIL7/IQAlvQwEpnAC7DtLNJCKUoO/w45c44GwCXiA" +
-            "FB/OXAATQryUxdN4LfFiwgjCNYg+kYMIEFkCKDs6PKAIJouyGWMS1FSKJOMRB/BoIxYJIUXFUxNwoIkEKPA" +
-            "gCBZSQHQ1A2EWDfDEUVLyADj5AChSIQW6gu10bE/JG2VnCZGfo4R4d0sdQoBAHhPjhIB94v/wRoRKQWGRHg" +
-            "rhGSQJxCS+0pCZbEhAAOw=="
-
-    val contentTypePng = "image/png"
-    val imagePng =
-        "iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAApgAAAKYB3X3" +
-            "/OAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAANCSURBVEiJtZZPbBtFFMZ/M7ubXd" +
-            "tdb1xSFyeilBapySVU8h8OoFaooFSqiihIVIpQBKci6KEg9Q6H9kovIHoCIVQJJCKE1ENFjnAgcaSGC6rEn" +
-            "xBwA04Tx43t2FnvDAfjkNibxgHxnWb2e/u992bee7tCa00YFsffekFY+nUzFtjW0LrvjRXrCDIAaPLlW0nH" +
-            "L0SsZtVoaF98mLrx3pdhOqLtYPHChahZcYYO7KvPFxvRl5XPp1sN3adWiD1ZAqD6XYK1b/dvE5IWryTt2ud" +
-            "LFedwc1+9kLp+vbbpoDh+6TklxBeAi9TL0taeWpdmZzQDry0AcO+jQ12RyohqqoYoo8RDwJrU+qXkjWtfi8" +
-            "Xxt58BdQuwQs9qC/afLwCw8tnQbqYAPsgxE1S6F3EAIXux2oQFKm0ihMsOF71dHYx+f3NND68ghCu1YIoeP" +
-            "PQN1pGRABkJ6Bus96CutRZMydTl+TvuiRW1m3n0eDl0vRPcEysqdXn+jsQPsrHMquGeXEaY4Yk4wxWcY5V/" +
-            "9scqOMOVUFthatyTy8QyqwZ+kDURKoMWxNKr2EeqVKcTNOajqKoBgOE28U4tdQl5p5bwCw7BWquaZSzAPlw" +
-            "jlithJtp3pTImSqQRrb2Z8PHGigD4RZuNX6JYj6wj7O4TFLbCO/Mn/m8R+h6rYSUb3ekokRY6f/YukArN97" +
-            "9jcW+V/S8g0eT/N3VN3kTqWbQ428m9/8k0P/1aIhF36PccEl6EhOcAUCrXKZXXWS3XKd2vc/TRBG9O5ELC1" +
-            "7MmWubD2nKhUKZa26Ba2+D3P+4/MNCFwg59oWVeYhkzgN/JDR8deKBoD7Y+ljEjGZ0sosXVTvbc6RHirr2r" +
-            "eNy1OXd6pJsQ+gqjk8VWFYmHrwBzW/n+uMPFiRwHB2I7ih8ciHFxIkd/3Omk5tCDV1t+2nNu5sxxpDFNx+h" +
-            "uNhVT3/zMDz8usXC3ddaHBj1GHj/As08fwTS7Kt1HBTmyN29vdwAw+/wbwLVOJ3uAD1wi/dUH7Qei66Pfyu" +
-            "Rj4Ik9is+hglfbkbfR3cnZm7chlUWLdwmprtCohX4HUtlOcQjLYCu+fzGJH2QRKvP3UNz8bWk1qMxjGTOMT" +
-            "hZ3kvgLI5AzFfo379UAAAAASUVORK5CYII="
-
     private suspend fun testBase(server: Nip96MediaServers.ServerName) {
         val serverInfo =
             Nip96Retriever()
@@ -100,7 +49,15 @@ class ImageUploadTesting {
                     server.baseUrl,
                 )
 
-        val bytes = Base64.getDecoder().decode(imagePng)
+        val bitmap = Bitmap.createBitmap(200, 300, Bitmap.Config.ARGB_8888)
+        for (x in 0 until bitmap.width) {
+            for (y in 0 until bitmap.height) {
+                bitmap.setPixel(x, y, Color.rgb(Random.nextInt(), Random.nextInt(), Random.nextInt()))
+            }
+        }
+        val baos = ByteArrayOutputStream()
+        bitmap.compress(Bitmap.CompressFormat.PNG, 100, baos)
+        val bytes = baos.toByteArray()
         val inputStream = bytes.inputStream()
 
         val account = Account(KeyPair())
@@ -110,7 +67,7 @@ class ImageUploadTesting {
                 .uploadImage(
                     inputStream,
                     bytes.size.toLong(),
-                    contentTypePng,
+                    "image/png",
                     alt = null,
                     sensitiveContent = null,
                     serverInfo,
@@ -124,31 +81,31 @@ class ImageUploadTesting {
         val contentType = result.tags!!.first { it[0] == "m" }.get(1)
         val ox = result.tags!!.first { it[0] == "ox" }.get(1)
 
-        Assert.assertTrue(url.startsWith("http"))
+        Assert.assertTrue("${server.name}: Invalid result url", url.startsWith("http"))
 
         val imageData: ByteArray =
             ImageDownloader().waitAndGetImage(url)
                 ?: run {
-                    fail("Should not be null")
+                    fail("${server.name}: Should not be null")
                     return
                 }
 
         FileHeader.prepare(
             imageData,
-            contentTypePng,
+            "image/png",
             null,
             onReady = {
                 if (dim != null) {
-                    assertEquals(dim, it.dim)
+                    // assertEquals("${server.name}: Invalid dimensions", it.dim, dim)
                 }
                 if (size != null) {
-                    assertEquals(size, it.size.toString())
+                    // assertEquals("${server.name}: Invalid size", it.size.toString(), size)
                 }
                 if (hash != null) {
-                    assertEquals(hash, it.hash)
+                    assertEquals("${server.name}: Invalid hash", it.hash, hash)
                 }
             },
-            onError = { fail("It should not fail") },
+            onError = { fail("${server.name}: It should not fail") },
         )
 
         // delay(1000)
@@ -156,6 +113,14 @@ class ImageUploadTesting {
         // assertTrue(Nip96Uploader(account).delete(ox, contentType, serverInfo))
     }
 
+    @Test
+    fun runTestOnDefaultServers() =
+        runBlocking {
+            Nip96MediaServers.DEFAULT.forEach {
+                testBase(it)
+            }
+        }
+
     @Test()
     fun testNostrCheck() =
         runBlocking {
@@ -163,12 +128,14 @@ class ImageUploadTesting {
         }
 
     @Test()
+    @Ignore("Not Working anymore")
     fun testNostrage() =
         runBlocking {
             testBase(Nip96MediaServers.ServerName("nostrage", "https://nostrage.com"))
         }
 
     @Test()
+    @Ignore("Not Working anymore")
     fun testSove() =
         runBlocking {
             testBase(Nip96MediaServers.ServerName("sove", "https://sove.rent"))
@@ -181,6 +148,7 @@ class ImageUploadTesting {
         }
 
     @Test()
+    @Ignore("Not Working anymore")
     fun testSovbit() =
         runBlocking {
             testBase(Nip96MediaServers.ServerName("sovbit", "https://files.sovbit.host"))
@@ -191,4 +159,17 @@ class ImageUploadTesting {
         runBlocking {
             testBase(Nip96MediaServers.ServerName("void.cat", "https://void.cat"))
         }
+
+    @Test()
+    fun testNostrPic() =
+        runBlocking {
+            testBase(Nip96MediaServers.ServerName("nostpic.com", "https://nostpic.com"))
+        }
+
+    @Test()
+    @Ignore("Not Working anymore")
+    fun testNostrOnch() =
+        runBlocking {
+            testBase(Nip96MediaServers.ServerName("nostr.onch.services", "https://nostr.onch.services"))
+        }
 }

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

@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) 2024 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.vitorpamplona.amethyst.service.ots.OkHttpBlockstreamExplorer
+import com.vitorpamplona.amethyst.service.ots.OkHttpCalendarBuilder
+import com.vitorpamplona.quartz.crypto.KeyPair
+import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.events.OtsEvent
+import com.vitorpamplona.quartz.ots.OpenTimestamps
+import com.vitorpamplona.quartz.signers.NostrSignerInternal
+import junit.framework.TestCase.assertEquals
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+@RunWith(AndroidJUnit4::class)
+class OkHttpOtsTest {
+    val otsEvent = "{\"content\":\"AE9wZW5UaW1lc3RhbXBzAABQcm9vZgC/ieLohOiSlAEIqCiiW0FlsU9lqK5f1A+cL6CGJ1Ah4V/A1yNJY/stUE3wECJz6ng/QxU5Z6xwaMx97qkI//AQqJv8bEMrGTplGWRv5qm4DgjxIHkcQqzpL0Fjr9VBAAijDe0IsQYpOhw1SIjZIgQa6i16CPEEZck7CvAIxR0AloJzCZoAg9/jDS75DI4uLWh0dHBzOi8vYWxpY2UuYnRjLmNhbGVuZGFyLm9wZW50aW1lc3RhbXBzLm9yZ//wEOwPtjIkKI1hmtv9t1kuxZcI8QRlyTsK8Ahl0wrCSggZzgCD3+MNLvkMjiwraHR0cHM6Ly9ib2IuYnRjLmNhbGVuZGFyLm9wZW50aW1lc3RhbXBzLm9yZ//wEE1dVGa8JCuf2ek0c5ybDKII8SCBoVz8Sal45Kd1O8STWIGJTcl5JPtAZBZitqk3BE9MqAjxBGXJOwrwCHoGVgAZi9q9AIPf4w0u+QyOKShodHRwczovL2Zpbm5leS5jYWxlbmRhci5ldGVybml0eXdhbGwuY29t8BAFZFXFYg7DJJ0OzjmJ0FKWCPEEZck7CvAI0M49IcBR5bf/AIPf4w0u+QyOIyJodHRwczovL2J0Yy5jYWxlbmRhci5jYXRhbGxheHkuY29tCPEgoE3IfYTmxxo4W/x/QYp/NGX6Wu93gSQkwbpjpOhZORcI8SDWLLurVQaXHdUuwivCfTfuxYCaq+AzypSGqLDAVocrEgjwIBfgjta16y13Gp4etQOCa9YiKEcM+/9AieG/vZolr3IDCPAgMR2zFCb384CEi8tVuI2fHgLT3I9zpe7oqJTzCcEqxWEI8SAJSdgeeosr7IxdOt8r7f0ipWc8FI6GAhgep8zSRgWikAjxIGxYmtCsC79Tx4z4YsT1WuMo+ycMkwhGQsQltF597cchCPAgCLrBf9vR1Aex6yY+vSkXAvLjMKdMqM/a1g8zNPwLeJcI8SBDCbTk4CczTuiIyZeUyYRVh31BZdjaSd2nU/pBQxu+6QjwIOwqE9/WqGC6CHH0i+tr7edvYX5PstSDf08KmnMqsqCoCPEgQIdEBg358vfek3Qjfyrgl51iCU6WUWmThsGLPDTcB0QI8SAX4dp64iI8pBx+zBqAQwUN6XgZ1cEfT8+2vha/9I1vzwjxWQEAAAAB8YJxvxJJth8OnxIV6UOXveIZAcJPTHcAkWgnucpuYqYAAAAAAP3///8CRhoMAAAAAAAWABTUUZK82uAvbU3vVyaaPIOddZBicwAAAAAAAAAAImog8ARCqgwACAjwIB9TcMDLhzgeS1Uw647lNvCfWECkkUvfrrOe6nay0sGdCAjwICYfs90sbPggoMICyOHGYbmOzop2L9mlnh4xqiBLY7yPCAjxINDiVWOBHnRmGJleQdB9myvJAJbNJ9kciZlTOkgJy89mCAjwIHfxqDLdwycj1Vtyth2CaSDdLQwiey9oV6Xov4stLpWNCAjxIGurJYpKJnKp9+y7MAdC+gXgHOiAu5P3RRUFW9l5hGaCCAjxICXqs9hdY0QMP/MNeqlt6s7xaIYtEXZ1CLvou5gaZNEICAjxIHdYxVeI76NXbT2zHcv6lw+v819Ooib7KWxc1GAsiX2fCAjwICPWdi3uBXOlIdmYi+V9C7wAqLyGE4DMoHD+GtvLizqiCAjwIOF2vENtWN5okEMMS+JSf1SGTY9yYP9j0JjXLbC1s+N1CAjxINWsgCtsPxhRNbe372k8/20WDbiL9e8934hGF256DvRECAjwII3mi+Li06j10ORxg0dYMkcsyGb115Jiqq1YEV3K/u+aCAgABYiWDXPXGQEDw9Qy\",\"created_at\":1707690688,\"id\":\"759f9da5846e936fab06766a524b36ba71c03bbc69ad0944fb8ee4bb1f3dd705\",\"kind\":1040,\"pubkey\":\"82fbb08c8ef45c4d71c88368d0ae805bc62fb92f166ab04a0b7a0c83d8cbc29a\",\"sig\":\"07c7896c8cbb97b5d7483097590c9d31b73f35c1ad9e752002bb5c1776cbd852e1d32704333d6930c9bc3e40f8b899a1f2e9f91cc3bf797d86acdecba7792576\",\"tags\":[[\"e\",\"a828a25b4165b14f65a8ae5fd40f9c2fa086275021e15fc0d7234963fb2d504d\"],[\"p\",\"595ca8eaace5899cb6ab7e2542bfc972136376f2eabc09287f1857eb8f167e53\"],[\"alt\",\"NIP-03 time stamp\"]]}"
+    val otsEvent2 = "{\"content\":\"AE9wZW5UaW1lc3RhbXBzAABQcm9vZgC/ieLohOiSlAEIqGNPU2jhd4no+zg2ytDkuf5PIoivr8KHI8BL68aKGNbwENyCNtiEN98IzIZgEu3cl6YI//AQ6TkSRd3BTGhDHCK1KkJc+AjxIAHaizG++NNL3Vm13BJrIhT7Br6tEYpb0TVRGaadgiUMCPAgOSDREH9v1Y50UHu79LfC4Lcd9WklQJzRQpw+Unb/pyII8QRltDD58AgqrxfAVrLw7QCD3+MNLvkMji4taHR0cHM6Ly9hbGljZS5idGMuY2FsZW5kYXIub3BlbnRpbWVzdGFtcHMub3Jn//AQQMq/CLpGwY60nmddPS7OVgjxIDKxqd9nl+Mej41vP52Wd7gv7004r3n1rFGDObS8icRvCPAgH9TB/kwvXJEEw+h9Ce6fLaI3MORjtTEge0GbAefT6W4I8QRltDD58AhRcoU3gAo/swCD3+MNLvkMjiwraHR0cHM6Ly9ib2IuYnRjLmNhbGVuZGFyLm9wZW50aW1lc3RhbXBzLm9yZ//wECWtWsKo0uvSr8BYonjs3DEI8CBlsh2ng1Spl0K4oStYElGuMJsjd2uo5nXB+apo5A7ipwjxIM8oxynBwNA+QS/X7Ebtl1kyhFgfoOQioASNfCBzZ4gaCPEEZbQw+fAId6Yd5cw5gioAg9/jDS75DI4pKGh0dHBzOi8vZmlubmV5LmNhbGVuZGFyLmV0ZXJuaXR5d2FsbC5jb23wEJmPzXQbxv0AFTIyjTWjMskI8CAurbkrfrBtlinZXSDxj+m/oIkze57hGjTSxu1Xs87XYQjwIPk/LMD0zIgKoEE2dfeoYrrdHuO6dwmghTwUFajH2QzkCPEEZbQw+fAIE+Pq1/Wmdpj/AIPf4w0u+QyOIyJodHRwczovL2J0Yy5jYWxlbmRhci5jYXRhbGxheHkuY29tCPAgB2CbqkV7VpjRKIl3Ea6cBmB/EHcSN/YCgcc1E+mc07QI8CAfpkZ2Hh4Rukz3x4il3tZqQtlDlbna+I6so2t2YSEmMQjwIJOv32jbsMa2HJwpleRCKLEhgYOoHCSfpv1ZO0YNNNFsCPAgLMM7eFfCjokQfU4gdU5WpG/wBLkO9lDRF0GktL6ujt8I8SCRxJ0bC1PQ8qFmI/1jh8AS5d1/6VRJNMt1Hz41QmNr3QjwIBmgrKBF+OZ3y+XOMv2E7IZ4WwLr2u2H+ehsBfy7cPlICPEgm4ZMCSXzZVWu40d+zk2edaur6KOauo8X7V2KaFBR1VoI8SBKVVOiyq6IFqGn/15kLwk7L8upMAIZ0znjhYxYqSTQCQjwIMBD1twPZ33GxbwTiuOCeJPkoP++6R2wYpCii8UBTdgwCPAg84VkgMXwrt2xxRoeC1/6CtsFctki+w3m8Rs5/6g/IhEI8CCnzZQDhJyicX7bS7U8PMUObuC9Y4TXe+4THoXBMMXkxwjxIMZ0oAvshpcwowR3qPEDbwKZ6B4NPSU4Hz/+4PnD74gnCPAgIfLZEKqAvkMNXfakXoNq1UVqGSzL4Z86z5GzUfbvw8UI8SC8KoIeLvjd4vJ/xhNVphakPRd80YKeNkeYEuVH8k2EtAjwIPRtinLLxzt8iuw0XZtpTDzEstZOTNYVm+Bi3fEzdeIuCPFZAQAAAAE8vsasINN5DKon0KakX2HNdCB126ZLKXrw4PfvyEfqbwAAAAAA/f///wLPGw8AAAAAABYAFCvgxlh6msa4ZOtgvlc5KiZCx7IvAAAAAAAAAAAiaiDwBKygDAAICPEgB/2DJ3s6gMky/PceGZocTFRXjZUiCCAhHGYwQk/8yrUICPEgDuSd6+PJHUMuEHyLcKFxw7xfvRHRfInjkV3/Zy3BxqAICPEgZDgQ+4VXzlOIkGoO8EVxDgs2cWaeh4EEiaqa/y50gKAICPAgFI+zIuYcMF69GmPQVsXa9oy8eng7MeRZdIxArQyeX3oICPEgX5HYIuImpiSTEapgEssEW4l+W+4aRfNCG3pZf7z0hCoICPEgPkAbOSjFdtS4NT7MXgMYVQoQhI1JZtdFxUu4J3NTt7IICPEguW3qyuyGjctu5d9rM9P9ZCs/ZK4vAc+z21b9ygklgWAICPEgu4e2645xtvGhI1Zzuiv23vRhwE8uC9vj1TAgNg/C8UcICPAgwoQX8X0nY4HoQLRsJ0z8JCWQDzRh2iL2QXEb8z3gbjIICPAgzTwlPRtStsLJWhz3Q/0l8tMnrPSHVuh+zCiGk95dW2MICPAgGcBEuYZyzFNapHOfnJ9Q515QzO2VbIRhlVI0vIhd4jwICPAgidRMoM2pA+KmVJenVrLcbollsbUg9lL9bmv1C1dSxswICPAgZinGakwhbHdanTaRJeBkEUlbhfNokvj8b5KneyG+wzIICAAFiJYNc9cZAQOtwTI=\",\"created_at\":1706324334,\"id\":\"2ad074ddb7724eb13b4244b49cf2321b1057f37fdf8ce102e6329b839cf763a9\",\"kind\":1040,\"pubkey\":\"82fbb08c8ef45c4d71c88368d0ae805bc62fb92f166ab04a0b7a0c83d8cbc29a\",\"sig\":\"ad7274bb32ba9e9cfdbd52f4887e8a2fda1047c75a7185b2ab7ff254ebac14ed48a2b60737494d655e24c9400eeeec7e29293a77bfcaafaecd94b350c9a2c22b\",\"tags\":[[\"e\",\"a8634f5368e17789e8fb3836cad0e4b9fe4f2288afafc28723c04bebc68a18d6\"],[\"p\",\"c31e22c3715c1bde5608b7e0d04904f22f5fc453ba1806d21c9f2382e1e58c6c\"],[\"alt\",\"NIP-03 time stamp\"]]}"
+    val otsPendingEvent = "{\"id\":\"12fa15ad4b4cf9dc5940389325b69b93c5c1f59c049c701ee669b275299fdaf1\",\"pubkey\":\"dcaa6c8a2f47b6fef4a34b20e8843c59dbe7c5f07a402338c09fd147dd01d22b\",\"created_at\":1708877521,\"kind\":1040,\"tags\":[[\"e\",\"a8634f5368e17789e8fb3836cad0e4b9fe4f2288afafc28723c04bebc68a18d6\"],[\"alt\",\"Opentimestamps Attestation\"]],\"content\":\"AE9wZW5UaW1lc3RhbXBzAABQcm9vZgC/ieLohOiSlAEIqGNPU2jhd4no+zg2ytDkuf5PIoivr8KHI8BL68aKGNbwELidvzr0usf55CkpKf6OABQI//AQK3sWd2tq+7KO8YNJIARJugjxBGXbZtPwCL0H4/7GL5+SAIPf4w0u+QyOLCtodHRwczovL2JvYi5idGMuY2FsZW5kYXIub3BlbnRpbWVzdGFtcHMub3Jn//AQPDZsJgN1TnJXoUzlsgo93wjwIIfBc7LUqkCbC1BLZRZ+6LXztK50UdH5xe7fn40bupkrCPEEZdtm0/AI0CADXN5ZIncAg9/jDS75DI4uLWh0dHBzOi8vYWxpY2UuYnRjLmNhbGVuZGFyLm9wZW50aW1lc3RhbXBzLm9yZ/AQcELcSrE04cuGKlZQf2LeVwjwILUDSf9vK2GaefKTpn/LV2oUsQaA5WbqaP3C+1ZxQfRNCPEEZdtm0/AIbCtb+yRXFqUAg9/jDS75DI4pKGh0dHBzOi8vZmlubmV5LmNhbGVuZGFyLmV0ZXJuaXR5d2FsbC5jb20=\",\"sig\":\"f6854c0228c15c08aeb70bbabe9ed87bbb7289fab31b13cabac15138bb71179553e06080b83f4a813fbdaf614f63293beea3fc73fe865da6551193fa4d38de04\"}"
+
+    val otsEvent2Digest = "a8634f5368e17789e8fb3836cad0e4b9fe4f2288afafc28723c04bebc68a18d6"
+
+    @Before
+    fun setup() {
+        OtsEvent.otsInstance = OpenTimestamps(OkHttpBlockstreamExplorer(), OkHttpCalendarBuilder())
+    }
+
+    @Test
+    fun verifyNostrEvent() {
+        val ots = Event.fromJson(otsEvent) as OtsEvent
+        println(ots.info())
+        assertEquals(1707688818L, ots.verify())
+    }
+
+    @Test
+    fun verifyNostrEvent2() {
+        val ots = Event.fromJson(otsEvent2) as OtsEvent
+        println(ots.info())
+        assertEquals(1706322179L, ots.verify())
+    }
+
+    @Test
+    fun verifyNostrPendingEvent() {
+        val ots = Event.fromJson(otsPendingEvent) as OtsEvent
+        println(ots.info())
+        assertEquals(null, ots.verify())
+    }
+
+    @Test
+    fun createOTSEventAndVerify() {
+        val signer = NostrSignerInternal(KeyPair())
+        var ots: OtsEvent? = null
+
+        val countDownLatch = CountDownLatch(1)
+
+        val otsFile = OtsEvent.stamp(otsEvent2Digest)
+
+        OtsEvent.create(otsEvent2Digest, otsFile, signer) {
+            ots = it
+            countDownLatch.countDown()
+        }
+
+        Assert.assertTrue(countDownLatch.await(1, TimeUnit.SECONDS))
+
+        println(ots!!.toJson())
+        println(ots!!.info())
+
+        // Should not be valid because we need to wait for confirmations
+        assertEquals(null, ots!!.verify())
+    }
+}

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

app/src/fdroid/java/com/vitorpamplona/amethyst/service/lang/LanguageTranslatorService.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -31,17 +31,21 @@ import com.vitorpamplona.quartz.events.ImmutableListOfLists
 fun TranslatableRichTextViewer(
     content: String,
     canPreview: Boolean,
+    quotesLeft: Int,
     modifier: Modifier = Modifier,
     tags: ImmutableListOfLists<String>,
     backgroundColor: MutableState<Color>,
+    id: String,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit,
 ) = ExpandableRichTextViewer(
     content,
     canPreview,
+    quotesLeft,
     modifier,
     tags,
     backgroundColor,
+    id,
     accountViewModel,
     nav,
 )

app/src/main/java/androidx/compose/material3/pullrefresh/PullRefresh.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

app/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshIndicator.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

app/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshIndicatorTransform.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

app/src/main/java/androidx/compose/material3/pullrefresh/PullRefreshState.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -26,9 +26,14 @@ import android.os.StrictMode
 import android.os.StrictMode.ThreadPolicy
 import android.os.StrictMode.VmPolicy
 import android.util.Log
+import androidx.security.crypto.EncryptedSharedPreferences
 import coil.ImageLoader
 import coil.disk.DiskCache
+import com.vitorpamplona.amethyst.service.ots.OkHttpBlockstreamExplorer
+import com.vitorpamplona.amethyst.service.ots.OkHttpCalendarBuilder
 import com.vitorpamplona.amethyst.service.playback.VideoCache
+import com.vitorpamplona.quartz.events.OtsEvent
+import com.vitorpamplona.quartz.ots.OpenTimestamps
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -52,7 +57,7 @@ class Amethyst : Application() {
         newCache
     }
 
-    private val imageCache: DiskCache by lazy {
+    val coilCache: DiskCache by lazy {
         DiskCache.Builder()
             .directory(applicationContext.safeCacheDir.resolve("image_cache"))
             .maxSizePercent(0.2)
@@ -64,6 +69,8 @@ class Amethyst : Application() {
         super.onCreate()
         instance = this
 
+        OtsEvent.otsInstance = OpenTimestamps(OkHttpBlockstreamExplorer(), OkHttpCalendarBuilder())
+
         if (BuildConfig.DEBUG) {
             StrictMode.setThreadPolicy(
                 ThreadPolicy.Builder().detectAll().penaltyLog().build(),
@@ -84,7 +91,11 @@ class Amethyst : Application() {
     }
 
     fun imageLoaderBuilder(): ImageLoader.Builder {
-        return ImageLoader.Builder(applicationContext).diskCache { imageCache }
+        return ImageLoader.Builder(applicationContext).diskCache { coilCache }
+    }
+
+    fun encryptedStorage(npub: String? = null): EncryptedSharedPreferences {
+        return EncryptedStorage.preferences(instance, npub)
     }
 
     companion object {

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -20,32 +20,35 @@
  */
 package com.vitorpamplona.amethyst
 
+import android.content.Context
 import androidx.security.crypto.EncryptedSharedPreferences
 import androidx.security.crypto.MasterKey
 
-object EncryptedStorage {
-    private const val PREFERENCES_NAME = "secret_keeper"
+class EncryptedStorage {
+    companion object {
+        private const val PREFERENCES_NAME = "secret_keeper"
 
-    // returns the preferences for each account or a global file if null.
-    fun prefsFileName(npub: String? = null): String {
-        return if (npub == null) PREFERENCES_NAME else "${PREFERENCES_NAME}_$npub"
-    }
+        // returns the preferences for each account or a global file if null.
+        fun prefsFileName(npub: String? = null): String {
+            return if (npub == null) PREFERENCES_NAME else "${PREFERENCES_NAME}_$npub"
+        }
 
-    fun preferences(npub: String? = null): EncryptedSharedPreferences {
-        val context = Amethyst.instance
-        val masterKey: MasterKey =
-            MasterKey.Builder(context, MasterKey.DEFAULT_MASTER_KEY_ALIAS)
-                .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
-                .build()
+        fun preferences(
+            applicationContext: Context,
+            npub: String? = null,
+        ): EncryptedSharedPreferences {
+            val masterKey: MasterKey =
+                MasterKey.Builder(applicationContext, MasterKey.DEFAULT_MASTER_KEY_ALIAS)
+                    .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
+                    .build()
 
-        val preferencesName = prefsFileName(npub)
-
-        return EncryptedSharedPreferences.create(
-            context,
-            preferencesName,
-            masterKey,
-            EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
-            EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM,
-        ) as EncryptedSharedPreferences
+            return EncryptedSharedPreferences.create(
+                applicationContext,
+                prefsFileName(npub),
+                masterKey,
+                EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+                EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM,
+            ) as EncryptedSharedPreferences
+        }
     }
 }

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -27,23 +27,18 @@ import android.util.Log
 import androidx.compose.runtime.Immutable
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.BooleanType
-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.Settings
-import com.vitorpamplona.amethyst.model.ThemeType
-import com.vitorpamplona.amethyst.model.parseBooleanType
-import com.vitorpamplona.amethyst.model.parseConnectivityType
-import com.vitorpamplona.amethyst.model.parseThemeType
 import com.vitorpamplona.amethyst.service.HttpClientManager
 import com.vitorpamplona.amethyst.service.Nip96MediaServers
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.quartz.crypto.KeyPair
+import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
 import com.vitorpamplona.quartz.encoders.hexToByteArray
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.encoders.toNpub
@@ -112,6 +107,8 @@ private object PrefKeys {
     const val LOGIN_WITH_EXTERNAL_SIGNER = "login_with_external_signer"
     const val AUTOMATICALLY_SHOW_PROFILE_PICTURE = "automatically_show_profile_picture"
     const val SIGNER_PACKAGE_NAME = "signer_package_name"
+    const val HAS_DONATED_IN_VERSION = "has_donated_in_version"
+    const val PENDING_ATTESTATIONS = "pending_attestations"
 
     const val ALL_ACCOUNT_INFO = "all_saved_accounts_info"
     const val SHARED_SETTINGS = "shared_settings"
@@ -233,7 +230,7 @@ object LocalPreferences {
                 if (npub == null) DEBUG_PREFERENCES_NAME else "${DEBUG_PREFERENCES_NAME}_$npub"
             Amethyst.instance.getSharedPreferences(preferenceFile, Context.MODE_PRIVATE)
         } else {
-            return EncryptedStorage.preferences(npub)
+            return Amethyst.instance.encryptedStorage(npub)
         }
     }
 
@@ -331,12 +328,18 @@ object LocalPreferences {
                         PrefKeys.LAST_READ_PER_ROUTE,
                         Event.mapper.writeValueAsString(account.lastReadPerRoute),
                     )
+                    putStringSet(PrefKeys.HAS_DONATED_IN_VERSION, account.hasDonatedInVersion)
 
                     if (account.showSensitiveContent == null) {
                         remove(PrefKeys.SHOW_SENSITIVE_CONTENT)
                     } else {
                         putBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, account.showSensitiveContent!!)
                     }
+
+                    putString(
+                        PrefKeys.PENDING_ATTESTATIONS,
+                        Event.mapper.writeValueAsString(account.pendingAttestations),
+                    )
                 }
                 .apply()
         }
@@ -345,15 +348,6 @@ object LocalPreferences {
         return currentAccount()?.let { loadCurrentAccountFromEncryptedStorage(it) }
     }
 
-    suspend fun migrateOldSharedSettings(): Settings? {
-        val prefs = encryptedPreferences()
-        loadOldSharedSettings(prefs)?.let {
-            saveSharedSettings(it, prefs)
-            return it
-        }
-        return null
-    }
-
     suspend fun saveSharedSettings(
         sharedSettings: Settings,
         prefs: SharedPreferences = encryptedPreferences(),
@@ -381,67 +375,6 @@ object LocalPreferences {
         }
     }
 
-    @Deprecated("Turned into a single JSON object")
-    suspend fun loadOldSharedSettings(prefs: SharedPreferences = encryptedPreferences()): Settings? {
-        with(prefs) {
-            if (!contains(PrefKeys.AUTOMATICALLY_START_PLAYBACK)) {
-                return null
-            }
-
-            val automaticallyShowImages =
-                if (contains(PrefKeys.AUTOMATICALLY_SHOW_IMAGES)) {
-                    parseConnectivityType(getBoolean(PrefKeys.AUTOMATICALLY_SHOW_IMAGES, false))
-                } else {
-                    ConnectivityType.ALWAYS
-                }
-
-            val automaticallyStartPlayback =
-                if (contains(PrefKeys.AUTOMATICALLY_START_PLAYBACK)) {
-                    parseConnectivityType(getBoolean(PrefKeys.AUTOMATICALLY_START_PLAYBACK, false))
-                } else {
-                    ConnectivityType.ALWAYS
-                }
-            val automaticallyShowUrlPreview =
-                if (contains(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW)) {
-                    parseConnectivityType(getBoolean(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW, false))
-                } else {
-                    ConnectivityType.ALWAYS
-                }
-            val automaticallyHideNavigationBars =
-                if (contains(PrefKeys.AUTOMATICALLY_HIDE_NAV_BARS)) {
-                    parseBooleanType(getBoolean(PrefKeys.AUTOMATICALLY_HIDE_NAV_BARS, false))
-                } else {
-                    BooleanType.ALWAYS
-                }
-
-            val automaticallyShowProfilePictures =
-                if (contains(PrefKeys.AUTOMATICALLY_SHOW_PROFILE_PICTURE)) {
-                    parseConnectivityType(getBoolean(PrefKeys.AUTOMATICALLY_SHOW_PROFILE_PICTURE, false))
-                } else {
-                    ConnectivityType.ALWAYS
-                }
-
-            val themeType =
-                if (contains(PrefKeys.THEME)) {
-                    parseThemeType(getInt(PrefKeys.THEME, ThemeType.SYSTEM.screenCode))
-                } else {
-                    ThemeType.SYSTEM
-                }
-
-            return Settings(
-                themeType,
-                getString(PrefKeys.PREFERRED_LANGUAGE, null)?.ifBlank { null },
-                automaticallyShowImages,
-                automaticallyStartPlayback,
-                automaticallyShowUrlPreview,
-                automaticallyHideNavigationBars,
-                automaticallyShowProfilePictures,
-                false,
-                false,
-            )
-        }
-    }
-
     val mutex = Mutex()
 
     suspend fun loadCurrentAccountFromEncryptedStorage(npub: String): Account? =
@@ -521,7 +454,7 @@ object LocalPreferences {
                 val zapPaymentRequestServer =
                     try {
                         getString(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, null)?.let {
-                            Event.mapper.readValue<Nip47URI?>(it)
+                            Event.mapper.readValue<Nip47WalletConnect.Nip47URI?>(it)
                         }
                     } catch (e: Throwable) {
                         if (e is CancellationException) throw e
@@ -554,6 +487,26 @@ object LocalPreferences {
                         null
                     }
 
+                val pendingAttestations =
+                    try {
+                        getString(PrefKeys.PENDING_ATTESTATIONS, null)?.let {
+                            println("Decoding Attestation List: " + it)
+                            if (it != null) {
+                                Event.mapper.readValue<Map<HexKey, String>>(it)
+                            } else {
+                                null
+                            }
+                        }
+                    } catch (e: Throwable) {
+                        if (e is CancellationException) throw e
+                        Log.w(
+                            "LocalPreferences",
+                            "Error Decoding Contact List ${getString(PrefKeys.LATEST_CONTACT_LIST, null)}",
+                            e,
+                        )
+                        null
+                    }
+
                 val languagePreferences =
                     try {
                         getString(PrefKeys.LANGUAGE_PREFS, null)?.let {
@@ -617,6 +570,8 @@ object LocalPreferences {
                         NostrSignerInternal(keyPair)
                     }
 
+                val hasDonatedInVersion = getStringSet(PrefKeys.HAS_DONATED_IN_VERSION, null) ?: setOf()
+
                 val account =
                     Account(
                         keyPair = keyPair,
@@ -644,6 +599,8 @@ object LocalPreferences {
                         warnAboutPostsWithReports = warnAboutReports,
                         filterSpamFromStrangers = filterSpam,
                         lastReadPerRoute = lastReadPerRoute,
+                        hasDonatedInVersion = hasDonatedInVersion,
+                        pendingAttestations = pendingAttestations ?: emptyMap(),
                     )
 
                 // Loads from DB

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -31,6 +31,7 @@ import androidx.lifecycle.asLiveData
 import androidx.lifecycle.liveData
 import androidx.lifecycle.switchMap
 import com.vitorpamplona.amethyst.Amethyst
+import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.service.FileHeader
 import com.vitorpamplona.amethyst.service.Nip96MediaServers
 import com.vitorpamplona.amethyst.service.NostrLnZapPaymentResponseDataSource
@@ -43,6 +44,7 @@ import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.Nip47WalletConnect
 import com.vitorpamplona.quartz.encoders.hexToByteArray
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.events.BookmarkListEvent
@@ -54,10 +56,12 @@ import com.vitorpamplona.quartz.events.ClassifiedsEvent
 import com.vitorpamplona.quartz.events.Contact
 import com.vitorpamplona.quartz.events.ContactListEvent
 import com.vitorpamplona.quartz.events.DeletionEvent
+import com.vitorpamplona.quartz.events.DraftEvent
 import com.vitorpamplona.quartz.events.EmojiPackEvent
 import com.vitorpamplona.quartz.events.EmojiPackSelectionEvent
 import com.vitorpamplona.quartz.events.EmojiUrl
 import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.events.EventInterface
 import com.vitorpamplona.quartz.events.FileHeaderEvent
 import com.vitorpamplona.quartz.events.FileServersEvent
 import com.vitorpamplona.quartz.events.FileStorageEvent
@@ -65,6 +69,7 @@ import com.vitorpamplona.quartz.events.FileStorageHeaderEvent
 import com.vitorpamplona.quartz.events.GeneralListEvent
 import com.vitorpamplona.quartz.events.GenericRepostEvent
 import com.vitorpamplona.quartz.events.GiftWrapEvent
+import com.vitorpamplona.quartz.events.GitReplyEvent
 import com.vitorpamplona.quartz.events.HTTPAuthorizationEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
 import com.vitorpamplona.quartz.events.LnZapEvent
@@ -74,6 +79,7 @@ import com.vitorpamplona.quartz.events.LnZapRequestEvent
 import com.vitorpamplona.quartz.events.MetadataEvent
 import com.vitorpamplona.quartz.events.MuteListEvent
 import com.vitorpamplona.quartz.events.NIP24Factory
+import com.vitorpamplona.quartz.events.OtsEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.Price
@@ -86,6 +92,7 @@ import com.vitorpamplona.quartz.events.Response
 import com.vitorpamplona.quartz.events.SealedGossipEvent
 import com.vitorpamplona.quartz.events.StatusEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
+import com.vitorpamplona.quartz.events.TextNoteModificationEvent
 import com.vitorpamplona.quartz.events.WrappedEvent
 import com.vitorpamplona.quartz.events.ZapSplitSetup
 import com.vitorpamplona.quartz.signers.NostrSigner
@@ -96,15 +103,20 @@ import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.collections.immutable.toPersistentSet
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combineTransform
+import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flattenMerge
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.launch
@@ -170,7 +182,7 @@ class Account(
     var defaultStoriesFollowList: MutableStateFlow<String> = MutableStateFlow(GLOBAL_FOLLOWS),
     var defaultNotificationFollowList: MutableStateFlow<String> = MutableStateFlow(GLOBAL_FOLLOWS),
     var defaultDiscoveryFollowList: MutableStateFlow<String> = MutableStateFlow(GLOBAL_FOLLOWS),
-    var zapPaymentRequest: Nip47URI? = null,
+    var zapPaymentRequest: Nip47WalletConnect.Nip47URI? = null,
     var hideDeleteRequestDialog: Boolean = false,
     var hideBlockAlertDialog: Boolean = false,
     var hideNIP24WarningDialog: Boolean = false,
@@ -181,10 +193,10 @@ class Account(
     var warnAboutPostsWithReports: Boolean = true,
     var filterSpamFromStrangers: Boolean = true,
     var lastReadPerRoute: Map<String, Long> = mapOf<String, Long>(),
+    var hasDonatedInVersion: Set<String> = setOf<String>(),
+    var pendingAttestations: Map<HexKey, String> = mapOf<HexKey, String>(),
+    val scope: CoroutineScope = Amethyst.instance.applicationIOScope,
 ) {
-    // Uses a single scope for the entire application.
-    val scope = Amethyst.instance.applicationIOScope
-
     var transientHiddenUsers: ImmutableSet<String> = persistentSetOf()
 
     data class PaymentRequest(
@@ -201,178 +213,121 @@ class Account(
     val saveable: AccountLiveData = AccountLiveData(this)
 
     @Immutable
-    data class LiveFollowLists(
+    class LiveFollowLists(
         val users: ImmutableSet<String> = persistentSetOf(),
         val hashtags: ImmutableSet<String> = persistentSetOf(),
         val geotags: ImmutableSet<String> = persistentSetOf(),
         val communities: ImmutableSet<String> = persistentSetOf(),
     )
 
+    class ListNameNotePair(val listName: String, val event: GeneralListEvent?)
+
     @OptIn(ExperimentalCoroutinesApi::class)
-    val liveKind3Follows: StateFlow<LiveFollowLists> by lazy {
-        userProfile()
-            .live()
-            .follows
-            .asFlow()
-            .transformLatest {
-                emit(
-                    LiveFollowLists(
-                        userProfile().cachedFollowingKeySet().toImmutableSet(),
-                        userProfile().cachedFollowingTagSet().toImmutableSet(),
-                        userProfile().cachedFollowingGeohashSet().toImmutableSet(),
-                        userProfile().cachedFollowingCommunitiesSet().toImmutableSet(),
-                    ),
-                )
-            }
-            .stateIn(scope, SharingStarted.Eagerly, LiveFollowLists())
+    val liveKind3FollowsFlow: Flow<LiveFollowLists> =
+        userProfile().flow().follows.stateFlow.transformLatest {
+            emit(
+                LiveFollowLists(
+                    it.user.cachedFollowingKeySet().toImmutableSet(),
+                    it.user.cachedFollowingTagSet().toImmutableSet(),
+                    it.user.cachedFollowingGeohashSet().toImmutableSet(),
+                    it.user.cachedFollowingCommunitiesSet().toImmutableSet(),
+                ),
+            )
+        }
+
+    val liveKind3Follows = liveKind3FollowsFlow.stateIn(scope, SharingStarted.Eagerly, LiveFollowLists())
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private val liveHomeList: Flow<ListNameNotePair> by lazy {
+        defaultHomeFollowList.flatMapLatest { listName ->
+            loadPeopleListFlowFromListName(listName)
+        }
     }
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    private val liveHomeList: StateFlow<NoteState?> by lazy {
-        defaultHomeFollowList
-            .transformLatest {
-                LocalCache.checkGetOrCreateAddressableNote(it)?.flow()?.metadata?.stateFlow?.let {
-                    emit(it)
+    fun loadPeopleListFlowFromListName(listName: String): Flow<ListNameNotePair> {
+        return if (listName != GLOBAL_FOLLOWS && listName != KIND3_FOLLOWS) {
+            val note = LocalCache.checkGetOrCreateAddressableNote(listName)
+            note?.flow()?.metadata?.stateFlow?.mapLatest {
+                val noteEvent = it.note.event as? GeneralListEvent
+                ListNameNotePair(listName, noteEvent)
+            } ?: MutableStateFlow(ListNameNotePair(listName, null))
+        } else {
+            MutableStateFlow(ListNameNotePair(listName, null))
+        }
+    }
+
+    fun combinePeopleListFlows(
+        kind3FollowsSource: Flow<LiveFollowLists>,
+        peopleListFollowsSource: Flow<ListNameNotePair>,
+    ): Flow<LiveFollowLists?> {
+        return combineTransform(kind3FollowsSource, peopleListFollowsSource) { kind3Follows, peopleListFollows ->
+            if (peopleListFollows.listName == GLOBAL_FOLLOWS) {
+                emit(null)
+            } else if (peopleListFollows.listName == KIND3_FOLLOWS) {
+                emit(kind3Follows)
+            } else if (peopleListFollows.event == null) {
+                emit(LiveFollowLists())
+            } else {
+                val result = waitToDecrypt(peopleListFollows.event)
+                if (result == null) {
+                    emit(LiveFollowLists())
+                } else {
+                    emit(result)
                 }
             }
-            .flattenMerge()
-            .stateIn(scope, SharingStarted.Eagerly, null)
+        }
     }
 
     val liveHomeFollowLists: StateFlow<LiveFollowLists?> by lazy {
-        combineTransform(defaultHomeFollowList, liveKind3Follows, liveHomeList) {
-                listName,
-                kind3Follows,
-                peopleListFollows,
-            ->
-            if (listName == GLOBAL_FOLLOWS) {
-                emit(null)
-            } else if (listName == KIND3_FOLLOWS) {
-                emit(kind3Follows)
-            } else {
-                val result =
-                    withTimeoutOrNull(1000) {
-                        suspendCancellableCoroutine { continuation ->
-                            decryptLiveFollows(peopleListFollows) { continuation.resume(it) }
-                        }
-                    }
-                result?.let { emit(it) } ?: run { emit(LiveFollowLists()) }
-            }
-        }
+        combinePeopleListFlows(liveKind3FollowsFlow, liveHomeList)
             .stateIn(scope, SharingStarted.Eagerly, LiveFollowLists())
     }
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    private val liveNotificationList: StateFlow<NoteState?> by lazy {
+    private val liveNotificationList: Flow<ListNameNotePair> by lazy {
         defaultNotificationFollowList
-            .transformLatest {
-                LocalCache.checkGetOrCreateAddressableNote(it)?.flow()?.metadata?.stateFlow?.let {
-                    emit(it)
-                }
-            }
-            .flattenMerge()
-            .stateIn(scope, SharingStarted.Eagerly, null)
+            .transformLatest { listName ->
+                emit(loadPeopleListFlowFromListName(listName))
+            }.flattenMerge()
     }
 
     val liveNotificationFollowLists: StateFlow<LiveFollowLists?> by lazy {
-        combineTransform(defaultNotificationFollowList, liveKind3Follows, liveNotificationList) {
-                listName,
-                kind3Follows,
-                peopleListFollows,
-            ->
-            if (listName == GLOBAL_FOLLOWS) {
-                emit(null)
-            } else if (listName == KIND3_FOLLOWS) {
-                emit(kind3Follows)
-            } else {
-                val result =
-                    withTimeoutOrNull(1000) {
-                        suspendCancellableCoroutine { continuation ->
-                            decryptLiveFollows(peopleListFollows) { continuation.resume(it) }
-                        }
-                    }
-                result?.let { emit(it) } ?: run { emit(LiveFollowLists()) }
-            }
-        }
+        combinePeopleListFlows(liveKind3FollowsFlow, liveNotificationList)
             .stateIn(scope, SharingStarted.Eagerly, LiveFollowLists())
     }
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    private val liveStoriesList: StateFlow<NoteState?> by lazy {
+    private val liveStoriesList: Flow<ListNameNotePair> by lazy {
         defaultStoriesFollowList
-            .transformLatest {
-                LocalCache.checkGetOrCreateAddressableNote(it)?.flow()?.metadata?.stateFlow?.let {
-                    emit(it)
-                }
-            }
-            .flattenMerge()
-            .stateIn(scope, SharingStarted.Eagerly, null)
+            .transformLatest { listName ->
+                emit(loadPeopleListFlowFromListName(listName))
+            }.flattenMerge()
     }
 
     val liveStoriesFollowLists: StateFlow<LiveFollowLists?> by lazy {
-        combineTransform(defaultStoriesFollowList, liveKind3Follows, liveStoriesList) {
-                listName,
-                kind3Follows,
-                peopleListFollows,
-            ->
-            if (listName == GLOBAL_FOLLOWS) {
-                emit(null)
-            } else if (listName == KIND3_FOLLOWS) {
-                emit(kind3Follows)
-            } else {
-                val result =
-                    withTimeoutOrNull(1000) {
-                        suspendCancellableCoroutine { continuation ->
-                            decryptLiveFollows(peopleListFollows) { continuation.resume(it) }
-                        }
-                    }
-                result?.let { emit(it) } ?: run { emit(LiveFollowLists()) }
-            }
-        }
+        combinePeopleListFlows(liveKind3FollowsFlow, liveStoriesList)
             .stateIn(scope, SharingStarted.Eagerly, LiveFollowLists())
     }
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    private val liveDiscoveryList: StateFlow<NoteState?> by lazy {
+    private val liveDiscoveryList: Flow<ListNameNotePair> by lazy {
         defaultDiscoveryFollowList
-            .transformLatest {
-                LocalCache.checkGetOrCreateAddressableNote(it)?.flow()?.metadata?.stateFlow?.let {
-                    emit(it)
-                }
-            }
-            .flattenMerge()
-            .stateIn(scope, SharingStarted.Eagerly, null)
+            .transformLatest { listName ->
+                emit(loadPeopleListFlowFromListName(listName))
+            }.flattenMerge()
     }
 
     val liveDiscoveryFollowLists: StateFlow<LiveFollowLists?> by lazy {
-        combineTransform(defaultDiscoveryFollowList, liveKind3Follows, liveDiscoveryList) {
-                listName,
-                kind3Follows,
-                peopleListFollows,
-            ->
-            if (listName == GLOBAL_FOLLOWS) {
-                emit(null)
-            } else if (listName == KIND3_FOLLOWS) {
-                emit(kind3Follows)
-            } else {
-                val result =
-                    withTimeoutOrNull(1000) {
-                        suspendCancellableCoroutine { continuation ->
-                            decryptLiveFollows(peopleListFollows) { continuation.resume(it) }
-                        }
-                    }
-                result?.let { emit(it) } ?: run { emit(LiveFollowLists()) }
-            }
-        }
+        combinePeopleListFlows(liveKind3FollowsFlow, liveDiscoveryList)
             .stateIn(scope, SharingStarted.Eagerly, LiveFollowLists())
     }
 
     private fun decryptLiveFollows(
-        peopleListFollows: NoteState?,
+        listEvent: GeneralListEvent,
         onReady: (LiveFollowLists) -> Unit,
     ) {
-        val listEvent = (peopleListFollows?.note?.event as? GeneralListEvent)
-        listEvent?.privateTags(signer) { privateTagList ->
+        listEvent.privateTags(signer) { privateTagList ->
             onReady(
                 LiveFollowLists(
                     users =
@@ -390,6 +345,16 @@ class Account(
         }
     }
 
+    suspend fun waitToDecrypt(peopleListFollows: GeneralListEvent): LiveFollowLists? {
+        return withTimeoutOrNull(1000) {
+            suspendCancellableCoroutine { continuation ->
+                decryptLiveFollows(peopleListFollows) {
+                    continuation.resume(it)
+                }
+            }
+        }
+    }
+
     @Immutable
     data class LiveHiddenUsers(
         val hiddenUsers: ImmutableSet<String>,
@@ -566,7 +531,7 @@ class Account(
         if (!isWriteable()) return
 
         MetadataEvent.updateFromPast(
-            latest = userProfile().info?.latestMetadata,
+            latest = userProfile().latestMetadata,
             name = name,
             picture = picture,
             banner = banner,
@@ -727,7 +692,7 @@ class Account(
         zapResponseEvent.response(signer, onReady)
     }
 
-    fun calculateIfNoteWasZappedByAccount(
+    suspend fun calculateIfNoteWasZappedByAccount(
         zappedNote: Note?,
         onWasZapped: () -> Unit,
     ) {
@@ -830,17 +795,18 @@ class Account(
         }
     }
 
-    suspend fun delete(note: Note) {
-        return delete(listOf(note))
+    fun delete(note: Note) {
+        delete(listOf(note))
     }
 
-    suspend fun delete(notes: List<Note>) {
+    fun delete(notes: List<Note>) {
         if (!isWriteable()) return
 
-        val myNotes = notes.filter { it.author == userProfile() }.mapNotNull { it.event?.id() }
+        val myEvents = notes.filter { it.author == userProfile() }
+        val myNoteVersions = myEvents.mapNotNull { it.event as? Event }
 
-        if (myNotes.isNotEmpty()) {
-            DeletionEvent.create(myNotes, signer) {
+        if (myNoteVersions.isNotEmpty()) {
+            DeletionEvent.create(myNoteVersions, signer) {
                 Client.send(it)
                 LocalCache.justConsume(it, null)
             }
@@ -891,6 +857,39 @@ class Account(
         }
     }
 
+    suspend fun updateAttestations() {
+        Log.d("Pending Attestations", "Updating ${pendingAttestations.size} pending attestations")
+
+        pendingAttestations.toMap().forEach { pair ->
+            val newAttestation = OtsEvent.upgrade(pair.value, pair.key)
+
+            if (pair.value != newAttestation) {
+                OtsEvent.create(pair.key, newAttestation, signer) {
+                    LocalCache.justConsume(it, null)
+                    Client.send(it)
+
+                    pendingAttestations = pendingAttestations - pair.key
+                }
+            }
+        }
+    }
+
+    fun hasPendingAttestations(note: Note): Boolean {
+        val id = note.event?.id() ?: note.idHex
+        return pendingAttestations.get(id) != null
+    }
+
+    fun timestamp(note: Note) {
+        if (!isWriteable()) return
+        if (note.isDraft()) return
+
+        val id = note.event?.id() ?: note.idHex
+
+        pendingAttestations = pendingAttestations + Pair(id, OtsEvent.stamp(id))
+
+        saveable.invalidateData()
+    }
+
     fun follow(user: User) {
         if (!isWriteable()) return
 
@@ -1166,7 +1165,7 @@ class Account(
         Client.send(signedEvent, relayList = relayList)
         LocalCache.consume(signedEvent, null)
 
-        return LocalCache.notes[signedEvent.id]
+        return LocalCache.getNoteIfExists(signedEvent.id)
     }
 
     fun consumeNip95(
@@ -1176,7 +1175,7 @@ class Account(
         LocalCache.consume(data, null)
         LocalCache.consume(signedEvent, null)
 
-        return LocalCache.notes[signedEvent.id]
+        return LocalCache.getNoteIfExists(signedEvent.id)
     }
 
     fun sendNip95(
@@ -1196,7 +1195,7 @@ class Account(
         Client.send(signedEvent, relayList = relayList)
         LocalCache.consume(signedEvent, null)
 
-        LocalCache.notes[signedEvent.id]?.let { onReady(it) }
+        LocalCache.getNoteIfExists(signedEvent.id)?.let { onReady(it) }
     }
 
     fun createHeader(
@@ -1272,6 +1271,7 @@ class Account(
         relayList: List<Relay>? = null,
         geohash: String? = null,
         nip94attachments: List<Event>? = null,
+        draftTag: String?,
     ) {
         if (!isWriteable()) return
 
@@ -1299,20 +1299,116 @@ class Account(
             geohash = geohash,
             nip94attachments = nip94attachments,
             signer = signer,
+            isDraft = draftTag != null,
         ) {
-            Client.send(it, relayList = relayList)
-            LocalCache.justConsume(it, null)
+            if (draftTag != null) {
+                if (message.isBlank()) {
+                    deleteDraft(draftTag)
+                } else {
+                    DraftEvent.create(draftTag, it, emptyList(), signer) { draftEvent ->
+                        Client.send(draftEvent, relayList = relayList)
+                        LocalCache.justConsume(draftEvent, null)
+                    }
+                }
+            } else {
+                Client.send(it, relayList = relayList)
+                LocalCache.justConsume(it, null)
 
-            replyTo?.forEach { it.event?.let { Client.send(it, relayList = relayList) } }
-            addresses?.forEach {
-                LocalCache.getAddressableNoteIfExists(it.toTag())?.event?.let {
-                    Client.send(it, relayList = relayList)
+                replyTo?.forEach { it.event?.let { Client.send(it, relayList = relayList) } }
+                addresses?.forEach {
+                    LocalCache.getAddressableNoteIfExists(it.toTag())?.event?.let {
+                        Client.send(it, relayList = relayList)
+                    }
                 }
             }
         }
     }
 
-    fun sendPost(
+    fun sendGitReply(
+        message: String,
+        replyTo: List<Note>?,
+        mentions: List<User>?,
+        repository: ATag?,
+        zapReceiver: List<ZapSplitSetup>? = null,
+        wantsToMarkAsSensitive: Boolean,
+        zapRaiserAmount: Long? = null,
+        replyingTo: String?,
+        root: String?,
+        directMentions: Set<HexKey>,
+        forkedFrom: Event?,
+        relayList: List<Relay>? = null,
+        geohash: String? = null,
+        nip94attachments: List<FileHeaderEvent>? = null,
+        draftTag: String?,
+    ) {
+        if (!isWriteable()) return
+
+        val repliesToHex = replyTo?.filter { it.address() == null }?.map { it.idHex }
+        val mentionsHex = mentions?.map { it.pubkeyHex }
+        val addresses = listOfNotNull(repository) + (replyTo?.mapNotNull { it.address() } ?: emptyList())
+
+        GitReplyEvent.create(
+            msg = message,
+            replyTos = repliesToHex,
+            mentions = mentionsHex,
+            addresses = addresses,
+            extraTags = null,
+            zapReceiver = zapReceiver,
+            markAsSensitive = wantsToMarkAsSensitive,
+            zapRaiserAmount = zapRaiserAmount,
+            replyingTo = replyingTo,
+            root = root,
+            directMentions = directMentions,
+            geohash = geohash,
+            nip94attachments = nip94attachments,
+            forkedFrom = forkedFrom,
+            signer = signer,
+            isDraft = draftTag != null,
+        ) {
+            if (draftTag != null) {
+                if (message.isBlank()) {
+                    deleteDraft(draftTag)
+                } else {
+                    DraftEvent.create(draftTag, it, signer) { draftEvent ->
+                        Client.send(draftEvent, relayList = relayList)
+                        LocalCache.justConsume(draftEvent, null)
+                    }
+                }
+            } else {
+                Client.send(it, relayList = relayList)
+                LocalCache.justConsume(it, null)
+
+                // broadcast replied notes
+                replyingTo?.let {
+                    LocalCache.getNoteIfExists(replyingTo)?.event?.let {
+                        Client.send(it, relayList = relayList)
+                    }
+                }
+                replyTo?.forEach { it.event?.let { Client.send(it, relayList = relayList) } }
+                addresses?.forEach {
+                    LocalCache.getAddressableNoteIfExists(it.toTag())?.event?.let {
+                        Client.send(it, relayList = relayList)
+                    }
+                }
+            }
+        }
+    }
+
+    fun deleteDraft(draftTag: String) {
+        val key = DraftEvent.createAddressTag(userProfile().pubkeyHex, draftTag)
+        LocalCache.getAddressableNoteIfExists(key)?.let {
+            val noteEvent = it.event
+            if (noteEvent is DraftEvent) {
+                noteEvent.createDeletedEvent(signer) {
+                    Client.send(it)
+                    LocalCache.justConsume(it, null)
+                }
+            }
+            delete(it)
+        }
+    }
+
+    suspend fun sendPost(
         message: String,
         replyTo: List<Note>?,
         mentions: List<User>?,
@@ -1323,9 +1419,11 @@ class Account(
         replyingTo: String?,
         root: String?,
         directMentions: Set<HexKey>,
+        forkedFrom: Event?,
         relayList: List<Relay>? = null,
         geohash: String? = null,
         nip94attachments: List<FileHeaderEvent>? = null,
+        draftTag: String?,
     ) {
         if (!isWriteable()) return
 
@@ -1347,23 +1445,59 @@ class Account(
             directMentions = directMentions,
             geohash = geohash,
             nip94attachments = nip94attachments,
+            forkedFrom = forkedFrom,
+            signer = signer,
+            isDraft = draftTag != null,
+        ) {
+            if (draftTag != null) {
+                if (message.isBlank()) {
+                    deleteDraft(draftTag)
+                } else {
+                    DraftEvent.create(draftTag, it, signer) { draftEvent ->
+                        Client.send(draftEvent, relayList = relayList)
+                        LocalCache.justConsume(draftEvent, null)
+                    }
+                }
+            } else {
+                Client.send(it, relayList = relayList)
+                LocalCache.justConsume(it, null)
+
+                // broadcast replied notes
+                replyingTo?.let {
+                    LocalCache.getNoteIfExists(replyingTo)?.event?.let {
+                        Client.send(it, relayList = relayList)
+                    }
+                }
+                replyTo?.forEach { it.event?.let { Client.send(it, relayList = relayList) } }
+                addresses?.forEach {
+                    LocalCache.getAddressableNoteIfExists(it.toTag())?.event?.let {
+                        Client.send(it, relayList = relayList)
+                    }
+                }
+            }
+        }
+    }
+
+    fun sendEdit(
+        message: String,
+        originalNote: Note,
+        notify: HexKey?,
+        summary: String? = null,
+        relayList: List<Relay>? = null,
+    ) {
+        if (!isWriteable()) return
+
+        val idHex = originalNote.event?.id() ?: return
+
+        TextNoteModificationEvent.create(
+            content = message,
+            eventId = idHex,
+            notify = notify,
+            summary = summary,
             signer = signer,
         ) {
-            Client.send(it, relayList = relayList)
             LocalCache.justConsume(it, null)
-
-            // broadcast replied notes
-            replyingTo?.let {
-                LocalCache.getNoteIfExists(replyingTo)?.event?.let {
-                    Client.send(it, relayList = relayList)
-                }
-            }
-            replyTo?.forEach { it.event?.let { Client.send(it, relayList = relayList) } }
-            addresses?.forEach {
-                LocalCache.getAddressableNoteIfExists(it.toTag())?.event?.let {
-                    Client.send(it, relayList = relayList)
-                }
-            }
+            Client.send(it, relayList = relayList)
         }
     }
 
@@ -1382,6 +1516,7 @@ class Account(
         relayList: List<Relay>? = null,
         geohash: String? = null,
         nip94attachments: List<FileHeaderEvent>? = null,
+        draftTag: String?,
     ) {
         if (!isWriteable()) return
 
@@ -1405,15 +1540,27 @@ class Account(
             zapRaiserAmount = zapRaiserAmount,
             geohash = geohash,
             nip94attachments = nip94attachments,
+            isDraft = draftTag != null,
         ) {
-            Client.send(it, relayList = relayList)
-            LocalCache.justConsume(it, null)
+            if (draftTag != null) {
+                if (message.isBlank()) {
+                    deleteDraft(draftTag)
+                } else {
+                    DraftEvent.create(draftTag, it, signer) { draftEvent ->
+                        Client.send(draftEvent, relayList = relayList)
+                        LocalCache.justConsume(draftEvent, null)
+                    }
+                }
+            } else {
+                Client.send(it, relayList = relayList)
+                LocalCache.justConsume(it, null)
 
-            // Rebroadcast replies and tags to the current relay set
-            replyTo?.forEach { it.event?.let { Client.send(it, relayList = relayList) } }
-            addresses?.forEach {
-                LocalCache.getAddressableNoteIfExists(it.toTag())?.event?.let {
-                    Client.send(it, relayList = relayList)
+                // Rebroadcast replies and tags to the current relay set
+                replyTo?.forEach { it.event?.let { Client.send(it, relayList = relayList) } }
+                addresses?.forEach {
+                    LocalCache.getAddressableNoteIfExists(it.toTag())?.event?.let {
+                        Client.send(it, relayList = relayList)
+                    }
                 }
             }
         }
@@ -1429,6 +1576,7 @@ class Account(
         zapRaiserAmount: Long? = null,
         geohash: String? = null,
         nip94attachments: List<FileHeaderEvent>? = null,
+        draftTag: String?,
     ) {
         if (!isWriteable()) return
 
@@ -1446,9 +1594,21 @@ class Account(
             geohash = geohash,
             nip94attachments = nip94attachments,
             signer = signer,
+            isDraft = draftTag != null,
         ) {
-            Client.send(it)
-            LocalCache.justConsume(it, null)
+            if (draftTag != null) {
+                if (message.isBlank()) {
+                    deleteDraft(draftTag)
+                } else {
+                    DraftEvent.create(draftTag, it, signer) { draftEvent ->
+                        Client.send(draftEvent)
+                        LocalCache.justConsume(draftEvent, null)
+                    }
+                }
+            } else {
+                Client.send(it)
+                LocalCache.justConsume(it, null)
+            }
         }
     }
 
@@ -1462,6 +1622,7 @@ class Account(
         zapRaiserAmount: Long? = null,
         geohash: String? = null,
         nip94attachments: List<FileHeaderEvent>? = null,
+        draftTag: String?,
     ) {
         if (!isWriteable()) return
 
@@ -1480,9 +1641,21 @@ class Account(
             geohash = geohash,
             nip94attachments = nip94attachments,
             signer = signer,
+            isDraft = draftTag != null,
         ) {
-            Client.send(it)
-            LocalCache.justConsume(it, null)
+            if (draftTag != null) {
+                if (message.isBlank()) {
+                    deleteDraft(draftTag)
+                } else {
+                    DraftEvent.create(draftTag, it, signer) { draftEvent ->
+                        Client.send(draftEvent)
+                        LocalCache.justConsume(draftEvent, null)
+                    }
+                }
+            } else {
+                Client.send(it)
+                LocalCache.justConsume(it, null)
+            }
         }
     }
 
@@ -1496,6 +1669,7 @@ class Account(
         zapRaiserAmount: Long? = null,
         geohash: String? = null,
         nip94attachments: List<FileHeaderEvent>? = null,
+        draftTag: String?,
     ) {
         sendPrivateMessage(
             message,
@@ -1507,6 +1681,7 @@ class Account(
             zapRaiserAmount,
             geohash,
             nip94attachments,
+            draftTag,
         )
     }
 
@@ -1520,6 +1695,7 @@ class Account(
         zapRaiserAmount: Long? = null,
         geohash: String? = null,
         nip94attachments: List<FileHeaderEvent>? = null,
+        draftTag: String?,
     ) {
         if (!isWriteable()) return
 
@@ -1539,9 +1715,21 @@ class Account(
             nip94attachments = nip94attachments,
             signer = signer,
             advertiseNip18 = false,
+            isDraft = draftTag != null,
         ) {
-            Client.send(it)
-            LocalCache.consume(it, null)
+            if (draftTag != null) {
+                if (message.isBlank()) {
+                    deleteDraft(draftTag)
+                } else {
+                    DraftEvent.create(draftTag, it, emptyList(), signer) { draftEvent ->
+                        Client.send(draftEvent)
+                        LocalCache.justConsume(draftEvent, null)
+                    }
+                }
+            } else {
+                Client.send(it)
+                LocalCache.consume(it, null)
+            }
         }
     }
 
@@ -1556,6 +1744,7 @@ class Account(
         zapRaiserAmount: Long? = null,
         geohash: String? = null,
         nip94attachments: List<FileHeaderEvent>? = null,
+        draftTag: String? = null,
     ) {
         if (!isWriteable()) return
 
@@ -1573,9 +1762,21 @@ class Account(
             zapRaiserAmount = zapRaiserAmount,
             geohash = geohash,
             nip94attachments = nip94attachments,
+            draftTag = draftTag,
             signer = signer,
         ) {
-            broadcastPrivately(it)
+            if (draftTag != null) {
+                if (message.isBlank()) {
+                    deleteDraft(draftTag)
+                } else {
+                    DraftEvent.create(draftTag, it.msg, emptyList(), signer) { draftEvent ->
+                        Client.send(draftEvent)
+                        LocalCache.justConsume(draftEvent, null)
+                    }
+                }
+            } else {
+                broadcastPrivately(it)
+            }
         }
     }
 
@@ -1657,7 +1858,7 @@ class Account(
             Client.send(event)
             LocalCache.justConsume(event, null)
 
-            DeletionEvent.create(listOf(event.id), signer) { event2 ->
+            DeletionEvent.createForVersionOnly(listOf(event), signer) { event2 ->
                 Client.send(event2)
                 LocalCache.justConsume(event2, null)
             }
@@ -1723,6 +1924,7 @@ class Account(
         isPrivate: Boolean,
     ) {
         if (!isWriteable()) return
+        if (note.isDraft()) return
 
         if (note is AddressableNote) {
             BookmarkListEvent.addReplaceable(
@@ -2037,7 +2239,7 @@ class Account(
         saveable.invalidateData()
     }
 
-    fun changeZapPaymentRequest(newServer: Nip47URI?) {
+    fun changeZapPaymentRequest(newServer: Nip47WalletConnect.Nip47URI?) {
         zapPaymentRequest = newServer
         live.invalidateData()
         saveable.invalidateData()
@@ -2089,13 +2291,18 @@ class Account(
     }
 
     fun cachedDecryptContent(note: Note): String? {
-        val event = note.event
+        return cachedDecryptContent(note.event)
+    }
+
+    fun cachedDecryptContent(event: EventInterface?): String? {
+        if (event == null) return null
+
         return if (event is PrivateDmEvent && isWriteable()) {
             event.cachedContentFor(signer)
         } else if (event is LnZapRequestEvent && event.isPrivateZap() && isWriteable()) {
             event.cachedPrivateZap()?.content
         } else {
-            event?.content()
+            event.content()
         }
     }
 
@@ -2354,6 +2561,16 @@ class Account(
         return lastReadPerRoute[route] ?: 0
     }
 
+    fun hasDonatedInThisVersion(): Boolean {
+        return hasDonatedInVersion.contains(BuildConfig.VERSION_NAME)
+    }
+
+    fun markDonatedInThisVersion() {
+        hasDonatedInVersion = hasDonatedInVersion + BuildConfig.VERSION_NAME
+        saveable.invalidateData()
+        live.invalidateData()
+    }
+
     suspend fun registerObservers() =
         withContext(Dispatchers.Main) {
             // saves contact list for the next time.

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -28,7 +28,7 @@ import com.vitorpamplona.amethyst.service.checkNotInMainThread
 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.encoders.Nip19Bech32
 import com.vitorpamplona.quartz.events.Event
 import kotlinx.coroutines.Dispatchers
 
@@ -58,7 +58,7 @@ class AntiSpamFilter {
         // really long, make it ok.
         // The idea here is to avoid considering repeated "@Bot, command" messages spam, while still
         // blocking repeated "lnbc..." invoices or fishing urls
-        if (event.content.length < 180 && Nip19.nip19regex.matcher(event.content).find()) return false
+        if (event.content.length < 180 && Nip19Bech32.nip19regex.matcher(event.content).find()) return false
 
         // double list strategy:
         // if duplicated, it goes into spam. 1000 spam messages are saved into the spam list.
@@ -71,7 +71,7 @@ class AntiSpamFilter {
         ) {
             Log.w(
                 "Potential SPAM Message for sharing",
-                "${Nip19.createNEvent(event.id, event.pubKey, event.kind, null)}",
+                "${Nip19Bech32.createNEvent(event.id, event.pubKey, event.kind, null)}",
             )
             Log.w(
                 "Potential SPAM Message",

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -22,9 +22,11 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.commons.data.LargeCache
 import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
+import com.vitorpamplona.amethyst.ui.dal.DefaultFeedOrder
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.Hex
@@ -33,7 +35,6 @@ 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
 
 @Stable
 class PublicChatChannel(idHex: String) : Channel(idHex) {
@@ -107,10 +108,9 @@ class LiveActivitiesChannel(val address: ATag) : Channel(address.toTag()) {
 @Stable
 abstract class Channel(val idHex: String) {
     var creator: User? = null
-
     var updatedMetadataAt: Long = 0
-
-    val notes = ConcurrentHashMap<HexKey, Note>()
+    val notes = LargeCache<HexKey, Note>()
+    var lastNoteCreatedAt: Long = 0
 
     open fun id() = Hex.decode(idHex)
 
@@ -131,7 +131,7 @@ abstract class Channel(val idHex: String) {
     }
 
     open fun profilePicture(): String? {
-        return creator?.profilePicture()
+        return creator?.info?.banner
     }
 
     open fun updateChannelInfo(
@@ -145,7 +145,11 @@ abstract class Channel(val idHex: String) {
     }
 
     fun addNote(note: Note) {
-        notes[note.idHex] = note
+        notes.put(note.idHex, note)
+
+        if ((note.createdAt() ?: 0) > lastNoteCreatedAt) {
+            lastNoteCreatedAt = note.createdAt() ?: 0
+        }
     }
 
     fun removeNote(note: Note) {
@@ -163,18 +167,18 @@ abstract class Channel(val idHex: String) {
 
     fun pruneOldAndHiddenMessages(account: Account): Set<Note> {
         val important =
-            notes.values
-                .filter { it.author?.let { it1 -> account.isHidden(it1) } == false }
-                .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
-                .reversed()
-                .take(1000)
+            notes.filter { key, it ->
+                it.author?.let { author -> account.isHidden(author) } == false
+            }
+                .sortedWith(DefaultFeedOrder)
+                .take(500)
                 .toSet()
 
-        val toBeRemoved = notes.values.filter { it !in important }.toSet()
+        val toBeRemoved = notes.filter { key, it -> it !in important }
 
         toBeRemoved.forEach { notes.remove(it.idHex) }
 
-        return toBeRemoved
+        return toBeRemoved.toSet()
     }
 }
 

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -27,6 +27,7 @@ import com.vitorpamplona.quartz.utils.TimeUtils
 
 @Stable
 class Chatroom() {
+    var authors: Set<User> = setOf()
     var roomMessages: Set<Note> = setOf()
     var subject: String? = null
     var subjectCreatedAt: Long? = null
@@ -38,6 +39,12 @@ class Chatroom() {
         if (msg !in roomMessages) {
             roomMessages = roomMessages + msg
 
+            msg.author?.let { author ->
+                if (author !in authors) {
+                    authors += author
+                }
+            }
+
             val newSubject = msg.event?.subject()
 
             if (newSubject != null && (msg.createdAt() ?: 0) > (subjectCreatedAt ?: 0)) {
@@ -51,8 +58,8 @@ class Chatroom() {
     fun removeMessageSync(msg: Note) {
         checkNotInMainThread()
 
-        if (msg !in roomMessages) {
-            roomMessages = roomMessages + msg
+        if (msg in roomMessages) {
+            roomMessages = roomMessages - msg
 
             roomMessages
                 .filter { it.event?.subject() != null }
@@ -66,7 +73,7 @@ class Chatroom() {
     }
 
     fun senderIntersects(keySet: Set<HexKey>): Boolean {
-        return roomMessages.any { it.author?.pubkeyHex in keySet }
+        return authors.any { it.pubkeyHex in keySet }
     }
 
     fun pruneMessagesToTheLatestOnly(): Set<Note> {

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -21,161 +21,91 @@
 package com.vitorpamplona.amethyst.model
 
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.commons.hashtags.Amethyst
+import com.vitorpamplona.amethyst.commons.hashtags.Btc
+import com.vitorpamplona.amethyst.commons.hashtags.Cashu
+import com.vitorpamplona.amethyst.commons.hashtags.Coffee
+import com.vitorpamplona.amethyst.commons.hashtags.CustomHashTagIcons
+import com.vitorpamplona.amethyst.commons.hashtags.Footstr
+import com.vitorpamplona.amethyst.commons.hashtags.Grownostr
+import com.vitorpamplona.amethyst.commons.hashtags.Lightning
+import com.vitorpamplona.amethyst.commons.hashtags.Mate
+import com.vitorpamplona.amethyst.commons.hashtags.Nostr
+import com.vitorpamplona.amethyst.commons.hashtags.Plebs
+import com.vitorpamplona.amethyst.commons.hashtags.Skull
+import com.vitorpamplona.amethyst.commons.hashtags.Tunestr
+import com.vitorpamplona.amethyst.commons.hashtags.Weed
+import com.vitorpamplona.amethyst.commons.hashtags.Zap
+import com.vitorpamplona.amethyst.commons.richtext.HashTagSegment
+import com.vitorpamplona.amethyst.commons.richtext.RegularTextSegment
+import com.vitorpamplona.amethyst.ui.components.HashTag
+import com.vitorpamplona.amethyst.ui.components.RenderRegular
+import com.vitorpamplona.amethyst.ui.theme.ThemeComparisonColumn
+import com.vitorpamplona.quartz.events.EmptyTagList
 
-fun checkForHashtagWithIcon(
-    tag: String,
-    primary: Color,
-): HashtagIcon? {
+@Preview
+@Composable
+fun RenderHashTagIcons() {
+    val nav: (String) -> Unit = {}
+
+    ThemeComparisonColumn {
+        RenderRegular(
+            "Testing rendering of hashtags: #Bitcoin, #nostr, #lightning, #zap, #amethyst, #cashu, #plebs, #coffee, #skullofsatoshi, #grownostr, #footstr, #tunestr, #weed, #mate",
+            EmptyTagList,
+        ) { word, state ->
+            when (word) {
+                is HashTagSegment -> HashTag(word, nav)
+                is RegularTextSegment -> Text(word.segmentText)
+            }
+        }
+    }
+}
+
+fun checkForHashtagWithIcon(tag: String): HashtagIcon? {
     return when (tag.lowercase()) {
-        "bitcoin",
-        "btc",
-        "timechain",
-        "bitcoiner",
-        "bitcoiners",
-        ->
-            HashtagIcon(
-                R.drawable.ht_btc,
-                "Bitcoin",
-                Color.Unspecified,
-                Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp),
-            )
-        "nostr",
-        "nostrich",
-        "nostriches",
-        "thenostr",
-        ->
-            HashtagIcon(
-                R.drawable.ht_nostr,
-                "Nostr",
-                Color.Unspecified,
-                Modifier.padding(1.dp, 2.dp, 0.dp, 0.dp),
-            )
-        "lightning",
-        "lightningnetwork",
-        ->
-            HashtagIcon(
-                R.drawable.ht_lightning,
-                "Lightning",
-                Color.Unspecified,
-                Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp),
-            )
-        "zap",
-        "zaps",
-        "zapper",
-        "zappers",
-        "zapping",
-        "zapped",
-        "zapathon",
-        "zapraiser",
-        "zaplife",
-        "zapchain",
-        ->
-            HashtagIcon(
-                R.drawable.zap,
-                "Zap",
-                Color.Unspecified,
-                Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp),
-            )
-        "amethyst" ->
-            HashtagIcon(
-                R.drawable.amethyst,
-                "Amethyst",
-                Color.Unspecified,
-                Modifier.padding(3.dp, 2.dp, 0.dp, 0.dp),
-            )
-        "onyx" ->
-            HashtagIcon(
-                R.drawable.black_heart,
-                "Onyx",
-                Color.Unspecified,
-                Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp),
-            )
-        "cashu",
-        "ecash",
-        "nut",
-        "nuts",
-        "deeznuts",
-        ->
-            HashtagIcon(
-                R.drawable.cashu,
-                "Cashu",
-                Color.Unspecified,
-                Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp),
-            )
-        "plebs",
-        "pleb",
-        "plebchain",
-        ->
-            HashtagIcon(
-                R.drawable.plebs,
-                "Pleb",
-                Color.Unspecified,
-                Modifier.padding(2.dp, 2.dp, 0.dp, 1.dp),
-            )
-        "coffee",
-        "coffeechain",
-        "cafe",
-        ->
-            HashtagIcon(
-                R.drawable.coffee,
-                "Coffee",
-                Color.Unspecified,
-                Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp),
-            )
-        "skullofsatoshi" ->
-            HashtagIcon(
-                R.drawable.skull,
-                "SkullofSatoshi",
-                Color.Unspecified,
-                Modifier.padding(2.dp, 1.dp, 0.dp, 0.dp),
-            )
-        "grownostr",
-        "gardening",
-        "garden",
-        ->
-            HashtagIcon(
-                R.drawable.grownostr,
-                "GrowNostr",
-                Color.Unspecified,
-                Modifier.padding(0.dp, 1.dp, 0.dp, 1.dp),
-            )
-        "footstr" ->
-            HashtagIcon(
-                R.drawable.footstr,
-                "Footstr",
-                Color.Unspecified,
-                Modifier.padding(1.dp, 1.dp, 0.dp, 0.dp),
-            )
-        "tunestr",
-        "music",
-        "nowplaying",
-        ->
-            HashtagIcon(R.drawable.tunestr, "Tunestr", primary, Modifier.padding(0.dp, 3.dp, 0.dp, 1.dp))
-        "weed",
-        "weedstr",
-        "420",
-        "cannabis",
-        "marijuana",
-        ->
-            HashtagIcon(
-                R.drawable.weed,
-                "Weed",
-                Color.Unspecified,
-                Modifier.padding(0.dp, 0.dp, 0.dp, 0.dp),
-            )
+        "₿itcoin", "bitcoin", "btc", "timechain", "bitcoiner", "bitcoiners" -> bitcoin
+        "nostr", "nostrich", "nostriches", "thenostr" -> nostr
+        "lightning", "lightningnetwork" -> lightning
+        "zap", "zaps", "zapper", "zappers", "zapping", "zapped", "zapathon", "zapraiser", "zaplife", "zapchain" -> zap
+        "amethyst" -> amethyst
+        "cashu", "ecash", "nut", "nuts", "deeznuts" -> cashu
+        "plebs", "pleb", "plebchain" -> plebs
+        "coffee", "coffeechain", "cafe" -> coffee
+        "skullofsatoshi" -> skull
+        "grownostr", "gardening", "garden" -> growstr
+        "footstr" -> footstr
+        "tunestr", "music", "nowplaying" -> tunestr
+        "mate", "matechain", "matestr" -> matestr
+        "weed", "weedstr", "420", "cannabis", "marijuana" -> weed
         else -> null
     }
 }
 
+val bitcoin = HashtagIcon(CustomHashTagIcons.Btc, "Bitcoin", Modifier.padding(start = 1.dp, bottom = 1.dp, top = 1.dp))
+val nostr = HashtagIcon(CustomHashTagIcons.Nostr, "Nostr", Modifier.padding(start = 1.dp, bottom = 1.dp, top = 1.dp))
+val lightning = HashtagIcon(CustomHashTagIcons.Lightning, "Lightning", Modifier.padding(start = 1.dp, bottom = 1.dp, top = 1.dp))
+val zap = HashtagIcon(CustomHashTagIcons.Zap, "Zap", Modifier.padding(start = 1.dp, bottom = 1.dp, top = 1.dp))
+val amethyst = HashtagIcon(CustomHashTagIcons.Amethyst, "Amethyst", Modifier.padding(start = 2.dp, bottom = 1.dp, top = 1.dp))
+val cashu = HashtagIcon(CustomHashTagIcons.Cashu, "Cashu", Modifier.padding(start = 1.dp, bottom = 1.dp, top = 1.dp))
+val plebs = HashtagIcon(CustomHashTagIcons.Plebs, "Pleb", Modifier.padding(start = 2.dp, bottom = 1.dp, top = 1.dp))
+val coffee = HashtagIcon(CustomHashTagIcons.Coffee, "Coffee", Modifier.padding(start = 3.dp, bottom = 1.dp, top = 1.dp))
+val skull = HashtagIcon(CustomHashTagIcons.Skull, "SkullofSatoshi", Modifier.padding(start = 1.dp, bottom = 1.dp, top = 1.dp))
+val growstr = HashtagIcon(CustomHashTagIcons.Grownostr, "GrowNostr", Modifier.padding(start = 1.dp, bottom = 1.dp, top = 1.dp))
+val footstr = HashtagIcon(CustomHashTagIcons.Footstr, "Footstr", Modifier.padding(start = 2.dp, bottom = 1.dp, top = 1.dp))
+val tunestr = HashtagIcon(CustomHashTagIcons.Tunestr, "Tunestr", Modifier.padding(start = 1.dp, bottom = 1.dp, top = 1.dp))
+val weed = HashtagIcon(CustomHashTagIcons.Weed, "Weed", Modifier.padding(start = 1.dp, bottom = 0.dp, top = 0.dp))
+val matestr = HashtagIcon(CustomHashTagIcons.Mate, "Mate", Modifier.padding(start = 1.dp, bottom = 0.dp, top = 0.dp))
+
 @Immutable
 class HashtagIcon(
-    val icon: Int,
+    val icon: ImageVector,
     val description: String,
-    val color: Color,
-    val modifier: Modifier,
+    val modifier: Modifier = Modifier,
 )

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

@@ -0,0 +1,161 @@
+/**
+ * Copyright (c) 2024 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.model
+
+import android.util.Log
+import com.fasterxml.jackson.annotation.JsonSubTypes
+import com.fasterxml.jackson.annotation.JsonTypeInfo
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.persistentMapOf
+import kotlinx.collections.immutable.toImmutableMap
+
+@JsonTypeInfo(
+    use = JsonTypeInfo.Id.NAME,
+    include = JsonTypeInfo.As.PROPERTY,
+    property = "resourceType",
+)
+@JsonSubTypes(
+    JsonSubTypes.Type(value = Practitioner::class, name = "Practitioner"),
+    JsonSubTypes.Type(value = Patient::class, name = "Patient"),
+    JsonSubTypes.Type(value = Bundle::class, name = "Bundle"),
+    JsonSubTypes.Type(value = VisionPrescription::class, name = "VisionPrescription"),
+)
+open class Resource(
+    var resourceType: String? = null,
+    var id: String = "",
+)
+
+class Practitioner(
+    resourceType: String? = null,
+    id: String = "",
+    var active: Boolean? = null,
+    var name: ArrayList<HumanName> = arrayListOf(),
+    var gender: String? = null,
+) : Resource(resourceType, id)
+
+class Patient(
+    resourceType: String? = null,
+    id: String = "",
+    var active: Boolean? = null,
+    var name: ArrayList<HumanName> = arrayListOf(),
+    var gender: String? = null,
+) : Resource(resourceType, id)
+
+class HumanName(
+    var use: String? = null,
+    var family: String? = null,
+    var given: ArrayList<String> = arrayListOf(),
+) {
+    fun assembleName(): String {
+        return given.joinToString(" ") + " " + family
+    }
+}
+
+class Bundle(
+    resourceType: String? = null,
+    id: String = "",
+    var type: String? = null,
+    var created: String? = null,
+    var entry: List<Resource> = arrayListOf(),
+) : Resource(resourceType, id)
+
+class VisionPrescription(
+    resourceType: String? = null,
+    id: String = "",
+    var status: String? = null,
+    var created: String? = null,
+    var patient: Reference? = Reference(),
+    var encounter: Reference? = Reference(),
+    var dateWritten: String? = null,
+    var prescriber: Reference? = Reference(),
+    var lensSpecification: List<LensSpecification> = arrayListOf(),
+) : Resource(resourceType, id)
+
+class LensSpecification(
+    var eye: String? = null,
+    var sphere: Double? = null,
+    var cylinder: Double? = null,
+    var axis: Double? = null,
+    var add: Double? = null,
+    var prism: List<Prism> = arrayListOf(),
+    // contact lenses
+    var power: Double? = null,
+    var backCurve: Double? = null,
+    var diameter: Double? = null,
+    var color: String? = null,
+    var brand: String? = null,
+    var note: String? = null,
+)
+
+class Prism(
+    var amount: Double? = null,
+    var base: String? = null,
+)
+
+class Reference(
+    var reference: String? = null,
+)
+
+data class FhirElementDatabase(
+    var baseResource: Resource? = null,
+    var localDb: ImmutableMap<String, Resource> = persistentMapOf(),
+)
+
+fun findReferenceInDb(
+    it: String,
+    db: Map<String, Resource>,
+): Resource? {
+    val parts = it.split("/")
+    return if (parts.size == 2) {
+        db.get(parts[1].removePrefix("#"))
+    } else {
+        db.get(it.removePrefix("#"))
+    }
+}
+
+fun parseResourceBundleOrNull(json: String): FhirElementDatabase? {
+    val mapper =
+        jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+
+    return try {
+        val resource = mapper.readValue(json, Resource::class.java)
+
+        val db =
+            when (resource) {
+                is Bundle -> {
+                    resource.entry.associateBy { it.id }.toImmutableMap()
+                }
+                else -> {
+                    persistentMapOf(resource.id to resource)
+                }
+            }
+
+        FhirElementDatabase(
+            localDb = db,
+            baseResource = resource,
+        )
+    } catch (e: Exception) {
+        Log.e("RenderEyeGlassesPrescription", "Parser error", e)
+        null
+    }
+}

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -39,7 +39,7 @@ 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.Nip19Bech32
 import com.vitorpamplona.quartz.encoders.toNote
 import com.vitorpamplona.quartz.events.AddressableEvent
 import com.vitorpamplona.quartz.events.BaseTextNoteEvent
@@ -47,6 +47,7 @@ import com.vitorpamplona.quartz.events.ChannelCreateEvent
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.ChannelMetadataEvent
 import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
+import com.vitorpamplona.quartz.events.DraftEvent
 import com.vitorpamplona.quartz.events.Event
 import com.vitorpamplona.quartz.events.EventInterface
 import com.vitorpamplona.quartz.events.GenericRepostEvent
@@ -56,6 +57,7 @@ import com.vitorpamplona.quartz.events.LiveActivitiesEvent
 import com.vitorpamplona.quartz.events.LnZapEvent
 import com.vitorpamplona.quartz.events.LnZapPaymentRequestEvent
 import com.vitorpamplona.quartz.events.LnZapPaymentResponseEvent
+import com.vitorpamplona.quartz.events.LnZapRequestEvent
 import com.vitorpamplona.quartz.events.LongTextNoteEvent
 import com.vitorpamplona.quartz.events.PayInvoiceSuccessResponse
 import com.vitorpamplona.quartz.events.RepostEvent
@@ -66,10 +68,13 @@ import com.vitorpamplona.quartz.utils.containsAny
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withTimeoutOrNull
 import java.math.BigDecimal
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
+import kotlin.coroutines.resume
 
 @Stable
 class AddressableNote(val address: ATag) : Note(address.toTag()) {
@@ -93,6 +98,14 @@ class AddressableNote(val address: ATag) : Note(address.toTag()) {
     fun dTag(): String? {
         return (event as? AddressableEvent)?.dTag()
     }
+
+    override fun wasOrShouldBeDeletedBy(
+        deletionEvents: Set<HexKey>,
+        deletionAddressables: Set<ATag>,
+    ): Boolean {
+        val thisEvent = event
+        return deletionAddressables.contains(address) || (thisEvent != null && deletionEvents.contains(thisEvent.id()))
+    }
 }
 
 @Stable
@@ -138,17 +151,17 @@ open class Note(val idHex: String) {
         return if (myEvent is WrappedEvent) {
             val host = myEvent.host
             if (host != null) {
-                Nip19.createNEvent(
+                Nip19Bech32.createNEvent(
                     host.id,
                     host.pubKey,
                     host.kind(),
                     relays.firstOrNull()?.url,
                 )
             } else {
-                Nip19.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relays.firstOrNull()?.url)
+                Nip19Bech32.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relays.firstOrNull()?.url)
             }
         } else {
-            Nip19.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relays.firstOrNull()?.url)
+            Nip19Bech32.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relays.firstOrNull()?.url)
         }
     }
 
@@ -167,7 +180,8 @@ open class Note(val idHex: String) {
             event is LiveActivitiesEvent
         ) {
             (event as? ChannelMessageEvent)?.channel()
-                ?: (event as? ChannelMetadataEvent)?.channel() ?: (event as? ChannelCreateEvent)?.id
+                ?: (event as? ChannelMetadataEvent)?.channel()
+                ?: (event as? ChannelCreateEvent)?.id
                 ?: (event as? LiveActivitiesChatMessageEvent)?.activity()?.toTag()
                 ?: (event as? LiveActivitiesEvent)?.address()?.toTag()
         } else {
@@ -179,6 +193,8 @@ open class Note(val idHex: String) {
 
     open fun createdAt() = event?.createdAt()
 
+    fun isDraft() = event is DraftEvent
+
     fun loadEvent(
         event: Event,
         author: User,
@@ -306,6 +322,12 @@ open class Note(val idHex: String) {
     }
 
     fun removeAllChildNotes(): List<Note> {
+        val repliesChanged = replies.isNotEmpty()
+        val reactionsChanged = reactions.isNotEmpty()
+        val zapsChanged = zaps.isNotEmpty() || zapPayments.isNotEmpty()
+        val boostsChanged = boosts.isNotEmpty()
+        val reportsChanged = reports.isNotEmpty()
+
         val toBeRemoved =
             replies +
                 reactions.values.flatten() +
@@ -326,11 +348,11 @@ open class Note(val idHex: String) {
         relays = listOf<RelayBriefInfoCache.RelayBriefInfo>()
         lastReactionsDownloadTime = emptyMap()
 
-        liveSet?.innerReplies?.invalidateData()
-        liveSet?.innerReactions?.invalidateData()
-        liveSet?.innerBoosts?.invalidateData()
-        liveSet?.innerReports?.invalidateData()
-        liveSet?.innerZaps?.invalidateData()
+        if (repliesChanged) liveSet?.innerReplies?.invalidateData()
+        if (reactionsChanged) liveSet?.innerReactions?.invalidateData()
+        if (boostsChanged) liveSet?.innerBoosts?.invalidateData()
+        if (reportsChanged) liveSet?.innerReports?.invalidateData()
+        if (zapsChanged) liveSet?.innerZaps?.invalidateData()
 
         return toBeRemoved
     }
@@ -521,59 +543,76 @@ open class Note(val idHex: String) {
         }
     }
 
-    private fun recursiveIsZappedByCalculation(
+    private suspend fun isZappedByCalculation(
         option: Int?,
         user: User,
         account: Account,
-        remainingZapEvents: List<Pair<Note, Note?>>,
+        remainingZapEvents: Map<Note, Note?>,
         onWasZappedByAuthor: () -> Unit,
     ) {
         if (remainingZapEvents.isEmpty()) {
             return
         }
 
-        val next = remainingZapEvents.first()
+        remainingZapEvents.forEach { next ->
+            val zapRequest = next.key.event as LnZapRequestEvent
+            val zapEvent = next.value?.event as? LnZapEvent
 
-        if (next.first.author?.pubkeyHex == user.pubkeyHex) {
-            onWasZappedByAuthor()
-        } else {
-            account.decryptZapContentAuthor(next.first) {
-                if (
-                    it.pubKey == user.pubkeyHex &&
-                    (option == null || option == (it as? LnZapEvent)?.zappedPollOption())
-                ) {
+            if (!zapRequest.isPrivateZap()) {
+                // public events
+                if (zapRequest.pubKey == user.pubkeyHex && (option == null || option == zapEvent?.zappedPollOption())) {
                     onWasZappedByAuthor()
+                    return
+                }
+            } else {
+                // private events
+
+                // if has already decrypted
+                val privateZap = zapRequest.cachedPrivateZap()
+                if (privateZap != null) {
+                    if (privateZap.pubKey == user.pubkeyHex && (option == null || option == zapEvent?.zappedPollOption())) {
+                        onWasZappedByAuthor()
+                        return
+                    }
                 } else {
-                    recursiveIsZappedByCalculation(
-                        option,
-                        user,
-                        account,
-                        remainingZapEvents.minus(next),
-                        onWasZappedByAuthor,
-                    )
+                    if (account.isWriteable()) {
+                        val result =
+                            withTimeoutOrNull(1000) {
+                                suspendCancellableCoroutine { continuation ->
+                                    zapRequest.decryptPrivateZap(account.signer) {
+                                        continuation.resume(it)
+                                    }
+                                }
+                            }
+
+                        if (result?.pubKey == user.pubkeyHex && (option == null || option == zapEvent?.zappedPollOption())) {
+                            onWasZappedByAuthor()
+                            return
+                        }
+                    }
                 }
             }
         }
     }
 
-    fun isZappedBy(
+    suspend fun isZappedBy(
         user: User,
         account: Account,
         onWasZappedByAuthor: () -> Unit,
     ) {
-        recursiveIsZappedByCalculation(null, user, account, zaps.toList(), onWasZappedByAuthor)
+        isZappedByCalculation(null, user, account, zaps, onWasZappedByAuthor)
         if (account.userProfile() == user) {
             recursiveIsPaidByCalculation(account, zapPayments.toList(), onWasZappedByAuthor)
         }
     }
 
-    fun isZappedBy(
+    suspend fun isZappedBy(
         option: Int?,
         user: User,
         account: Account,
         onWasZappedByAuthor: () -> Unit,
     ) {
-        recursiveIsZappedByCalculation(option, user, account, zaps.toList(), onWasZappedByAuthor)
+        isZappedByCalculation(option, user, account, zaps, onWasZappedByAuthor)
     }
 
     fun getReactionBy(user: User): String? {
@@ -900,6 +939,14 @@ open class Note(val idHex: String) {
             createOrDestroyFlowSync(false)
         }
     }
+
+    open fun wasOrShouldBeDeletedBy(
+        deletionEvents: Set<HexKey>,
+        deletionAddressables: Set<ATag>,
+    ): Boolean {
+        val thisEvent = event
+        return deletionEvents.contains(idHex) || (thisEvent is AddressableEvent && deletionAddressables.contains(thisEvent.address()))
+    }
 }
 
 @Stable
@@ -926,6 +973,8 @@ class NoteLiveSet(u: Note) {
     val innerReports = NoteBundledRefresherLiveData(u)
     val innerRelays = NoteBundledRefresherLiveData(u)
     val innerZaps = NoteBundledRefresherLiveData(u)
+    val innerOts = NoteBundledRefresherLiveData(u)
+    val innerModifications = NoteBundledRefresherLiveData(u)
 
     val metadata = innerMetadata.map { it }
     val reactions = innerReactions.map { it }
@@ -935,8 +984,6 @@ class NoteLiveSet(u: Note) {
     val relays = innerRelays.map { it }
     val zaps = innerZaps.map { it }
 
-    val authorChanges = innerMetadata.map { it.note.author }.distinctUntilChanged()
-
     val hasEvent = innerMetadata.map { it.note.event != null }.distinctUntilChanged()
 
     val hasReactions =
@@ -974,12 +1021,13 @@ class NoteLiveSet(u: Note) {
             reports.hasObservers() ||
             relays.hasObservers() ||
             zaps.hasObservers() ||
-            authorChanges.hasObservers() ||
             hasEvent.hasObservers() ||
             hasReactions.hasObservers() ||
             replyCount.hasObservers() ||
             reactionCount.hasObservers() ||
-            boostCount.hasObservers()
+            boostCount.hasObservers() ||
+            innerOts.hasObservers() ||
+            innerModifications.hasObservers()
     }
 
     fun destroy() {
@@ -990,6 +1038,8 @@ class NoteLiveSet(u: Note) {
         innerReports.destroy()
         innerRelays.destroy()
         innerZaps.destroy()
+        innerOts.destroy()
+        innerModifications.destroy()
     }
 }
 

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -96,7 +96,7 @@ class ParticipantListBuilder {
             it.replyTo?.forEach { addFollowsThatDirectlyParticipateOnToSet(it, followingSet, mySet) }
         }
 
-        LocalCache.getChannelIfExists(baseNote.idHex)?.notes?.values?.forEach {
+        LocalCache.getChannelIfExists(baseNote.idHex)?.notes?.forEach { key, it ->
             addFollowsThatDirectlyParticipateOnToSet(it, followingSet, mySet)
         }
 

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -34,6 +34,7 @@ data class Settings(
     val automaticallyShowProfilePictures: ConnectivityType = ConnectivityType.ALWAYS,
     val dontShowPushNotificationSelector: Boolean = false,
     val dontAskForNotificationPermissions: Boolean = false,
+    val featureSet: FeatureSetType = FeatureSetType.COMPLETE,
 )
 
 enum class ThemeType(val screenCode: Int, val resourceId: Int) {
@@ -59,6 +60,11 @@ enum class ConnectivityType(val prefCode: Boolean?, val screenCode: Int, val res
     NEVER(false, 2, R.string.connectivity_type_never),
 }
 
+enum class FeatureSetType(val screenCode: Int, val resourceId: Int) {
+    COMPLETE(0, R.string.ui_feature_set_type_complete),
+    SIMPLIFIED(1, R.string.ui_feature_set_type_simplified),
+}
+
 fun parseConnectivityType(code: Boolean?): ConnectivityType {
     return when (code) {
         ConnectivityType.ALWAYS.prefCode -> ConnectivityType.ALWAYS
@@ -81,6 +87,16 @@ fun parseConnectivityType(screenCode: Int): ConnectivityType {
     }
 }
 
+fun parseFeatureSetType(screenCode: Int): FeatureSetType {
+    return when (screenCode) {
+        FeatureSetType.COMPLETE.screenCode -> FeatureSetType.COMPLETE
+        FeatureSetType.SIMPLIFIED.screenCode -> FeatureSetType.SIMPLIFIED
+        else -> {
+            FeatureSetType.COMPLETE
+        }
+    }
+}
+
 enum class BooleanType(val prefCode: Boolean?, val screenCode: Int, val reourceId: Int) {
     ALWAYS(null, 0, R.string.connectivity_type_always),
     NEVER(false, 1, R.string.connectivity_type_never),

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -21,6 +21,8 @@
 package com.vitorpamplona.amethyst.model
 
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.quartz.encoders.ATag
+import com.vitorpamplona.quartz.events.AddressableEvent
 import com.vitorpamplona.quartz.events.GenericRepostEvent
 import com.vitorpamplona.quartz.events.RepostEvent
 import kotlin.time.measureTimedValue
@@ -78,7 +80,7 @@ class ThreadAssembler {
                 val note = LocalCache.checkGetOrCreateNote(noteId) ?: return emptySet<Note>()
 
                 if (note.event != null) {
-                    val thread = mutableSetOf<Note>()
+                    val thread = OnlyLatestVersionSet()
 
                     val threadRoot = searchRoot(note, thread) ?: note
 
@@ -87,7 +89,7 @@ class ThreadAssembler {
                     // did not added them.
                     note.replies.forEach { loadDown(it, thread) }
 
-                    thread.toSet()
+                    thread
                 } else {
                     setOf(note)
                 }
@@ -109,3 +111,87 @@ class ThreadAssembler {
         }
     }
 }
+
+class OnlyLatestVersionSet : MutableSet<Note> {
+    val map = hashMapOf<ATag, Long>()
+    val set = hashSetOf<Note>()
+
+    override fun add(element: Note): Boolean {
+        val loadedCreatedAt = element.createdAt()
+        val noteEvent = element.event
+
+        return if (element is AddressableNote && loadedCreatedAt != null) {
+            innerAdd(element.address, element, loadedCreatedAt)
+        } else if (noteEvent is AddressableEvent && loadedCreatedAt != null) {
+            innerAdd(noteEvent.address(), element, loadedCreatedAt)
+        } else {
+            set.add(element)
+        }
+    }
+
+    private fun innerAdd(
+        address: ATag,
+        element: Note,
+        loadedCreatedAt: Long,
+    ): Boolean {
+        val existing = map.get(address)
+        return if (existing == null) {
+            map.put(address, loadedCreatedAt)
+            set.add(element)
+        } else {
+            if (loadedCreatedAt > existing) {
+                map.put(address, loadedCreatedAt)
+                set.add(element)
+            } else {
+                false
+            }
+        }
+    }
+
+    override fun addAll(elements: Collection<Note>): Boolean {
+        return elements.map { add(it) }.any()
+    }
+
+    override val size: Int
+        get() = set.size
+
+    override fun clear() {
+        set.clear()
+        map.clear()
+    }
+
+    override fun isEmpty(): Boolean {
+        return set.isEmpty()
+    }
+
+    override fun containsAll(elements: Collection<Note>): Boolean {
+        return set.containsAll(elements)
+    }
+
+    override fun contains(element: Note): Boolean {
+        return set.contains(element)
+    }
+
+    override fun iterator(): MutableIterator<Note> {
+        return set.iterator()
+    }
+
+    override fun retainAll(elements: Collection<Note>): Boolean {
+        return set.retainAll(elements)
+    }
+
+    override fun removeAll(elements: Collection<Note>): Boolean {
+        return elements.map { remove(it) }.any()
+    }
+
+    override fun remove(element: Note): Boolean {
+        element.address()?.let {
+            map.remove(it)
+        }
+        (element.event as? AddressableEvent)?.address()?.let {
+            map.remove(it)
+        }
+
+        return set.remove(element)
+    }
+}

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -26,8 +26,6 @@ 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 {
@@ -37,46 +35,44 @@ object UrlCachedPreviewer {
     suspend fun previewInfo(
         url: String,
         onReady: suspend (UrlPreviewState) -> Unit,
-    ) = withContext(Dispatchers.IO) {
+    ) {
         cache[url]?.let {
             onReady(it)
-            return@withContext
+            return
         }
 
         BahaUrlPreview(
             url,
             object : IUrlPreviewCallback {
-                override suspend fun onComplete(urlInfo: UrlInfoItem) =
-                    withContext(Dispatchers.IO) {
-                        cache[url]?.let {
-                            if (it is UrlPreviewState.Loaded || it is UrlPreviewState.Empty) {
-                                onReady(it)
-                                return@withContext
-                            }
-                        }
-
-                        val state =
-                            if (urlInfo.fetchComplete() && urlInfo.url == url) {
-                                UrlPreviewState.Loaded(urlInfo)
-                            } else {
-                                UrlPreviewState.Empty
-                            }
-
-                        cache.put(url, state)
-                        onReady(state)
-                    }
-
-                override suspend fun onFailed(throwable: Throwable) =
-                    withContext(Dispatchers.IO) {
-                        cache[url]?.let {
+                override suspend fun onComplete(urlInfo: UrlInfoItem) {
+                    cache[url]?.let {
+                        if (it is UrlPreviewState.Loaded || it is UrlPreviewState.Empty) {
                             onReady(it)
-                            return@withContext
+                            return
+                        }
+                    }
+
+                    val state =
+                        if (urlInfo.fetchComplete() && urlInfo.url == url) {
+                            UrlPreviewState.Loaded(urlInfo)
+                        } else {
+                            UrlPreviewState.Empty
                         }
 
-                        val state = UrlPreviewState.Error(throwable.message ?: "Error Loading url preview")
-                        cache.put(url, state)
-                        onReady(state)
+                    cache.put(url, state)
+                    onReady(state)
+                }
+
+                override suspend fun onFailed(throwable: Throwable) {
+                    cache[url]?.let {
+                        onReady(it)
+                        return
                     }
+
+                    val state = UrlPreviewState.Error(throwable.message ?: "Error Loading url preview")
+                    cache.put(url, state)
+                    onReady(state)
+                }
             },
         )
             .fetchUrlPreview()

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -52,6 +52,7 @@ import java.math.BigDecimal
 class User(val pubkeyHex: String) {
     var info: UserMetadata? = null
 
+    var latestMetadata: MetadataEvent? = null
     var latestContactList: ContactListEvent? = null
     var latestBookmarkList: BookmarkListEvent? = null
 
@@ -80,7 +81,7 @@ class User(val pubkeyHex: String) {
     override fun toString(): String = pubkeyHex
 
     fun toBestShortFirstName(): String {
-        val fullName = bestDisplayName() ?: bestUsername() ?: return pubkeyDisplayHex()
+        val fullName = toBestDisplayName()
 
         val names = fullName.split(' ')
 
@@ -96,23 +97,14 @@ class User(val pubkeyHex: String) {
     }
 
     fun toBestDisplayName(): String {
-        return bestDisplayName() ?: bestUsername() ?: pubkeyDisplayHex()
-    }
-
-    fun bestUsername(): String? {
-        return info?.name?.ifBlank { null } ?: info?.username?.ifBlank { null }
-    }
-
-    fun bestDisplayName(): String? {
-        return info?.displayName?.ifBlank { null }
+        return info?.bestName() ?: pubkeyDisplayHex()
     }
 
     fun nip05(): String? {
-        return info?.nip05?.ifBlank { null }
+        return info?.nip05
     }
 
     fun profilePicture(): String? {
-        if (info?.picture.isNullOrBlank()) info?.picture = null
         return info?.picture
     }
 
@@ -135,14 +127,15 @@ class User(val pubkeyHex: String) {
 
         // Update following of the current user
         liveSet?.innerFollows?.invalidateData()
+        flowSet?.follows?.invalidateData()
 
         // Update Followers of the past user list
         // Update Followers of the new contact list
         (oldContactListEvent)?.unverifiedFollowKeySet()?.forEach {
-            LocalCache.users[it]?.liveSet?.innerFollowers?.invalidateData()
+            LocalCache.getUserIfExists(it)?.liveSet?.innerFollowers?.invalidateData()
         }
         (latestContactList)?.unverifiedFollowKeySet()?.forEach {
-            LocalCache.users[it]?.liveSet?.innerFollowers?.invalidateData()
+            LocalCache.getUserIfExists(it)?.liveSet?.innerFollowers?.invalidateData()
         }
 
         liveSet?.innerRelays?.invalidateData()
@@ -285,6 +278,18 @@ class User(val pubkeyHex: String) {
         }
     }
 
+    fun removeMessage(
+        room: ChatroomKey,
+        msg: Note,
+    ) {
+        checkNotInMainThread()
+        val privateChatroom = getOrCreatePrivateChatroom(room)
+        if (msg in privateChatroom.roomMessages) {
+            privateChatroom.removeMessageSync(msg)
+            liveSet?.innerMessages?.invalidateData()
+        }
+    }
+
     fun addRelayBeingUsed(
         relay: Relay,
         eventTime: Long,
@@ -307,9 +312,8 @@ class User(val pubkeyHex: String) {
         latestMetadata: MetadataEvent,
     ) {
         info = newUserInfo
-        info?.latestMetadata = latestMetadata
-        info?.updatedMetadataAt = latestMetadata.createdAt
         info?.tags = latestMetadata.tags.toImmutableListOfLists()
+        info?.cleanBlankNames()
 
         if (newUserInfo.lud16.isNullOrBlank()) {
             info?.lud06?.let {
@@ -363,7 +367,7 @@ class User(val pubkeyHex: String) {
     }
 
     suspend fun transientFollowerCount(): Int {
-        return LocalCache.users.count { it.value.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
+        return LocalCache.users.count { _, it -> it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
     }
 
     fun cachedFollowingKeySet(): Set<HexKey> {
@@ -387,13 +391,13 @@ class User(val pubkeyHex: String) {
     }
 
     suspend fun cachedFollowerCount(): Int {
-        return LocalCache.users.count { it.value.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
+        return LocalCache.users.count { _, it -> it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
     }
 
     fun hasSentMessagesTo(key: ChatroomKey?): Boolean {
         val messagesToUser = privateChatrooms[key] ?: return false
 
-        return messagesToUser.roomMessages.any { this.pubkeyHex == it.author?.pubkeyHex }
+        return messagesToUser.authors.any { this == it }
     }
 
     fun hasReport(
@@ -471,14 +475,16 @@ class User(val pubkeyHex: String) {
 @Stable
 class UserFlowSet(u: User) {
     // Observers line up here.
+    val follows = UserBundledRefresherFlow(u)
     val relays = UserBundledRefresherFlow(u)
 
     fun isInUse(): Boolean {
-        return relays.stateFlow.subscriptionCount.value > 0
+        return relays.stateFlow.subscriptionCount.value > 0 || follows.stateFlow.subscriptionCount.value > 0
     }
 
     fun destroy() {
         relays.destroy()
+        follows.destroy()
     }
 }
 

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -20,48 +20,13 @@
  */
 package com.vitorpamplona.amethyst.service
 
-import android.util.Log
 import android.util.LruCache
-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.components.ZoomableUrlContent
-import com.vitorpamplona.amethyst.ui.components.ZoomableUrlImage
-import com.vitorpamplona.amethyst.ui.components.ZoomableUrlVideo
-import com.vitorpamplona.amethyst.ui.components.hashTagsPattern
-import com.vitorpamplona.amethyst.ui.components.imageExtensions
-import com.vitorpamplona.amethyst.ui.components.removeQueryParamsForExtensionComparison
-import com.vitorpamplona.amethyst.ui.components.tagIndex
-import com.vitorpamplona.amethyst.ui.components.videoExtensions
-import com.vitorpamplona.quartz.encoders.Nip54
-import com.vitorpamplona.quartz.encoders.Nip92
-import com.vitorpamplona.quartz.events.FileHeaderEvent
+import com.vitorpamplona.amethyst.commons.richtext.RichTextParser
+import com.vitorpamplona.amethyst.commons.richtext.RichTextViewerState
 import com.vitorpamplona.quartz.events.ImmutableListOfLists
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.ImmutableMap
-import kotlinx.collections.immutable.ImmutableSet
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toImmutableList
-import kotlinx.collections.immutable.toImmutableMap
-import kotlinx.collections.immutable.toImmutableSet
-import kotlinx.collections.immutable.toPersistentList
-import kotlinx.coroutines.CancellationException
-import java.util.regex.Pattern
-
-@Immutable
-data class RichTextViewerState(
-    val urlSet: ImmutableSet<String>,
-    val imagesForPager: ImmutableMap<String, ZoomableUrlContent>,
-    val imageList: ImmutableList<ZoomableUrlContent>,
-    val customEmoji: ImmutableMap<String, String>,
-    val paragraphs: ImmutableList<ParagraphState>,
-)
-
-data class ParagraphState(val words: ImmutableList<Segment>, val isRTL: Boolean)
 
 object CachedRichTextParser {
-    val richTextCache = LruCache<String, RichTextViewerState>(200)
+    val richTextCache = LruCache<String, RichTextViewerState>(50)
 
     fun parseText(
         content: String,
@@ -76,298 +41,3 @@ object CachedRichTextParser {
         }
     }
 }
-
-// Group 1 = url, group 4 additional chars
-// val noProtocolUrlValidator =
-// Pattern.compile("(([\\w\\d-]+\\.)*[a-zA-Z][\\w-]+[\\.\\:]\\w+([\\/\\?\\=\\&\\#\\.]?[\\w-]+)*\\/?)(.*)")
-
-// 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}])*\\/?)(.*)",
-        )
-    } 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 parseMediaUrl(
-        fullUrl: String,
-        eventTags: ImmutableListOfLists<String>,
-    ): ZoomableUrlContent? {
-        val removedParamsFromUrl = removeQueryParamsForExtensionComparison(fullUrl)
-        return if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
-            val frags = Nip54().parse(fullUrl)
-            val tags = Nip92().parse(fullUrl, eventTags.lists)
-
-            ZoomableUrlImage(
-                url = fullUrl,
-                description = frags[FileHeaderEvent.ALT] ?: tags[FileHeaderEvent.ALT],
-                hash = frags[FileHeaderEvent.HASH] ?: tags[FileHeaderEvent.HASH],
-                blurhash = frags[FileHeaderEvent.BLUR_HASH] ?: tags[FileHeaderEvent.BLUR_HASH],
-                dim = frags[FileHeaderEvent.DIMENSION] ?: tags[FileHeaderEvent.DIMENSION],
-                contentWarning = frags["content-warning"] ?: tags["content-warning"],
-            )
-        } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
-            val frags = Nip54().parse(fullUrl)
-            val tags = Nip92().parse(fullUrl, eventTags.lists)
-            ZoomableUrlVideo(
-                url = fullUrl,
-                description = frags[FileHeaderEvent.ALT] ?: tags[FileHeaderEvent.ALT],
-                hash = frags[FileHeaderEvent.HASH] ?: tags[FileHeaderEvent.HASH],
-                blurhash = frags[FileHeaderEvent.BLUR_HASH] ?: tags[FileHeaderEvent.BLUR_HASH],
-                dim = frags[FileHeaderEvent.DIMENSION] ?: tags[FileHeaderEvent.DIMENSION],
-                contentWarning = frags["content-warning"] ?: tags["content-warning"],
-            )
-        } else {
-            null
-        }
-    }
-
-    fun parseText(
-        content: String,
-        tags: ImmutableListOfLists<String>,
-    ): RichTextViewerState {
-        val urls = UrlDetector(content, UrlDetectorOptions.Default).detect()
-
-        val urlSet =
-            urls.mapNotNullTo(LinkedHashSet(urls.size)) {
-                // removes e-mails
-                if (Patterns.EMAIL_ADDRESS.matcher(it.originalUrl).matches()) {
-                    null
-                } else if (isNumber(it.originalUrl)) {
-                    null
-                } else if (it.originalUrl.contains("。")) {
-                    null
-                } else {
-                    if (HTTPRegex.matches(it.originalUrl)) {
-                        it.originalUrl
-                    } else {
-                        null
-                    }
-                }
-            }
-
-        val imagesForPager =
-            urlSet.mapNotNull { fullUrl -> parseMediaUrl(fullUrl, tags) }.associateBy { it.url }
-        val imageList = imagesForPager.values.toList()
-
-        val emojiMap =
-            tags.lists.filter { it.size > 2 && it[0] == "emoji" }.associate { ":${it[1]}:" to it[2] }
-
-        val segments = findTextSegments(content, imagesForPager.keys, urlSet, emojiMap, tags)
-
-        return RichTextViewerState(
-            urlSet.toImmutableSet(),
-            imagesForPager.toImmutableMap(),
-            imageList.toImmutableList(),
-            emojiMap.toImmutableMap(),
-            segments,
-        )
-    }
-
-    private fun findTextSegments(
-        content: String,
-        images: Set<String>,
-        urls: Set<String>,
-        emojis: Map<String, String>,
-        tags: ImmutableListOfLists<String>,
-    ): ImmutableList<ParagraphState> {
-        val lines = content.split('\n')
-        val paragraphSegments = ArrayList<ParagraphState>(lines.size)
-
-        lines.forEach { paragraph ->
-            var isDirty = false
-            val isRTL = isArabic(paragraph)
-
-            val wordList = paragraph.trimEnd().split(' ')
-            val segments = ArrayList<Segment>(wordList.size)
-            wordList.forEach { word ->
-                val wordSegment = wordIdentifier(word, images, urls, emojis, tags)
-                if (wordSegment !is RegularTextSegment) {
-                    isDirty = true
-                }
-                segments.add(wordSegment)
-            }
-
-            val newSegments =
-                if (isDirty) {
-                    ParagraphState(segments.toPersistentList(), isRTL)
-                } else {
-                    ParagraphState(persistentListOf<Segment>(RegularTextSegment(paragraph)), isRTL)
-                }
-
-            paragraphSegments.add(newSegments)
-        }
-
-        return paragraphSegments.toImmutableList()
-    }
-
-    fun isNumber(word: String): Boolean {
-        return numberPattern.matcher(word).matches()
-    }
-
-    fun isDate(word: String): Boolean {
-        return shortDatePattern.matcher(word).matches() || longDatePattern.matcher(word).matches()
-    }
-
-    private fun isArabic(text: String): Boolean {
-        return text.any { it in '\u0600'..'\u06FF' || it in '\u0750'..'\u077F' }
-    }
-
-    private fun wordIdentifier(
-        word: String,
-        images: Set<String>,
-        urls: Set<String>,
-        emojis: Map<String, String>,
-        tags: ImmutableListOfLists<String>,
-    ): Segment {
-        val emailMatcher = Patterns.EMAIL_ADDRESS.matcher(word)
-        val phoneMatcher = Patterns.PHONE.matcher(word)
-        val schemelessMatcher = noProtocolUrlValidator.matcher(word)
-
-        return if (word.isEmpty()) {
-            RegularTextSegment(word)
-        } else if (images.contains(word)) {
-            ImageSegment(word)
-        } else if (urls.contains(word)) {
-            LinkSegment(word)
-        } else if (emojis.any { word.contains(it.key) }) {
-            EmojiSegment(word)
-        } else if (word.startsWith("lnbc", true)) {
-            InvoiceSegment(word)
-        } else if (word.startsWith("lnurl", true)) {
-            WithdrawSegment(word)
-        } else if (word.startsWith("cashuA", true)) {
-            CashuSegment(word)
-        } else if (emailMatcher.matches()) {
-            EmailSegment(word)
-        } else if (word.length in 7..14 && !isDate(word) && phoneMatcher.matches()) {
-            PhoneSegment(word)
-        } else if (startsWithNIP19Scheme(word)) {
-            BechSegment(word)
-        } else if (word.startsWith("#")) {
-            parseHash(word, tags)
-        } 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.find(word) != null) {
-                SchemelessUrlSegment(word, url, additionalChars)
-            } else {
-                RegularTextSegment(word)
-            }
-        } else {
-            RegularTextSegment(word)
-        }
-    }
-
-    private fun parseHash(
-        word: String,
-        tags: ImmutableListOfLists<String>,
-    ): Segment {
-        // First #[n]
-
-        val matcher = tagIndex.matcher(word)
-        try {
-            if (matcher.find()) {
-                val index = matcher.group(1)?.toInt()
-                val suffix = matcher.group(2)
-
-                if (index != null && index >= 0 && index < tags.lists.size) {
-                    val tag = tags.lists[index]
-
-                    if (tag.size > 1) {
-                        if (tag[0] == "p") {
-                            return HashIndexUserSegment(word, tag[1], suffix)
-                        } else if (tag[0] == "e" || tag[0] == "a") {
-                            return HashIndexEventSegment(word, tag[1], suffix)
-                        }
-                    }
-                }
-            }
-        } catch (e: Exception) {
-            if (e is CancellationException) throw e
-            Log.w("Tag Parser", "Couldn't link tag $word", e)
-        }
-
-        // Second #Amethyst
-        val hashtagMatcher = hashTagsPattern.matcher(word)
-
-        try {
-            if (hashtagMatcher.find()) {
-                val hashtag = hashtagMatcher.group(1)
-                if (hashtag != null) {
-                    return HashTagSegment(word, hashtag, hashtagMatcher.group(2))
-                }
-            }
-        } catch (e: Exception) {
-            if (e is CancellationException) throw e
-            Log.e("Hashtag Parser", "Couldn't link hashtag $word", e)
-        }
-
-        return RegularTextSegment(word)
-    }
-
-    companion object {
-        val longDatePattern: Pattern = Pattern.compile("^\\d{4}-\\d{2}-\\d{2}$")
-        val shortDatePattern: Pattern = Pattern.compile("^\\d{2}-\\d{2}-\\d{2}$")
-        val numberPattern: Pattern = Pattern.compile("^(-?[\\d.]+)([a-zA-Z%]*)$")
-    }
-}
-
-@Immutable open class Segment(val segmentText: String)
-
-@Immutable class ImageSegment(segment: String) : Segment(segment)
-
-@Immutable class LinkSegment(segment: String) : Segment(segment)
-
-@Immutable class EmojiSegment(segment: String) : Segment(segment)
-
-@Immutable class InvoiceSegment(segment: String) : Segment(segment)
-
-@Immutable class WithdrawSegment(segment: String) : Segment(segment)
-
-@Immutable class CashuSegment(segment: String) : Segment(segment)
-
-@Immutable class EmailSegment(segment: String) : Segment(segment)
-
-@Immutable class PhoneSegment(segment: String) : Segment(segment)
-
-@Immutable class BechSegment(segment: String) : Segment(segment)
-
-@Immutable
-open class HashIndexSegment(segment: String, val hex: String, val extras: String?) :
-    Segment(segment)
-
-@Immutable
-class HashIndexUserSegment(segment: String, hex: String, extras: String?) :
-    HashIndexSegment(segment, hex, extras)
-
-@Immutable
-class HashIndexEventSegment(segment: String, hex: String, extras: String?) :
-    HashIndexSegment(segment, hex, extras)
-
-@Immutable
-class HashTagSegment(segment: String, val hashtag: String, val extras: String?) : Segment(segment)
-
-@Immutable
-class SchemelessUrlSegment(segment: String, val url: String, val extras: String?) :
-    Segment(segment)
-
-@Immutable class RegularTextSegment(segment: String) : Segment(segment)
-
-fun startsWithNIP19Scheme(word: String): Boolean {
-    val cleaned = word.lowercase().removePrefix("@").removePrefix("nostr:").removePrefix("@")
-
-    return listOf("npub1", "naddr1", "note1", "nprofile1", "nevent1").any { cleaned.startsWith(it) }
-}

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -21,6 +21,7 @@
 package com.vitorpamplona.amethyst.service
 
 import android.content.Context
+import android.util.LruCache
 import androidx.compose.runtime.Immutable
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
@@ -42,6 +43,24 @@ data class CashuToken(
     val proofs: JsonNode,
 )
 
+object CachedCashuProcessor {
+    val cashuCache = LruCache<String, GenericLoadable<CashuToken>>(20)
+
+    fun cached(token: String): GenericLoadable<CashuToken> {
+        return cashuCache[token] ?: GenericLoadable.Loading()
+    }
+
+    fun parse(token: String): GenericLoadable<CashuToken> {
+        if (cashuCache[token] !is GenericLoadable.Loaded) {
+            val newCachuData = CashuProcessor().parse(token)
+
+            cashuCache.put(token, newCachuData)
+        }
+
+        return cashuCache[token]
+    }
+}
+
 class CashuProcessor {
     fun parse(cashuToken: String): GenericLoadable<CashuToken> {
         checkNotInMainThread()

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -27,6 +27,7 @@ import android.location.Location
 import android.location.LocationListener
 import android.location.LocationManager
 import android.os.HandlerThread
+import android.util.LruCache
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import kotlinx.coroutines.CancellationException
@@ -92,7 +93,33 @@ class LocationUtil(context: Context) {
         }
 }
 
-class ReverseGeoLocationUtil {
+object CachedGeoLocations {
+    val locationNames = LruCache<String, String>(20)
+
+    fun cached(geoHashStr: String): String? {
+        return locationNames[geoHashStr]
+    }
+
+    suspend fun geoLocate(
+        geoHashStr: String,
+        location: Location,
+        context: Context,
+    ): String? {
+        locationNames[geoHashStr]?.let {
+            return it
+        }
+
+        val name = ReverseGeoLocationUtil().execute(location, context)?.ifBlank { null }
+
+        if (name != null) {
+            locationNames.put(geoHashStr, name)
+        }
+
+        return name
+    }
+}
+
+private class ReverseGeoLocationUtil {
     suspend fun execute(
         location: Location,
         context: Context,

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -22,7 +22,8 @@ package com.vitorpamplona.amethyst.service
 
 import android.util.Log
 import android.util.LruCache
-import com.vitorpamplona.amethyst.model.RelayInformation
+import com.vitorpamplona.quartz.encoders.Nip11RelayInformation
+import com.vitorpamplona.quartz.utils.TimeUtils
 import kotlinx.coroutines.CancellationException
 import okhttp3.Call
 import okhttp3.Callback
@@ -31,29 +32,64 @@ import okhttp3.Response
 import java.io.IOException
 
 object Nip11CachedRetriever {
-    val relayInformationDocumentCache = LruCache<String, RelayInformation>(100)
+    open class RetrieveResult(val time: Long)
+
+    class RetrieveResultError(val error: Nip11Retriever.ErrorCode, val msg: String? = null) : RetrieveResult(TimeUtils.now())
+
+    class RetrieveResultSuccess(val data: Nip11RelayInformation) : RetrieveResult(TimeUtils.now())
+
+    val relayInformationDocumentCache = LruCache<String, RetrieveResult?>(100)
     val retriever = Nip11Retriever()
 
+    fun getFromCache(dirtyUrl: String): Nip11RelayInformation? {
+        val result = relayInformationDocumentCache.get(retriever.cleanUrl(dirtyUrl)) ?: return null
+        if (result is RetrieveResultSuccess) return result.data
+        return null
+    }
+
     suspend fun loadRelayInfo(
         dirtyUrl: String,
-        onInfo: (RelayInformation) -> Unit,
+        onInfo: (Nip11RelayInformation) -> Unit,
         onError: (String, Nip11Retriever.ErrorCode, String?) -> Unit,
     ) {
         val url = retriever.cleanUrl(dirtyUrl)
         val doc = relayInformationDocumentCache.get(url)
 
         if (doc != null) {
-            onInfo(doc)
+            if (doc is RetrieveResultSuccess) {
+                onInfo(doc.data)
+            } else if (doc is RetrieveResultError) {
+                if (TimeUtils.now() - doc.time < TimeUtils.ONE_HOUR) {
+                    onError(dirtyUrl, doc.error, null)
+                } else {
+                    Nip11Retriever()
+                        .loadRelayInfo(
+                            url = url,
+                            dirtyUrl = dirtyUrl,
+                            onInfo = {
+                                relayInformationDocumentCache.put(url, RetrieveResultSuccess(it))
+                                onInfo(it)
+                            },
+                            onError = { dirtyUrl, code, errorMsg ->
+                                relayInformationDocumentCache.put(url, RetrieveResultError(code, errorMsg))
+                                onError(url, code, errorMsg)
+                            },
+                        )
+                }
+            }
         } else {
             Nip11Retriever()
                 .loadRelayInfo(
-                    url,
-                    dirtyUrl,
+                    url = url,
+                    dirtyUrl = dirtyUrl,
                     onInfo = {
-                        relayInformationDocumentCache.put(url, it)
+                        relayInformationDocumentCache.put(url, RetrieveResultSuccess(it))
                         onInfo(it)
                     },
-                    onError,
+                    onError = { dirtyUrl, code, errorMsg ->
+                        relayInformationDocumentCache.put(url, RetrieveResultError(code, errorMsg))
+                        onError(url, code, errorMsg)
+                    },
                 )
         }
     }
@@ -78,9 +114,10 @@ class Nip11Retriever {
     suspend fun loadRelayInfo(
         url: String,
         dirtyUrl: String,
-        onInfo: (RelayInformation) -> Unit,
+        onInfo: (Nip11RelayInformation) -> Unit,
         onError: (String, ErrorCode, String?) -> Unit,
     ) {
+        checkNotInMainThread()
         try {
             val request: Request =
                 Request.Builder().header("Accept", "application/nostr+json").url(url).build()
@@ -98,7 +135,7 @@ class Nip11Retriever {
                                 val body = it.body.string()
                                 try {
                                     if (it.isSuccessful) {
-                                        onInfo(RelayInformation.fromJson(body))
+                                        onInfo(Nip11RelayInformation.fromJson(body))
                                     } else {
                                         onError(dirtyUrl, ErrorCode.FAIL_WITH_HTTP_STATUS, it.code.toString())
                                     }

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -32,8 +32,7 @@ object Nip96MediaServers {
         listOf(
             ServerName("Nostr.Build", "https://nostr.build"),
             ServerName("NostrCheck.me", "https://nostrcheck.me"),
-            ServerName("Nostrage", "https://nostrage.com"),
-            ServerName("Sove", "https://sove.rent"),
+            ServerName("NostPic", "https://nostpic.com"),
             ServerName("Sovbit", "https://files.sovbit.host"),
             ServerName("Void.cat", "https://void.cat"),
         )

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -200,8 +200,6 @@ class Nip96Uploader(val account: Account?) {
 
         nip98Header(server.apiUrl)?.let { requestBuilder.addHeader("Authorization", it) }
 
-        println(server.apiUrl.removeSuffix("/") + "/$hash.$extension")
-
         val request =
             requestBuilder
                 .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -35,13 +35,21 @@ 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.CalendarDateSlotEvent
+import com.vitorpamplona.quartz.events.CalendarRSVPEvent
+import com.vitorpamplona.quartz.events.CalendarTimeSlotEvent
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.ContactListEvent
+import com.vitorpamplona.quartz.events.DraftEvent
 import com.vitorpamplona.quartz.events.EmojiPackSelectionEvent
 import com.vitorpamplona.quartz.events.Event
 import com.vitorpamplona.quartz.events.EventInterface
 import com.vitorpamplona.quartz.events.GenericRepostEvent
 import com.vitorpamplona.quartz.events.GiftWrapEvent
+import com.vitorpamplona.quartz.events.GitIssueEvent
+import com.vitorpamplona.quartz.events.GitPatchEvent
+import com.vitorpamplona.quartz.events.GitReplyEvent
+import com.vitorpamplona.quartz.events.HighlightEvent
 import com.vitorpamplona.quartz.events.LnZapEvent
 import com.vitorpamplona.quartz.events.LnZapPaymentResponseEvent
 import com.vitorpamplona.quartz.events.MetadataEvent
@@ -120,24 +128,12 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
         )
     }
 
-    fun createAccountAcceptedAwardsFilter(): TypedFilter {
+    fun createAccountSettingsFilter(): TypedFilter {
         return TypedFilter(
             types = COMMON_FEED_TYPES,
             filter =
                 JsonFilter(
-                    kinds = listOf(BadgeProfilesEvent.KIND, EmojiPackSelectionEvent.KIND),
-                    authors = listOf(account.userProfile().pubkeyHex),
-                    limit = 10,
-                ),
-        )
-    }
-
-    fun createAccountBookmarkListFilter(): TypedFilter {
-        return TypedFilter(
-            types = COMMON_FEED_TYPES,
-            filter =
-                JsonFilter(
-                    kinds = listOf(BookmarkListEvent.KIND, PeopleListEvent.KIND, MuteListEvent.KIND),
+                    kinds = listOf(BookmarkListEvent.KIND, PeopleListEvent.KIND, MuteListEvent.KIND, BadgeProfilesEvent.KIND, EmojiPackSelectionEvent.KIND),
                     authors = listOf(account.userProfile().pubkeyHex),
                     limit = 100,
                 ),
@@ -149,7 +145,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
             types = COMMON_FEED_TYPES,
             filter =
                 JsonFilter(
-                    kinds = listOf(ReportEvent.KIND),
+                    kinds = listOf(DraftEvent.KIND, ReportEvent.KIND),
                     authors = listOf(account.userProfile().pubkeyHex),
                     since =
                         latestEOSEs.users[account.userProfile()]
@@ -204,6 +200,36 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
         )
     }
 
+    fun createNotificationFilter2(): TypedFilter {
+        val since =
+            latestEOSEs.users[account.userProfile()]
+                ?.followList
+                ?.get(account.defaultNotificationFollowList.value)
+                ?.relayList
+                ?: account.activeRelays()?.associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
+                ?: account.convertLocalRelays().associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
+
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter =
+                JsonFilter(
+                    kinds =
+                        listOf(
+                            GitReplyEvent.KIND,
+                            GitIssueEvent.KIND,
+                            GitPatchEvent.KIND,
+                            HighlightEvent.KIND,
+                            CalendarDateSlotEvent.KIND,
+                            CalendarTimeSlotEvent.KIND,
+                            CalendarRSVPEvent.KIND,
+                        ),
+                    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
+                    limit = 400,
+                    since = since,
+                ),
+        )
+    }
+
     fun createGiftWrapsToMeFilter() =
         TypedFilter(
             types = COMMON_FEED_TYPES,
@@ -237,22 +263,53 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
         checkNotInMainThread()
 
         if (LocalCache.justVerify(event)) {
-            if (event is GiftWrapEvent) {
-                // Avoid decrypting over and over again if the event already exist.
-                val note = LocalCache.getNoteIfExists(event.id)
-                if (note != null && relay.brief in note.relays) return
+            when (event) {
+                is DraftEvent -> {
+                    // Avoid decrypting over and over again if the event already exist.
 
-                event.cachedGift(account.signer) { this.consume(it, relay) }
-            }
+                    if (!event.isDeleted()) {
+                        val note = LocalCache.getNoteIfExists(event.id)
+                        if (note != null && relay.brief in note.relays) return
 
-            if (event is SealedGossipEvent) {
-                // Avoid decrypting over and over again if the event already exist.
-                val note = LocalCache.getNoteIfExists(event.id)
-                if (note != null && relay.brief in note.relays) return
+                        // decrypts
+                        event.cachedDraft(account.signer) {}
 
-                event.cachedGossip(account.signer) { LocalCache.justConsume(it, relay) }
-            } else {
-                LocalCache.justConsume(event, relay)
+                        LocalCache.justConsume(event, relay)
+                    }
+                }
+
+                is GiftWrapEvent -> {
+                    // Avoid decrypting over and over again if the event already exist.
+                    val note = LocalCache.getNoteIfExists(event.id)
+                    if (note != null && relay.brief in note.relays) return
+
+                    event.cachedGift(account.signer) { this.consume(it, relay) }
+                }
+
+                is SealedGossipEvent -> {
+                    // Avoid decrypting over and over again if the event already exist.
+                    val note = LocalCache.getNoteIfExists(event.id)
+                    if (note != null && relay.brief in note.relays) return
+
+                    event.cachedGossip(account.signer) { LocalCache.justConsume(it, relay) }
+                }
+
+                is LnZapEvent -> {
+                    // Avoid decrypting over and over again if the event already exist.
+
+                    val note = LocalCache.getNoteIfExists(event.id)
+                    if (note != null && relay.brief in note.relays) return
+
+                    event.zapRequest?.let {
+                        if (it.isPrivateZap()) {
+                            it.decryptPrivateZap(account.signer) {}
+                        }
+                    }
+                }
+
+                else -> {
+                    LocalCache.justConsume(event, relay)
+                }
             }
         }
     }
@@ -297,10 +354,10 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                     createAccountContactListFilter(),
                     createAccountRelayListFilter(),
                     createNotificationFilter(),
+                    createNotificationFilter2(),
                     createGiftWrapsToMeFilter(),
                     createAccountReportsFilter(),
-                    createAccountAcceptedAwardsFilter(),
-                    createAccountBookmarkListFilter(),
+                    createAccountSettingsFilter(),
                     createAccountLastPostsListFilter(),
                     createOtherAccountsBaseFilter(),
                 )
@@ -312,7 +369,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                     createAccountMetadataFilter(),
                     createAccountContactListFilter(),
                     createAccountRelayListFilter(),
-                    createAccountBookmarkListFilter(),
+                    createAccountSettingsFilter(),
                 )
                     .ifEmpty { null }
         }

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -26,6 +26,7 @@ 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.AddressableEvent
 import com.vitorpamplona.quartz.events.Event
 import com.vitorpamplona.quartz.utils.TimeUtils
 import kotlinx.coroutines.CoroutineScope
@@ -221,7 +222,7 @@ abstract class NostrDataSource(val debugName: String) {
         // saves the channels that are currently active
         val activeSubscriptions = subscriptions.values.filter { it.typedFilters != null }
         // saves the current content to only update if it changes
-        val currentFilters = activeSubscriptions.associate { it.id to it.toJson() }
+        val currentFilters = activeSubscriptions.associate { it.id to it.typedFilters }
 
         changingFilters.getAndSet(true)
 
@@ -245,7 +246,7 @@ abstract class NostrDataSource(val debugName: String) {
                         Client.close(updatedSubscription.id)
                     } else {
                         // was active and is still active, check if it has changed.
-                        if (updatedSubscription.toJson() != currentFilters[updatedSubscription.id]) {
+                        if (updatedSubscription.hasChangedFiltersFrom(currentFilters[updatedSubscription.id])) {
                             Client.close(updatedSubscription.id)
                             if (active) {
                                 Client.sendFilter(updatedSubscription.id, updatedSubscriptionNewFilters)
@@ -265,7 +266,7 @@ abstract class NostrDataSource(val debugName: String) {
                         // was not active and is still not active, does nothing
                     } else {
                         // was not active and becomes active, sends the filter.
-                        if (updatedSubscription.toJson() != currentFilters[updatedSubscription.id]) {
+                        if (updatedSubscription.hasChangedFiltersFrom(currentFilters[updatedSubscription.id])) {
                             if (active) {
                                 Log.d(
                                     this@NostrDataSource.javaClass.simpleName,
@@ -293,7 +294,13 @@ abstract class NostrDataSource(val debugName: String) {
         eventId: String,
         relay: Relay,
     ) {
-        LocalCache.getNoteIfExists(eventId)?.addRelay(relay)
+        val note = LocalCache.getNoteIfExists(eventId)
+        val noteEvent = note?.event
+        if (noteEvent is AddressableEvent) {
+            LocalCache.getAddressableNoteIfExists(noteEvent.address().toTag())?.addRelay(relay)
+        } else {
+            note?.addRelay(relay)
+        }
     }
 
     open fun markAsEOSE(

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -178,9 +178,8 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                 filter =
                     JsonFilter(
                         authors = follows,
-                        kinds =
-                            listOf(ChannelCreateEvent.KIND, ChannelMetadataEvent.KIND, ChannelMessageEvent.KIND),
-                        limit = 300,
+                        kinds = listOf(ChannelMessageEvent.KIND),
+                        limit = 500,
                         since =
                             latestEOSEs.users[account.userProfile()]
                                 ?.followList
@@ -194,7 +193,7 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
                     filter =
                         JsonFilter(
                             ids = followChats,
-                            kinds = listOf(ChannelCreateEvent.KIND),
+                            kinds = listOf(ChannelCreateEvent.KIND, ChannelMessageEvent.KIND),
                             limit = 300,
                             since =
                                 latestEOSEs.users[account.userProfile()]

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -24,9 +24,12 @@ 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.crypto.KeyPair
+import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.Hex
 import com.vitorpamplona.quartz.encoders.HexValidator
-import com.vitorpamplona.quartz.encoders.Nip19
+import com.vitorpamplona.quartz.encoders.Nip19Bech32
+import com.vitorpamplona.quartz.encoders.bechToBytes
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.events.AudioHeaderEvent
 import com.vitorpamplona.quartz.events.AudioTrackEvent
@@ -66,83 +69,118 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SearchEventFeed") {
                         null
                     }
 
-                Nip19.uriToRoute(mySearchString)?.hex ?: isAStraightHex
+                when (val parsed = Nip19Bech32.uriToRoute(mySearchString)?.entity) {
+                    is Nip19Bech32.NSec -> KeyPair(privKey = parsed.hex.bechToBytes()).pubKey.toHexKey()
+                    is Nip19Bech32.NPub -> parsed.hex
+                    is Nip19Bech32.NProfile -> parsed.hex
+                    is Nip19Bech32.Note -> parsed.hex
+                    is Nip19Bech32.NEvent -> parsed.hex
+                    is Nip19Bech32.NEmbed -> parsed.event.id
+                    is Nip19Bech32.NRelay -> null
+                    is Nip19Bech32.NAddress -> parsed.atag
+                    else -> isAStraightHex
+                }
             } catch (e: Exception) {
                 if (e is CancellationException) throw e
                 null
             }
 
-        // downloads all the reactions to a given event.
-        return listOfNotNull(
+        val directReferenceFilters =
             hexToWatch?.let {
-                TypedFilter(
-                    types = COMMON_FEED_TYPES,
-                    filter =
-                        JsonFilter(
-                            ids = listOfNotNull(hexToWatch),
+                if (it.contains(":")) {
+                    // naddr
+                    listOfNotNull(
+                        ATag.parse(it, null)?.let { aTag ->
+                            TypedFilter(
+                                types = COMMON_FEED_TYPES,
+                                filter =
+                                    JsonFilter(
+                                        kinds = listOf(MetadataEvent.KIND, aTag.kind),
+                                        authors = listOfNotNull(aTag.pubKeyHex),
+                                        // just to be sure
+                                        limit = 5,
+                                    ),
+                            )
+                        },
+                    )
+                } else {
+                    // event ids
+                    listOf(
+                        TypedFilter(
+                            types = COMMON_FEED_TYPES,
+                            filter =
+                                JsonFilter(
+                                    ids = listOfNotNull(hexToWatch),
+                                ),
                         ),
-                )
-            },
-            hexToWatch?.let {
+                        // authors
+                        TypedFilter(
+                            types = COMMON_FEED_TYPES,
+                            filter =
+                                JsonFilter(
+                                    kinds = listOf(MetadataEvent.KIND),
+                                    authors = listOfNotNull(hexToWatch),
+                                    // just to be sure
+                                    limit = 5,
+                                ),
+                        ),
+                    )
+                }
+            } ?: emptyList()
+
+        // downloads all the reactions to a given event.
+        return directReferenceFilters +
+            listOfNotNull(
                 TypedFilter(
-                    types = COMMON_FEED_TYPES,
+                    types = setOf(FeedType.SEARCH),
                     filter =
                         JsonFilter(
                             kinds = listOf(MetadataEvent.KIND),
-                            authors = listOfNotNull(hexToWatch),
+                            search = mySearchString,
+                            limit = 100,
                         ),
-                )
-            },
-            TypedFilter(
-                types = setOf(FeedType.SEARCH),
-                filter =
-                    JsonFilter(
-                        kinds = listOf(MetadataEvent.KIND),
-                        search = mySearchString,
-                        limit = 100,
-                    ),
-            ),
-            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,
-                    ),
-            ),
-        )
+                ),
+                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,
+                        ),
+                ),
+            )
     }
 
     val searchChannel = requestNewChannel()

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -28,14 +28,18 @@ 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.CommunityPostApprovalEvent
+import com.vitorpamplona.quartz.events.DeletionEvent
 import com.vitorpamplona.quartz.events.GenericRepostEvent
+import com.vitorpamplona.quartz.events.GitReplyEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
 import com.vitorpamplona.quartz.events.LnZapEvent
+import com.vitorpamplona.quartz.events.OtsEvent
 import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.ReactionEvent
 import com.vitorpamplona.quartz.events.ReportEvent
 import com.vitorpamplona.quartz.events.RepostEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
+import com.vitorpamplona.quartz.events.TextNoteModificationEvent
 
 object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
     private var eventsToWatch = setOf<Note>()
@@ -54,29 +58,45 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
         }
 
         return groupByEOSEPresence(addressesToWatch).map {
-            TypedFilter(
-                types = COMMON_FEED_TYPES,
-                filter =
-                    JsonFilter(
-                        kinds =
-                            listOf(
-                                TextNoteEvent.KIND,
-                                ReactionEvent.KIND,
-                                RepostEvent.KIND,
-                                GenericRepostEvent.KIND,
-                                ReportEvent.KIND,
-                                LnZapEvent.KIND,
-                                PollNoteEvent.KIND,
-                                CommunityPostApprovalEvent.KIND,
-                                LiveActivitiesChatMessageEvent.KIND,
-                            ),
-                        tags = mapOf("a" to it.mapNotNull { it.address()?.toTag() }),
-                        since = findMinimumEOSEs(it),
-                        // Max amount of "replies" to download on a specific event.
-                        limit = 1000,
-                    ),
+            listOf(
+                TypedFilter(
+                    types = COMMON_FEED_TYPES,
+                    filter =
+                        JsonFilter(
+                            kinds =
+                                listOf(
+                                    TextNoteEvent.KIND,
+                                    ReactionEvent.KIND,
+                                    RepostEvent.KIND,
+                                    GenericRepostEvent.KIND,
+                                    ReportEvent.KIND,
+                                    LnZapEvent.KIND,
+                                    PollNoteEvent.KIND,
+                                    CommunityPostApprovalEvent.KIND,
+                                    LiveActivitiesChatMessageEvent.KIND,
+                                ),
+                            tags = mapOf("a" to it.mapNotNull { it.address()?.toTag() }),
+                            since = findMinimumEOSEs(it),
+                            // Max amount of "replies" to download on a specific event.
+                            limit = 1000,
+                        ),
+                ),
+                TypedFilter(
+                    types = COMMON_FEED_TYPES,
+                    filter =
+                        JsonFilter(
+                            kinds =
+                                listOf(
+                                    DeletionEvent.KIND,
+                                ),
+                            tags = mapOf("a" to it.mapNotNull { it.address()?.toTag() }),
+                            since = findMinimumEOSEs(it),
+                            // Max amount of "replies" to download on a specific event.
+                            limit = 10,
+                        ),
+                ),
             )
-        }
+        }.flatten()
     }
 
     private fun createAddressFilter(): List<TypedFilter>? {
@@ -120,27 +140,67 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
         }
 
         return groupByEOSEPresence(eventsToWatch).map {
-            TypedFilter(
-                types = COMMON_FEED_TYPES,
-                filter =
-                    JsonFilter(
-                        kinds =
-                            listOf(
-                                TextNoteEvent.KIND,
-                                ReactionEvent.KIND,
-                                RepostEvent.KIND,
-                                GenericRepostEvent.KIND,
-                                ReportEvent.KIND,
-                                LnZapEvent.KIND,
-                                PollNoteEvent.KIND,
-                            ),
-                        tags = mapOf("e" to it.map { it.idHex }),
-                        since = findMinimumEOSEs(it),
-                        // Max amount of "replies" to download on a specific event.
-                        limit = 1000,
-                    ),
+            listOf(
+                TypedFilter(
+                    types = COMMON_FEED_TYPES,
+                    filter =
+                        JsonFilter(
+                            kinds =
+                                listOf(
+                                    TextNoteEvent.KIND,
+                                    ReactionEvent.KIND,
+                                    RepostEvent.KIND,
+                                    GenericRepostEvent.KIND,
+                                    ReportEvent.KIND,
+                                    LnZapEvent.KIND,
+                                    PollNoteEvent.KIND,
+                                    OtsEvent.KIND,
+                                    TextNoteModificationEvent.KIND,
+                                    GitReplyEvent.KIND,
+                                ),
+                            tags = mapOf("e" to it.map { it.idHex }),
+                            since = findMinimumEOSEs(it),
+                            // Max amount of "replies" to download on a specific event.
+                            limit = 1000,
+                        ),
+                ),
+                TypedFilter(
+                    types = COMMON_FEED_TYPES,
+                    filter =
+                        JsonFilter(
+                            kinds =
+                                listOf(
+                                    DeletionEvent.KIND,
+                                ),
+                            tags = mapOf("e" to it.map { it.idHex }),
+                            since = findMinimumEOSEs(it),
+                            // Max amount of "replies" to download on a specific event.
+                            limit = 10,
+                        ),
+                ),
             )
+        }.flatten()
+    }
+
+    private fun createQuotesFilter(): List<TypedFilter>? {
+        if (eventsToWatch.isEmpty()) {
+            return null
         }
+
+        return groupByEOSEPresence(eventsToWatch).map {
+            listOf(
+                TypedFilter(
+                    types = COMMON_FEED_TYPES,
+                    filter =
+                        JsonFilter(
+                            tags = mapOf("q" to it.map { it.idHex }),
+                            since = findMinimumEOSEs(it),
+                            // Max amount of "replies" to download on a specific event.
+                            limit = 1000,
+                        ),
+                ),
+            )
+        }.flatten()
     }
 
     fun createLoadEventsIfNotLoadedFilter(): List<TypedFilter>? {
@@ -205,9 +265,10 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
         val missing = createLoadEventsIfNotLoadedFilter()
         val addresses = createAddressFilter()
         val addressReactions = createReactionsToWatchInAddressFilter()
+        val quotes = createQuotesFilter()
 
         singleEventChannel.typedFilters =
-            listOfNotNull(missing, addresses, reactions, addressReactions).flatten().ifEmpty { null }
+            listOfNotNull(missing, addresses, reactions, addressReactions, quotes).flatten().ifEmpty { null }
     }
 
     fun add(eventId: Note) {

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -35,7 +35,7 @@ object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
     fun createUserMetadataFilter(): List<TypedFilter>? {
         if (usersToWatch.isEmpty()) return null
 
-        val firstTimers = usersToWatch.filter { it.info?.latestMetadata == null }.map { it.pubkeyHex }
+        val firstTimers = usersToWatch.filter { it.latestMetadata == null }.map { it.pubkeyHex }
 
         if (firstTimers.isEmpty()) return null
 
@@ -54,7 +54,7 @@ object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
     fun createUserMetadataStatusReportFilter(): List<TypedFilter>? {
         if (usersToWatch.isEmpty()) return null
 
-        val secondTimers = usersToWatch.filter { it.info?.latestMetadata != null }
+        val secondTimers = usersToWatch.filter { it.latestMetadata != null }
 
         if (secondTimers.isEmpty()) return null
 
@@ -91,7 +91,7 @@ object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
             checkNotInMainThread()
 
             usersToWatch.forEach {
-                if (it.info?.latestMetadata != null) {
+                if (it.latestMetadata != null) {
                     val eose = it.latestEOSEs[relayUrl]
                     if (eose == null) {
                         it.latestEOSEs = it.latestEOSEs + Pair(relayUrl, EOSETime(time))

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -40,6 +40,8 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
 
     var job: Job? = null
 
+    val SUPPORTED_VIDEO_MIME_TYPES = listOf("image/jpeg", "image/gif", "image/png", "image/webp", "video/mp4", "video/mpeg", "video/webm", "audio/aac", "audio/mpeg", "audio/webm", "audio/wav")
+
     override fun start() {
         job?.cancel()
         job =
@@ -68,6 +70,7 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
                     authors = follows,
                     kinds = listOf(FileHeaderEvent.KIND, FileStorageHeaderEvent.KIND),
                     limit = 200,
+                    tags = mapOf("m" to SUPPORTED_VIDEO_MIME_TYPES),
                     since =
                         latestEOSEs.users[account.userProfile()]
                             ?.followList
@@ -93,6 +96,7 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
                                 hashToLoad
                                     .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
                                     .flatten(),
+                            "m" to SUPPORTED_VIDEO_MIME_TYPES,
                         ),
                     limit = 100,
                     since =
@@ -120,6 +124,7 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
                                 hashToLoad
                                     .map { listOf(it, it.lowercase(), it.uppercase(), it.capitalize()) }
                                     .flatten(),
+                            "m" to SUPPORTED_VIDEO_MIME_TYPES,
                         ),
                     limit = 100,
                     since =

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -24,7 +24,11 @@ import android.util.Log
 import android.util.LruCache
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.BuildConfig
+import com.vitorpamplona.quartz.crypto.CryptoUtils
+import okhttp3.EventListener
+import okhttp3.Protocol
 import okhttp3.Request
+import okio.ByteString.Companion.toByteString
 import kotlin.coroutines.cancellation.CancellationException
 
 @Immutable data class OnlineCheckResult(val timeInMs: Long, val online: Boolean)
@@ -49,21 +53,44 @@ object OnlineChecker {
             return checkOnlineCache.get(url).online
         }
 
-        Log.d("OnlineChecker", "isOnline $url")
-
         return try {
-            val request =
-                Request.Builder()
-                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-                    .url(url)
-                    .get()
-                    .build()
-
             val result =
-                HttpClientManager.getHttpClient().newCall(request).execute().use {
-                    checkNotInMainThread()
-                    it.isSuccessful
+                if (url.startsWith("wss")) {
+                    val request =
+                        Request.Builder()
+                            .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                            .url(url.replace("wss+livekit://", "wss://"))
+                            .header("Upgrade", "websocket")
+                            .header("Connection", "Upgrade")
+                            .header("Sec-WebSocket-Key", CryptoUtils.random(16).toByteString().base64())
+                            .header("Sec-WebSocket-Version", "13")
+                            .header("Sec-WebSocket-Extensions", "permessage-deflate")
+                            .build()
+
+                    val client =
+                        HttpClientManager.getHttpClient().newBuilder()
+                            .eventListener(EventListener.NONE)
+                            .protocols(listOf(Protocol.HTTP_1_1))
+                            .build()
+
+                    client.newCall(request).execute().use {
+                        checkNotInMainThread()
+                        it.isSuccessful
+                    }
+                } else {
+                    val request =
+                        Request.Builder()
+                            .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                            .url(url)
+                            .get()
+                            .build()
+
+                    HttpClientManager.getHttpClient().newCall(request).execute().use {
+                        checkNotInMainThread()
+                        it.isSuccessful
+                    }
                 }
+
             checkOnlineCache.put(url, OnlineCheckResult(System.currentTimeMillis(), result))
             result
         } catch (e: Exception) {

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2024 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.service.lnurl
+
+import android.util.LruCache
+import androidx.compose.runtime.Stable
+import com.vitorpamplona.quartz.encoders.LnInvoiceUtil
+import kotlinx.coroutines.CancellationException
+import java.text.NumberFormat
+
+@Stable
+data class InvoiceAmount(val invoice: String, val amount: String?)
+
+object CachedLnInvoiceParser {
+    val lnInvoicesCache = LruCache<String, InvoiceAmount>(20)
+
+    fun cached(lnurl: String): InvoiceAmount? {
+        return lnInvoicesCache[lnurl]
+    }
+
+    fun parse(lnbcWord: String): InvoiceAmount? {
+        val myInvoice = LnInvoiceUtil.findInvoice(lnbcWord)
+        if (myInvoice != null) {
+            val myInvoiceAmount =
+                try {
+                    NumberFormat.getInstance().format(LnInvoiceUtil.getAmountInSats(myInvoice))
+                } catch (e: Exception) {
+                    if (e is CancellationException) throw e
+                    e.printStackTrace()
+                    null
+                }
+
+            val lnInvoice = InvoiceAmount(myInvoice, myInvoiceAmount)
+
+            lnInvoicesCache.put(lnbcWord, lnInvoice)
+
+            return lnInvoice
+        }
+
+        return null
+    }
+}

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -64,15 +64,17 @@ class EventNotificationConsumer(private val applicationContext: Context) {
         account: Account,
     ) {
         pushWrappedEvent.cachedGift(account.signer) { notificationEvent ->
-            LocalCache.justConsume(notificationEvent, null)
-
-            unwrapAndConsume(notificationEvent, account) { innerEvent ->
-                if (innerEvent is PrivateDmEvent) {
-                    notify(innerEvent, account)
-                } else if (innerEvent is LnZapEvent) {
-                    notify(innerEvent, account)
-                } else if (innerEvent is ChatMessageEvent) {
-                    notify(innerEvent, account)
+            if (!LocalCache.hasConsumed(notificationEvent) && LocalCache.justVerify(notificationEvent)) {
+                unwrapAndConsume(notificationEvent, account) { innerEvent ->
+                    if (!LocalCache.hasConsumed(innerEvent)) {
+                        if (innerEvent is PrivateDmEvent) {
+                            notify(innerEvent, account)
+                        } else if (innerEvent is LnZapEvent) {
+                            notify(innerEvent, account)
+                        } else if (innerEvent is ChatMessageEvent) {
+                            notify(innerEvent, account)
+                        }
+                    }
                 }
             }
         }
@@ -108,11 +110,11 @@ class EventNotificationConsumer(private val applicationContext: Context) {
         acc: Account,
     ) {
         if (
-            event.createdAt > TimeUtils.fiveMinutesAgo() && // old event being re-broadcasted
+            event.createdAt > TimeUtils.fifteenMinutesAgo() && // old event being re-broadcasted
             event.pubKey != acc.userProfile().pubkeyHex
         ) { // from the user
 
-            val chatNote = LocalCache.notes[event.id] ?: return
+            val chatNote = LocalCache.getNoteIfExists(event.id) ?: return
             val chatRoom = event.chatroomKey(acc.keyPair.pubKey.toHexKey())
 
             val followingKeySet = acc.followingKeySet()
@@ -145,10 +147,10 @@ class EventNotificationConsumer(private val applicationContext: Context) {
         event: PrivateDmEvent,
         acc: Account,
     ) {
-        val note = LocalCache.notes[event.id] ?: return
+        val note = LocalCache.getNoteIfExists(event.id) ?: return
 
         // old event being re-broadcast
-        if (event.createdAt < TimeUtils.fiveMinutesAgo()) return
+        if (event.createdAt < TimeUtils.fifteenMinutesAgo()) return
 
         if (acc.userProfile().pubkeyHex == event.verifiedRecipientPubKey()) {
             val followingKeySet = acc.followingKeySet()
@@ -184,10 +186,10 @@ class EventNotificationConsumer(private val applicationContext: Context) {
         event: LnZapEvent,
         acc: Account,
     ) {
-        val noteZapEvent = LocalCache.notes[event.id] ?: return
+        val noteZapEvent = LocalCache.getNoteIfExists(event.id) ?: return
 
         // old event being re-broadcast
-        if (event.createdAt < TimeUtils.fiveMinutesAgo()) return
+        if (event.createdAt < TimeUtils.fifteenMinutesAgo()) return
 
         val noteZapRequest = event.zapRequest?.id?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
         val noteZapped =
@@ -195,7 +197,7 @@ class EventNotificationConsumer(private val applicationContext: Context) {
 
         if ((event.amount ?: BigDecimal.ZERO) < BigDecimal.TEN) return
 
-        if (acc.userProfile().pubkeyHex == event.zappedAuthor().firstOrNull()) {
+        if (event.isTaggedUser(acc.userProfile().pubkeyHex)) {
             val amount = showAmount(event.amount)
             (noteZapRequest.event as? LnZapRequestEvent)?.let { event ->
                 acc.decryptZapContentAuthor(noteZapRequest) {

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -0,0 +1,103 @@
+/**
+ * Copyright (c) 2024 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.service.ots
+
+import android.util.Log
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.vitorpamplona.amethyst.BuildConfig
+import com.vitorpamplona.amethyst.service.HttpClientManager
+import com.vitorpamplona.quartz.ots.BitcoinExplorer
+import com.vitorpamplona.quartz.ots.BlockHeader
+import com.vitorpamplona.quartz.ots.exceptions.UrlException
+import okhttp3.Request
+
+class OkHttpBlockstreamExplorer : BitcoinExplorer {
+    /**
+     * Retrieve the block information from the block hash.
+     *
+     * @param hash Hash of the block.
+     * @return the blockheader of the hash
+     * @throws Exception desc
+     */
+    override fun block(hash: String): BlockHeader {
+        val client = HttpClientManager.getHttpClient()
+        val url = "$BLOCKSTREAM_API_URL/block/$hash"
+
+        val request =
+            Request.Builder()
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                .header("Accept", "application/json")
+                .url(url)
+                .get()
+                .build()
+
+        client.newCall(request).execute().use {
+            if (it.isSuccessful) {
+                val jsonObject = jacksonObjectMapper().readTree(it.body.string())
+
+                val blockHeader = BlockHeader()
+                blockHeader.merkleroot = jsonObject["merkle_root"].asText()
+                blockHeader.setTime(jsonObject["timestamp"].asInt().toString())
+                blockHeader.blockHash = hash
+                Log.d("OkHttpBlockstreamExplorer", "$BLOCKSTREAM_API_URL/block/$hash")
+                return blockHeader
+            } else {
+                throw UrlException("Couldn't open $url: " + it.message + " " + it.code)
+            }
+        }
+    }
+
+    /**
+     * Retrieve the block hash from the block height.
+     *
+     * @param height Height of the block.
+     * @return the hash of the block at height height
+     * @throws Exception desc
+     */
+    @Throws(Exception::class)
+    override fun blockHash(height: Int): String {
+        val client = HttpClientManager.getHttpClient()
+
+        val url = "$BLOCKSTREAM_API_URL/block-height/$height"
+
+        val request =
+            Request.Builder()
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                .url(url)
+                .get()
+                .build()
+
+        client.newCall(request).execute().use {
+            if (it.isSuccessful) {
+                val blockHash = it.body.string()
+
+                Log.d("OkHttpBlockstreamExplorer", "$url $blockHash")
+                return blockHash
+            } else {
+                throw UrlException(it.message)
+            }
+        }
+    }
+
+    companion object {
+        private const val BLOCKSTREAM_API_URL = "https://blockstream.info/api"
+    }
+}

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

@@ -0,0 +1,133 @@
+/**
+ * Copyright (c) 2024 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.service.ots
+
+import com.vitorpamplona.amethyst.BuildConfig
+import com.vitorpamplona.amethyst.service.HttpClientManager
+import com.vitorpamplona.quartz.encoders.Hex
+import com.vitorpamplona.quartz.ots.ICalendar
+import com.vitorpamplona.quartz.ots.StreamDeserializationContext
+import com.vitorpamplona.quartz.ots.Timestamp
+import com.vitorpamplona.quartz.ots.exceptions.CommitmentNotFoundException
+import com.vitorpamplona.quartz.ots.exceptions.DeserializationException
+import com.vitorpamplona.quartz.ots.exceptions.ExceededSizeException
+import com.vitorpamplona.quartz.ots.exceptions.UrlException
+import com.vitorpamplona.quartz.ots.http.Request
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.RequestBody.Companion.toRequestBody
+
+/**
+ * Class representing remote calendar server interface.
+ */
+class OkHttpCalendar(val url: String) : ICalendar {
+    /**
+     * Submitting a digest to remote calendar. Returns a com.eternitywall.ots.Timestamp committing to that digest.
+     *
+     * @param digest The digest hash to send.
+     * @return the Timestamp received from the calendar.
+     * @throws ExceededSizeException if response is too big.
+     * @throws UrlException          if url is not reachable.
+     * @throws DeserializationException    if the data is corrupt
+     */
+    @Throws(ExceededSizeException::class, UrlException::class, DeserializationException::class)
+    override fun submit(digest: ByteArray): Timestamp {
+        try {
+            val client = HttpClientManager.getHttpClient()
+            val url = "$url/digest"
+
+            val mediaType = "application/x-www-form-urlencoded; charset=utf-8".toMediaType()
+            val requestBody = digest.toRequestBody(mediaType)
+
+            val request =
+                okhttp3.Request.Builder()
+                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                    .header("Accept", "application/vnd.opentimestamps.v1")
+                    .header("Content-Type", "application/x-www-form-urlencoded")
+                    .url(url)
+                    .post(requestBody)
+                    .build()
+
+            client.newCall(request).execute().use {
+                if (it.isSuccessful) {
+                    val ctx = StreamDeserializationContext(it.body.bytes())
+                    return Timestamp.deserialize(ctx, digest)
+                } else {
+                    throw UrlException("Failed to open $url")
+                }
+            }
+        } catch (e: ExceededSizeException) {
+            throw e
+        } catch (e: DeserializationException) {
+            throw e
+        } catch (e: Exception) {
+            throw UrlException(e.message)
+        }
+    }
+
+    /**
+     * Get a timestamp for a given commitment.
+     *
+     * @param commitment The digest hash to send.
+     * @return the Timestamp from the calendar server (with blockchain information if already written).
+     * @throws ExceededSizeException       if response is too big.
+     * @throws UrlException                if url is not reachable.
+     * @throws CommitmentNotFoundException if commit is not found.
+     * @throws DeserializationException    if the data is corrupt
+     */
+    @Throws(
+        DeserializationException::class,
+        ExceededSizeException::class,
+        CommitmentNotFoundException::class,
+        UrlException::class,
+    )
+    override fun getTimestamp(commitment: ByteArray): Timestamp {
+        try {
+            val client = HttpClientManager.getHttpClient()
+            val url = url + "/timestamp/" + Hex.encode(commitment)
+
+            val request =
+                okhttp3.Request.Builder()
+                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                    .header("Accept", "application/vnd.opentimestamps.v1")
+                    .header("Content-Type", "application/x-www-form-urlencoded")
+                    .url(url)
+                    .get()
+                    .build()
+
+            client.newCall(request).execute().use {
+                if (it.isSuccessful) {
+                    val ctx = StreamDeserializationContext(it.body.bytes())
+                    return Timestamp.deserialize(ctx, commitment)
+                } else {
+                    throw CommitmentNotFoundException("Calendar response a status code != 200: " + it.code)
+                }
+            }
+        } catch (e: DeserializationException) {
+            throw e
+        } catch (e: ExceededSizeException) {
+            throw e
+        } catch (e: CommitmentNotFoundException) {
+            throw e
+        } catch (e: Exception) {
+            throw UrlException(e.message)
+        }
+    }
+}

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

@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) 2024 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.service.ots
+
+import com.vitorpamplona.amethyst.BuildConfig
+import com.vitorpamplona.amethyst.service.HttpClientManager
+import com.vitorpamplona.quartz.ots.ICalendarAsyncSubmit
+import com.vitorpamplona.quartz.ots.StreamDeserializationContext
+import com.vitorpamplona.quartz.ots.Timestamp
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.RequestBody.Companion.toRequestBody
+import java.util.Optional
+import java.util.concurrent.BlockingQueue
+
+/**
+ * For making async calls to a calendar server
+ */
+class OkHttpCalendarAsyncSubmit(private val url: String, private val digest: ByteArray) : ICalendarAsyncSubmit {
+    private var queue: BlockingQueue<Optional<Timestamp>>? = null
+
+    fun setQueue(queue: BlockingQueue<Optional<Timestamp>>?) {
+        this.queue = queue
+    }
+
+    @Throws(Exception::class)
+    override fun call(): Optional<Timestamp> {
+        val client = HttpClientManager.getHttpClient()
+        val url = "$url/digest"
+
+        val mediaType = "application/x-www-form-urlencoded; charset=utf-8".toMediaType()
+        val requestBody = digest.toRequestBody(mediaType)
+
+        val request =
+            okhttp3.Request.Builder()
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                .header("Accept", "application/vnd.opentimestamps.v1")
+                .header("Content-Type", "application/x-www-form-urlencoded")
+                .url(url)
+                .post(requestBody)
+                .build()
+
+        client.newCall(request).execute().use {
+            if (it.isSuccessful) {
+                val ctx = StreamDeserializationContext(it.body.bytes())
+                val timestamp = Timestamp.deserialize(ctx, digest)
+                val of = Optional.of(timestamp)
+                queue!!.add(of)
+                return of
+            } else {
+                queue!!.add(Optional.empty())
+                return Optional.empty()
+            }
+        }
+    }
+}

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

@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2024 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.service.ots
+
+import com.vitorpamplona.quartz.ots.CalendarBuilder
+import com.vitorpamplona.quartz.ots.ICalendar
+import com.vitorpamplona.quartz.ots.ICalendarAsyncSubmit
+
+class OkHttpCalendarBuilder : CalendarBuilder {
+    override fun newSyncCalendar(url: String): ICalendar {
+        return OkHttpCalendar(url)
+    }
+
+    override fun newAsyncCalendar(
+        url: String,
+        digest: ByteArray,
+    ): ICalendarAsyncSubmit {
+        return OkHttpCalendarAsyncSubmit(url, digest)
+    }
+}

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -27,6 +27,7 @@ import android.util.LruCache
 import androidx.core.net.toUri
 import androidx.media3.common.C
 import androidx.media3.common.Player
+import androidx.media3.common.Player.PositionInfo
 import androidx.media3.common.Player.STATE_IDLE
 import androidx.media3.common.Player.STATE_READY
 import androidx.media3.exoplayer.ExoPlayer
@@ -143,6 +144,14 @@ class MultiPlayerPlaybackManager(
                         }
                     }
                 }
+
+                override fun onPositionDiscontinuity(
+                    oldPosition: PositionInfo,
+                    newPosition: PositionInfo,
+                    reason: Int,
+                ) {
+                    cachedPositions.add(uri, newPosition.positionMs)
+                }
             },
         )
 

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -23,62 +23,73 @@ package com.vitorpamplona.amethyst.service.playback
 import android.content.Intent
 import android.util.Log
 import androidx.annotation.OptIn
+import androidx.media3.common.MediaItem
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.datasource.okhttp.OkHttpDataSource
-import androidx.media3.exoplayer.hls.HlsMediaSource
+import androidx.media3.exoplayer.drm.DrmSessionManagerProvider
+import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
 import androidx.media3.exoplayer.source.MediaSource
-import androidx.media3.exoplayer.source.ProgressiveMediaSource
+import androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy
 import androidx.media3.session.MediaSession
 import androidx.media3.session.MediaSessionService
-import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.service.HttpClientManager
+import okhttp3.OkHttpClient
+
+class WssOrHttpFactory(httpClient: OkHttpClient) : MediaSource.Factory {
+    @UnstableApi
+    val http = DefaultMediaSourceFactory(OkHttpDataSource.Factory(httpClient))
+
+    @UnstableApi
+    val wss = DefaultMediaSourceFactory(WssStreamDataSource.Factory(httpClient))
+
+    @OptIn(UnstableApi::class)
+    override fun setDrmSessionManagerProvider(drmSessionManagerProvider: DrmSessionManagerProvider): MediaSource.Factory {
+        http.setDrmSessionManagerProvider(drmSessionManagerProvider)
+        wss.setDrmSessionManagerProvider(drmSessionManagerProvider)
+        return this
+    }
+
+    @OptIn(UnstableApi::class)
+    override fun setLoadErrorHandlingPolicy(loadErrorHandlingPolicy: LoadErrorHandlingPolicy): MediaSource.Factory {
+        http.setLoadErrorHandlingPolicy(loadErrorHandlingPolicy)
+        wss.setLoadErrorHandlingPolicy(loadErrorHandlingPolicy)
+        return this
+    }
+
+    @OptIn(UnstableApi::class)
+    override fun getSupportedTypes(): IntArray {
+        return http.supportedTypes
+    }
+
+    @OptIn(UnstableApi::class)
+    override fun createMediaSource(mediaItem: MediaItem): MediaSource {
+        return if (mediaItem.mediaId.startsWith("wss")) {
+            wss.createMediaSource(mediaItem)
+        } else {
+            http.createMediaSource(mediaItem)
+        }
+    }
+}
 
 @UnstableApi // Extend MediaSessionService
 class PlaybackService : MediaSessionService() {
     private var videoViewedPositionCache = VideoViewedPositionCache()
 
-    private var managerHls: MultiPlayerPlaybackManager? = null
-    private var managerProgressive: MultiPlayerPlaybackManager? = null
-    private var managerLocal: MultiPlayerPlaybackManager? = null
+    private var managerAllInOne: MultiPlayerPlaybackManager? = null
 
-    fun newHslDataSource(): MediaSource.Factory {
-        return HlsMediaSource.Factory(OkHttpDataSource.Factory(HttpClientManager.getHttpClient()))
+    fun newAllInOneDataSource(): MediaSource.Factory {
+        // This might be needed for live kit.
+        // return WssOrHttpFactory(HttpClientManager.getHttpClient())
+        return DefaultMediaSourceFactory(OkHttpDataSource.Factory(HttpClientManager.getHttpClient()))
     }
 
-    fun newProgressiveDataSource(): MediaSource.Factory {
-        return ProgressiveMediaSource.Factory(
-            (applicationContext as Amethyst).videoCache.get(HttpClientManager.getHttpClient()),
-        )
-    }
-
-    fun lazyHlsDS(): MultiPlayerPlaybackManager {
-        managerHls?.let {
+    fun lazyDS(): MultiPlayerPlaybackManager {
+        managerAllInOne?.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
+        val newInstance = MultiPlayerPlaybackManager(newAllInOneDataSource(), videoViewedPositionCache)
+        managerAllInOne = newInstance
         return newInstance
     }
 
@@ -94,15 +105,11 @@ class PlaybackService : MediaSessionService() {
     }
 
     private fun onProxyUpdated() {
-        val toDestroyHls = managerHls
-        val toDestroyProgressive = managerProgressive
+        val toDestroyAllInOne = managerAllInOne
 
-        managerHls = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
-        managerProgressive =
-            MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
+        managerAllInOne = MultiPlayerPlaybackManager(newAllInOneDataSource(), videoViewedPositionCache)
 
-        toDestroyHls?.releaseAppPlayers()
-        toDestroyProgressive?.releaseAppPlayers()
+        toDestroyAllInOne?.releaseAppPlayers()
     }
 
     override fun onTaskRemoved(rootIntent: Intent?) {
@@ -116,23 +123,11 @@ class PlaybackService : MediaSessionService() {
 
         HttpClientManager.proxyChangeListeners.remove(this@PlaybackService::onProxyUpdated)
 
-        managerHls?.releaseAppPlayers()
-        managerLocal?.releaseAppPlayers()
-        managerProgressive?.releaseAppPlayers()
+        managerAllInOne?.releaseAppPlayers()
 
         super.onDestroy()
     }
 
-    fun getAppropriateMediaSessionManager(fileName: String): MultiPlayerPlaybackManager? {
-        return if (fileName.startsWith("file")) {
-            lazyLocalDS()
-        } else if (fileName.endsWith("m3u8")) {
-            lazyHlsDS()
-        } else {
-            lazyProgressiveDS()
-        }
-    }
-
     override fun onUpdateNotification(
         session: MediaSession,
         startInForegroundRequired: Boolean,
@@ -141,38 +136,18 @@ class PlaybackService : MediaSessionService() {
         super.onUpdateNotification(session, startInForegroundRequired)
 
         // Overrides the notification with any player actually playing
-        managerHls?.playingContent()?.forEach {
+        managerAllInOne?.playingContent()?.forEach {
             if (it.player.isPlaying) {
                 super.onUpdateNotification(it, startInForegroundRequired)
             }
         }
-        managerLocal?.playingContent()?.forEach {
-            if (it.player.isPlaying) {
-                super.onUpdateNotification(session, startInForegroundRequired)
-            }
-        }
-        managerProgressive?.playingContent()?.forEach {
-            if (it.player.isPlaying) {
-                super.onUpdateNotification(session, startInForegroundRequired)
-            }
-        }
 
         // Overrides again with playing with audio
-        managerHls?.playingContent()?.forEach {
+        managerAllInOne?.playingContent()?.forEach {
             if (it.player.isPlaying && it.player.volume > 0) {
                 super.onUpdateNotification(it, startInForegroundRequired)
             }
         }
-        managerLocal?.playingContent()?.forEach {
-            if (it.player.isPlaying && it.player.volume > 0) {
-                super.onUpdateNotification(session, startInForegroundRequired)
-            }
-        }
-        managerProgressive?.playingContent()?.forEach {
-            if (it.player.isPlaying && it.player.volume > 0) {
-                super.onUpdateNotification(session, startInForegroundRequired)
-            }
-        }
     }
 
     // Return a MediaSession to link with the MediaController that is making
@@ -182,9 +157,9 @@ class PlaybackService : MediaSessionService() {
         val uri = controllerInfo.connectionHints.getString("uri") ?: return null
         val callbackUri = controllerInfo.connectionHints.getString("callbackUri")
 
-        val manager = getAppropriateMediaSessionManager(uri)
+        val manager = lazyDS()
 
-        return manager?.getMediaSession(
+        return manager.getMediaSession(
             id,
             uri,
             callbackUri,

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

app/src/main/java/com/vitorpamplona/amethyst/service/playback/WssDataStreamCollector.kt

@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2024 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.service.playback
+
+import okhttp3.WebSocket
+import okhttp3.WebSocketListener
+import okio.ByteString
+import java.util.concurrent.ConcurrentSkipListSet
+
+class WssDataStreamCollector : WebSocketListener() {
+    private val wssData = ConcurrentSkipListSet<ByteString>()
+
+    override fun onMessage(
+        webSocket: WebSocket,
+        bytes: ByteString,
+    ) {
+        wssData.add(bytes)
+    }
+
+    override fun onClosing(
+        webSocket: WebSocket,
+        code: Int,
+        reason: String,
+    ) {
+        super.onClosing(webSocket, code, reason)
+        wssData.removeAll(wssData)
+    }
+
+    fun canStream(): Boolean {
+        return wssData.size > 0
+    }
+
+    fun getNextStream(): ByteString {
+        return wssData.pollFirst()
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/playback/WssStreamDataSource.kt

@@ -0,0 +1,112 @@
+/**
+ * Copyright (c) 2024 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.service.playback
+
+import android.net.Uri
+import androidx.annotation.OptIn
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.datasource.BaseDataSource
+import androidx.media3.datasource.DataSource
+import androidx.media3.datasource.DataSpec
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.WebSocket
+import kotlin.math.min
+
+@OptIn(UnstableApi::class)
+class WssStreamDataSource(val httpClient: OkHttpClient) : BaseDataSource(true) {
+    val dataStreamCollector: WssDataStreamCollector = WssDataStreamCollector()
+    var webSocketClient: WebSocket? = null
+
+    private var currentByteStream: ByteArray? = null
+    private var currentPosition = 0
+    private var remainingBytes = 0
+
+    override fun open(dataSpec: DataSpec): Long {
+        // Form the request and open the socket.
+        // Provide the listener
+        // which collects the data for us (Previous class).
+        webSocketClient =
+            httpClient.newWebSocket(
+                Request.Builder().apply {
+                    dataSpec.httpRequestHeaders.forEach { entry ->
+                        addHeader(entry.key, entry.value)
+                    }
+                }.url(dataSpec.uri.toString()).build(),
+                dataStreamCollector,
+            )
+
+        return -1 // Return -1 as the size is unknown (streaming)
+    }
+
+    override fun getUri(): Uri? {
+        webSocketClient?.request()?.url?.let {
+            return Uri.parse(it.toString())
+        }
+
+        return null
+    }
+
+    override fun read(
+        target: ByteArray,
+        offset: Int,
+        length: Int,
+    ): Int {
+        // return 0 (nothing read) when no data present...
+        if (currentByteStream == null && !dataStreamCollector.canStream()) {
+            return 0
+        }
+
+        // parse one (data) ByteString at a time.
+        // reset the current position and remaining bytes
+        // for every new data
+        if (currentByteStream == null) {
+            currentByteStream = dataStreamCollector.getNextStream().toByteArray()
+            currentPosition = 0
+            remainingBytes = currentByteStream?.size ?: 0
+        }
+
+        val readSize = min(length, remainingBytes)
+
+        currentByteStream?.copyInto(target, offset, currentPosition, currentPosition + readSize)
+        currentPosition += readSize
+        remainingBytes -= readSize
+
+        // once the data is read set currentByteStream to null
+        // so the next data would be collected to process in next
+        // iteration.
+        if (remainingBytes == 0) {
+            currentByteStream = null
+        }
+
+        return readSize
+    }
+
+    override fun close() {
+        // close the socket and relase the resources
+        webSocketClient?.cancel()
+    }
+
+    // Factory class for DataSource
+    class Factory(val okHttpClient: OkHttpClient) : DataSource.Factory {
+        override fun createDataSource(): DataSource = WssStreamDataSource(okHttpClient)
+    }
+}

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -21,18 +21,14 @@
 package com.vitorpamplona.amethyst.service.previews
 
 import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 
 class BahaUrlPreview(val url: String, var callback: IUrlPreviewCallback?) {
     suspend fun fetchUrlPreview(timeOut: Int = 30000) =
-        withContext(Dispatchers.IO) {
-            try {
-                fetch(timeOut)
-            } catch (t: Throwable) {
-                if (t is CancellationException) throw t
-                callback?.onFailed(t)
-            }
+        try {
+            fetch(timeOut)
+        } catch (t: Throwable) {
+            if (t is CancellationException) throw t
+            callback?.onFailed(t)
         }
 
     private suspend fun fetch(timeOut: Int = 30000) {

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -20,66 +20,48 @@
  */
 package com.vitorpamplona.amethyst.service.previews
 
+import com.vitorpamplona.amethyst.commons.preview.MetaTag
+import com.vitorpamplona.amethyst.commons.preview.MetaTagsParser
 import com.vitorpamplona.amethyst.service.HttpClientManager
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.MediaType
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
-import org.jsoup.Jsoup
-import org.jsoup.nodes.Document
+import okio.BufferedSource
+import okio.ByteString.Companion.decodeHex
+import okio.Options
+import java.nio.charset.Charset
 
-private const val ELEMENT_TAG_META = "meta"
 private const val ATTRIBUTE_VALUE_PROPERTY = "property"
 private const val ATTRIBUTE_VALUE_NAME = "name"
 private const val ATTRIBUTE_VALUE_ITEMPROP = "itemprop"
+private const val ATTRIBUTE_VALUE_CHARSET = "charset"
+private const val ATTRIBUTE_VALUE_HTTP_EQUIV = "http-equiv"
 
 // for <meta itemprop=... to get title
 private val META_X_TITLE =
     arrayOf(
         "og:title",
-        "\"og:title\"",
-        "'og:title'",
-        "name",
-        "\"name\"",
-        "'name'",
         "twitter:title",
-        "\"twitter:title\"",
-        "'twitter:title'",
         "title",
-        "\"title\"",
-        "'title'",
     )
 
 // for <meta itemprop=... to get description
 private val META_X_DESCRIPTION =
     arrayOf(
         "og:description",
-        "\"og:description\"",
-        "'og:description'",
-        "description",
-        "\"description\"",
-        "'description'",
         "twitter:description",
-        "\"twitter:description\"",
-        "'twitter:description'",
         "description",
-        "\"description\"",
-        "'description'",
     )
 
 // for <meta itemprop=... to get image
 private val META_X_IMAGE =
     arrayOf(
         "og:image",
-        "\"og:image\"",
-        "'og:image'",
-        "image",
-        "\"image\"",
-        "'image'",
         "twitter:image",
-        "\"twitter:image\"",
-        "'twitter:image'",
+        "image",
     )
 
 private const val CONTENT = "content"
@@ -91,16 +73,15 @@ suspend fun getDocument(
     withContext(Dispatchers.IO) {
         val request: Request = Request.Builder().url(url).get().build()
         HttpClientManager.getHttpClient().newCall(request).execute().use {
+            checkNotInMainThread()
             if (it.isSuccessful) {
                 val mimeType =
-                    it.headers.get("Content-Type")?.toMediaType()
+                    it.headers["Content-Type"]?.toMediaType()
                         ?: throw IllegalArgumentException(
-                            "Website returned unknown mimetype: ${it.headers.get("Content-Type")}",
+                            "Website returned unknown mimetype: ${it.headers["Content-Type"]}",
                         )
-
                 if (mimeType.type == "text" && mimeType.subtype == "html") {
-                    val document = Jsoup.parse(it.body.string())
-                    parseHtml(url, document, mimeType)
+                    parseHtml(url, it.body.source(), mimeType)
                 } else if (mimeType.type == "image") {
                     UrlInfoItem(url, image = url, mimeType = mimeType)
                 } else if (mimeType.type == "video") {
@@ -118,65 +99,141 @@ suspend fun getDocument(
 
 suspend fun parseHtml(
     url: String,
-    document: Document,
+    source: BufferedSource,
     type: MediaType,
 ): UrlInfoItem =
     withContext(Dispatchers.IO) {
-        val metaTags = document.getElementsByTag(ELEMENT_TAG_META)
+        // sniff charset from Content-Type header or BOM
+        val sniffedCharset = type.charset() ?: source.readBomAsCharset()
+        if (sniffedCharset != null) {
+            val metaTags = MetaTagsParser.parse(source.readByteArray().toString(sniffedCharset))
+            return@withContext extractUrlInfo(url, metaTags, type)
+        }
 
-        var title: String = ""
-        var description: String = ""
-        var image: String = ""
+        // if sniffing was failed, detect charset from content
+        val bodyBytes = source.readByteArray()
+        val charset = detectCharset(bodyBytes)
+        val metaTags = MetaTagsParser.parse(bodyBytes.toString(charset))
+        return@withContext extractUrlInfo(url, metaTags, type)
+    }
 
-        metaTags.forEach {
-            when (it.attr(ATTRIBUTE_VALUE_PROPERTY)) {
-                in META_X_TITLE ->
-                    if (title.isEmpty()) {
-                        title = it.attr(CONTENT)
-                    }
-                in META_X_DESCRIPTION ->
-                    if (description.isEmpty()) {
-                        description = it.attr(CONTENT)
-                    }
-                in META_X_IMAGE ->
-                    if (image.isEmpty()) {
-                        image = it.attr(CONTENT)
-                    }
-            }
+// taken from okhttp
+private val UNICODE_BOMS =
+    Options.of(
+        // UTF-8
+        "efbbbf".decodeHex(),
+        // UTF-16BE
+        "feff".decodeHex(),
+        // UTF-16LE
+        "fffe".decodeHex(),
+        // UTF-32BE
+        "0000ffff".decodeHex(),
+        // UTF-32LE
+        "ffff0000".decodeHex(),
+    )
 
-            when (it.attr(ATTRIBUTE_VALUE_NAME)) {
-                in META_X_TITLE ->
-                    if (title.isEmpty()) {
-                        title = it.attr(CONTENT)
-                    }
-                in META_X_DESCRIPTION ->
-                    if (description.isEmpty()) {
-                        description = it.attr(CONTENT)
-                    }
-                in META_X_IMAGE ->
-                    if (image.isEmpty()) {
-                        image = it.attr(CONTENT)
-                    }
-            }
+private fun BufferedSource.readBomAsCharset(): Charset? {
+    return when (select(UNICODE_BOMS)) {
+        0 -> Charsets.UTF_8
+        1 -> Charsets.UTF_16BE
+        2 -> Charsets.UTF_16LE
+        3 -> Charsets.UTF_32BE
+        4 -> Charsets.UTF_32LE
+        -1 -> null
+        else -> throw AssertionError()
+    }
+}
 
-            when (it.attr(ATTRIBUTE_VALUE_ITEMPROP)) {
-                in META_X_TITLE ->
-                    if (title.isEmpty()) {
-                        title = it.attr(CONTENT)
-                    }
-                in META_X_DESCRIPTION ->
-                    if (description.isEmpty()) {
-                        description = it.attr(CONTENT)
-                    }
-                in META_X_IMAGE ->
-                    if (image.isEmpty()) {
-                        image = it.attr(CONTENT)
-                    }
-            }
+private val RE_CONTENT_TYPE_CHARSET = Regex("""charset=([^;]+)""")
 
-            if (title.isNotEmpty() && description.isNotEmpty() && image.isNotEmpty()) {
-                return@withContext UrlInfoItem(url, title, description, image, type)
+private fun detectCharset(bodyBytes: ByteArray): Charset {
+    // try to detect charset from meta tags parsed from first 1024 bytes of body
+    val firstPart = String(bodyBytes, 0, 1024, Charset.forName("utf-8"))
+    val metaTags = MetaTagsParser.parse(firstPart)
+    metaTags.forEach { meta ->
+        val charsetAttr = meta.attr(ATTRIBUTE_VALUE_CHARSET)
+        if (charsetAttr.isNotEmpty()) {
+            runCatching { Charset.forName(charsetAttr) }.getOrNull()?.let {
+                return it
             }
         }
-        return@withContext UrlInfoItem(url, title, description, image, type)
+        if (meta.attr(ATTRIBUTE_VALUE_HTTP_EQUIV).lowercase() == "content-type") {
+            RE_CONTENT_TYPE_CHARSET.find(meta.attr(CONTENT))
+                ?.let {
+                    runCatching { Charset.forName(it.groupValues[1]) }.getOrNull()
+                }?.let {
+                    return it
+                }
+        }
     }
+    // defaults to UTF-8
+    return Charset.forName("utf-8")
+}
+
+private fun extractUrlInfo(
+    url: String,
+    metaTags: Sequence<MetaTag>,
+    type: MediaType,
+): UrlInfoItem {
+    var title: String = ""
+    var description: String = ""
+    var image: String = ""
+
+    metaTags.forEach {
+        when (it.attr(ATTRIBUTE_VALUE_PROPERTY)) {
+            in META_X_TITLE ->
+                if (title.isEmpty()) {
+                    title = it.attr(CONTENT)
+                }
+
+            in META_X_DESCRIPTION ->
+                if (description.isEmpty()) {
+                    description = it.attr(CONTENT)
+                }
+
+            in META_X_IMAGE ->
+                if (image.isEmpty()) {
+                    image = it.attr(CONTENT)
+                }
+        }
+
+        when (it.attr(ATTRIBUTE_VALUE_NAME)) {
+            in META_X_TITLE ->
+                if (title.isEmpty()) {
+                    title = it.attr(CONTENT)
+                }
+
+            in META_X_DESCRIPTION ->
+                if (description.isEmpty()) {
+                    description = it.attr(CONTENT)
+                }
+
+            in META_X_IMAGE ->
+                if (image.isEmpty()) {
+                    image = it.attr(CONTENT)
+                }
+        }
+
+        when (it.attr(ATTRIBUTE_VALUE_ITEMPROP)) {
+            in META_X_TITLE ->
+                if (title.isEmpty()) {
+                    title = it.attr(CONTENT)
+                }
+
+            in META_X_DESCRIPTION ->
+                if (description.isEmpty()) {
+                    description = it.attr(CONTENT)
+                }
+
+            in META_X_IMAGE ->
+                if (image.isEmpty()) {
+                    image = it.attr(CONTENT)
+                }
+        }
+
+        if (title.isNotEmpty() && description.isNotEmpty() && image.isNotEmpty()) {
+            return UrlInfoItem(url, title, description, image, type)
+        }
+    }
+    return UrlInfoItem(url, title, description, image, type)
+}

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -98,7 +98,7 @@ object Client : RelayPool.Listener {
         checkNotInMainThread()
 
         subscriptions = subscriptions + Pair(subscriptionId, filters)
-        RelayPool.sendFilter(subscriptionId)
+        RelayPool.sendFilter(subscriptionId, filters)
     }
 
     fun sendFilterOnlyIfDisconnected(
@@ -108,7 +108,7 @@ object Client : RelayPool.Listener {
         checkNotInMainThread()
 
         subscriptions = subscriptions + Pair(subscriptionId, filters)
-        RelayPool.sendFilterOnlyIfDisconnected(subscriptionId)
+        RelayPool.connectAndSendFiltersIfDisconnected()
     }
 
     fun send(
@@ -134,7 +134,7 @@ object Client : RelayPool.Listener {
                 newSporadicRelay(
                     relay,
                     feedTypes,
-                    onConnected = { relay -> relay.send(signedEvent) },
+                    onConnected = { myRelay -> myRelay.send(signedEvent) },
                     onDone = onDone,
                 )
             }
@@ -152,7 +152,9 @@ object Client : RelayPool.Listener {
         RelayPool.addRelay(relay)
 
         relay.connectAndRun {
-            allSubscriptions().forEach { relay.sendFilter(requestId = it) }
+            allSubscriptions().forEach {
+                relay.sendFilter(it.key, it.value)
+            }
 
             onConnected(relay)
 
@@ -264,8 +266,8 @@ object Client : RelayPool.Listener {
         listeners = listeners.minus(listener)
     }
 
-    fun allSubscriptions(): Set<String> {
-        return subscriptions.keys
+    fun allSubscriptions(): Map<String, List<TypedFilter>> {
+        return subscriptions
     }
 
     fun getSubscriptionFilters(subId: String): List<TypedFilter> {
@@ -292,7 +294,7 @@ object Client : RelayPool.Listener {
         open fun onRelayStateChange(
             type: Relay.StateType,
             relay: Relay,
-            channel: String?,
+            subscriptionId: String?,
         ) = Unit
 
         /** When an relay saves or rejects a new event. */

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -35,144 +35,29 @@ object Constants {
 
     val defaultRelays =
         arrayOf(
-            // Free relays for only DMs and Follows due to the amount of spam
+            // Free relays for only DMs, Chats and Follows due to the amount of spam
+            RelaySetupInfo("wss://nostr.bitcoiner.social", read = true, write = true, feedTypes = activeTypesChats),
+            RelaySetupInfo("wss://relay.nostr.bg", read = true, write = true, feedTypes = activeTypesChats),
+            RelaySetupInfo("wss://nostr.oxtr.dev", read = true, write = true, feedTypes = activeTypesChats),
+            RelaySetupInfo("wss://nostr.orangepill.dev", read = true, write = true, feedTypes = activeTypes),
+            RelaySetupInfo("wss://nostr.fmt.wiz.biz", read = true, write = false, feedTypes = activeTypesChats),
             RelaySetupInfo("wss://relay.damus.io", read = true, write = true, feedTypes = activeTypes),
-            // Chats
-            RelaySetupInfo(
-                "wss://nostr.bitcoiner.social",
-                read = true,
-                write = true,
-                feedTypes = activeTypesChats,
-            ),
-            RelaySetupInfo(
-                "wss://relay.nostr.bg",
-                read = true,
-                write = true,
-                feedTypes = activeTypesChats,
-            ),
-            RelaySetupInfo(
-                "wss://nostr.oxtr.dev",
-                read = true,
-                write = true,
-                feedTypes = activeTypesChats,
-            ),
-            RelaySetupInfo(
-                "wss://nostr-pub.wellorder.net",
-                read = true,
-                write = true,
-                feedTypes = activeTypesChats,
-            ),
+            // Global
             RelaySetupInfo("wss://nostr.mom", read = true, write = true, feedTypes = activeTypesGlobalChats),
             RelaySetupInfo("wss://nos.lol", read = true, write = true, feedTypes = activeTypesGlobalChats),
-            // Less Reliable
-            // NewRelayListViewModel.Relay("wss://nostr.orangepill.dev", read = true, write = true,
-            // feedTypes = activeTypes),
-            // NewRelayListViewModel.Relay("wss://nostr.onsats.org", read = true, write = true, feedTypes
-            // = activeTypes),
-            // NewRelayListViewModel.Relay("wss://nostr.sandwich.farm", read = true, write = true,
-            // feedTypes = activeTypes),
-            // NewRelayListViewModel.Relay("wss://relay.nostr.ch", read = true, write = true, feedTypes =
-            // activeTypes),
-            // NewRelayListViewModel.Relay("wss://nostr.zebedee.cloud", read = true, write = true,
-            // feedTypes = activeTypes),
-            // NewRelayListViewModel.Relay("wss://nostr.rocks", read = true, write = true, feedTypes =
-            // activeTypes),
-            // NewRelayListViewModel.Relay("wss://nostr.fmt.wiz.biz", read = true, write = true, feedTypes
-            // = activeTypes),
-            // 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,
-            ),
-            RelaySetupInfo(
-                "wss://puravida.nostr.land",
-                read = true,
-                write = false,
-                feedTypes = activeTypesGlobalChats,
-            ),
-            RelaySetupInfo(
-                "wss://nostr.wine",
-                read = true,
-                write = false,
-                feedTypes = activeTypesGlobalChats,
-            ),
-            RelaySetupInfo(
-                "wss://nostr.inosta.cc",
-                read = true,
-                write = false,
-                feedTypes = activeTypesGlobalChats,
-            ),
-            RelaySetupInfo(
-                "wss://atlas.nostr.land",
-                read = true,
-                write = false,
-                feedTypes = activeTypesGlobalChats,
-            ),
-            RelaySetupInfo(
-                "wss://relay.orangepill.dev",
-                read = true,
-                write = false,
-                feedTypes = activeTypesGlobalChats,
-            ),
-            RelaySetupInfo(
-                "wss://relay.nostrati.com",
-                read = true,
-                write = false,
-                feedTypes = activeTypesGlobalChats,
-            ),
+            RelaySetupInfo("wss://nostr.wine", 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://nostr.wine", read = true, write = false, feedTypes = activeTypesSearch),
-            RelaySetupInfo(
-                "wss://relay.noswhere.com",
-                read = true,
-                write = false,
-                feedTypes = activeTypesSearch,
-            ),
+            RelaySetupInfo("wss://relay.noswhere.com", read = true, write = false, feedTypes = activeTypesSearch),
         )
 
     val forcedRelayForSearch =
         arrayOf(
-            RelaySetupInfo(
-                "wss://relay.nostr.band",
-                read = true,
-                write = false,
-                feedTypes = activeTypesSearch,
-            ),
+            RelaySetupInfo("wss://relay.nostr.band", read = true, write = false, feedTypes = activeTypesSearch),
             RelaySetupInfo("wss://nostr.wine", read = true, write = false, feedTypes = activeTypesSearch),
-            RelaySetupInfo(
-                "wss://relay.noswhere.com",
-                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/EOSE.kt

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -37,26 +37,26 @@ class JsonFilter(
         val filter =
             factory.objectNode().apply {
                 ids?.run {
-                    put(
+                    replace(
                         "ids",
                         factory.arrayNode(ids.size).apply { ids.forEach { add(it) } },
                     )
                 }
                 authors?.run {
-                    put(
+                    replace(
                         "authors",
                         factory.arrayNode(authors.size).apply { authors.forEach { add(it) } },
                     )
                 }
                 kinds?.run {
-                    put(
+                    replace(
                         "kinds",
                         factory.arrayNode(kinds.size).apply { kinds.forEach { add(it) } },
                     )
                 }
                 tags?.run {
                     entries.forEach { kv ->
-                        put(
+                        replace(
                             "#${kv.key}",
                             factory.arrayNode(kv.value.size).apply { kv.value.forEach { add(it) } },
                         )

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -344,19 +344,23 @@ class Relay(
         afterEOSEPerSubscription = LinkedHashMap(afterEOSEPerSubscription.size)
     }
 
-    fun sendFilter(requestId: String) {
+    fun sendFilter(
+        requestId: String,
+        filters: List<TypedFilter>,
+    ) {
         checkNotInMainThread()
 
         if (read) {
             if (isConnected()) {
                 if (isReady) {
-                    val filters =
-                        Client.getSubscriptionFilters(requestId).filter { filter ->
+                    val relayFilters =
+                        filters.filter { filter ->
                             activeTypes.any { it in filter.types }
                         }
-                    if (filters.isNotEmpty()) {
+
+                    if (relayFilters.isNotEmpty()) {
                         val request =
-                            filters.joinToStringLimited(
+                            relayFilters.joinToStringLimited(
                                 separator = ",",
                                 limit = 20,
                                 prefix = """["REQ","$requestId",""",
@@ -409,7 +413,7 @@ class Relay(
         return buffer.toString()
     }
 
-    fun sendFilterOnlyIfDisconnected(subscriptionId: String) {
+    fun connectAndSendFiltersIfDisconnected() {
         checkNotInMainThread()
 
         if (socket == null) {
@@ -423,7 +427,9 @@ class Relay(
 
     fun renewFilters() {
         // Force update all filters after AUTH.
-        Client.allSubscriptions().forEach { sendFilter(requestId = it) }
+        Client.allSubscriptions().forEach {
+            sendFilter(requestId = it.key, it.value)
+        }
     }
 
     fun send(signedEvent: EventInterface) {
@@ -452,7 +458,7 @@ class Relay(
                         eventUploadCounterInBytes += event.bytesUsedInMemory()
 
                         // Sends everything.
-                        Client.allSubscriptions().forEach { sendFilter(requestId = it) }
+                        renewFilters()
                     }
                 }
             }

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -77,12 +77,17 @@ object RelayPool : Relay.Listener {
         relays.forEach { it.connect() }
     }
 
-    fun sendFilter(subscriptionId: String) {
-        relays.forEach { it.sendFilter(subscriptionId) }
+    fun sendFilter(
+        subscriptionId: String,
+        filters: List<TypedFilter>,
+    ) {
+        relays.forEach { relay ->
+            relay.sendFilter(subscriptionId, filters)
+        }
     }
 
-    fun sendFilterOnlyIfDisconnected(subscriptionId: String) {
-        relays.forEach { it.sendFilterOnlyIfDisconnected(subscriptionId) }
+    fun connectAndSendFiltersIfDisconnected() {
+        relays.forEach { it.connectAndSendFiltersIfDisconnected() }
     }
 
     fun sendToSelectedRelays(

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -20,8 +20,6 @@
  */
 package com.vitorpamplona.amethyst.service.relays
 
-import com.fasterxml.jackson.databind.JsonNode
-import com.vitorpamplona.quartz.events.Event
 import java.util.UUID
 
 data class Subscription(
@@ -37,23 +35,36 @@ data class Subscription(
         onEOSE?.let { it(time, relay) }
     }
 
-    fun toJson(): String {
-        return Event.mapper.writeValueAsString(toJsonObject())
-    }
+    fun hasChangedFiltersFrom(otherFilters: List<TypedFilter>?): Boolean {
+        if (typedFilters == null && otherFilters == null) return false
+        if (typedFilters?.size != otherFilters?.size) return true
 
-    fun toJsonObject(): JsonNode {
-        val factory = Event.mapper.nodeFactory
+        typedFilters?.forEachIndexed { index, typedFilter ->
+            val otherFilter = otherFilters?.getOrNull(index) ?: return true
 
-        return factory.objectNode().apply {
-            put("id", id)
-            typedFilters?.also { filters ->
-                put(
-                    "typedFilters",
-                    factory.arrayNode(filters.size).apply {
-                        filters.forEach { filter -> add(filter.toJsonObject()) }
-                    },
-                )
+            // Does not check SINCE on purpose. Avoids replacing the filter if SINCE was all that changed.
+            // fast check
+            if (typedFilter.filter.authors?.size != otherFilter.filter.authors?.size ||
+                typedFilter.filter.ids?.size != otherFilter.filter.ids?.size ||
+                typedFilter.filter.tags?.size != otherFilter.filter.tags?.size ||
+                typedFilter.filter.kinds?.size != otherFilter.filter.kinds?.size ||
+                typedFilter.filter.limit != otherFilter.filter.limit ||
+                typedFilter.filter.search?.length != otherFilter.filter.search?.length ||
+                typedFilter.filter.until != otherFilter.filter.until
+            ) {
+                return true
+            }
+
+            // deep check
+            if (typedFilter.filter.ids != otherFilter.filter.ids ||
+                typedFilter.filter.authors != otherFilter.filter.authors ||
+                typedFilter.filter.tags != otherFilter.filter.tags ||
+                typedFilter.filter.kinds != otherFilter.filter.kinds ||
+                typedFilter.filter.search != otherFilter.filter.search
+            ) {
+                return true
             }
         }
+        return false
     }
 }

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Vitor Pamplona
+ * Copyright (c) 2024 Vitor Pamplona
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -20,73 +20,7 @@
  */
 package com.vitorpamplona.amethyst.service.relays
 
-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>,
     val filter: JsonFilter,
-) {
-    fun toJson(): String {
-        return Event.mapper.writeValueAsString(toJsonObject())
-    }
-
-    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>): ArrayNode {
-        val factory = Event.mapper.nodeFactory
-        return factory.arrayNode(types.size).apply { types.forEach { add(it.name.lowercase()) } }
-    }
-
-    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) } },
-                )
-            }
-            filter.authors?.run {
-                put(
-                    "authors",
-                    factory.arrayNode(filter.authors.size).apply { filter.authors.forEach { add(it) } },
-                )
-            }
-            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) }
-        }
-    }
-}
+)