v0.75.3

2. Starts the wallet in a separate task to allow people to come back to Amethyst switching apps instead of the back button.

.github/workflows/create-release.yml

@@ -47,7 +47,7 @@ jobs:
           keyPassword: ${{ secrets.KEY_PASSWORD }}
 
       - name: Build APK
-        run: ./gradlew assembleRelease --stacktrace --no-daemon
+        run: ./gradlew assembleRelease --stacktrace
 
       - name: Sign APK (Google Play)
         uses: r0adkll/sign-android-release@v1
@@ -76,7 +76,7 @@ jobs:
           tag_name: ${{ github.ref }}
           release_name: Release ${{ github.ref }}
           draft: false
-          prerelease: false
+          prerelease: true
 
       # Google Play APK
       - name: Upload Play APK Universal Asset
@@ -85,7 +85,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} 
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: app/build/outputs/apk/play/release/app-play-universal-release-unsigned-signed.apk
           asset_name: amethyst-googleplay-universal-${{ github.ref_name }}.apk
           asset_content_type: application/zip

.idea/.gitignore

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

.idea/.name

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

.idea/inspectionProfiles/Project_Default.xml

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

.idea/kotlinc.xml

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

PRIVACY.md

@@ -1,13 +1,48 @@
-# Amethyst Privacy Policy & Terms of Use
+# Amethyst Privacy Policy and Terms of Use
 
-Effective as of Jan 20, 2023 for the distributed applications in the Play Store and the F-Droid Catalogue 
+## Privacy Policy
 
-The Amethyst app for Android does not collect or process any personal information from its users. The app is used to connect to third-party Nostr servers (also called Relays) that may or may not collect personal information and are not covered by this privacy policy. Each third-party relay server comes equipped with its own privacy policy and terms of use that can be viewed through the app or through that server's website. The developers of this open source project or maintainers of the distribution channels (app stores) do not have access to the data located in the user's phone. Accounts are fully maintained by the user. We do not have control over them. 
+Effective as of Jun 12, 2023
 
-The app may collect a per-device token, your public key and a preferred Relay to connect to and provide push notification services through Google's Firebase Cloud Messaging. Other than that, the data from connected accounts is only stored locally on the device when it is required for functionality and performance of Amethyst. This data is strictly confidental and cannot be accessed by other apps (on non-rooted devices). Phone data can be deleted by clearing Amethyst's local storage or uninstalling the app.
+The Amethyst app for Android does not collect or process any personal information from its users. The app is used to connect to third-party Nostr servers (also called Relays) that may or may not collect personal information and are not covered by this privacy policy. Each third-party relay server comes equipped with its own privacy policy and terms of use that can be viewed through the app or through that server's website. The developers of this open-source project or maintainers of the distribution channels (app stores) do not have access to the data located in the user's phone. Accounts are fully maintained by the user. We do not have control over them. 
 
-You cannot use the Amethyst app for Android to submit Objectionable Content to relays. Objectionable Content includes, but is not limited to: (i) sexually explicit materials; (ii) obscene, defamatory, libelous, slanderous, violent and/or unlawful content or profanity; (iii) content that infringes upon the rights of any third party, including copyright, trademark, privacy, publicity or other personal or proprietary right, or that is deceptive or fraudulent; (iv) content that promotes the use or sale of illegal or regulated substances, tobacco products, ammunition and/or firearms; and (v) illegal content related to gambling.
+The app may collect a per-device token, your public key, and a preferred Relay to connect to and provide push notification services through Google's Firebase Cloud Messaging. Other than that, the data from connected accounts are only stored locally on the device when it's required for the functionality and performance of Amethyst. This data is strictly confidential and cannot be accessed by other apps (on non-rooted devices). Phone data can be deleted by clearing Amethyst's local storage or uninstalling the app.
 
-We reserve the right to modify this Privacy Policy at any time. Any modifications to this Privacy Policy will be effective upon our posting the new terms and/or upon implementation of the new changes on the Service (or as otherwise indicated at the time of posting). In all cases, your continued use of the app after the posting of any modified Privacy Policy indicates your acceptance of the terms of the modified Privacy Policy.
+Amethyst offers a few options to upload pictures and videos in order to post them online. You can choose the server at your discretion. Similar to relays, such services are independent of the app and have their own privacy policy and terms of use. 
+
+### Privacy with Relays services
+
+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.
+
+The relay can also see which public keys you are using and what information you are requesting from the network. Your public key is tied to your IP address and your relay filters.
+
+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 the content inside Private Zaps and Private DMs.
+
+While the content of direct messages (DMs) is only visible to you, and your DM Nostr counterparty, everyone can see when you and your counterparty are DM-ing each other. Image uploads in the DM screen use one of the chosen image servers and simply paste the image link on the DM text. Your uploaded pictures are available to anyone with that direct link. 
+
+### Visibility & Permanence of Your Content on Nostr Relays
+
+#### Information Visibility
+
+Content that you share can be shared with other relays by any user of the network. 
+Information that you share is publicly visible to anyone reading from relays that have your information. Your information may also be visible to Nostr users who do not share relays with you.
+
+#### Information Permanence
+
+Information shared on Nostr should be assumed permanent for privacy purposes. There is no way to guarantee deleting or editing any content once posted.
+
+## Terms of Use
+
+### For versions downloaded from Google's Play Store
+
+You cannot use the Amethyst app for Android to submit Objectionable Content to relays. Objectionable Content includes but is not limited to: (i) sexually explicit materials; (ii) obscene, defamatory, libelous, slanderous, violent and/or unlawful content or profanity; (iii) content that infringes upon the rights of any third party, including copyright, trademark, privacy, publicity or other personal or proprietary rights, or that is deceptive or fraudulent; (iv) content that promotes the use or sale of illegal or regulated substances, tobacco products, ammunition and/or firearms; and (v) illegal content related to gambling.
+
+### For versions downloaded from F-Droid
+
+We do not control the distribution of the application in F-Droid. Legal matters should be resolved between the user and F-Droid. 
+
+## Other Notes
+
+We reserve the right to modify this Privacy Policy and Terms of Use at any time. Any modifications to this document will be effective upon our posting of the new terms and/or upon implementation of the new changes on the Service (or as otherwise indicated at the time of posting). In all cases, your continued use of the app after the posting of any modified Privacy Policy and Terms of Use indicates your acceptance of the terms of the modified Privacy Policy and/or Terms of Use.
 
 If you have any questions about Amethyst or this privacy policy, you can send a message to amethyst@vitorpamplona.com

README.md

@@ -4,6 +4,11 @@
 
 Amethyst brings the best social network to your Android phone. Just insert your Nostr private key and start posting. 
 
+[<img src="./docs/design/obtainium.png"
+alt="Get it on Obtaininum"
+height="80">](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)
 [<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/)
@@ -11,15 +16,15 @@ Amethyst brings the best social network to your Android phone. Just insert your
      alt="Get it on Google Play"
      height="80">](https://play.google.com/store/apps/details?id=com.vitorpamplona.amethyst)
 
-Or get the latest APK from the [Releases Section](https://github.com/vitorpamplona/amethyst/releases/latest).
-
 # Current Features
 
 - [x] Event Builders / WebSocket Subscriptions (NIP-01)
 - [x] Home Feed
 - [x] Notifications Feed
 - [x] Global Feed
-- [x] Reactions (likes NIP-25, boost, reply)
+- [x] Replies and mentions (NIP-10)
+- [x] Reactions (NIP-25)
+- [x] Reposts (NIP-18)
 - [x] Image/Video/Url/LnInvoice Previews
 - [x] View Threads
 - [x] Private Messages (NIP-04)
@@ -36,7 +41,7 @@ Or get the latest APK from the [Releases Section](https://github.com/vitorpamplo
 - [x] URI Support (NIP-21)
 - [x] Created_at Limits (NIP-22)
 - [x] Event Deletion (NIP-09)
-- [x] Identity Verification (NIP-05)
+- [x] Nostr Address (NIP-05)
 - [x] Long-form Content (NIP-23)
 - [x] Parameterized Replaceable Events (NIP-33)
 - [x] Online Relay Search (NIP-50)
@@ -56,21 +61,35 @@ Or get the latest APK from the [Releases Section](https://github.com/vitorpamplo
 - [x] Relay Authentication (NIP-42)
 - [x] Content stored in relays themselves (NIP-95)
 - [x] Custom Emoji (NIP-30)
+- [x] Zap Forwarding (NIP-57)
 - [x] Text Note References (NIP-27)
-- [x] Audio Tracks (zapstr.live) (NIP-TBD)
+- [x] Audio Tracks (zapstr.live) (Kind:31337)
 - [x] Push Notifications (Zaps and Messages)
 - [x] Generic Tags (NIP-12)
 - [x] Sensitive Content (NIP-36)
 - [x] View Individual Reactions (Like, Boost, Zaps, Reports) per Post
+- [x] Recommended Application Handlers (NIP-89)
+- [x] Events with a Subject (NIP-14)
+- [x] Generic Reposts (kind:16)
+- [x] Live Activities & Live Chats (NIP-53)
+- [x] Relay Pages (NIP-11)
+- [x] HTTP Auth (NIP-98)
+- [x] Zapraiser (NIP-TBD)
+- [x] Moderated Communities (NIP-72)
+- [x] Emoji Packs (Kind:30030)
+- [x] Personal Emoji Lists (Kind:10030)
+- [x] Classifieds (Kind:30403)
+- [x] Private Messages and Small Groups (NIP-24)
+- [x] Gift Wraps & Seals (NIP-59)
+- [x] Versioned Encrypted Payloads (NIP-44)
+- [x] Expiration Support (NIP-40)
+- [x] Status Event (NIP-38)
 - [ ] Marketplace (NIP-15)
 - [ ] Image/Video Capture in the app
 - [ ] Local Database
 - [ ] Bookmarks, Pinned Posts, Muted Events (NIP-51)
-- [ ] Relay Pages (NIP-11)
 - [ ] Proof of Work in the Phone (NIP-13, NIP-20)
-- [ ] Events with a Subject (NIP-14)
 - [ ] Workspaces
-- [ ] Expiration Support (NIP-40)
 - [ ] Infinity Scroll
 - [ ] Relay List Metadata (NIP-65)
 - [ ] Signing Requests (NIP-46)
@@ -183,6 +202,12 @@ Information that you share is publicly visible to anyone reading from relays tha
 ## Information Permanence ##
 Information shared on nostr should be assumed permanent for privacy purposes. There is no way to guarantee deleting or editing any content once posted. 
 
+# Screenshots
+
+| Home Feed                                 | Messages                                     | Live Streams                                    | Notifications                                          |
+|-------------------------------------------|----------------------------------------------|-------------------------------------------------|--------------------------------------------------------|
+| ![Home Feed](./docs/screenshots/home.png) | ![Messages](./docs/screenshots/messages.png) | ![Live Streams](./docs/screenshots/replies.png) | ![Notifications](./docs/screenshots/notifications.png) |
+
 # Contributing
 
 [Issues](https://github.com/vitorpamplona/amethyst/issues) and [pull requests](https://github.com/vitorpamplona/amethyst/pulls) are very welcome.

app/build.gradle

@@ -1,33 +1,33 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id 'org.jlleitschuh.gradle.ktlint' version "11.3.1"
+    id 'org.jlleitschuh.gradle.ktlint' version "11.5.1"
     id 'com.google.gms.google-services'
 }
 
 android {
     namespace 'com.vitorpamplona.amethyst'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
-        targetSdk 33
-        versionCode 204
-        versionName "0.56.4"
+        targetSdk 34
+        versionCode 282
+        versionName "0.75.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary true
         }
-        resConfigs("ar", "cs", "eo", "es", "fa", "fr", "hu", "night", "nl", "pt-rBR", "ru", "sv-rSE", "ta", "tr", "uk", "zh", "sh-rHK", "zh-rTW" )
+        resourceConfigurations += ['ar', 'cs', 'de', 'eo', 'es', 'fa', 'fr', 'hu', 'ja', 'night', 'nl', 'pt-rBR', 'ru', 'sv-rSE', 'ta', 'th', 'tr', 'uk', 'zh', 'sh-rHK', 'zh-rTW']
     }
 
     buildTypes {
         release {
-            // TODO: Make sure all of JSON parsers work when activating these.
-            //minifyEnabled true
-            //proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            //signingConfig signingConfigs.debug
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), 'proguard-rules.pro'
+            minifyEnabled true
             resValue "string", "app_name", "@string/app_name_release"
         }
         debug {
@@ -37,7 +37,7 @@ android {
         }
     }
 
-    flavorDimensions "channel"
+    flavorDimensions = ["channel"]
 
     productFlavors {
         play {
@@ -73,7 +73,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "1.4.7"
+        kotlinCompilerExtensionVersion "1.5.1"
     }
 
     packagingOptions {
@@ -87,7 +87,8 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation project(path: ':quartz')
+    implementation "androidx.core:core-ktx:$core_ktx_version"
     implementation 'androidx.activity:activity-compose:1.7.2'
     implementation "androidx.compose.ui:ui:$compose_ui_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
@@ -96,7 +97,7 @@ dependencies {
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
 
     // Navigation
-    implementation("androidx.navigation:navigation-compose:$nav_version")
+    implementation "androidx.navigation:navigation-compose:$nav_version"
 
     // Observe Live data as State
     implementation "androidx.compose.runtime:runtime-livedata:$compose_ui_version"
@@ -108,41 +109,27 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
-    implementation 'net.engawapg.lib:zoomable:1.4.2'
+    // Zoomable images
+    implementation "net.engawapg.lib:zoomable:1.5.0"
 
     // Biometrics
     implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"
 
-    // Bitcoin secp256k1 bindings to Android
-    implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.10.0'
-
-    // Nostr Base Protocol
-    implementation('com.github.vitorpamplona.NostrPostr:nostrpostrlib:master-SNAPSHOT') {
-        exclude group:'fr.acinq.secp256k1'
-        exclude module: 'guava'
-        exclude module: 'guava-testlib'
-    }
-
     // Websockets API
     implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'
 
-    // Json Serialization TODO: We might need to converge between gson and Jackson (we are usin both)
-    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2'
-    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
-
-    // link preview
+    // HTML Parsing for Link Preview
     implementation 'org.jsoup:jsoup:1.16.1'
-    //implementation 'tw.com.oneup.www:Baha-UrlPreview:1.0.1'
 
     // Encrypted Key Storage
     implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha06'
 
     // view videos
-    implementation 'com.google.android.exoplayer:exoplayer:2.18.7'
+    implementation "androidx.media3:media3-exoplayer:${exoplayer_version}"
     // important for proxy / tor
-    implementation 'com.google.android.exoplayer:extension-okhttp:2.18.7'
+    implementation "androidx.media3:media3-datasource-okhttp:${exoplayer_version}"
 
     // Load images from the web.
     implementation "io.coil-kt:coil-compose:$coil_version"
@@ -157,17 +144,25 @@ dependencies {
     // Permission to upload pictures:
     implementation "com.google.accompanist:accompanist-permissions:$accompanist_version"
 
-    // Parses URLs from Text:
-    implementation "io.github.url-detector:url-detector:0.1.23"
-
     // For QR generation
-    implementation 'com.google.zxing:core:3.5.1'
+    implementation 'com.google.zxing:core:3.5.2'
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
 
     // Markdown
-    implementation "com.halilibo.compose-richtext:richtext-ui:0.16.0"
-    implementation "com.halilibo.compose-richtext:richtext-ui-material:0.16.0"
-    implementation "com.halilibo.compose-richtext:richtext-commonmark:0.16.0"
+    //implementation "com.halilibo.compose-richtext:richtext-ui:0.16.0"
+    //implementation "com.halilibo.compose-richtext:richtext-ui-material:0.16.0"
+    //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:a0954aba63')
+    implementation('com.github.vitorpamplona.compose-richtext:richtext-ui-material:a0954aba63')
+    implementation('com.github.vitorpamplona.compose-richtext:richtext-commonmark:a0954aba63')
+
+    // Language picker and Theme chooser
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
+    implementation "androidx.media3:media3-ui:$media3_version"
+    implementation "androidx.media3:media3-session:$media3_version"
 
     // Local model for language identification
     playImplementation 'com.google.mlkit:language-id:17.0.4'
@@ -176,7 +171,7 @@ dependencies {
     playImplementation 'com.google.mlkit:translate:17.0.1'
 
     // PushNotifications
-    playImplementation platform('com.google.firebase:firebase-bom:32.1.0')
+    playImplementation platform('com.google.firebase:firebase-bom:32.2.3')
     playImplementation 'com.google.firebase:firebase-messaging-ktx'
 
     // Charts
@@ -185,19 +180,19 @@ dependencies {
     implementation "com.patrykandpatrick.vico:views:${vico_version}"
     implementation "com.patrykandpatrick.vico:compose-m2:${vico_version}"
 
-    // immutable collections to avoid recomposition
-    implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5")
+    // GeoHash
+    implementation 'com.github.drfonfon:android-kotlin-geohash:1.0'
+
+    // Waveform visualizer
+    implementation 'com.github.lincollincol:compose-audiowaveform:1.1.1'
 
     // Video compression lib
-    implementation 'com.github.AbedElazizShe:LightCompressor:1.2.3'
+    implementation 'com.github.AbedElazizShe:LightCompressor:1.3.1'
     // Image compression lib
     implementation 'id.zelory:compressor:3.0.1'
 
-    // Automatic memory leak detection
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.11'
-
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'io.mockk:mockk:1.13.5'
+    testImplementation 'io.mockk:mockk:1.13.7'
     androidTestImplementation 'androidx.test.ext:junit:1.2.0-alpha01'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version"

app/proguard-rules.pro

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

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

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

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

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

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

@@ -11,17 +11,17 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 class TranslationsTest {
 
-    fun translatePT(text: String, translateTo: String): String? {
+    fun translateTo(text: String, translateTo: String): String? {
         val task = LanguageTranslatorService.autoTranslate(text, emptySet(), translateTo)
         return Tasks.await(task).result
     }
 
     fun assertTranslate(expected: String, input: String, translateTo: String) {
-        assertEquals(null, expected, translatePT(input, translateTo))
+        assertEquals(null, expected, translateTo(input, translateTo))
     }
 
     fun assertTranslateContains(expected: String, input: String, translateTo: String) {
-        val translated = translatePT(input, translateTo)!!
+        val translated = translateTo(input, translateTo)!!
         assertTrue("'$translated' does not contain '$expected'", translated.contains(expected))
     }
 
@@ -86,4 +86,26 @@ class TranslationsTest {
             "en"
         )
     }
+
+    @Test
+    fun testJapaneseTranslationsOfUrl() {
+        assertTranslateContains(
+            "https://youtu.be/wMYFmCDy_Eg",
+            "うちの会社の小さい先輩の話 第1話「うちの会社の先輩は小さくて可愛い」\n" +
+                "\n" +
+                "https://youtu.be/wMYFmCDy_Eg\n" +
+                "\n" +
+                "先輩がうざい後輩の話と似たような話かと思ったけど、もっとオタクの妄想あるある的なものを詰め込んだやつだ。ワードとかシチュエーションとか、ヒロインのサイズ感とか。知らんけど",
+            "en"
+        )
+    }
+
+    @Test
+    fun testEmoji() {
+        assertTranslateContains(
+            "https://cdn.nostr.build/i/df3783dcdf7dd289ba02ba538dc039c8fe1d4db055e580b81604ed88c6af4ee0.jpg",
+            "\uD83E\uDD23 https://cdn.nostr.build/i/df3783dcdf7dd289ba02ba538dc039c8fe1d4db055e580b81604ed88c6af4ee0.jpg ",
+            "pt"
+        )
+    }
 }

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

@@ -4,8 +4,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.quartz.events.ImmutableListOfLists
 
 @Composable
 fun TranslatableRichTextViewer(

app/src/main/AndroidManifest.xml

@@ -27,6 +27,19 @@
     <!-- To know receive notifications when the app connects/disconnects from the web -->
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
 
+    <!-- Audio/Video Playback -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
+
+    <!-- Keeps screen on while playing videos -->
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <!-- This notification permission is needed for some phones -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
+    <!-- Adds Geohash to posts if active -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
     <!-- Old permission to access media -->
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
@@ -47,10 +60,11 @@
         android:usesCleartextTraffic="true"
         android:hardwareAccelerated="true"
         android:localeConfig="@xml/locales_config"
-        tools:targetApi="33">
+        tools:targetApi="34">
         <activity
             android:name=".ui.MainActivity"
             android:exported="true"
+            android:launchMode="singleTop"
             android:windowSoftInputMode="adjustResize"
             android:configChanges="orientation|screenSize|screenLayout"
             android:theme="@style/Theme.Amethyst">
@@ -91,6 +105,17 @@
             android:screenOrientation="fullSensor"
             tools:replace="screenOrientation" />
 
+        <service
+            android:name=".PlaybackService"
+            android:foregroundServiceType="mediaPlayback"
+            android:stopWithTask="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="androidx.media3.session.MediaSessionService"/>
+                <action android:name="android.media.browse.MediaBrowserService"/>
+            </intent-filter>
+        </service>
+
     </application>
 
 </manifest>

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

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

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

@@ -4,24 +4,25 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.compose.runtime.Immutable
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
+import com.fasterxml.jackson.module.kotlin.readValue
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.ConnectivityType
 import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
+import com.vitorpamplona.amethyst.model.Nip47URI
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
-import com.vitorpamplona.amethyst.model.hexToByteArray
+import com.vitorpamplona.amethyst.model.ServersAvailable
+import com.vitorpamplona.amethyst.model.Settings
+import com.vitorpamplona.amethyst.model.parseConnectivityType
 import com.vitorpamplona.amethyst.service.HttpClient
-import com.vitorpamplona.amethyst.service.model.ContactListEvent
-import com.vitorpamplona.amethyst.service.model.Event
-import com.vitorpamplona.amethyst.service.model.Event.Companion.getRefinedEvent
-import com.vitorpamplona.amethyst.service.model.LnZapEvent
-import com.vitorpamplona.amethyst.ui.actions.ServersAvailable
-import com.vitorpamplona.amethyst.ui.note.Nip47URI
-import fr.acinq.secp256k1.Hex
-import nostr.postr.Persona
-import nostr.postr.toHex
-import nostr.postr.toNpub
+import com.vitorpamplona.quartz.crypto.KeyPair
+import com.vitorpamplona.quartz.encoders.Hex
+import com.vitorpamplona.quartz.encoders.hexToByteArray
+import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.encoders.toNpub
+import com.vitorpamplona.quartz.events.ContactListEvent
+import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.events.LnZapEvent
 import java.io.File
 import java.util.Locale
 
@@ -43,29 +44,39 @@ private object PrefKeys {
     const val NOSTR_PRIVKEY = "nostr_privkey"
     const val NOSTR_PUBKEY = "nostr_pubkey"
     const val FOLLOWING_CHANNELS = "following_channels"
+    const val FOLLOWING_COMMUNITIES = "following_communities"
     const val HIDDEN_USERS = "hidden_users"
     const val RELAYS = "relays"
     const val DONT_TRANSLATE_FROM = "dontTranslateFrom"
     const val LANGUAGE_PREFS = "languagePreferences"
     const val TRANSLATE_TO = "translateTo"
     const val ZAP_AMOUNTS = "zapAmounts"
+    const val REACTION_CHOICES = "reactionChoices"
     const val DEFAULT_ZAPTYPE = "defaultZapType"
     const val DEFAULT_FILE_SERVER = "defaultFileServer"
     const val DEFAULT_HOME_FOLLOW_LIST = "defaultHomeFollowList"
     const val DEFAULT_STORIES_FOLLOW_LIST = "defaultStoriesFollowList"
     const val DEFAULT_NOTIFICATION_FOLLOW_LIST = "defaultNotificationFollowList"
+    const val DEFAULT_DISCOVERY_FOLLOW_LIST = "defaultDiscoveryFollowList"
     const val ZAP_PAYMENT_REQUEST_SERVER = "zapPaymentServer"
     const val LATEST_CONTACT_LIST = "latestContactList"
     const val HIDE_DELETE_REQUEST_DIALOG = "hide_delete_request_dialog"
     const val HIDE_BLOCK_ALERT_DIALOG = "hide_block_alert_dialog"
+    const val HIDE_NIP_24_WARNING_DIALOG = "hide_nip24_warning_dialog"
     const val USE_PROXY = "use_proxy"
     const val PROXY_PORT = "proxy_port"
     const val SHOW_SENSITIVE_CONTENT = "show_sensitive_content"
+    const val WARN_ABOUT_REPORTS = "warn_about_reports"
+    const val FILTER_SPAM_FROM_STRANGERS = "filter_spam_from_strangers"
+    const val LAST_READ_PER_ROUTE = "last_read_route_per_route"
+    const val AUTOMATICALLY_SHOW_IMAGES = "automatically_show_images"
+    const val AUTOMATICALLY_START_PLAYBACK = "automatically_start_playback"
+    const val THEME = "theme"
+    const val PREFERRED_LANGUAGE = "preferred_Language"
+    const val AUTOMATICALLY_LOAD_URL_PREVIEW = "automatically_load_url_preview"
     val LAST_READ: (String) -> String = { route -> "last_read_route_$route" }
 }
 
-private val gson = GsonBuilder().create()
-
 object LocalPreferences {
     private const val comma = ","
 
@@ -194,29 +205,40 @@ object LocalPreferences {
         }
     }
 
+    fun allLocalAccountNPubs(): Set<String> {
+        return savedAccounts().toSet()
+    }
+
     fun saveToEncryptedStorage(account: Account) {
         val prefs = encryptedPreferences(account.userProfile().pubkeyNpub())
         prefs.edit().apply {
-            account.loggedIn.privKey?.let { putString(PrefKeys.NOSTR_PRIVKEY, it.toHex()) }
-            account.loggedIn.pubKey.let { putString(PrefKeys.NOSTR_PUBKEY, it.toHex()) }
+            account.keyPair.privKey?.let { putString(PrefKeys.NOSTR_PRIVKEY, it.toHexKey()) }
+            account.keyPair.pubKey.let { putString(PrefKeys.NOSTR_PUBKEY, it.toHexKey()) }
             putStringSet(PrefKeys.FOLLOWING_CHANNELS, account.followingChannels)
+            putStringSet(PrefKeys.FOLLOWING_COMMUNITIES, account.followingCommunities)
             putStringSet(PrefKeys.HIDDEN_USERS, account.hiddenUsers)
-            putString(PrefKeys.RELAYS, gson.toJson(account.localRelays))
+            putString(PrefKeys.RELAYS, Event.mapper.writeValueAsString(account.localRelays))
             putStringSet(PrefKeys.DONT_TRANSLATE_FROM, account.dontTranslateFrom)
-            putString(PrefKeys.LANGUAGE_PREFS, gson.toJson(account.languagePreferences))
+            putString(PrefKeys.LANGUAGE_PREFS, Event.mapper.writeValueAsString(account.languagePreferences))
             putString(PrefKeys.TRANSLATE_TO, account.translateTo)
-            putString(PrefKeys.ZAP_AMOUNTS, gson.toJson(account.zapAmountChoices))
-            putString(PrefKeys.DEFAULT_ZAPTYPE, gson.toJson(account.defaultZapType))
-            putString(PrefKeys.DEFAULT_FILE_SERVER, gson.toJson(account.defaultFileServer))
+            putString(PrefKeys.ZAP_AMOUNTS, Event.mapper.writeValueAsString(account.zapAmountChoices))
+            putString(PrefKeys.REACTION_CHOICES, Event.mapper.writeValueAsString(account.reactionChoices))
+            putString(PrefKeys.DEFAULT_ZAPTYPE, account.defaultZapType.name)
+            putString(PrefKeys.DEFAULT_FILE_SERVER, account.defaultFileServer.name)
             putString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, account.defaultHomeFollowList)
             putString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, account.defaultStoriesFollowList)
             putString(PrefKeys.DEFAULT_NOTIFICATION_FOLLOW_LIST, account.defaultNotificationFollowList)
-            putString(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, gson.toJson(account.zapPaymentRequest))
-            putString(PrefKeys.LATEST_CONTACT_LIST, Event.gson.toJson(account.backupContactList))
+            putString(PrefKeys.DEFAULT_DISCOVERY_FOLLOW_LIST, account.defaultDiscoveryFollowList)
+            putString(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, Event.mapper.writeValueAsString(account.zapPaymentRequest))
+            putString(PrefKeys.LATEST_CONTACT_LIST, Event.mapper.writeValueAsString(account.backupContactList))
             putBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, account.hideDeleteRequestDialog)
+            putBoolean(PrefKeys.HIDE_NIP_24_WARNING_DIALOG, account.hideNIP24WarningDialog)
             putBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, account.hideBlockAlertDialog)
             putBoolean(PrefKeys.USE_PROXY, account.proxy != null)
             putInt(PrefKeys.PROXY_PORT, account.proxyPort)
+            putBoolean(PrefKeys.WARN_ABOUT_REPORTS, account.warnAboutPostsWithReports)
+            putBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, account.filterSpamFromStrangers)
+            putString(PrefKeys.LAST_READ_PER_ROUTE, Event.mapper.writeValueAsString(account.lastReadPerRoute))
 
             if (account.showSensitiveContent == null) {
                 remove(PrefKeys.SHOW_SENSITIVE_CONTENT)
@@ -224,6 +246,47 @@ object LocalPreferences {
                 putBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, account.showSensitiveContent!!)
             }
         }.apply()
+
+        val globalPrefs = encryptedPreferences()
+        globalPrefs.edit().apply {
+            if (account.settings.automaticallyShowImages.prefCode == null) {
+                remove(PrefKeys.AUTOMATICALLY_SHOW_IMAGES)
+            } else {
+                putBoolean(PrefKeys.AUTOMATICALLY_SHOW_IMAGES, account.settings.automaticallyShowImages.prefCode!!)
+            }
+
+            if (account.settings.automaticallyStartPlayback.prefCode == null) {
+                remove(PrefKeys.AUTOMATICALLY_START_PLAYBACK)
+            } else {
+                putBoolean(PrefKeys.AUTOMATICALLY_START_PLAYBACK, account.settings.automaticallyStartPlayback.prefCode!!)
+            }
+            if (account.settings.automaticallyShowUrlPreview.prefCode == null) {
+                remove(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW)
+            } else {
+                putBoolean(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW, account.settings.automaticallyShowUrlPreview.prefCode!!)
+            }
+            putString(PrefKeys.PREFERRED_LANGUAGE, account.settings.preferredLanguage ?: "")
+        }.apply()
+    }
+
+    fun updateTheme(theme: Int) {
+        encryptedPreferences().edit().apply {
+            putInt(PrefKeys.THEME, theme)
+        }.apply()
+    }
+
+    fun getTheme(): Int {
+        encryptedPreferences().apply {
+            return getInt(PrefKeys.THEME, 0)
+        }
+    }
+
+    fun getPreferredLanguage(): String {
+        var language = ""
+        encryptedPreferences().apply {
+            language = getString(PrefKeys.PREFERRED_LANGUAGE, "") ?: ""
+        }
+        return language
     }
 
     fun loadFromEncryptedStorage(): Account? {
@@ -237,36 +300,39 @@ object LocalPreferences {
             val pubKey = getString(PrefKeys.NOSTR_PUBKEY, null) ?: return null
             val privKey = getString(PrefKeys.NOSTR_PRIVKEY, null)
             val followingChannels = getStringSet(PrefKeys.FOLLOWING_CHANNELS, null) ?: setOf()
+            val followingCommunities = getStringSet(PrefKeys.FOLLOWING_COMMUNITIES, null) ?: setOf()
             val hiddenUsers = getStringSet(PrefKeys.HIDDEN_USERS, emptySet()) ?: setOf()
-            val localRelays = gson.fromJson(
-                getString(PrefKeys.RELAYS, "[]"),
-                object : TypeToken<Set<RelaySetupInfo>>() {}.type
-            ) ?: setOf<RelaySetupInfo>()
+            val localRelays = getString(PrefKeys.RELAYS, "[]")?.let {
+                println("LocalRelays: $it")
+                Event.mapper.readValue<Set<RelaySetupInfo>?>(it)
+            } ?: setOf<RelaySetupInfo>()
 
             val dontTranslateFrom = getStringSet(PrefKeys.DONT_TRANSLATE_FROM, null) ?: setOf()
             val translateTo = getString(PrefKeys.TRANSLATE_TO, null) ?: Locale.getDefault().language
             val defaultHomeFollowList = getString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, null) ?: KIND3_FOLLOWS
             val defaultStoriesFollowList = getString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
             val defaultNotificationFollowList = getString(PrefKeys.DEFAULT_NOTIFICATION_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
+            val defaultDiscoveryFollowList = getString(PrefKeys.DEFAULT_DISCOVERY_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
 
-            val zapAmountChoices = gson.fromJson(
-                getString(PrefKeys.ZAP_AMOUNTS, "[]"),
-                object : TypeToken<List<Long>>() {}.type
-            ) ?: listOf(500L, 1000L, 5000L)
+            val zapAmountChoices = getString(PrefKeys.ZAP_AMOUNTS, "[]")?.let {
+                Event.mapper.readValue<List<Long>?>(it)
+            }?.ifEmpty { listOf(500L, 1000L, 5000L) } ?: listOf(500L, 1000L, 5000L)
 
-            val defaultZapType = gson.fromJson(
-                getString(PrefKeys.DEFAULT_ZAPTYPE, "PUBLIC"),
-                object : TypeToken<LnZapEvent.ZapType>() {}.type
-            ) ?: LnZapEvent.ZapType.PUBLIC
+            val reactionChoices = getString(PrefKeys.REACTION_CHOICES, "[]")?.let {
+                Event.mapper.readValue<List<String>?>(it)
+            }?.ifEmpty { listOf("+") } ?: listOf("+")
 
-            val defaultFileServer = gson.fromJson(
-                getString(PrefKeys.DEFAULT_FILE_SERVER, "NOSTR_BUILD"),
-                object : TypeToken<ServersAvailable>() {}.type
-            ) ?: ServersAvailable.NOSTR_BUILD
+            val defaultZapType = getString(PrefKeys.DEFAULT_ZAPTYPE, "")?.let { serverName ->
+                LnZapEvent.ZapType.values().firstOrNull() { it.name == serverName }
+            } ?: LnZapEvent.ZapType.PUBLIC
+
+            val defaultFileServer = getString(PrefKeys.DEFAULT_FILE_SERVER, "")?.let { serverName ->
+                ServersAvailable.values().firstOrNull() { it.name == serverName }
+            } ?: ServersAvailable.NOSTR_BUILD
 
             val zapPaymentRequestServer = try {
                 getString(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, null)?.let {
-                    gson.fromJson(it, Nip47URI::class.java)
+                    Event.mapper.readValue<Nip47URI?>(it)
                 }
             } catch (e: Throwable) {
                 e.printStackTrace()
@@ -275,8 +341,7 @@ object LocalPreferences {
 
             val latestContactList = try {
                 getString(PrefKeys.LATEST_CONTACT_LIST, null)?.let {
-                    Event.gson.fromJson(it, Event::class.java)
-                        .getRefinedEvent(true) as ContactListEvent
+                    Event.fromJson(it) as ContactListEvent?
                 }
             } catch (e: Throwable) {
                 e.printStackTrace()
@@ -285,10 +350,7 @@ object LocalPreferences {
 
             val languagePreferences = try {
                 getString(PrefKeys.LANGUAGE_PREFS, null)?.let {
-                    gson.fromJson(
-                        it,
-                        object : TypeToken<Map<String, String>>() {}.type
-                    ) as Map<String, String>
+                    Event.mapper.readValue<Map<String, String>?>(it)
                 } ?: mapOf()
             } catch (e: Throwable) {
                 e.printStackTrace()
@@ -297,6 +359,7 @@ object LocalPreferences {
 
             val hideDeleteRequestDialog = getBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, false)
             val hideBlockAlertDialog = getBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, false)
+            val hideNIP24WarningDialog = getBoolean(PrefKeys.HIDE_NIP_24_WARNING_DIALOG, false)
             val useProxy = getBoolean(PrefKeys.USE_PROXY, false)
             val proxyPort = getInt(PrefKeys.PROXY_PORT, 9050)
             val proxy = HttpClient.initProxy(useProxy, "127.0.0.1", proxyPort)
@@ -306,46 +369,75 @@ object LocalPreferences {
             } else {
                 null
             }
+            val filterSpam = getBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, true)
+            val warnAboutReports = getBoolean(PrefKeys.WARN_ABOUT_REPORTS, true)
+
+            val lastReadPerRoute = try {
+                getString(PrefKeys.LAST_READ_PER_ROUTE, null)?.let {
+                    Event.mapper.readValue<Map<String, Long>?>(it)
+                } ?: mapOf()
+            } catch (e: Throwable) {
+                e.printStackTrace()
+                mapOf()
+            }
+
+            val settings = Settings()
+            encryptedPreferences().apply {
+                settings.automaticallyShowImages = if (contains(PrefKeys.AUTOMATICALLY_SHOW_IMAGES)) {
+                    parseConnectivityType(getBoolean(PrefKeys.AUTOMATICALLY_SHOW_IMAGES, false))
+                } else {
+                    ConnectivityType.ALWAYS
+                }
+
+                settings.automaticallyStartPlayback = if (contains(PrefKeys.AUTOMATICALLY_START_PLAYBACK)) {
+                    parseConnectivityType(getBoolean(PrefKeys.AUTOMATICALLY_START_PLAYBACK, false))
+                } else {
+                    ConnectivityType.ALWAYS
+                }
+                settings.automaticallyShowUrlPreview = if (contains(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW)) {
+                    parseConnectivityType(getBoolean(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW, false))
+                } else {
+                    ConnectivityType.ALWAYS
+                }
+
+                settings.preferredLanguage = getString(PrefKeys.PREFERRED_LANGUAGE, "")
+            }
 
             val a = Account(
-                Persona(privKey = privKey?.hexToByteArray(), pubKey = pubKey.hexToByteArray()),
-                followingChannels,
-                hiddenUsers,
-                localRelays,
-                dontTranslateFrom,
-                languagePreferences,
-                translateTo,
-                zapAmountChoices,
-                defaultZapType,
-                defaultFileServer,
-                defaultHomeFollowList,
-                defaultStoriesFollowList,
-                defaultNotificationFollowList,
-                zapPaymentRequestServer,
-                hideDeleteRequestDialog,
-                hideBlockAlertDialog,
-                latestContactList,
-                proxy,
-                proxyPort,
-                showSensitiveContent
+                keyPair = KeyPair(privKey = privKey?.hexToByteArray(), pubKey = pubKey.hexToByteArray()),
+                followingChannels = followingChannels,
+                followingCommunities = followingCommunities,
+                hiddenUsers = hiddenUsers,
+                localRelays = localRelays,
+                dontTranslateFrom = dontTranslateFrom,
+                languagePreferences = languagePreferences,
+                translateTo = translateTo,
+                zapAmountChoices = zapAmountChoices,
+                reactionChoices = reactionChoices,
+                defaultZapType = defaultZapType,
+                defaultFileServer = defaultFileServer,
+                defaultHomeFollowList = defaultHomeFollowList,
+                defaultStoriesFollowList = defaultStoriesFollowList,
+                defaultNotificationFollowList = defaultNotificationFollowList,
+                defaultDiscoveryFollowList = defaultDiscoveryFollowList,
+                zapPaymentRequest = zapPaymentRequestServer,
+                hideDeleteRequestDialog = hideDeleteRequestDialog,
+                hideBlockAlertDialog = hideBlockAlertDialog,
+                hideNIP24WarningDialog = hideNIP24WarningDialog,
+                backupContactList = latestContactList,
+                proxy = proxy,
+                proxyPort = proxyPort,
+                showSensitiveContent = showSensitiveContent,
+                warnAboutPostsWithReports = warnAboutReports,
+                filterSpamFromStrangers = filterSpam,
+                lastReadPerRoute = lastReadPerRoute,
+                settings = settings
             )
 
             return a
         }
     }
 
-    fun saveLastRead(route: String, timestampInSecs: Long) {
-        encryptedPreferences(currentAccount()).edit().apply {
-            putLong(PrefKeys.LAST_READ(route), timestampInSecs)
-        }.apply()
-    }
-
-    fun loadLastRead(route: String): Long {
-        encryptedPreferences(currentAccount()).run {
-            return getLong(PrefKeys.LAST_READ(route), 0)
-        }
-    }
-
     fun migrateSingleUserPrefs() {
         if (currentAccount() != null) return
 

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

@@ -0,0 +1,135 @@
+package com.vitorpamplona.amethyst
+
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.util.LruCache
+import androidx.core.net.toUri
+import androidx.media3.common.C
+import androidx.media3.common.Player
+import androidx.media3.common.Player.STATE_IDLE
+import androidx.media3.common.Player.STATE_READY
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.session.MediaSession
+import com.vitorpamplona.amethyst.ui.MainActivity
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlin.math.abs
+
+class MultiPlayerPlaybackManager(
+    private val dataSourceFactory: androidx.media3.exoplayer.source.MediaSource.Factory? = null,
+    private val cachedPositions: VideoViewedPositionCache
+) {
+    // protects from LruCache killing playing sessions
+    private val playingMap = mutableMapOf<String, MediaSession>()
+
+    private val cache =
+        object : LruCache<String, MediaSession>(10) { // up to 10 videos in the screen at the same time
+            override fun entryRemoved(
+                evicted: Boolean,
+                key: String?,
+                oldValue: MediaSession?,
+                newValue: MediaSession?
+            ) {
+                super.entryRemoved(evicted, key, oldValue, newValue)
+
+                if (!playingMap.contains(key)) {
+                    oldValue?.let {
+                        it.player.release()
+                        it.release()
+                    }
+                }
+            }
+        }
+
+    private fun getCallbackIntent(callbackUri: String, applicationContext: Context): PendingIntent {
+        return PendingIntent.getActivity(
+            applicationContext,
+            0,
+            Intent(Intent.ACTION_VIEW, callbackUri.toUri(), applicationContext, MainActivity::class.java),
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+        )
+    }
+
+    @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
+    fun getMediaSession(id: String, uri: String, callbackUri: String?, context: Context, applicationContext: Context): MediaSession {
+        val existingSession = playingMap.get(id) ?: cache.get(id)
+        if (existingSession != null) return existingSession
+
+        val player = ExoPlayer.Builder(context).run {
+            dataSourceFactory?.let { setMediaSourceFactory(it) }
+            build()
+        }
+
+        player.apply {
+            repeatMode = Player.REPEAT_MODE_ALL
+            videoScalingMode = C.VIDEO_SCALING_MODE_SCALE_TO_FIT
+            volume = 0f
+        }
+
+        val mediaSession = MediaSession.Builder(context, player).run {
+            callbackUri?.let {
+                setSessionActivity(getCallbackIntent(it, applicationContext))
+            }
+            setId(id)
+            build()
+        }
+
+        player.addListener(object : Player.Listener {
+            override fun onIsPlayingChanged(isPlaying: Boolean) {
+                if (isPlaying) {
+                    player.setWakeMode(C.WAKE_MODE_NETWORK)
+                    playingMap.put(id, mediaSession)
+                } else {
+                    player.setWakeMode(C.WAKE_MODE_NONE)
+                    cache.put(id, mediaSession)
+                    playingMap.remove(id, mediaSession)
+                }
+            }
+
+            override fun onPlaybackStateChanged(playbackState: Int) {
+                when (playbackState) {
+                    STATE_IDLE -> {
+                        if (player.currentPosition > 5 * 60) { // 5 seconds
+                            cachedPositions.add(uri, player.currentPosition)
+                        }
+                    }
+                    STATE_READY -> {
+                        cachedPositions.get(uri)?.let { lastPosition ->
+                            if (abs(player.currentPosition - lastPosition) > 5 * 60) {
+                                player.seekTo(lastPosition)
+                            }
+                        }
+                    }
+                    else -> {
+                        if (player.currentPosition > 5 * 60) { // 5 seconds
+                            cachedPositions.add(uri, player.currentPosition)
+                        }
+                    }
+                }
+            }
+        })
+
+        cache.put(id, mediaSession)
+
+        return mediaSession
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    fun releaseAppPlayers() {
+        GlobalScope.launch(Dispatchers.Main) {
+            cache.evictAll()
+            playingMap.forEach {
+                it.value.player.release()
+                it.value.release()
+            }
+            playingMap.clear()
+        }
+    }
+
+    fun playingContent(): Collection<MediaSession> {
+        return playingMap.values
+    }
+}

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

@@ -1,53 +0,0 @@
-package com.vitorpamplona.amethyst
-
-import androidx.lifecycle.LiveData
-import com.vitorpamplona.amethyst.ui.components.BundledUpdate
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
-
-object NotificationCache {
-    // TODO: This must be account-based
-    val lastReadByRoute = mutableMapOf<String, Long>()
-
-    fun markAsRead(route: String, timestampInSecs: Long) {
-        val lastTime = lastReadByRoute[route]
-        if (lastTime == null || timestampInSecs > lastTime) {
-            lastReadByRoute.put(route, timestampInSecs)
-
-            val scope = CoroutineScope(Job() + Dispatchers.IO)
-            scope.launch {
-                LocalPreferences.saveLastRead(route, timestampInSecs)
-                live.invalidateData()
-            }
-        }
-    }
-
-    fun load(route: String): Long {
-        var lastTime = lastReadByRoute[route]
-        if (lastTime == null) {
-            lastTime = LocalPreferences.loadLastRead(route)
-            lastReadByRoute[route] = lastTime
-        }
-        return lastTime
-    }
-
-    // Observers line up here.
-    val live: NotificationLiveData = NotificationLiveData(this)
-}
-
-class NotificationLiveData(val cache: NotificationCache) : LiveData<NotificationState>(NotificationState(cache)) {
-    // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.IO)
-
-    fun invalidateData() {
-        bundler.invalidate() {
-            if (hasActiveObservers()) {
-                postValue(NotificationState(cache))
-            }
-        }
-    }
-}
-
-class NotificationState(val cache: NotificationCache)

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

@@ -0,0 +1,11 @@
+package com.vitorpamplona.amethyst
+
+object OptOutFromFilters {
+    var warnAboutPostsWithReports: Boolean = true
+    var filterSpamFromStrangers: Boolean = true
+
+    fun start(warnAboutReports: Boolean, filterSpam: Boolean) {
+        warnAboutPostsWithReports = warnAboutReports
+        filterSpamFromStrangers = filterSpam
+    }
+}

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

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

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

@@ -0,0 +1,143 @@
+package com.vitorpamplona.amethyst
+
+import androidx.annotation.OptIn
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.datasource.okhttp.OkHttpDataSource
+import androidx.media3.exoplayer.hls.HlsMediaSource
+import androidx.media3.exoplayer.source.MediaSource
+import androidx.media3.exoplayer.source.ProgressiveMediaSource
+import androidx.media3.session.MediaSession
+import androidx.media3.session.MediaSessionService
+import com.vitorpamplona.amethyst.service.HttpClient
+
+@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
+
+    fun newHslDataSource(): MediaSource.Factory {
+        return HlsMediaSource.Factory(OkHttpDataSource.Factory(HttpClient.getHttpClient()))
+    }
+
+    fun newProgressiveDataSource(): MediaSource.Factory {
+        return ProgressiveMediaSource.Factory(VideoCache.get(Amethyst.instance, HttpClient.getHttpClient()))
+    }
+
+    fun lazyHlsDS(): MultiPlayerPlaybackManager {
+        managerHls?.let { return it }
+
+        val newInstance = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
+        managerHls = newInstance
+        return newInstance
+    }
+
+    fun lazyProgressiveDS(): MultiPlayerPlaybackManager {
+        managerProgressive?.let { return it }
+
+        val newInstance = MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
+        managerProgressive = newInstance
+        return newInstance
+    }
+
+    fun lazyLocalDS(): MultiPlayerPlaybackManager {
+        managerLocal?.let { return it }
+
+        val newInstance = MultiPlayerPlaybackManager(cachedPositions = videoViewedPositionCache)
+        managerLocal = newInstance
+        return newInstance
+    }
+
+    // Create your Player and MediaSession in the onCreate lifecycle event
+    @OptIn(UnstableApi::class)
+    override fun onCreate() {
+        super.onCreate()
+
+        // Stop all videos and recreates all managers when the proxy changes.
+        HttpClient.proxyChangeListeners.add(this@PlaybackService::onProxyUpdated)
+    }
+
+    private fun onProxyUpdated() {
+        val toDestroyHls = managerHls
+        val toDestroyProgressive = managerProgressive
+
+        managerHls = MultiPlayerPlaybackManager(newHslDataSource(), videoViewedPositionCache)
+        managerProgressive = MultiPlayerPlaybackManager(newProgressiveDataSource(), videoViewedPositionCache)
+
+        toDestroyHls?.releaseAppPlayers()
+        toDestroyProgressive?.releaseAppPlayers()
+    }
+
+    override fun onDestroy() {
+        HttpClient.proxyChangeListeners.remove(this@PlaybackService::onProxyUpdated)
+
+        managerHls?.releaseAppPlayers()
+        managerLocal?.releaseAppPlayers()
+        managerProgressive?.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) {
+        // Updates any new player ready
+        super.onUpdateNotification(session, startInForegroundRequired)
+
+        // Overrides the notification with any player actually playing
+        managerHls?.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 {
+            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
+    // this request.
+    override fun onGetSession(controllerInfo: MediaSession.ControllerInfo): MediaSession? {
+        val id = controllerInfo.connectionHints.getString("id") ?: return null
+        val uri = controllerInfo.connectionHints.getString("uri") ?: return null
+        val callbackUri = controllerInfo.connectionHints.getString("callbackUri")
+
+        val manager = getAppropriateMediaSessionManager(uri)
+
+        return manager?.getMediaSession(id, uri, callbackUri, context = this, applicationContext = applicationContext)
+    }
+}

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

@@ -8,14 +8,21 @@ import coil.ImageLoader
 import coil.decode.GifDecoder
 import coil.decode.ImageDecoderDecoder
 import coil.decode.SvgDecoder
+import coil.disk.DiskCache
+import coil.util.DebugLogger
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.HttpClient
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
+import com.vitorpamplona.amethyst.service.NostrChatroomDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
-import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
+import com.vitorpamplona.amethyst.service.NostrCommunityDataSource
+import com.vitorpamplona.amethyst.service.NostrDiscoveryDataSource
+import com.vitorpamplona.amethyst.service.NostrGeohashDataSource
+import com.vitorpamplona.amethyst.service.NostrHashtagDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
+import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
@@ -23,6 +30,9 @@ import com.vitorpamplona.amethyst.service.NostrThreadDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
 import com.vitorpamplona.amethyst.service.NostrVideoDataSource
 import com.vitorpamplona.amethyst.service.relays.Client
+import com.vitorpamplona.amethyst.ui.actions.ImageUploader
+import com.vitorpamplona.quartz.encoders.decodePublicKeyAsHexOrNull
+import java.io.File
 
 object ServiceManager {
     private var account: Account? = null
@@ -40,6 +50,7 @@ object ServiceManager {
 
         // Resets Proxy Use
         HttpClient.start(account)
+        OptOutFromFilters.start(account?.warnAboutPostsWithReports ?: true, account?.filterSpamFromStrangers ?: true)
         Coil.setImageLoader {
             ImageLoader.Builder(context).components {
                 if (Build.VERSION.SDK_INT >= 28) {
@@ -48,15 +59,13 @@ object ServiceManager {
                     add(GifDecoder.Factory())
                 }
                 add(SvgDecoder.Factory())
-            } // .logger(DebugLogger())
+            }.logger(DebugLogger())
+                .diskCache { SingletonDiskCache.get(context.applicationContext) }
                 .okHttpClient { HttpClient.getHttpClient() }
                 .respectCacheHeaders(false)
                 .build()
         }
 
-        // Initializes video cache.
-        VideoCache.init(context.applicationContext)
-
         if (myAccount != null) {
             Client.connect(myAccount.activeRelays() ?: myAccount.convertLocalRelays())
 
@@ -65,11 +74,15 @@ object ServiceManager {
             NostrHomeDataSource.account = myAccount
             NostrChatroomListDataSource.account = myAccount
             NostrVideoDataSource.account = myAccount
+            NostrDiscoveryDataSource.account = myAccount
+            ImageUploader.account = myAccount
 
             // Notification Elements
             NostrHomeDataSource.start()
             NostrAccountDataSource.start()
             NostrChatroomListDataSource.start()
+            NostrDiscoveryDataSource.start()
+            NostrVideoDataSource.start()
 
             // More Info Data Sources
             NostrSingleEventDataSource.start()
@@ -84,9 +97,14 @@ object ServiceManager {
         NostrAccountDataSource.stop()
         NostrHomeDataSource.stop()
         NostrChannelDataSource.stop()
+        NostrChatroomDataSource.stop()
         NostrChatroomListDataSource.stop()
+        NostrDiscoveryDataSource.stop()
 
-        NostrGlobalDataSource.stop()
+        NostrCommunityDataSource.stop()
+        NostrHashtagDataSource.stop()
+        NostrGeohashDataSource.stop()
+        NostrSearchEventOrUserDataSource.stop()
         NostrSingleChannelDataSource.stop()
         NostrSingleEventDataSource.stop()
         NostrSingleUserDataSource.stop()
@@ -100,11 +118,40 @@ object ServiceManager {
     fun cleanUp() {
         LocalCache.cleanObservers()
 
+        val accounts = LocalPreferences.allLocalAccountNPubs().mapNotNull { decodePublicKeyAsHexOrNull(it) }.toSet()
+
         account?.let {
             LocalCache.pruneOldAndHiddenMessages(it)
             LocalCache.pruneHiddenMessages(it)
-            LocalCache.pruneContactLists(it)
-            // LocalCache.pruneNonFollows(it)
+            LocalCache.pruneContactLists(accounts)
+            LocalCache.pruneRepliesAndReactions(accounts)
+            LocalCache.prunePastVersionsOfReplaceables()
+            LocalCache.pruneExpiredEvents()
         }
     }
 }
+
+object SingletonDiskCache {
+
+    private const val DIRECTORY = "image_cache"
+    private var instance: DiskCache? = null
+
+    @Synchronized
+    fun get(context: Context): DiskCache {
+        return instance ?: run {
+            // Create the singleton disk cache instance.
+            DiskCache.Builder()
+                .directory(context.safeCacheDir.resolve(DIRECTORY))
+                .maxSizePercent(0.2)
+                .maximumMaxSizeBytes(500L * 1024 * 1024) // 250MB
+                .build()
+                .also { instance = it }
+        }
+    }
+}
+
+internal val Context.safeCacheDir: File
+    get() {
+        val cacheDir = checkNotNull(cacheDir) { "cacheDir == null" }
+        return cacheDir.apply { mkdirs() }
+    }

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

@@ -1,14 +1,16 @@
 package com.vitorpamplona.amethyst
 
 import android.content.Context
-import com.google.android.exoplayer2.database.StandaloneDatabaseProvider
-import com.google.android.exoplayer2.ext.okhttp.OkHttpDataSource
-import com.google.android.exoplayer2.upstream.cache.CacheDataSource
-import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor
-import com.google.android.exoplayer2.upstream.cache.SimpleCache
-import com.vitorpamplona.amethyst.service.HttpClient
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.database.StandaloneDatabaseProvider
+import androidx.media3.datasource.cache.CacheDataSource
+import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor
+import androidx.media3.datasource.cache.SimpleCache
+import androidx.media3.datasource.okhttp.OkHttpDataSource
+import okhttp3.OkHttpClient
+import java.io.File
 
-object VideoCache {
+@UnstableApi object VideoCache {
 
     var exoPlayerCacheSize: Long = 90 * 1024 * 1024 // 90MB
 
@@ -20,33 +22,34 @@ object VideoCache {
     lateinit var cacheDataSourceFactory: CacheDataSource.Factory
 
     @Synchronized
-    fun init(context: Context) {
-        if (!this::simpleCache.isInitialized) {
-            exoDatabaseProvider = StandaloneDatabaseProvider(context)
+    fun initFileCache(context: Context) {
+        exoDatabaseProvider = StandaloneDatabaseProvider(context)
 
-            simpleCache = SimpleCache(
-                context.cacheDir,
-                leastRecentlyUsedCacheEvictor,
-                exoDatabaseProvider
-            )
-
-            cacheDataSourceFactory = CacheDataSource.Factory()
-                .setCache(simpleCache)
-                .setUpstreamDataSourceFactory(
-                    OkHttpDataSource.Factory(HttpClient.getHttpClient())
-                )
-                .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
-        } else {
-            cacheDataSourceFactory = CacheDataSource.Factory()
-                .setCache(simpleCache)
-                .setUpstreamDataSourceFactory(
-                    OkHttpDataSource.Factory(HttpClient.getHttpClient())
-                )
-                .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
-        }
+        simpleCache = SimpleCache(
+            File(context.cacheDir, "exoplayer"),
+            leastRecentlyUsedCacheEvictor,
+            exoDatabaseProvider
+        )
     }
 
-    fun get(): CacheDataSource.Factory {
+    // This method should be called when proxy setting changes.
+    fun renewCacheFactory(client: OkHttpClient) {
+        cacheDataSourceFactory = CacheDataSource.Factory()
+            .setCache(simpleCache)
+            .setUpstreamDataSourceFactory(
+                OkHttpDataSource.Factory(client)
+            )
+            .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
+    }
+
+    fun get(context: Context, client: OkHttpClient): CacheDataSource.Factory {
+        if (!this::simpleCache.isInitialized) {
+            initFileCache(context)
+        }
+
+        // Renews the factory because OkHttpMight have changed.
+        renewCacheFactory(client)
+
         return cacheDataSourceFactory
     }
 }

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

@@ -0,0 +1,15 @@
+package com.vitorpamplona.amethyst
+
+import android.util.LruCache
+
+class VideoViewedPositionCache {
+    val cachedPosition = LruCache<String, Long>(100)
+
+    fun add(uri: String, position: Long) {
+        cachedPosition.put(uri, position)
+    }
+
+    fun get(uri: String): Long? {
+        return cachedPosition.get(uri)
+    }
+}

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

@@ -2,12 +2,15 @@ package com.vitorpamplona.amethyst.model
 
 import android.util.Log
 import android.util.LruCache
+import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.OptOutFromFilters
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.service.model.Event
-import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
+import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.Nip19
+import com.vitorpamplona.quartz.events.Event
 import kotlinx.coroutines.Dispatchers
 
 data class Spammer(val pubkeyHex: HexKey, var duplicatedMessages: Set<HexKey>)
@@ -16,10 +19,11 @@ class AntiSpamFilter {
     val recentMessages = LruCache<Int, String>(1000)
     val spamMessages = LruCache<Int, Spammer>(1000)
 
-    @Synchronized
     fun isSpam(event: Event, relay: Relay?): Boolean {
         checkNotInMainThread()
 
+        if (!OptOutFromFilters.filterSpamFromStrangers) return false
+
         val idHex = event.id
 
         // if short message, ok
@@ -41,15 +45,9 @@ class AntiSpamFilter {
             Log.w("Potential SPAM Message", "${event.id} ${recentMessages[hash]} ${spamMessages[hash] != null} ${relay?.url} ${event.content.replace("\n", " | ")}")
 
             // Log down offenders
-            if (spamMessages.get(hash) == null) {
-                spamMessages.put(hash, Spammer(event.pubKey, setOf(recentMessages[hash], event.id)))
-                liveSpam.invalidateData()
-            } else {
-                val spammer = spamMessages.get(hash)
-                spammer.duplicatedMessages = spammer.duplicatedMessages + event.id
+            logOffender(hash, event)
 
-                liveSpam.invalidateData()
-            }
+            liveSpam.invalidateData()
 
             return true
         }
@@ -59,16 +57,31 @@ class AntiSpamFilter {
         return false
     }
 
+    @Synchronized
+    private fun logOffender(hashCode: Int, event: Event) {
+        if (spamMessages.get(hashCode) == null) {
+            spamMessages.put(hashCode, Spammer(event.pubKey, setOf(recentMessages[hashCode], event.id)))
+        } else {
+            val spammer = spamMessages.get(hashCode)
+            spammer.duplicatedMessages = spammer.duplicatedMessages + event.id
+        }
+    }
+
     val liveSpam: AntiSpamLiveData = AntiSpamLiveData(this)
 }
 
+@Stable
 class AntiSpamLiveData(val cache: AntiSpamFilter) : LiveData<AntiSpamState>(AntiSpamState(cache)) {
 
     // Refreshes observers in batches.
     private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateData() {
+        checkNotInMainThread()
+
         bundler.invalidate() {
+            checkNotInMainThread()
+
             if (hasActiveObservers()) {
                 postValue(AntiSpamState(cache))
             }

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

@@ -3,28 +3,113 @@ package com.vitorpamplona.amethyst.model
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
-import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
-import fr.acinq.secp256k1.Hex
+import com.vitorpamplona.quartz.encoders.ATag
+import com.vitorpamplona.quartz.encoders.Hex
+import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.toNote
+import com.vitorpamplona.quartz.events.ChannelCreateEvent
+import com.vitorpamplona.quartz.events.LiveActivitiesEvent
 import kotlinx.coroutines.Dispatchers
 import java.util.concurrent.ConcurrentHashMap
 
 @Stable
-class Channel(val idHex: String) {
-    var creator: User? = null
+class PublicChatChannel(idHex: String) : Channel(idHex) {
     var info = ChannelCreateEvent.ChannelData(null, null, null)
 
+    fun updateChannelInfo(creator: User, channelInfo: ChannelCreateEvent.ChannelData, updatedAt: Long) {
+        this.creator = creator
+        this.info = channelInfo
+        this.updatedMetadataAt = updatedAt
+
+        live.invalidateData()
+    }
+
+    override fun toBestDisplayName(): String {
+        return info.name ?: super.toBestDisplayName()
+    }
+
+    override fun summary(): String? {
+        return info.about
+    }
+
+    override fun profilePicture(): String? {
+        if (info.picture.isNullOrBlank()) return super.profilePicture()
+        return info.picture ?: super.profilePicture()
+    }
+
+    override fun anyNameStartsWith(prefix: String): Boolean {
+        return listOfNotNull(info.name, info.about)
+            .filter { it.contains(prefix, true) }.isNotEmpty()
+    }
+}
+
+@Stable
+class LiveActivitiesChannel(val address: ATag) : Channel(address.toTag()) {
+    var info: LiveActivitiesEvent? = null
+
+    override fun idNote() = address.toNAddr()
+    override fun idDisplayNote() = idNote().toShortenHex()
+    fun address() = address
+
+    fun updateChannelInfo(creator: User, channelInfo: LiveActivitiesEvent, updatedAt: Long) {
+        this.info = channelInfo
+        super.updateChannelInfo(creator, updatedAt)
+    }
+
+    override fun toBestDisplayName(): String {
+        return info?.title() ?: super.toBestDisplayName()
+    }
+
+    override fun summary(): String? {
+        return info?.summary()
+    }
+
+    override fun profilePicture(): String? {
+        return info?.image()?.ifBlank { null }
+    }
+
+    override fun anyNameStartsWith(prefix: String): Boolean {
+        return listOfNotNull(info?.title(), info?.summary())
+            .filter { it.contains(prefix, true) }.isNotEmpty()
+    }
+}
+
+@Stable
+abstract class Channel(val idHex: String) {
+    var creator: User? = null
+
     var updatedMetadataAt: Long = 0
 
     val notes = ConcurrentHashMap<HexKey, Note>()
 
-    fun id() = Hex.decode(idHex)
-    fun idNote() = id().toNote()
-    fun idDisplayNote() = idNote().toShortenHex()
+    open fun id() = Hex.decode(idHex)
+    open fun idNote() = id().toNote()
+    open fun idDisplayNote() = idNote().toShortenHex()
 
-    fun toBestDisplayName(): String {
-        return info.name ?: idDisplayNote()
+    open fun toBestDisplayName(): String {
+        return idDisplayNote()
+    }
+
+    open fun summary(): String? {
+        return null
+    }
+
+    open fun creatorName(): String? {
+        return creator?.toBestDisplayName()
+    }
+
+    open fun profilePicture(): String? {
+        return creator?.profilePicture()
+    }
+
+    open fun updateChannelInfo(creator: User, updatedAt: Long) {
+        this.creator = creator
+        this.updatedMetadataAt = updatedAt
+
+        live.invalidateData()
     }
 
     fun addNote(note: Note) {
@@ -39,23 +124,7 @@ class Channel(val idHex: String) {
         notes.remove(noteHex)
     }
 
-    fun updateChannelInfo(creator: User, channelInfo: ChannelCreateEvent.ChannelData, updatedAt: Long) {
-        this.creator = creator
-        this.info = channelInfo
-        this.updatedMetadataAt = updatedAt
-
-        live.invalidateData()
-    }
-
-    fun profilePicture(): String? {
-        if (info.picture.isNullOrBlank()) info.picture = null
-        return info.picture
-    }
-
-    fun anyNameStartsWith(prefix: String): Boolean {
-        return listOfNotNull(info.name, info.about)
-            .filter { it.startsWith(prefix, true) }.isNotEmpty()
-    }
+    abstract fun anyNameStartsWith(prefix: String): Boolean
 
     // Observers line up here.
     val live: ChannelLiveData = ChannelLiveData(this)
@@ -83,7 +152,10 @@ class ChannelLiveData(val channel: Channel) : LiveData<ChannelState>(ChannelStat
     private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateData() {
+        checkNotInMainThread()
+
         bundler.invalidate() {
+            checkNotInMainThread()
             if (hasActiveObservers()) {
                 postValue(ChannelState(channel))
             }
@@ -92,12 +164,20 @@ class ChannelLiveData(val channel: Channel) : LiveData<ChannelState>(ChannelStat
 
     override fun onActive() {
         super.onActive()
-        NostrSingleChannelDataSource.add(channel.idHex)
+        if (channel is PublicChatChannel) {
+            NostrSingleChannelDataSource.add(channel.idHex)
+        } else {
+            NostrSingleChannelDataSource.add(channel.idHex)
+        }
     }
 
     override fun onInactive() {
         super.onInactive()
-        NostrSingleChannelDataSource.remove(channel.idHex)
+        if (channel is PublicChatChannel) {
+            NostrSingleChannelDataSource.remove(channel.idHex)
+        } else {
+            NostrSingleChannelDataSource.remove(channel.idHex)
+        }
     }
 }
 

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

@@ -1,26 +1,31 @@
 package com.vitorpamplona.amethyst.model
 import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Immutable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
-fun checkForHashtagWithIcon(tag: String): HashtagIcon? {
+fun checkForHashtagWithIcon(tag: String, primary: Color): HashtagIcon? {
     return when (tag.lowercase()) {
-        "bitcoin", "btc", "timechain" -> HashtagIcon(R.drawable.ht_btc, "Bitcoin", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp))
+        "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" -> 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))
         else -> null
     }
 }
+
+@Immutable
 class HashtagIcon(
     val icon: Int,
     val description: String,

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

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

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

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

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

@@ -3,25 +3,30 @@ package com.vitorpamplona.amethyst.model
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.distinctUntilChanged
+import androidx.lifecycle.map
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
-import com.vitorpamplona.amethyst.service.model.*
-import com.vitorpamplona.amethyst.service.nip19.Nip19
+import com.vitorpamplona.amethyst.service.firstFullCharOrEmoji
 import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.Relay
+import com.vitorpamplona.amethyst.ui.actions.updated
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
+import com.vitorpamplona.amethyst.ui.note.combineWith
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
-import fr.acinq.secp256k1.Hex
+import com.vitorpamplona.quartz.encoders.ATag
+import com.vitorpamplona.quartz.encoders.Hex
+import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.LnInvoiceUtil
+import com.vitorpamplona.quartz.encoders.Nip19
+import com.vitorpamplona.quartz.encoders.toNote
+import com.vitorpamplona.quartz.events.*
+import com.vitorpamplona.quartz.utils.TimeUtils
 import kotlinx.coroutines.Dispatchers
 import java.math.BigDecimal
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
-import java.util.Date
-import java.util.regex.Pattern
-
-val tagSearch = Pattern.compile("(?:\\s|\\A)\\#\\[([0-9]+)\\]")
 
 @Stable
 class AddressableNote(val address: ATag) : Note(address.toTag()) {
@@ -29,7 +34,14 @@ class AddressableNote(val address: ATag) : Note(address.toTag()) {
     override fun toNEvent() = address.toNAddr()
     override fun idDisplayNote() = idNote().toShortenHex()
     override fun address() = address
-    override fun createdAt() = (event as? LongTextNoteEvent)?.publishedAt() ?: event?.createdAt()
+    override fun createdAt(): Long? {
+        if (event == null) return null
+
+        val publishedAt = (event as? LongTextNoteEvent)?.publishedAt() ?: Long.MAX_VALUE
+        val lastCreatedAt = event?.createdAt() ?: Long.MAX_VALUE
+
+        return minOf(publishedAt, lastCreatedAt)
+    }
 }
 
 @Stable
@@ -41,20 +53,20 @@ open class Note(val idHex: String) {
     var replyTo: List<Note>? = null
 
     // These fields are updated every time an event related to this note is received.
-    var replies = setOf<Note>()
+    var replies = listOf<Note>()
         private set
-    var reactions = setOf<Note>()
+    var reactions = mapOf<String, List<Note>>()
         private set
-    var boosts = setOf<Note>()
+    var boosts = listOf<Note>()
         private set
-    var reports = mapOf<User, Set<Note>>()
+    var reports = mapOf<User, List<Note>>()
         private set
     var zaps = mapOf<Note, Note?>()
         private set
     var zapPayments = mapOf<Note, Note?>()
         private set
 
-    var relays = setOf<String>()
+    var relays = listOf<String>()
         private set
 
     var lastReactionsDownloadTime: Map<String, EOSETime> = emptyMap()
@@ -63,15 +75,45 @@ open class Note(val idHex: String) {
     open fun idNote() = id().toNote()
 
     open fun toNEvent(): String {
-        return Nip19.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relays.firstOrNull())
+        val myEvent = event
+        return if (myEvent is WrappedEvent) {
+            val host = myEvent.host
+            if (host != null) {
+                Nip19.createNEvent(
+                    host.id,
+                    host.pubKey,
+                    host.kind(),
+                    relays.firstOrNull()
+                )
+            } else {
+                Nip19.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relays.firstOrNull())
+            }
+        } else {
+            Nip19.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relays.firstOrNull())
+        }
+    }
+
+    fun toNostrUri(): String {
+        return "nostr:${toNEvent()}"
     }
 
     open fun idDisplayNote() = idNote().toShortenHex()
 
     fun channelHex(): HexKey? {
-        return (event as? ChannelMessageEvent)?.channel()
-            ?: (event as? ChannelMetadataEvent)?.channel()
-            ?: (event as? ChannelCreateEvent)?.id
+        return if (event is ChannelMessageEvent ||
+            event is ChannelMetadataEvent ||
+            event is ChannelCreateEvent ||
+            event is LiveActivitiesChatMessageEvent ||
+            event is LiveActivitiesEvent
+        ) {
+            (event as? ChannelMessageEvent)?.channel()
+                ?: (event as? ChannelMetadataEvent)?.channel()
+                ?: (event as? ChannelCreateEvent)?.id
+                ?: (event as? LiveActivitiesChatMessageEvent)?.activity()?.toTag()
+                ?: (event as? LiveActivitiesEvent)?.address()?.toTag()
+        } else {
+            null
+        }
     }
 
     open fun address(): ATag? = null
@@ -79,11 +121,13 @@ open class Note(val idHex: String) {
     open fun createdAt() = event?.createdAt()
 
     fun loadEvent(event: Event, author: User, replyTo: List<Note>) {
-        this.event = event
-        this.author = author
-        this.replyTo = replyTo
+        if (this.event?.id() != event.id()) {
+            this.event = event
+            this.author = author
+            this.replyTo = replyTo
 
-        liveSet?.metadata?.invalidateData()
+            liveSet?.metadata?.invalidateData()
+        }
     }
 
     fun formattedDateTime(timestamp: Long): String {
@@ -94,22 +138,31 @@ open class Note(val idHex: String) {
     /**
      * This method caches signatures during each execution to avoid recalculation in longer threads
      */
-    fun replyLevelSignature(cachedSignatures: MutableMap<Note, String> = mutableMapOf()): String {
+    fun replyLevelSignature(
+        eventsToConsider: Set<Note>,
+        cachedSignatures: MutableMap<Note, String>
+    ): String {
         val replyTo = replyTo
-        if (replyTo == null || replyTo.isEmpty()) {
+        if (event is RepostEvent || event is GenericRepostEvent || replyTo == null || replyTo.isEmpty()) {
             return "/" + formattedDateTime(createdAt() ?: 0) + ";"
         }
 
-        return replyTo
-            .map {
-                cachedSignatures[it] ?: it.replyLevelSignature(cachedSignatures).apply { cachedSignatures.put(it, this) }
-            }
-            .maxBy { it.length }.removeSuffix(";") + "/" + formattedDateTime(createdAt() ?: 0) + ";"
+        val mySignature = (
+            replyTo
+                .filter { it in eventsToConsider } // This forces the signature to be based on a branch, avoiding two roots
+                .map {
+                    cachedSignatures[it] ?: it.replyLevelSignature(eventsToConsider, cachedSignatures).apply { cachedSignatures.put(it, this) }
+                }
+                .maxByOrNull { it.length }?.removeSuffix(";") ?: ""
+            ) + "/" + formattedDateTime(createdAt() ?: 0) + ";"
+
+        cachedSignatures[this] = mySignature
+        return mySignature
     }
 
     fun replyLevel(cachedLevels: MutableMap<Note, Int> = mutableMapOf()): Int {
         val replyTo = replyTo
-        if (replyTo == null || replyTo.isEmpty()) {
+        if (event is RepostEvent || event is GenericRepostEvent || replyTo == null || replyTo.isEmpty()) {
             return 0
         }
 
@@ -126,16 +179,65 @@ open class Note(val idHex: String) {
     }
 
     fun removeReply(note: Note) {
-        replies = replies - note
-        liveSet?.replies?.invalidateData()
+        if (note in replies) {
+            replies = replies - note
+            liveSet?.replies?.invalidateData()
+        }
     }
+
     fun removeBoost(note: Note) {
-        boosts = boosts - note
-        liveSet?.boosts?.invalidateData()
+        if (note in boosts) {
+            boosts = boosts - note
+            liveSet?.boosts?.invalidateData()
+        }
     }
-    fun removeReaction(note: Note) {
-        reactions = reactions - note
+
+    fun removeAllChildNotes(): List<Note> {
+        val toBeRemoved = replies +
+            reactions.values.flatten() +
+            boosts +
+            reports.values.flatten() +
+            zaps.keys +
+            zaps.values.filterNotNull() +
+            zapPayments.keys +
+            zapPayments.values.filterNotNull()
+
+        replies = listOf<Note>()
+        reactions = mapOf<String, List<Note>>()
+        boosts = listOf<Note>()
+        reports = mapOf<User, List<Note>>()
+        zaps = mapOf<Note, Note?>()
+        zapPayments = mapOf<Note, Note?>()
+        relays = listOf<String>()
+        lastReactionsDownloadTime = emptyMap()
+
+        liveSet?.replies?.invalidateData()
         liveSet?.reactions?.invalidateData()
+        liveSet?.boosts?.invalidateData()
+        liveSet?.reports?.invalidateData()
+        liveSet?.zaps?.invalidateData()
+
+        return toBeRemoved
+    }
+
+    fun removeReaction(note: Note) {
+        val tags = note.event?.tags() ?: emptyList()
+        val reaction = note.event?.content()?.firstFullCharOrEmoji(ImmutableListOfLists(tags)) ?: "+"
+
+        if (reaction in reactions.keys && reactions[reaction]?.contains(note) == true) {
+            reactions[reaction]?.let {
+                if (note in it) {
+                    val newList = it.minus(note)
+                    if (newList.isEmpty()) {
+                        reactions = reactions.minus(reaction)
+                    } else {
+                        reactions = reactions + Pair(reaction, newList)
+                    }
+
+                    liveSet?.reactions?.invalidateData()
+                }
+            }
+        }
     }
 
     fun removeReport(deleteNote: Note) {
@@ -154,8 +256,7 @@ open class Note(val idHex: String) {
             zaps = zaps.minus(note)
             liveSet?.zaps?.invalidateData()
         } else if (zaps.containsValue(note)) {
-            val toRemove = zaps.filterValues { it == note }
-            zaps = zaps.minus(toRemove.keys)
+            zaps = zaps.filterValues { it != note }
             liveSet?.zaps?.invalidateData()
         }
     }
@@ -179,32 +280,70 @@ open class Note(val idHex: String) {
     }
 
     @Synchronized
+    private fun innerAddZap(zapRequest: Note, zap: Note?): Boolean {
+        if (zapRequest !in zaps.keys) {
+            zaps = zaps + Pair(zapRequest, zap)
+            return true
+        } else if (zaps[zapRequest] == null) {
+            zaps = zaps + Pair(zapRequest, zap)
+            return true
+        }
+
+        return false
+    }
+
     fun addZap(zapRequest: Note, zap: Note?) {
         checkNotInMainThread()
         if (zapRequest !in zaps.keys) {
-            zaps = zaps + Pair(zapRequest, zap)
-            liveSet?.zaps?.invalidateData()
-        } else if (zapRequest in zaps.keys && zaps[zapRequest] == null) {
-            zaps = zaps + Pair(zapRequest, zap)
-            liveSet?.zaps?.invalidateData()
+            val inserted = innerAddZap(zapRequest, zap)
+            if (inserted) {
+                liveSet?.zaps?.invalidateData()
+            }
+        } else if (zaps[zapRequest] == null) {
+            val inserted = innerAddZap(zapRequest, zap)
+            if (inserted) {
+                liveSet?.zaps?.invalidateData()
+            }
         }
     }
 
     @Synchronized
+    private fun innerAddZapPayment(zapPaymentRequest: Note, zapPayment: Note?): Boolean {
+        if (zapPaymentRequest !in zapPayments.keys) {
+            zapPayments = zapPayments + Pair(zapPaymentRequest, zapPayment)
+            return true
+        } else if (zapPayments[zapPaymentRequest] == null) {
+            zapPayments = zapPayments + Pair(zapPaymentRequest, zapPayment)
+            return true
+        }
+
+        return false
+    }
+
     fun addZapPayment(zapPaymentRequest: Note, zapPayment: Note?) {
         checkNotInMainThread()
         if (zapPaymentRequest !in zapPayments.keys) {
-            zapPayments = zapPayments + Pair(zapPaymentRequest, zapPayment)
-            liveSet?.zaps?.invalidateData()
-        } else if (zapPaymentRequest in zapPayments.keys && zapPayments[zapPaymentRequest] == null) {
-            zapPayments = zapPayments + Pair(zapPaymentRequest, zapPayment)
-            liveSet?.zaps?.invalidateData()
+            val inserted = innerAddZapPayment(zapPaymentRequest, zapPayment)
+            if (inserted) {
+                liveSet?.zaps?.invalidateData()
+            }
+        } else if (zapPayments[zapPaymentRequest] == null) {
+            val inserted = innerAddZapPayment(zapPaymentRequest, zapPayment)
+            if (inserted) {
+                liveSet?.zaps?.invalidateData()
+            }
         }
     }
 
     fun addReaction(note: Note) {
-        if (note !in reactions) {
-            reactions = reactions + note
+        val tags = note.event?.tags() ?: emptyList()
+        val reaction = note.event?.content()?.firstFullCharOrEmoji(ImmutableListOfLists(tags)) ?: "+"
+
+        if (reaction !in reactions.keys) {
+            reactions = reactions + Pair(reaction, listOf(note))
+            liveSet?.reactions?.invalidateData()
+        } else if (reactions[reaction]?.contains(note) == false) {
+            reactions = reactions + Pair(reaction, (reactions[reaction] ?: emptySet()) + note)
             liveSet?.reactions?.invalidateData()
         }
     }
@@ -213,7 +352,7 @@ open class Note(val idHex: String) {
         val author = note.author ?: return
 
         if (author !in reports.keys) {
-            reports = reports + Pair(author, setOf(note))
+            reports = reports + Pair(author, listOf(note))
             liveSet?.reports?.invalidateData()
         } else if (reports[author]?.contains(note) == false) {
             reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
@@ -243,16 +382,71 @@ open class Note(val idHex: String) {
         }
     }
 
-    fun isReactedBy(user: User): Boolean {
-        return reactions.any { it.author?.pubkeyHex == user.pubkeyHex }
+    fun publicZapAuthors(): Set<User> {
+        // Zaps who the requester was the user
+        return zaps.mapNotNull {
+            it.key.author
+        }.toSet()
+    }
+
+    fun publicZapAuthorHexes(): Set<HexKey> {
+        // Zaps who the requester was the user
+        return zaps.mapNotNull {
+            it.key.author?.pubkeyHex
+        }.toSet()
+    }
+
+    fun reactionAuthors(): Set<User> {
+        // Zaps who the requester was the user
+        return reactions.values.map {
+            it.mapNotNull { it.author }
+        }.flatten().toSet()
+    }
+
+    fun reactionAuthorHexes(): Set<HexKey> {
+        // Zaps who the requester was the user
+        return reactions.values.map {
+            it.mapNotNull { it.author?.pubkeyHex }
+        }.flatten().toSet()
+    }
+
+    fun replyAuthorHexes(): Set<HexKey> {
+        // Zaps who the requester was the user
+        return replies.mapNotNull {
+            it.author?.pubkeyHex
+        }.toSet()
+    }
+
+    fun replyAuthors(): Set<User> {
+        // Zaps who the requester was the user
+        return replies.mapNotNull {
+            it.author
+        }.toSet()
+    }
+
+    fun boostAuthors(): Set<User> {
+        // Zaps who the requester was the user
+        return boosts.mapNotNull {
+            it.author
+        }.toSet()
+    }
+
+    fun getReactionBy(user: User): String? {
+        return reactions.firstNotNullOfOrNull {
+            if (it.value.any { it.author?.pubkeyHex == user.pubkeyHex }) {
+                it.key
+            } else {
+                null
+            }
+        }
     }
 
     fun isBoostedBy(user: User): Boolean {
         return boosts.any { it.author?.pubkeyHex == user.pubkeyHex }
     }
 
-    fun reportsBy(user: User): Set<Note> {
-        return reports[user] ?: emptySet()
+    fun hasReportsBy(user: User): Boolean {
+        return reports[user]?.isNotEmpty() ?: false
     }
 
     fun reportAuthorsBy(users: Set<HexKey>): List<User> {
@@ -339,7 +533,7 @@ open class Note(val idHex: String) {
     }
 
     fun hasAnyReports(): Boolean {
-        val dayAgo = Date().time / 1000 - 24 * 60 * 60
+        val dayAgo = TimeUtils.oneDayAgo()
         return reports.isNotEmpty() ||
             (
                 author?.reports?.values?.any {
@@ -349,7 +543,14 @@ open class Note(val idHex: String) {
     }
 
     fun isNewThread(): Boolean {
-        return event is RepostEvent || replyTo == null || replyTo?.size == 0
+        return (
+            event is RepostEvent ||
+                event is GenericRepostEvent ||
+                replyTo == null ||
+                replyTo?.size == 0
+            ) &&
+            event !is ChannelMessageEvent &&
+            event !is LiveActivitiesChatMessageEvent
     }
 
     fun hasZapped(loggedIn: User): Boolean {
@@ -361,18 +562,61 @@ open class Note(val idHex: String) {
     }
 
     fun reactedBy(loggedIn: User, content: String): List<Note> {
-        return reactions.filter { it.author == loggedIn && it.event?.content() == content }
+        return reactions[content]?.filter { it.author == loggedIn } ?: emptyList()
+    }
+
+    fun reactedBy(loggedIn: User): List<String> {
+        return reactions.filter { it.value.any { it.author == loggedIn } }.mapNotNull { it.key }
     }
 
     fun hasBoostedInTheLast5Minutes(loggedIn: User): Boolean {
-        val currentTime = Date().time / 1000
-        return boosts.firstOrNull { it.author == loggedIn && (it.createdAt() ?: 0) > currentTime - (60 * 5) } != null // 5 minute protection
+        return boosts.firstOrNull { it.author == loggedIn && (it.createdAt() ?: 0) > TimeUtils.fiveMinutesAgo() } != null // 5 minute protection
     }
 
     fun boostedBy(loggedIn: User): List<Note> {
         return boosts.filter { it.author == loggedIn }
     }
 
+    fun moveAllReferencesTo(note: AddressableNote) {
+        // migrates these comments to a new version
+        replies.forEach {
+            note.addReply(it)
+            it.replyTo = it.replyTo?.updated(this, note)
+        }
+        reactions.forEach {
+            it.value.forEach {
+                note.addReaction(it)
+                it.replyTo = it.replyTo?.updated(this, note)
+            }
+        }
+        boosts.forEach {
+            note.addBoost(it)
+            it.replyTo = it.replyTo?.updated(this, note)
+        }
+        reports.forEach {
+            it.value.forEach {
+                note.addReport(it)
+                it.replyTo = it.replyTo?.updated(this, note)
+            }
+        }
+        zaps.forEach {
+            note.addZap(it.key, it.value)
+            it.key.replyTo = it.key.replyTo?.updated(this, note)
+            it.value?.replyTo = it.value?.replyTo?.updated(this, note)
+        }
+
+        replyTo = null
+        replies = emptyList()
+        reactions = emptyMap()
+        boosts = emptyList()
+        reports = emptyMap()
+        zaps = emptyMap()
+    }
+
+    fun clearEOSE() {
+        lastReactionsDownloadTime = emptyMap()
+    }
+
     var liveSet: NoteLiveSet? = null
 
     fun live(): NoteLiveSet {
@@ -384,15 +628,40 @@ open class Note(val idHex: String) {
 
     fun clearLive() {
         if (liveSet != null && liveSet?.isInUse() == false) {
+            liveSet?.destroy()
             liveSet = null
         }
     }
+
+    fun isHiddenFor(accountChoices: Account.LiveHiddenUsers): Boolean {
+        if (event == null) return false
+
+        val isBoostedNoteHidden = if (event is GenericRepostEvent || event is RepostEvent || event is CommunityPostApprovalEvent) {
+            replyTo?.lastOrNull()?.isHiddenFor(accountChoices) ?: false
+        } else {
+            false
+        }
+
+        val isSensitive = event?.isSensitive() ?: false
+        return isBoostedNoteHidden ||
+            accountChoices.hiddenUsers.contains(author?.pubkeyHex) ||
+            accountChoices.spammers.contains(author?.pubkeyHex) ||
+            (isSensitive && accountChoices.showSensitiveContent == false)
+    }
 }
 
+@Stable
 class NoteLiveSet(u: Note) {
     // Observers line up here.
     val metadata: NoteLiveData = NoteLiveData(u)
 
+    val authorChanges = metadata.map {
+        it.note.author
+    }
+    val hasEvent = metadata.map {
+        it.note.event != null
+    }.distinctUntilChanged()
+
     val reactions: NoteLiveData = NoteLiveData(u)
     val boosts: NoteLiveData = NoteLiveData(u)
     val replies: NoteLiveData = NoteLiveData(u)
@@ -400,6 +669,24 @@ class NoteLiveSet(u: Note) {
     val relays: NoteLiveData = NoteLiveData(u)
     val zaps: NoteLiveData = NoteLiveData(u)
 
+    val hasReactions = zaps.combineWith(boosts, reactions) { zapState, boostState, reactionState ->
+        zapState?.note?.zaps?.isNotEmpty() ?: false ||
+            boostState?.note?.boosts?.isNotEmpty() ?: false ||
+            reactionState?.note?.reactions?.isNotEmpty() ?: false
+    }.distinctUntilChanged()
+
+    val replyCount = replies.map {
+        it.note.replies.size
+    }.distinctUntilChanged()
+
+    val reactionCount = reactions.map {
+        it.note.reactions.values.sumOf { it.size }
+    }.distinctUntilChanged()
+
+    val boostCount = boosts.map {
+        it.note.boosts.size
+    }.distinctUntilChanged()
+
     fun isInUse(): Boolean {
         return metadata.hasObservers() ||
             reactions.hasObservers() ||
@@ -409,17 +696,37 @@ class NoteLiveSet(u: Note) {
             relays.hasObservers() ||
             zaps.hasObservers()
     }
+
+    fun destroy() {
+        metadata.destroy()
+        reactions.destroy()
+        boosts.destroy()
+        replies.destroy()
+        reports.destroy()
+        relays.destroy()
+        zaps.destroy()
+    }
 }
 
 class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.IO)
+    private val bundler = BundledUpdate(500, Dispatchers.IO)
+
+    fun destroy() {
+        bundler.cancel()
+    }
 
     fun invalidateData() {
+        if (!hasObservers()) return
+
+        checkNotInMainThread()
+
         bundler.invalidate() {
-            // if (hasObservers()) {
-            postValue(NoteState(note))
-            // }
+            checkNotInMainThread()
+
+            if (hasActiveObservers()) {
+                postValue(NoteState(note))
+            }
         }
     }
 

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

@@ -0,0 +1,77 @@
+package com.vitorpamplona.amethyst.model
+
+import com.vitorpamplona.quartz.encoders.HexKey
+
+class ParticipantListBuilder {
+    private fun addFollowsThatDirectlyParticipateOnToSet(baseNote: Note, followingSet: Set<HexKey>?, set: MutableSet<User>) {
+        baseNote.author?.let { author ->
+            if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) set.add(author)
+        }
+
+        // Breaks these searchers down to avoid the memory use of creating multiple lists
+        baseNote.replies.forEach { reply ->
+            reply.author?.let { author ->
+                if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) set.add(author)
+            }
+        }
+
+        baseNote.boosts.forEach { boost ->
+            boost.author?.let { author ->
+                if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) set.add(author)
+            }
+        }
+
+        baseNote.zaps.forEach { zapPair ->
+            zapPair.key.author?.let { author ->
+                if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) set.add(author)
+            }
+        }
+
+        baseNote.reactions.forEach { reactionSet ->
+            reactionSet.value.forEach { reaction ->
+                reaction.author?.let { author ->
+                    if (author !in set && (followingSet == null || author.pubkeyHex in followingSet)) set.add(author)
+                }
+            }
+        }
+    }
+
+    fun followsThatParticipateOnDirect(baseNote: Note?, followingSet: Set<HexKey>?): Set<User> {
+        if (baseNote == null) return mutableSetOf()
+
+        val set = mutableSetOf<User>()
+        addFollowsThatDirectlyParticipateOnToSet(baseNote, followingSet, set)
+        return set
+    }
+
+    fun followsThatParticipateOn(baseNote: Note?, followingSet: Set<HexKey>?): Set<User> {
+        if (baseNote == null) return mutableSetOf()
+
+        val mySet = mutableSetOf<User>()
+        addFollowsThatDirectlyParticipateOnToSet(baseNote, followingSet, mySet)
+
+        baseNote.replies.forEach {
+            addFollowsThatDirectlyParticipateOnToSet(it, followingSet, mySet)
+        }
+
+        baseNote.boosts.forEach {
+            it.replyTo?.forEach {
+                addFollowsThatDirectlyParticipateOnToSet(it, followingSet, mySet)
+            }
+        }
+
+        LocalCache.getChannelIfExists(baseNote.idHex)?.notes?.values?.forEach {
+            addFollowsThatDirectlyParticipateOnToSet(it, followingSet, mySet)
+        }
+
+        return mySet
+    }
+
+    fun countFollowsThatParticipateOn(baseNote: Note?, followingSet: Set<HexKey>?): Int {
+        if (baseNote == null) return 0
+
+        val list = followsThatParticipateOn(baseNote, followingSet)
+
+        return list.size
+    }
+}

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

@@ -0,0 +1,60 @@
+package com.vitorpamplona.amethyst.model
+
+import androidx.compose.runtime.Stable
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+
+@Stable
+class RelayInformation(
+    val id: String?,
+    val name: String?,
+    val description: String?,
+    val pubkey: String?,
+    val contact: String?,
+    val supported_nips: List<Int>?,
+    val supported_nip_extensions: List<String>?,
+    val software: String?,
+    val version: String?,
+    val limitation: RelayInformationLimitation?,
+    val relay_countries: List<String>?,
+    val language_tags: List<String>?,
+    val tags: List<String>?,
+    val posting_policy: String?,
+    val payments_url: String?,
+    val fees: RelayInformationFees?
+) {
+    companion object {
+        val mapper = jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+
+        fun fromJson(json: String): RelayInformation = mapper.readValue(json, RelayInformation::class.java)
+    }
+}
+
+@Stable
+class RelayInformationFee(
+    val amount: Int?,
+    val unit: String?,
+    val period: Int?,
+    val kinds: List<Int>?
+)
+
+class RelayInformationFees(
+    val admission: List<RelayInformationFee>?,
+    val subscription: List<RelayInformationFee>?,
+    val publication: List<RelayInformationFee>?,
+    val retention: List<RelayInformationFee>?
+)
+
+class RelayInformationLimitation(
+    val max_message_length: Int?,
+    val max_subscriptions: Int?,
+    val max_filters: Int?,
+    val max_limit: Int?,
+    val max_subid_length: Int?,
+    val min_prefix: Int?,
+    val max_event_tags: Int?,
+    val max_content_length: Int?,
+    val min_pow_difficulty: Int?,
+    val auth_required: Boolean?,
+    val payment_required: Boolean?
+)

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

@@ -12,5 +12,6 @@ data class RelaySetupInfo(
     val downloadCountInBytes: Int = 0,
     val uploadCountInBytes: Int = 0,
     val spamCount: Int = 0,
-    val feedTypes: Set<FeedType>
+    val feedTypes: Set<FeedType>,
+    val paidRelay: Boolean = false
 )

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

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

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

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

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

@@ -1,8 +1,8 @@
 package com.vitorpamplona.amethyst.model
 
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.service.model.ATag
-import kotlin.time.ExperimentalTime
+import com.vitorpamplona.quartz.events.GenericRepostEvent
+import com.vitorpamplona.quartz.events.RepostEvent
 import kotlin.time.measureTimedValue
 
 class ThreadAssembler {
@@ -10,12 +10,19 @@ class ThreadAssembler {
     private fun searchRoot(note: Note, testedNotes: MutableSet<Note> = mutableSetOf()): Note? {
         if (note.replyTo == null || note.replyTo?.isEmpty() == true) return note
 
+        if (note.event is RepostEvent || note.event is GenericRepostEvent) return note
+
         testedNotes.add(note)
 
         val markedAsRoot = note.event?.tags()?.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1)
-        if (markedAsRoot != null) return LocalCache.checkGetOrCreateNote(markedAsRoot)
+        if (markedAsRoot != null) {
+            // Check to ssee if there is an error in the tag and the root has replies
+            if (LocalCache.getNoteIfExists(markedAsRoot)?.replyTo?.isEmpty() == true) {
+                return LocalCache.checkGetOrCreateNote(markedAsRoot)
+            }
+        }
 
-        val hasNoReplyTo = note.replyTo?.firstOrNull { it.replyTo?.isEmpty() == true }
+        val hasNoReplyTo = note.replyTo?.reversed()?.firstOrNull { it.replyTo?.isEmpty() == true }
         if (hasNoReplyTo != null) return hasNoReplyTo
 
         // recursive
@@ -34,21 +41,11 @@ class ThreadAssembler {
         return null
     }
 
-    @OptIn(ExperimentalTime::class)
     fun findThreadFor(noteId: String): Set<Note> {
         checkNotInMainThread()
 
         val (result, elapsed) = measureTimedValue {
-            val note = if (noteId.contains(":")) {
-                val aTag = ATag.parse(noteId, null)
-                if (aTag != null) {
-                    LocalCache.getOrCreateAddressableNote(aTag)
-                } else {
-                    return emptySet()
-                }
-            } else {
-                LocalCache.getOrCreateNote(noteId)
-            }
+            val note = LocalCache.checkGetOrCreateNote(noteId) ?: return emptySet<Note>()
 
             if (note.event != null) {
                 val thread = mutableSetOf<Note>()

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

@@ -1,40 +1,58 @@
 package com.vitorpamplona.amethyst.model
 
-import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import android.util.LruCache
+import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.service.previews.BahaUrlPreview
 import com.vitorpamplona.amethyst.service.previews.IUrlPreviewCallback
 import com.vitorpamplona.amethyst.service.previews.UrlInfoItem
+import com.vitorpamplona.amethyst.ui.components.UrlPreviewState
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
+@Stable
 object UrlCachedPreviewer {
-    var cache = mapOf<String, UrlInfoItem>()
-        private set
-    var failures = mapOf<String, Throwable>()
+    var cache = LruCache<String, UrlPreviewState>(100)
         private set
 
-    fun previewInfo(url: String, callback: IUrlPreviewCallback? = null) {
-        checkNotInMainThread()
-
+    suspend fun previewInfo(
+        url: String,
+        onReady: suspend (UrlPreviewState) -> Unit
+    ) = withContext(Dispatchers.IO) {
         cache[url]?.let {
-            callback?.onComplete(it)
-            return
-        }
-
-        failures[url]?.let {
-            callback?.onFailed(it)
-            return
+            onReady(it)
+            return@withContext
         }
 
         BahaUrlPreview(
             url,
             object : IUrlPreviewCallback {
-                override fun onComplete(urlInfo: UrlInfoItem) {
-                    cache = cache + Pair(url, urlInfo)
-                    callback?.onComplete(urlInfo)
+                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.allFetchComplete() && urlInfo.url == url) {
+                        UrlPreviewState.Loaded(urlInfo)
+                    } else {
+                        UrlPreviewState.Empty
+                    }
+
+                    cache.put(url, state)
+                    onReady(state)
                 }
 
-                override fun onFailed(throwable: Throwable) {
-                    failures = failures + Pair(url, throwable)
-                    callback?.onFailed(throwable)
+                override suspend fun onFailed(throwable: Throwable) = withContext(Dispatchers.IO) {
+                    cache[url]?.let {
+                        onReady(it)
+                        return@withContext
+                    }
+
+                    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

@@ -3,21 +3,29 @@ package com.vitorpamplona.amethyst.model
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.distinctUntilChanged
+import androidx.lifecycle.map
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.service.model.BookmarkListEvent
-import com.vitorpamplona.amethyst.service.model.ContactListEvent
-import com.vitorpamplona.amethyst.service.model.LnZapEvent
-import com.vitorpamplona.amethyst.service.model.MetadataEvent
-import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
-import fr.acinq.secp256k1.Hex
+import com.vitorpamplona.quartz.encoders.Bech32
+import com.vitorpamplona.quartz.encoders.Hex
+import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.toNpub
+import com.vitorpamplona.quartz.events.BookmarkListEvent
+import com.vitorpamplona.quartz.events.ChatroomKey
+import com.vitorpamplona.quartz.events.ContactListEvent
+import com.vitorpamplona.quartz.events.LnZapEvent
+import com.vitorpamplona.quartz.events.MetadataEvent
+import com.vitorpamplona.quartz.events.ReportEvent
+import com.vitorpamplona.quartz.events.UserMetadata
+import com.vitorpamplona.quartz.events.toImmutableListOfLists
+import com.vitorpamplona.quartz.utils.TimeUtils
+import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.coroutines.Dispatchers
-import nostr.postr.Bech32
-import nostr.postr.toNpub
 import java.math.BigDecimal
 import java.util.regex.Pattern
 
@@ -30,9 +38,6 @@ class User(val pubkeyHex: String) {
     var latestContactList: ContactListEvent? = null
     var latestBookmarkList: BookmarkListEvent? = null
 
-    var notes = setOf<Note>()
-        private set
-
     var reports = mapOf<User, Set<Note>>()
         private set
 
@@ -44,18 +49,33 @@ class User(val pubkeyHex: String) {
     var relaysBeingUsed = mapOf<String, RelayInfo>()
         private set
 
-    var privateChatrooms = mapOf<User, Chatroom>()
+    var privateChatrooms = mapOf<ChatroomKey, Chatroom>()
         private set
 
-    var acceptedBadges: AddressableNote? = null
-
     fun pubkey() = Hex.decode(pubkeyHex)
     fun pubkeyNpub() = pubkey().toNpub()
 
     fun pubkeyDisplayHex() = pubkeyNpub().toShortenHex()
 
+    fun toNostrUri() = "nostr:${pubkeyNpub()}"
+
     override fun toString(): String = pubkeyHex
 
+    fun toBestShortFirstName(): String {
+        val fullName = bestDisplayName() ?: bestUsername() ?: return pubkeyDisplayHex()
+
+        val names = fullName.split(' ')
+
+        val firstName = if (names[0].length <= 3) {
+            // too short. Remove Dr.
+            "${names[0]} ${names.getOrNull(1) ?: ""}"
+        } else {
+            names[0]
+        }
+
+        return firstName
+    }
+
     fun toBestDisplayName(): String {
         return bestDisplayName() ?: bestUsername() ?: pubkeyDisplayHex()
     }
@@ -96,30 +116,15 @@ class User(val pubkeyHex: String) {
         // Update Followers of the past user list
         // Update Followers of the new contact list
         (oldContactListEvent)?.unverifiedFollowKeySet()?.forEach {
-            LocalCache.users[it]?.liveSet?.follows?.invalidateData()
+            LocalCache.users[it]?.liveSet?.followers?.invalidateData()
         }
         (latestContactList)?.unverifiedFollowKeySet()?.forEach {
-            LocalCache.users[it]?.liveSet?.follows?.invalidateData()
+            LocalCache.users[it]?.liveSet?.followers?.invalidateData()
         }
 
         liveSet?.relays?.invalidateData()
     }
 
-    fun addNote(note: Note) {
-        if (note !in notes) {
-            notes = notes + note
-            // No need for Listener yet
-        }
-    }
-
-    fun removeNote(note: Note) {
-        notes = notes - note
-    }
-
-    fun clearNotes() {
-        notes = setOf<Note>()
-    }
-
     fun addReport(note: Note) {
         val author = note.author ?: return
 
@@ -143,11 +148,6 @@ class User(val pubkeyHex: String) {
         }
     }
 
-    fun updateAcceptedBadges(note: AddressableNote) {
-        acceptedBadges = note
-        liveSet?.badges?.invalidateData()
-    }
-
     fun addZap(zapRequest: Note, zap: Note?) {
         if (zapRequest !in zaps.keys) {
             zaps = zaps + Pair(zapRequest, zap)
@@ -158,6 +158,16 @@ class User(val pubkeyHex: String) {
         }
     }
 
+    fun removeZap(zapRequestOrZapEvent: Note) {
+        if (zapRequestOrZapEvent in zaps.keys) {
+            zaps = zaps.minus(zapRequestOrZapEvent)
+            liveSet?.zaps?.invalidateData()
+        } else if (zapRequestOrZapEvent in zaps.values) {
+            zaps = zaps.filter { it.value != zapRequestOrZapEvent }
+            liveSet?.zaps?.invalidateData()
+        }
+    }
+
     fun zappedAmount(): BigDecimal {
         return zaps.mapNotNull { it.value?.event }
             .filterIsInstance<LnZapEvent>()
@@ -185,34 +195,51 @@ class User(val pubkeyHex: String) {
     }
 
     @Synchronized
-    private fun getOrCreatePrivateChatroom(user: User): Chatroom {
+    private fun getOrCreatePrivateChatroomSync(key: ChatroomKey): Chatroom {
         checkNotInMainThread()
 
-        return privateChatrooms[user] ?: run {
-            val privateChatroom = Chatroom(setOf<Note>())
-            privateChatrooms = privateChatrooms + Pair(user, privateChatroom)
+        return privateChatrooms[key] ?: run {
+            val privateChatroom = Chatroom()
+            privateChatrooms = privateChatrooms + Pair(key, privateChatroom)
             privateChatroom
         }
     }
 
-    @Synchronized
-    fun addMessage(user: User, msg: Note) {
-        checkNotInMainThread()
+    private fun getOrCreatePrivateChatroom(user: User): Chatroom {
+        val key = ChatroomKey(persistentSetOf(user.pubkeyHex))
+        return getOrCreatePrivateChatroom(key)
+    }
 
-        val privateChatroom = getOrCreatePrivateChatroom(user)
+    private fun getOrCreatePrivateChatroom(key: ChatroomKey): Chatroom {
+        return privateChatrooms[key] ?: getOrCreatePrivateChatroomSync(key)
+    }
+
+    fun addMessage(room: ChatroomKey, msg: Note) {
+        val privateChatroom = getOrCreatePrivateChatroom(room)
         if (msg !in privateChatroom.roomMessages) {
-            privateChatroom.roomMessages = privateChatroom.roomMessages + msg
+            privateChatroom.addMessageSync(msg)
             liveSet?.messages?.invalidateData()
         }
     }
 
-    @Synchronized
+    fun addMessage(user: User, msg: Note) {
+        val privateChatroom = getOrCreatePrivateChatroom(user)
+        if (msg !in privateChatroom.roomMessages) {
+            privateChatroom.addMessageSync(msg)
+            liveSet?.messages?.invalidateData()
+        }
+    }
+
+    fun createChatroom(withKey: ChatroomKey) {
+        getOrCreatePrivateChatroom(withKey)
+    }
+
     fun removeMessage(user: User, msg: Note) {
         checkNotInMainThread()
 
         val privateChatroom = getOrCreatePrivateChatroom(user)
         if (msg in privateChatroom.roomMessages) {
-            privateChatroom.roomMessages = privateChatroom.roomMessages - msg
+            privateChatroom.removeMessageSync(msg)
             liveSet?.messages?.invalidateData()
         }
     }
@@ -235,6 +262,7 @@ class User(val pubkeyHex: String) {
         info = newUserInfo
         info?.latestMetadata = latestMetadata
         info?.updatedMetadataAt = latestMetadata.createdAt
+        info?.tags = latestMetadata.tags.toImmutableListOfLists()
 
         if (newUserInfo.lud16.isNullOrBlank() && newUserInfo.lud06?.lowercase()?.startsWith("lnurl") == true) {
             try {
@@ -269,6 +297,12 @@ class User(val pubkeyHex: String) {
         } ?: false
     }
 
+    fun isFollowingGeohashCached(geoTag: String): Boolean {
+        return latestContactList?.verifiedFollowGeohashSet?.let {
+            return geoTag.lowercase() in it
+        } ?: false
+    }
+
     fun isFollowingCached(user: User): Boolean {
         return latestContactList?.verifiedFollowKeySet?.let {
             return user.pubkeyHex in it
@@ -297,6 +331,14 @@ class User(val pubkeyHex: String) {
         return latestContactList?.verifiedFollowTagSet ?: emptySet()
     }
 
+    fun cachedFollowingGeohashSet(): Set<HexKey> {
+        return latestContactList?.verifiedFollowGeohashSet ?: emptySet()
+    }
+
+    fun cachedFollowingCommunitiesSet(): Set<HexKey> {
+        return latestContactList?.verifiedFollowCommunitySet ?: emptySet()
+    }
+
     fun cachedFollowCount(): Int? {
         return latestContactList?.verifiedFollowKeySet?.size
     }
@@ -305,8 +347,8 @@ class User(val pubkeyHex: String) {
         return LocalCache.users.values.count { it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
     }
 
-    fun hasSentMessagesTo(user: User?): Boolean {
-        val messagesToUser = privateChatrooms[user] ?: return false
+    fun hasSentMessagesTo(key: ChatroomKey?): Boolean {
+        val messagesToUser = privateChatrooms[key] ?: return false
 
         return messagesToUser.roomMessages.any { this.pubkeyHex == it.author?.pubkeyHex }
     }
@@ -332,34 +374,63 @@ class User(val pubkeyHex: String) {
 
     fun clearLive() {
         if (liveSet != null && liveSet?.isInUse() == false) {
+            liveSet?.destroy()
             liveSet = null
         }
     }
 }
 
+@Stable
 class UserLiveSet(u: User) {
     // UI Observers line up here.
     val follows: UserLiveData = UserLiveData(u)
+    val followers: UserLiveData = UserLiveData(u)
     val reports: UserLiveData = UserLiveData(u)
     val messages: UserLiveData = UserLiveData(u)
     val relays: UserLiveData = UserLiveData(u)
     val relayInfo: UserLiveData = UserLiveData(u)
     val metadata: UserLiveData = UserLiveData(u)
     val zaps: UserLiveData = UserLiveData(u)
-    val badges: UserLiveData = UserLiveData(u)
     val bookmarks: UserLiveData = UserLiveData(u)
+    val statuses: UserLiveData = UserLiveData(u)
+
+    val profilePictureChanges = metadata.map {
+        it.user.profilePicture()
+    }.distinctUntilChanged()
+
+    val nip05Changes = metadata.map {
+        it.user.nip05()
+    }.distinctUntilChanged()
+
+    val userMetadataInfo = metadata.map {
+        it.user.info
+    }.distinctUntilChanged()
 
     fun isInUse(): Boolean {
         return follows.hasObservers() ||
+            followers.hasObservers() ||
             reports.hasObservers() ||
             messages.hasObservers() ||
             relays.hasObservers() ||
             relayInfo.hasObservers() ||
             metadata.hasObservers() ||
             zaps.hasObservers() ||
-            badges.hasObservers() ||
+            statuses.hasObservers() ||
             bookmarks.hasObservers()
     }
+
+    fun destroy() {
+        follows.destroy()
+        followers.destroy()
+        reports.destroy()
+        messages.destroy()
+        relays.destroy()
+        relayInfo.destroy()
+        metadata.destroy()
+        zaps.destroy()
+        bookmarks.destroy()
+        statuses.destroy()
+    }
 }
 
 @Immutable
@@ -369,55 +440,78 @@ data class RelayInfo(
     var counter: Long
 )
 
-data class Chatroom(var roomMessages: Set<Note>)
-
 @Stable
-class UserMetadata {
-    var name: String? = null
-    var username: String? = null
-    var display_name: String? = null
-    var displayName: String? = null
-    var picture: String? = null
-    var banner: String? = null
-    var website: String? = null
-    var about: String? = null
+class Chatroom() {
+    var roomMessages: Set<Note> = setOf()
+    var subject: String? = null
+    var subjectCreatedAt: Long? = null
 
-    var nip05: String? = null
-    var nip05Verified: Boolean = false
-    var nip05LastVerificationTime: Long? = 0
+    @Synchronized
+    fun addMessageSync(msg: Note) {
+        checkNotInMainThread()
 
-    var domain: String? = null
-    var lud06: String? = null
-    var lud16: String? = null
+        if (msg !in roomMessages) {
+            roomMessages = roomMessages + msg
 
-    var publish: String? = null
-    var iris: String? = null
-    var main_relay: String? = null
-    var twitter: String? = null
+            val newSubject = msg.event?.subject()
 
-    var updatedMetadataAt: Long = 0
-    var latestMetadata: MetadataEvent? = null
-
-    fun anyName(): String? {
-        return display_name ?: displayName ?: name ?: username
+            if (newSubject != null && (msg.createdAt() ?: 0) > (subjectCreatedAt ?: 0)) {
+                subject = newSubject
+                subjectCreatedAt = msg.createdAt()
+            }
+        }
     }
 
-    fun anyNameStartsWith(prefix: String): Boolean {
-        return listOfNotNull(name, username, display_name, displayName, nip05, lud06, lud16)
-            .any { it.contains(prefix, true) }
+    @Synchronized
+    fun removeMessageSync(msg: Note) {
+        checkNotInMainThread()
+
+        if (msg !in roomMessages) {
+            roomMessages = roomMessages + msg
+
+            roomMessages.filter { it.event?.subject() != null }.sortedBy { it.createdAt() }.lastOrNull()?.let {
+                subject = it.event?.subject()
+                subjectCreatedAt = it.createdAt()
+            }
+        }
     }
 
-    fun lnAddress(): String? {
-        return (lud16?.trim() ?: lud06?.trim())?.ifBlank { null }
+    fun senderIntersects(keySet: Set<HexKey>): Boolean {
+        return roomMessages.any { it.author?.pubkeyHex in keySet }
+    }
+
+    fun pruneMessagesToTheLatestOnly(): Set<Note> {
+        val sorted = roomMessages.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
+
+        val toKeep = if ((sorted.firstOrNull()?.createdAt() ?: 0) > TimeUtils.oneWeekAgo()) {
+            // Recent messages, keep last 100
+            sorted.take(100).toSet()
+        } else {
+            // Old messages, keep the last one.
+            sorted.take(1).toSet()
+        } + sorted.filter { it.liveSet?.isInUse() ?: false }
+
+        val toRemove = roomMessages.minus(toKeep)
+        roomMessages = toKeep
+        return toRemove
     }
 }
 
 class UserLiveData(val user: User) : LiveData<UserState>(UserState(user)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.IO)
+    private val bundler = BundledUpdate(500, Dispatchers.IO)
+
+    fun destroy() {
+        bundler.cancel()
+    }
 
     fun invalidateData() {
+        if (!hasObservers()) return
+        checkNotInMainThread()
+
         bundler.invalidate() {
+            checkNotInMainThread()
+
             if (hasActiveObservers()) {
                 postValue(UserState(user))
             }

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

@@ -49,6 +49,8 @@ object BlurHashDecoder {
      *                 By default it is true.
      */
     fun decode(blurHash: String?, width: Int, height: Int, punch: Float = 1f, useCache: Boolean = true): Bitmap? {
+        checkNotInMainThread()
+
         if (blurHash == null || blurHash.length < 6) {
             return null
         }

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.service
 
 import android.content.Context
 import android.net.Uri
+import androidx.compose.runtime.Stable
 import androidx.core.graphics.drawable.toDrawable
 import coil.ImageLoader
 import coil.decode.DataSource
@@ -14,6 +15,7 @@ import java.net.URLDecoder
 import java.net.URLEncoder
 import kotlin.math.roundToInt
 
+@Stable
 class BlurHashFetcher(
     private val options: Options,
     private val data: Uri

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

@@ -0,0 +1,292 @@
+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.startsWithNIP19Scheme
+import com.vitorpamplona.amethyst.ui.components.tagIndex
+import com.vitorpamplona.amethyst.ui.components.videoExtensions
+import com.vitorpamplona.quartz.events.ImmutableListOfLists
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.ImmutableSet
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.collections.immutable.toImmutableMap
+import kotlinx.collections.immutable.toImmutableSet
+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)
+
+    fun parseText(content: String, tags: ImmutableListOfLists<String>): RichTextViewerState {
+        return if (richTextCache[content] != null) {
+            richTextCache[content]
+        } else {
+            val newUrls = RichTextParser().parseText(content, tags)
+            richTextCache.put(content, newUrls)
+            newUrls
+        }
+    }
+}
+
+// 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 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 ->
+            val removedParamsFromUrl = fullUrl.split("?")[0].lowercase()
+            if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
+                ZoomableUrlImage(fullUrl)
+            } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
+                ZoomableUrlVideo(fullUrl)
+            } else {
+                null
+            }
+        }.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> {
+        var paragraphSegments = persistentListOf<ParagraphState>()
+
+        content.split('\n').forEach { paragraph ->
+            var segments = persistentListOf<Segment>()
+            var isDirty = false
+
+            val isRTL = isArabic(paragraph)
+
+            val wordList = paragraph.trimEnd().split(' ')
+            wordList.forEach { word ->
+                val wordSegment = wordIdentifier(word, images, urls, emojis, tags)
+                if (wordSegment !is RegularTextSegment) {
+                    isDirty = true
+                }
+                segments = segments.add(wordSegment)
+            }
+
+            val newSegments = if (isDirty) {
+                ParagraphState(segments, isRTL)
+            } else {
+                ParagraphState(persistentListOf<Segment>(RegularTextSegment(paragraph)), isRTL)
+            }
+
+            paragraphSegments = paragraphSegments.add(newSegments)
+        }
+
+        return paragraphSegments
+    }
+
+    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) {
+            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) {
+            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)

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

@@ -0,0 +1,100 @@
+package com.vitorpamplona.amethyst.service
+
+import androidx.compose.runtime.Immutable
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
+import com.vitorpamplona.amethyst.ui.components.GenericLoadable
+import com.vitorpamplona.quartz.events.Event
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import java.util.Base64
+
+@Immutable
+data class CashuToken(
+    val token: String,
+    val mint: String,
+    val totalAmount: Long,
+    val fees: Int,
+    val redeemInvoiceAmount: Long,
+    val proofs: JsonNode
+)
+
+class CashuProcessor {
+    fun parse(cashuToken: String): GenericLoadable<CashuToken> {
+        checkNotInMainThread()
+
+        try {
+            val base64token = cashuToken.replace("cashuA", "")
+            val cashu = jacksonObjectMapper().readTree(String(Base64.getDecoder().decode(base64token)))
+            val token = cashu.get("token").get(0)
+            val proofs = token.get("proofs")
+            val mint = token.get("mint").asText()
+
+            var totalAmount = 0L
+            for (proof in proofs) {
+                totalAmount += proof.get("amount").asLong()
+            }
+            val fees = Math.max(((totalAmount * 0.02).toInt()), 2)
+            val redeemInvoiceAmount = totalAmount - fees
+
+            return GenericLoadable.Loaded(CashuToken(cashuToken, mint, totalAmount, fees, redeemInvoiceAmount, proofs))
+        } catch (e: Exception) {
+            return GenericLoadable.Error<CashuToken>("Could not parse this cashu token")
+        }
+    }
+
+    suspend fun melt(token: CashuToken, lud16: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        checkNotInMainThread()
+
+        runCatching {
+            LightningAddressResolver().lnAddressInvoice(
+                lnaddress = lud16,
+                milliSats = token.redeemInvoiceAmount * 1000, // Make invoice and leave room for fees
+                message = "Redeem Cashu",
+                onSuccess = { invoice ->
+                    meltInvoice(token, invoice, onSuccess, onError)
+                },
+                onProgress = {
+                },
+                onError = onError
+            )
+        }
+    }
+
+    private fun meltInvoice(token: CashuToken, invoice: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        try {
+            val client = HttpClient.getHttpClient()
+            val url = token.mint + "/melt" // Melt cashu tokens at Mint
+
+            val factory = Event.mapper.nodeFactory
+
+            val jsonObject = factory.objectNode()
+            jsonObject.put("proofs", token.proofs)
+            jsonObject.put("pr", invoice)
+
+            val mediaType = "application/json; charset=utf-8".toMediaType()
+            val requestBody = jsonObject.toString().toRequestBody(mediaType)
+            val request = Request.Builder()
+                .url(url)
+                .post(requestBody)
+                .build()
+
+            client.newCall(request).execute().use {
+                val body = it.body.string()
+                val tree = jacksonObjectMapper().readTree(body)
+
+                val successful = tree?.get("paid")?.asText() == "true"
+
+                if (successful) {
+                    onSuccess("Redeemed ${token.totalAmount} Sats" + " (Fees: ${token.fees} Sats)")
+                } else {
+                    onError(tree?.get("detail")?.asText()?.split('.')?.getOrNull(0) ?: "Cashu: Tokens already spent.")
+                }
+            }
+        } catch (e: Exception) {
+            onError("Token melt failure: " + e.message)
+        }
+    }
+}

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

@@ -0,0 +1,107 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.quartz.events.ImmutableListOfLists
+
+fun String.isUTF16Char(pos: Int): Boolean {
+    return Character.charCount(this.codePointAt(pos)) == 2
+}
+
+fun String.firstFullCharOld(): String {
+    return when (this.length) {
+        0, 1 -> return this
+        2, 3 -> return if (isUTF16Char(0)) this.take(2) else this.take(1)
+        else -> {
+            val first = isUTF16Char(0)
+            val second = isUTF16Char(2)
+            if (first && second) {
+                this.take(4)
+            } else if (first) {
+                this.take(2)
+            } else {
+                this.take(1)
+            }
+        }
+    }
+}
+
+fun String.firstFullChar(): String {
+    var isInJoin = false
+    var hasHadSecondChance = false
+    var start = 0
+    var previousCharLength = 0
+    var next: Int
+    var codePoint: Int
+
+    var i = 0
+
+    while (i < this.length) {
+        codePoint = codePointAt(i)
+
+        // Skips if it starts with the join char 0x200D
+        if (codePoint == 0x200D && previousCharLength == 0) {
+            next = offsetByCodePoints(i, 1)
+            start = next
+        } else {
+            // If join, searches for the next char
+            if (codePoint == 0xFE0F) {
+            } else if (codePoint == 0x200D) {
+                isInJoin = true
+            } else {
+                // stops when two chars are not joined together
+                if (previousCharLength > 0 && !isInJoin) {
+                    if (Character.charCount(codePoint) == 1 || hasHadSecondChance) {
+                        break
+                    } else {
+                        hasHadSecondChance = true
+                    }
+                } else {
+                    hasHadSecondChance = false
+                }
+
+                isInJoin = false
+            }
+
+            // next char to evaluate
+            next = offsetByCodePoints(i, 1)
+            previousCharLength += (next - i)
+        }
+
+        i = next
+    }
+
+    // if ends in join, then seachers backwards until a char is found.
+    if (isInJoin) {
+        i = previousCharLength - 1
+        while (i > 0) {
+            if (this[i].code == 0x200D) {
+                previousCharLength -= 1
+            } else {
+                break
+            }
+
+            i -= 1
+        }
+    }
+
+    return substring(start, start + previousCharLength)
+}
+
+fun String.firstFullCharOrEmoji(tags: ImmutableListOfLists<String>): String {
+    if (length <= 2) {
+        return firstFullChar()
+    }
+
+    if (this[0] == ':') {
+        // makes sure an emoji exists
+        val emojiParts = this.split(":", limit = 3)
+        if (emojiParts.size >= 2) {
+            val emojiName = emojiParts[1]
+            val emojiUrl = tags.lists.firstOrNull() { it.size > 1 && it[1] == emojiName }?.getOrNull(2)
+            if (emojiUrl != null) {
+                return ":$emojiName:$emojiUrl"
+            }
+        }
+    }
+
+    return firstFullChar()
+}

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

@@ -3,10 +3,10 @@ package com.vitorpamplona.amethyst.service
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.util.Log
-import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.ui.actions.ImageDownloader
+import com.vitorpamplona.quartz.crypto.CryptoUtils
+import com.vitorpamplona.quartz.encoders.toHexKey
 import io.trbl.blurhash.BlurHash
-import java.security.MessageDigest
 import kotlin.math.roundToInt
 
 class FileHeader(
@@ -16,15 +16,16 @@ class FileHeader(
     val size: Int,
     val dim: String?,
     val blurHash: String?,
-    val description: String? = null
+    val description: String? = null,
+    val sensitiveContent: Boolean = false
 ) {
     companion object {
-        suspend fun prepare(fileUrl: String, mimeType: String?, description: String?, onReady: (FileHeader) -> Unit, onError: () -> Unit) {
+        suspend fun prepare(fileUrl: String, mimeType: String?, description: String?, sensitiveContent: Boolean, onReady: (FileHeader) -> Unit, onError: () -> Unit) {
             try {
                 val imageData: ByteArray? = ImageDownloader().waitAndGetImage(fileUrl)
 
                 if (imageData != null) {
-                    prepare(imageData, fileUrl, mimeType, description, onReady, onError)
+                    prepare(imageData, fileUrl, mimeType, description, sensitiveContent, onReady, onError)
                 } else {
                     onError()
                 }
@@ -39,13 +40,12 @@ class FileHeader(
             fileUrl: String,
             mimeType: String?,
             description: String?,
+            sensitiveContent: Boolean,
             onReady: (FileHeader) -> Unit,
             onError: () -> Unit
         ) {
             try {
-                val sha256 = MessageDigest.getInstance("SHA-256")
-
-                val hash = sha256.digest(data).toHexKey()
+                val hash = CryptoUtils.sha256(data).toHexKey()
                 val size = data.size
 
                 val (blurHash, dim) = if (mimeType?.startsWith("image/") == true) {
@@ -79,7 +79,7 @@ class FileHeader(
                     Pair(null, null)
                 }
 
-                onReady(FileHeader(fileUrl, mimeType, hash, size, dim, blurHash, description))
+                onReady(FileHeader(fileUrl, mimeType, hash, size, dim, blurHash, description, sensitiveContent))
             } catch (e: Exception) {
                 Log.e("ImageDownload", "Couldn't convert image in to File Header: ${e.message}")
                 onError()

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

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

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

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

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

@@ -1,7 +1,9 @@
 package com.vitorpamplona.amethyst.service
 
+import androidx.compose.runtime.Immutable
 import java.util.regex.Pattern
 
+@Immutable
 class NIP30Parser {
     val customEmojiPattern: Pattern = Pattern.compile("\\:([A-Za-z0-9_\\-]+)\\:", Pattern.CASE_INSENSITIVE)
 
@@ -18,7 +20,7 @@ class NIP30Parser {
 
         val regularChars = input.split(customEmojiPattern.toRegex())
 
-        var finalList = mutableListOf<String>()
+        val finalList = mutableListOf<String>()
         var index = 0
         for (e in regularChars) {
             finalList.add(e)

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

@@ -2,10 +2,7 @@ package com.vitorpamplona.amethyst.service
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import okhttp3.Call
 import okhttp3.Callback
@@ -13,73 +10,69 @@ import okhttp3.Request
 import okhttp3.Response
 
 class Nip05Verifier() {
-    val client = HttpClient.getHttpClient()
-
     fun assembleUrl(nip05address: String): String? {
         val parts = nip05address.trim().split("@")
 
         if (parts.size == 2) {
             return "https://${parts[1]}/.well-known/nostr.json?name=${parts[0]}"
         }
+        if (parts.size == 1) {
+            return "https://${parts[0]}/.well-known/nostr.json?name=_"
+        }
 
         return null
     }
 
-    fun fetchNip05Json(nip05address: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-        val scope = CoroutineScope(Job() + Dispatchers.IO)
-        scope.launch {
-            fetchNip05JsonSuspend(nip05address, onSuccess, onError)
-        }
-    }
-
-    private suspend fun fetchNip05JsonSuspend(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-        // checkNotInMainThread()
+    suspend fun fetchNip05Json(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) = withContext(Dispatchers.IO) {
+        checkNotInMainThread()
 
         val url = assembleUrl(nip05)
 
         if (url == null) {
             onError("Could not assemble url from Nip05: \"${nip05}\". Check the user's setup")
-            return
+            return@withContext
         }
 
-        withContext(Dispatchers.IO) {
-            try {
-                val request = Request.Builder()
-                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-                    .url(url)
-                    .build()
+        try {
+            val request = Request.Builder()
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                .url(url)
+                .build()
 
-                client.newCall(request).enqueue(object : Callback {
-                    override fun onResponse(call: Call, response: Response) {
-                        response.use {
-                            if (it.isSuccessful) {
-                                onSuccess(it.body.string())
-                            } else {
-                                onError("Could not resolve $nip05. Error: ${it.code}. Check if the server up and if the address $nip05 is correct")
-                            }
+            HttpClient.getHttpClient().newCall(request).enqueue(object : Callback {
+                override fun onResponse(call: Call, response: Response) {
+                    checkNotInMainThread()
+
+                    response.use {
+                        if (it.isSuccessful) {
+                            onSuccess(it.body.string())
+                        } else {
+                            onError("Could not resolve $nip05. Error: ${it.code}. Check if the server up and if the address $nip05 is correct")
                         }
                     }
+                }
 
-                    override fun onFailure(call: Call, e: java.io.IOException) {
-                        onError("Could not resolve $url. Check if the server up and if the address $nip05 is correct")
-                        e.printStackTrace()
-                    }
-                })
-            } catch (e: java.lang.Exception) {
-                onError("Could not resolve '$url': ${e.message}")
-            }
+                override fun onFailure(call: Call, e: java.io.IOException) {
+                    onError("Could not resolve $url. Check if the server up and if the address $nip05 is correct")
+                    e.printStackTrace()
+                }
+            })
+        } catch (e: java.lang.Exception) {
+            onError("Could not resolve '$url': ${e.message}")
         }
     }
 
-    fun verifyNip05(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    suspend fun verifyNip05(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
         // check fails on tests
-        // checkNotInMainThread()
+        checkNotInMainThread()
 
         val mapper = jacksonObjectMapper()
 
         fetchNip05Json(
             nip05,
             onSuccess = {
+                checkNotInMainThread()
+
                 // NIP05 usernames are case insensitive, but JSON properties are not
                 // converts the json to lowercase and then tries to access the username via a
                 // lowercase version of the username.
@@ -90,7 +83,12 @@ class Nip05Verifier() {
                     null
                 }
 
-                val user = nip05.split("@")[0].lowercase()
+                val parts = nip05.split("@")
+                val user = if (parts.size == 2) {
+                    parts[0].lowercase()
+                } else {
+                    "_"
+                }
 
                 val hexKey = nip05url?.get("names")?.get(user)?.asText()
 

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

@@ -1,11 +1,9 @@
 package com.vitorpamplona.amethyst.ui.note
 
 import android.net.Uri
-import com.vitorpamplona.amethyst.model.HexKey
-import com.vitorpamplona.amethyst.model.decodePublicKey
-import com.vitorpamplona.amethyst.model.toHexKey
-
-data class Nip47URI(val pubKeyHex: HexKey, val relayUri: String?, val secret: HexKey?)
+import com.vitorpamplona.amethyst.model.Nip47URI
+import com.vitorpamplona.quartz.encoders.decodePublicKey
+import com.vitorpamplona.quartz.encoders.toHexKey
 
 // Rename to the corect nip number when ready.
 object Nip47 {

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

@@ -1,24 +1,25 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.service.model.*
-import com.vitorpamplona.amethyst.service.model.BadgeAwardEvent
-import com.vitorpamplona.amethyst.service.model.BadgeProfilesEvent
-import com.vitorpamplona.amethyst.service.model.BookmarkListEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.model.ContactListEvent
-import com.vitorpamplona.amethyst.service.model.LnZapEvent
-import com.vitorpamplona.amethyst.service.model.MetadataEvent
-import com.vitorpamplona.amethyst.service.model.ReactionEvent
-import com.vitorpamplona.amethyst.service.model.ReportEvent
-import com.vitorpamplona.amethyst.service.model.RepostEvent
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.quartz.events.*
+import com.vitorpamplona.quartz.events.BadgeAwardEvent
+import com.vitorpamplona.quartz.events.BadgeProfilesEvent
+import com.vitorpamplona.quartz.events.BookmarkListEvent
+import com.vitorpamplona.quartz.events.ChannelMessageEvent
+import com.vitorpamplona.quartz.events.ContactListEvent
+import com.vitorpamplona.quartz.events.LnZapEvent
+import com.vitorpamplona.quartz.events.MetadataEvent
+import com.vitorpamplona.quartz.events.ReactionEvent
+import com.vitorpamplona.quartz.events.ReportEvent
+import com.vitorpamplona.quartz.events.RepostEvent
+import com.vitorpamplona.quartz.events.TextNoteEvent
 
 object NostrAccountDataSource : NostrDataSource("AccountData") {
     lateinit var account: Account
@@ -47,13 +48,24 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
         )
     }
 
+    fun createAccountRelayListFilter(): TypedFilter {
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter = JsonFilter(
+                kinds = listOf(AdvertisedRelayListEvent.kind, StatusEvent.kind),
+                authors = listOf(account.userProfile().pubkeyHex),
+                limit = 5
+            )
+        )
+    }
+
     fun createAccountAcceptedAwardsFilter(): TypedFilter {
         return TypedFilter(
             types = COMMON_FEED_TYPES,
             filter = JsonFilter(
-                kinds = listOf(BadgeProfilesEvent.kind),
+                kinds = listOf(BadgeProfilesEvent.kind, EmojiPackSelectionEvent.kind),
                 authors = listOf(account.userProfile().pubkeyHex),
-                limit = 1
+                limit = 10
             )
         )
     }
@@ -80,6 +92,16 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
         )
     }
 
+    fun createAccountLastPostsListFilter(): TypedFilter {
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter = JsonFilter(
+                authors = listOf(account.userProfile().pubkeyHex),
+                limit = 400
+            )
+        )
+    }
+
     fun createNotificationFilter() = TypedFilter(
         types = COMMON_FEED_TYPES,
         filter = JsonFilter(
@@ -88,6 +110,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                 PollNoteEvent.kind,
                 ReactionEvent.kind,
                 RepostEvent.kind,
+                GenericRepostEvent.kind,
                 ReportEvent.kind,
                 LnZapEvent.kind,
                 LnZapPaymentResponseEvent.kind,
@@ -100,19 +123,56 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
         )
     )
 
+    fun createGiftWrapsToMeFilter() = TypedFilter(
+        types = COMMON_FEED_TYPES,
+        filter = JsonFilter(
+            kinds = listOf(GiftWrapEvent.kind),
+            tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
+        )
+    )
+
     val accountChannel = requestNewChannel { time, relayUrl ->
         latestEOSEs.addOrUpdate(account.userProfile(), account.defaultNotificationFollowList, relayUrl, time)
     }
 
+    override fun consume(event: Event, relay: Relay) {
+        if (LocalCache.justVerify(event)) {
+            if (event is GiftWrapEvent) {
+                val privateKey = account.keyPair.privKey
+                if (privateKey != null) {
+                    event.cachedGift(privateKey)?.let {
+                        this.consume(it, relay)
+                    }
+                }
+            }
+
+            if (event is SealedGossipEvent) {
+                val privateKey = account.keyPair.privKey
+                if (privateKey != null) {
+                    event.cachedGossip(privateKey)?.let {
+                        LocalCache.justConsume(it, relay)
+                    }
+                }
+
+                // Don't store sealed gossips to avoid rebroadcasting by mistake.
+            } else {
+                LocalCache.justConsume(event, relay)
+            }
+        }
+    }
+
     override fun updateChannelFilters() {
         // gets everthing about the user logged in
         accountChannel.typedFilters = listOf(
             createAccountMetadataFilter(),
             createAccountContactListFilter(),
+            createAccountRelayListFilter(),
             createNotificationFilter(),
+            createGiftWrapsToMeFilter(),
             createAccountReportsFilter(),
             createAccountAcceptedAwardsFilter(),
-            createAccountBookmarkListFilter()
+            createAccountBookmarkListFilter(),
+            createAccountLastPostsListFilter()
         ).ifEmpty { null }
     }
 

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

@@ -2,10 +2,13 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.model.LiveActivitiesChannel
+import com.vitorpamplona.amethyst.model.PublicChatChannel
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.quartz.events.ChannelMessageEvent
+import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
 
 object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
     var account: Account? = null
@@ -25,7 +28,7 @@ object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
     fun createMessagesByMeToChannelFilter(): TypedFilter? {
         val myAccount = account ?: return null
 
-        if (channel != null) {
+        if (channel is PublicChatChannel) {
             // Brings on messages by the user from all other relays.
             // Since we ship with write to public, read from private only
             // this guarantees that messages from the author do not disappear.
@@ -37,12 +40,24 @@ object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
                     limit = 50
                 )
             )
+        } else if (channel is LiveActivitiesChannel) {
+            // Brings on messages by the user from all other relays.
+            // Since we ship with write to public, read from private only
+            // this guarantees that messages from the author do not disappear.
+            return TypedFilter(
+                types = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS, FeedType.GLOBAL, FeedType.SEARCH),
+                filter = JsonFilter(
+                    kinds = listOf(LiveActivitiesChatMessageEvent.kind),
+                    authors = listOf(myAccount.userProfile().pubkeyHex),
+                    limit = 50
+                )
+            )
         }
         return null
     }
 
     fun createMessagesToChannelFilter(): TypedFilter? {
-        if (channel != null) {
+        if (channel is PublicChatChannel) {
             return TypedFilter(
                 types = setOf(FeedType.PUBLIC_CHATS),
                 filter = JsonFilter(
@@ -51,6 +66,15 @@ object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
                     limit = 200
                 )
             )
+        } else if (channel is LiveActivitiesChannel) {
+            return TypedFilter(
+                types = setOf(FeedType.PUBLIC_CHATS),
+                filter = JsonFilter(
+                    kinds = listOf(LiveActivitiesChatMessageEvent.kind),
+                    tags = mapOf("a" to listOfNotNull(channel?.idHex)),
+                    limit = 200
+                )
+            )
         }
         return null
     }

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

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

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

@@ -1,15 +1,15 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
-import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.quartz.events.ChannelCreateEvent
+import com.vitorpamplona.quartz.events.ChannelMessageEvent
+import com.vitorpamplona.quartz.events.ChannelMetadataEvent
+import com.vitorpamplona.quartz.events.PrivateDmEvent
 
 object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
     lateinit var account: Account
@@ -44,17 +44,23 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
         )
     )
 
-    fun createMyChannelsFilter() = TypedFilter(
-        types = COMMON_FEED_TYPES, // Metadata comes from any relay
-        filter = JsonFilter(
-            kinds = listOf(ChannelCreateEvent.kind),
-            ids = account.followingChannels.toList(),
-            since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList
-        )
-    )
+    fun createMyChannelsFilter(): TypedFilter {
+        val followingEvents = account.selectedChatsFollowList()
 
-    fun createLastChannelInfoFilter(): List<TypedFilter> {
-        return account.followingChannels.map {
+        return TypedFilter(
+            types = COMMON_FEED_TYPES, // Metadata comes from any relay
+            filter = JsonFilter(
+                kinds = listOf(ChannelCreateEvent.kind),
+                ids = followingEvents.toList(),
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList
+            )
+        )
+    }
+
+    fun createLastChannelInfoFilter(): List<TypedFilter>? {
+        val followingEvents = account.selectedChatsFollowList()
+
+        return followingEvents.map {
             TypedFilter(
                 types = COMMON_FEED_TYPES, // Metadata comes from any relay
                 filter = JsonFilter(
@@ -66,15 +72,17 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
         }
     }
 
-    fun createLastMessageOfEachChannelFilter(): List<TypedFilter> {
-        return account.followingChannels.map {
+    fun createLastMessageOfEachChannelFilter(): List<TypedFilter>? {
+        val followingEvents = account.selectedChatsFollowList()
+
+        return followingEvents.map {
             TypedFilter(
                 types = setOf(FeedType.PUBLIC_CHATS),
                 filter = JsonFilter(
                     kinds = listOf(ChannelMessageEvent.kind),
                     tags = mapOf("e" to listOf(it)),
                     since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList,
-                    limit = 25 // Remember to consider spam that is being removed from the UI
+                    limit = 50 // Remember to consider spam that is being removed from the UI
                 )
             )
         }

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

@@ -0,0 +1,41 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
+import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
+
+object NostrCommunityDataSource : NostrDataSource("SingleCommunityFeed") {
+    private var communityToWatch: AddressableNote? = null
+
+    private fun createLoadCommunityFilter(): TypedFilter? {
+        val myCommunityToWatch = communityToWatch ?: return null
+
+        val community = myCommunityToWatch.event as? CommunityDefinitionEvent ?: return null
+
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter = JsonFilter(
+                authors = community.moderators().map { it.key }.plus(listOfNotNull(myCommunityToWatch.author?.pubkeyHex)),
+                tags = mapOf(
+                    "a" to listOf(myCommunityToWatch.address.toTag())
+                ),
+                kinds = listOf(CommunityPostApprovalEvent.kind),
+                limit = 500
+            )
+        )
+    }
+
+    val loadCommunityChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        loadCommunityChannel.typedFilters = listOfNotNull(createLoadCommunityFilter()).ifEmpty { null }
+    }
+
+    fun loadCommunity(note: AddressableNote?) {
+        communityToWatch = note
+        invalidateFilters()
+    }
+}

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

@@ -2,21 +2,23 @@ package com.vitorpamplona.amethyst.service
 
 import android.util.Log
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.service.model.*
-import com.vitorpamplona.amethyst.service.model.Event
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.service.relays.Subscription
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
+import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.utils.TimeUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
-import java.util.Date
 import java.util.UUID
 import kotlin.Error
 
 abstract class NostrDataSource(val debugName: String) {
+    private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+
     private var subscriptions = mapOf<String, Subscription>()
     data class Counter(var counter: Int)
 
@@ -39,7 +41,7 @@ abstract class NostrDataSource(val debugName: String) {
                     eventCounter = eventCounter + Pair(key, Counter(1))
                 }
 
-                LocalCache.verifyAndConsume(event, relay)
+                consume(event, relay)
             }
         }
 
@@ -57,7 +59,7 @@ abstract class NostrDataSource(val debugName: String) {
 
             if (type == Relay.Type.EOSE && channel != null) {
                 // updates a per subscripton since date
-                subscriptions[channel]?.updateEOSE(Date().time / 1000, relay.url)
+                subscriptions[channel]?.updateEOSE(TimeUtils.now(), relay.url)
             }
         }
 
@@ -70,12 +72,15 @@ abstract class NostrDataSource(val debugName: String) {
     }
 
     init {
+        Log.d("Init", "${this.javaClass.simpleName} Subscribe")
         Client.subscribe(clientListener)
     }
 
     fun destroy() {
         stop()
         Client.unsubscribe(clientListener)
+        scope.cancel()
+        bundler.cancel()
     }
 
     open fun start() {
@@ -106,18 +111,19 @@ abstract class NostrDataSource(val debugName: String) {
     private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateFilters() {
-        bundler.invalidate() {
-            // println("DataSource: ${this.javaClass.simpleName} InvalidateFilters")
+        scope.launch(Dispatchers.IO) {
+            bundler.invalidate() {
+                // println("DataSource: ${this.javaClass.simpleName} InvalidateFilters")
 
-            // adds the time to perform the refresh into this delay
-            // holding off new updates in case of heavy refresh routines.
-            resetFiltersSuspend()
+                // adds the time to perform the refresh into this delay
+                // holding off new updates in case of heavy refresh routines.
+                resetFiltersSuspend()
+            }
         }
     }
 
     fun resetFilters() {
-        val scope = CoroutineScope(Job() + Dispatchers.IO)
-        scope.launch {
+        scope.launch(Dispatchers.IO) {
             resetFiltersSuspend()
         }
     }
@@ -163,6 +169,10 @@ abstract class NostrDataSource(val debugName: String) {
         }
     }
 
+    open fun consume(event: Event, relay: Relay) {
+        LocalCache.verifyAndConsume(event, relay)
+    }
+
     abstract fun updateChannelFilters()
     open fun auth(relay: Relay, challenge: String) = Unit
 }

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

@@ -0,0 +1,212 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.service.relays.EOSEAccount
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.quartz.events.ChannelCreateEvent
+import com.vitorpamplona.quartz.events.ChannelMessageEvent
+import com.vitorpamplona.quartz.events.ChannelMetadataEvent
+import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
+import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
+import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.quartz.events.LiveActivitiesEvent
+
+object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
+    lateinit var account: Account
+
+    val latestEOSEs = EOSEAccount()
+
+    fun createLiveStreamFilter(): TypedFilter {
+        val follows = account.selectedUsersFollowList(account.defaultDiscoveryFollowList)
+
+        val followKeys = follows?.map {
+            it.substring(0, 8)
+        }
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter = JsonFilter(
+                authors = followKeys,
+                kinds = listOf(LiveActivitiesChatMessageEvent.kind, LiveActivitiesEvent.kind),
+                limit = 300,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+            )
+        )
+    }
+
+    fun createPublicChatFilter(): TypedFilter {
+        val follows = account.selectedUsersFollowList(account.defaultDiscoveryFollowList)
+
+        val followKeys = follows?.map {
+            it.substring(0, 8)
+        }
+
+        return TypedFilter(
+            types = setOf(FeedType.PUBLIC_CHATS),
+            filter = JsonFilter(
+                authors = followKeys,
+                kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind, ChannelMessageEvent.kind),
+                limit = 300,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+            )
+        )
+    }
+
+    fun createCommunitiesFilter(): TypedFilter {
+        val follows = account.selectedUsersFollowList(account.defaultDiscoveryFollowList)
+
+        val followKeys = follows?.map {
+            it.substring(0, 8)
+        }
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter = JsonFilter(
+                authors = followKeys,
+                kinds = listOf(CommunityDefinitionEvent.kind, CommunityPostApprovalEvent.kind),
+                limit = 300,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+            )
+        )
+    }
+
+    fun createLiveStreamTagsFilter(): TypedFilter? {
+        val hashToLoad = account.selectedTagsFollowList(account.defaultDiscoveryFollowList)
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter = JsonFilter(
+                kinds = listOf(LiveActivitiesChatMessageEvent.kind, LiveActivitiesEvent.kind),
+                tags = mapOf(
+                    "t" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 300,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+            )
+        )
+    }
+
+    fun createLiveStreamGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultDiscoveryFollowList)
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter = JsonFilter(
+                kinds = listOf(LiveActivitiesChatMessageEvent.kind, LiveActivitiesEvent.kind),
+                tags = mapOf(
+                    "g" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 300,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+            )
+        )
+    }
+
+    fun createPublicChatsTagsFilter(): TypedFilter? {
+        val hashToLoad = account.selectedTagsFollowList(account.defaultDiscoveryFollowList)
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.PUBLIC_CHATS),
+            filter = JsonFilter(
+                kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind, ChannelMessageEvent.kind),
+                tags = mapOf(
+                    "t" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 300,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+            )
+        )
+    }
+
+    fun createPublicChatsGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultDiscoveryFollowList)
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.PUBLIC_CHATS),
+            filter = JsonFilter(
+                kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind, ChannelMessageEvent.kind),
+                tags = mapOf(
+                    "g" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 300,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+            )
+        )
+    }
+
+    fun createCommunitiesTagsFilter(): TypedFilter? {
+        val hashToLoad = account.selectedTagsFollowList(account.defaultDiscoveryFollowList)
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter = JsonFilter(
+                kinds = listOf(CommunityDefinitionEvent.kind, CommunityPostApprovalEvent.kind),
+                tags = mapOf(
+                    "t" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 300,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+            )
+        )
+    }
+
+    fun createCommunitiesGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultDiscoveryFollowList)
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter = JsonFilter(
+                kinds = listOf(CommunityDefinitionEvent.kind, CommunityPostApprovalEvent.kind),
+                tags = mapOf(
+                    "g" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 300,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+            )
+        )
+    }
+
+    val discoveryFeedChannel = requestNewChannel() { time, relayUrl ->
+        latestEOSEs.addOrUpdate(account.userProfile(), account.defaultDiscoveryFollowList, relayUrl, time)
+    }
+
+    override fun updateChannelFilters() {
+        discoveryFeedChannel.typedFilters = listOfNotNull(
+            createLiveStreamFilter(),
+            createPublicChatFilter(),
+            createCommunitiesFilter(),
+            createLiveStreamTagsFilter(),
+            createPublicChatsTagsFilter(),
+            createCommunitiesTagsFilter(),
+            createCommunitiesGeohashesFilter(),
+            createPublicChatsGeohashesFilter(),
+            createLiveStreamGeohashesFilter()
+        ).ifEmpty { null }
+    }
+}

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

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

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

@@ -1,28 +0,0 @@
-package com.vitorpamplona.amethyst.service
-
-import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.model.HighlightEvent
-import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
-import com.vitorpamplona.amethyst.service.model.PinListEvent
-import com.vitorpamplona.amethyst.service.model.PollNoteEvent
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
-import com.vitorpamplona.amethyst.service.relays.FeedType
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
-
-object NostrGlobalDataSource : NostrDataSource("GlobalFeed") {
-    fun createGlobalFilter() = TypedFilter(
-        types = setOf(FeedType.GLOBAL),
-        filter = JsonFilter(
-            kinds = listOf(TextNoteEvent.kind, PollNoteEvent.kind, ChannelMessageEvent.kind, AudioTrackEvent.kind, PinListEvent.kind, LongTextNoteEvent.kind, HighlightEvent.kind),
-            limit = 200
-        )
-    )
-
-    val globalFeedChannel = requestNewChannel()
-
-    override fun updateChannelFilters() {
-        globalFeedChannel.typedFilters = listOf(createGlobalFilter()).ifEmpty { null }
-    }
-}

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

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

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

@@ -2,16 +2,23 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.UserState
-import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
-import com.vitorpamplona.amethyst.service.model.HighlightEvent
-import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
-import com.vitorpamplona.amethyst.service.model.PinListEvent
-import com.vitorpamplona.amethyst.service.model.PollNoteEvent
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.quartz.events.AudioHeaderEvent
+import com.vitorpamplona.quartz.events.AudioTrackEvent
+import com.vitorpamplona.quartz.events.ClassifiedsEvent
+import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
+import com.vitorpamplona.quartz.events.GenericRepostEvent
+import com.vitorpamplona.quartz.events.HighlightEvent
+import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.quartz.events.LiveActivitiesEvent
+import com.vitorpamplona.quartz.events.LongTextNoteEvent
+import com.vitorpamplona.quartz.events.PinListEvent
+import com.vitorpamplona.quartz.events.PollNoteEvent
+import com.vitorpamplona.quartz.events.RepostEvent
+import com.vitorpamplona.quartz.events.TextNoteEvent
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -47,18 +54,31 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
     }
 
     fun createFollowAccountsFilter(): TypedFilter {
-        val follows = account.selectedUsersFollowList(account.defaultHomeFollowList) ?: emptySet()
+        val follows = account.selectedUsersFollowList(account.defaultHomeFollowList)
 
-        val followKeys = follows.map {
-            it.substring(0, 6)
+        val followKeys = follows?.map {
+            it.substring(0, 8)
         }
 
-        val followSet = followKeys.plus(account.userProfile().pubkeyHex.substring(0, 6))
+        val followSet = followKeys?.plus(account.userProfile().pubkeyHex.substring(0, 8))
 
         return TypedFilter(
             types = setOf(FeedType.FOLLOWS),
             filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind, HighlightEvent.kind, AudioTrackEvent.kind, PinListEvent.kind),
+                kinds = listOf(
+                    TextNoteEvent.kind,
+                    RepostEvent.kind,
+                    GenericRepostEvent.kind,
+                    ClassifiedsEvent.kind,
+                    LongTextNoteEvent.kind,
+                    PollNoteEvent.kind,
+                    HighlightEvent.kind,
+                    AudioTrackEvent.kind,
+                    AudioHeaderEvent.kind,
+                    PinListEvent.kind,
+                    LiveActivitiesChatMessageEvent.kind,
+                    LiveActivitiesEvent.kind
+                ),
                 authors = followSet,
                 limit = 400,
                 since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultHomeFollowList)?.relayList
@@ -74,7 +94,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
         return TypedFilter(
             types = setOf(FeedType.FOLLOWS),
             filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, HighlightEvent.kind, AudioTrackEvent.kind, PinListEvent.kind),
+                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, ClassifiedsEvent.kind, HighlightEvent.kind, AudioHeaderEvent.kind, AudioTrackEvent.kind, PinListEvent.kind),
                 tags = mapOf(
                     "t" to hashToLoad.map {
                         listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
@@ -86,11 +106,63 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
         )
     }
 
+    fun createFollowGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultHomeFollowList) ?: emptySet()
+
+        if (hashToLoad.isEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.FOLLOWS),
+            filter = JsonFilter(
+                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, ClassifiedsEvent.kind, HighlightEvent.kind, AudioHeaderEvent.kind, AudioTrackEvent.kind, PinListEvent.kind),
+                tags = mapOf(
+                    "g" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 100,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultHomeFollowList)?.relayList
+            )
+        )
+    }
+
+    fun createFollowCommunitiesFilter(): TypedFilter? {
+        val communitiesToLoad = account.selectedCommunitiesFollowList(account.defaultHomeFollowList) ?: emptySet()
+
+        if (communitiesToLoad.isEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.FOLLOWS),
+            filter = JsonFilter(
+                kinds = listOf(
+                    TextNoteEvent.kind,
+                    LongTextNoteEvent.kind,
+                    ClassifiedsEvent.kind,
+                    HighlightEvent.kind,
+                    AudioHeaderEvent.kind,
+                    AudioTrackEvent.kind,
+                    PinListEvent.kind,
+                    CommunityPostApprovalEvent.kind
+                ),
+                tags = mapOf(
+                    "a" to communitiesToLoad.toList()
+                ),
+                limit = 100,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultHomeFollowList)?.relayList
+            )
+        )
+    }
+
     val followAccountChannel = requestNewChannel { time, relayUrl ->
         latestEOSEs.addOrUpdate(account.userProfile(), account.defaultHomeFollowList, relayUrl, time)
     }
 
     override fun updateChannelFilters() {
-        followAccountChannel.typedFilters = listOfNotNull(createFollowAccountsFilter(), createFollowTagsFilter()).ifEmpty { null }
+        followAccountChannel.typedFilters = listOfNotNull(
+            createFollowAccountsFilter(),
+            createFollowCommunitiesFilter(),
+            createFollowTagsFilter(),
+            createFollowGeohashesFilter()
+        ).ifEmpty { null }
     }
 }

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

@@ -1,12 +1,12 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.service.model.LnZapPaymentResponseEvent
-import com.vitorpamplona.amethyst.service.model.RelayAuthEvent
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.quartz.events.LnZapPaymentResponseEvent
+import com.vitorpamplona.quartz.events.RelayAuthEvent
 
 class NostrLnZapPaymentResponseDataSource(
     private val fromServiceHex: String,

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

@@ -1,15 +1,15 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.toHexKey
-import com.vitorpamplona.amethyst.service.model.*
-import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import fr.acinq.secp256k1.Hex
+import com.vitorpamplona.quartz.encoders.Hex
+import com.vitorpamplona.quartz.encoders.Nip19
+import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.events.*
 
-object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
+object NostrSearchEventOrUserDataSource : NostrDataSource("SearchEventFeed") {
     private var searchString: String? = null
 
     private fun createAnythingWithIDFilter(): List<TypedFilter>? {
@@ -54,6 +54,29 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
             TypedFilter(
                 types = setOf(FeedType.SEARCH),
                 filter = JsonFilter(
+                    kinds = listOf(
+                        TextNoteEvent.kind, LongTextNoteEvent.kind, BadgeDefinitionEvent.kind,
+                        PeopleListEvent.kind, BookmarkListEvent.kind, AudioHeaderEvent.kind,
+                        AudioTrackEvent.kind, PinListEvent.kind, PollNoteEvent.kind,
+                        ChannelCreateEvent.kind
+                    ),
+                    search = mySearchString,
+                    limit = 100
+                )
+            ),
+            TypedFilter(
+                types = setOf(FeedType.SEARCH),
+                filter = JsonFilter(
+                    kinds = listOf(
+                        ChannelMetadataEvent.kind,
+                        ClassifiedsEvent.kind,
+                        CommunityDefinitionEvent.kind,
+                        EmojiPackEvent.kind,
+                        HighlightEvent.kind,
+                        LiveActivitiesEvent.kind,
+                        PollNoteEvent.kind,
+                        NNSEvent.kind
+                    ),
                     search = mySearchString,
                     limit = 100
                 )

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

@@ -1,12 +1,14 @@
 package com.vitorpamplona.amethyst.service
 
+import com.vitorpamplona.amethyst.model.LiveActivitiesChannel
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.model.PublicChatChannel
 import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.quartz.events.ChannelCreateEvent
+import com.vitorpamplona.quartz.events.ChannelMetadataEvent
 
 object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
     private var channelsToWatch = setOf<String>()
@@ -30,8 +32,8 @@ object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
 
     fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
         val directEventsToLoad = channelsToWatch
-            .map { LocalCache.getOrCreateChannel(it) }
-            .filter { it.notes.isEmpty() }
+            .mapNotNull { LocalCache.checkGetOrCreateChannel(it) }
+            .filter { it.notes.isEmpty() && it is PublicChatChannel }
 
         val interestedEvents = (directEventsToLoad).map { it.idHex }.toSet()
 
@@ -49,13 +51,43 @@ object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
         )
     }
 
+    fun createLoadStreamingIfNotLoadedFilter(): List<TypedFilter>? {
+        val directEventsToLoad = channelsToWatch
+            .mapNotNull { LocalCache.checkGetOrCreateChannel(it) }
+            .filterIsInstance<LiveActivitiesChannel>()
+            .filter { it.info == null }
+
+        val interestedEvents = (directEventsToLoad).map { it.idHex }.toSet()
+
+        if (interestedEvents.isEmpty()) {
+            return null
+        }
+
+        // downloads linked events to this event.
+        return directEventsToLoad.map {
+            it.address().let { aTag ->
+                TypedFilter(
+                    types = COMMON_FEED_TYPES,
+                    filter = JsonFilter(
+                        kinds = listOf(aTag.kind),
+                        tags = mapOf("d" to listOf(aTag.dTag)),
+                        authors = listOf(aTag.pubKeyHex)
+                    )
+                )
+            }
+        }
+    }
+
     val singleChannelChannel = requestNewChannel()
 
     override fun updateChannelFilters() {
         val reactions = createRepliesAndReactionsFilter()
         val missing = createLoadEventsIfNotLoadedFilter()
+        val missingStreaming = createLoadStreamingIfNotLoadedFilter()
 
-        singleChannelChannel.typedFilters = listOfNotNull(reactions, missing).ifEmpty { null }
+        singleChannelChannel.typedFilters = (
+            (listOfNotNull(reactions, missing)) + (missingStreaming ?: emptyList())
+            ).ifEmpty { null }
     }
 
     fun add(eventId: String) {

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

@@ -2,17 +2,17 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.quartz.events.*
 
 object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
     private var eventsToWatch = setOf<Note>()
     private var addressesToWatch = setOf<Note>()
 
-    private fun createTagToAddressFilter(): List<TypedFilter>? {
+    private fun createReactionsToWatchInAddressFilter(): List<TypedFilter>? {
         val addressesToWatch = eventsToWatch.filter { it.address() != null } + addressesToWatch
 
         if (addressesToWatch.isEmpty()) {
@@ -25,15 +25,19 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                     types = COMMON_FEED_TYPES,
                     filter = JsonFilter(
                         kinds = listOf(
-                            TextNoteEvent.kind, LongTextNoteEvent.kind,
-                            ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind,
-                            LnZapEvent.kind, LnZapRequestEvent.kind,
-                            BadgeAwardEvent.kind, BadgeDefinitionEvent.kind, BadgeProfilesEvent.kind,
-                            PollNoteEvent.kind, AudioTrackEvent.kind, PinListEvent.kind,
-                            PeopleListEvent.kind, BookmarkListEvent.kind
+                            TextNoteEvent.kind,
+                            ReactionEvent.kind,
+                            RepostEvent.kind,
+                            GenericRepostEvent.kind,
+                            ReportEvent.kind,
+                            LnZapEvent.kind,
+                            PollNoteEvent.kind,
+                            CommunityPostApprovalEvent.kind,
+                            LiveActivitiesChatMessageEvent.kind
                         ),
                         tags = mapOf("a" to listOf(aTag.toTag())),
-                        since = it.lastReactionsDownloadTime
+                        since = it.lastReactionsDownloadTime,
+                        limit = 1000 // Max amount of "replies" to download on a specific event.
                     )
                 )
             }
@@ -49,14 +53,26 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
 
         return addressesToWatch.mapNotNull {
             it.address()?.let { aTag ->
-                TypedFilter(
-                    types = COMMON_FEED_TYPES,
-                    filter = JsonFilter(
-                        kinds = listOf(aTag.kind),
-                        tags = mapOf("d" to listOf(aTag.dTag)),
-                        authors = listOf(aTag.pubKeyHex.substring(0, 8))
+                if (aTag.kind < 25000 && aTag.dTag.isBlank()) {
+                    TypedFilter(
+                        types = COMMON_FEED_TYPES,
+                        filter = JsonFilter(
+                            kinds = listOf(aTag.kind),
+                            authors = listOf(aTag.pubKeyHex),
+                            limit = 1000 // Max amount of "replies" to download on a specific event.
+                        )
                     )
-                )
+                } else {
+                    TypedFilter(
+                        types = COMMON_FEED_TYPES,
+                        filter = JsonFilter(
+                            kinds = listOf(aTag.kind),
+                            tags = mapOf("d" to listOf(aTag.dTag)),
+                            authors = listOf(aTag.pubKeyHex),
+                            limit = 1000 // Max amount of "replies" to download on a specific event.
+                        )
+                    )
+                }
             }
         }
     }
@@ -74,19 +90,16 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                 filter = JsonFilter(
                     kinds = listOf(
                         TextNoteEvent.kind,
-                        LongTextNoteEvent.kind,
                         ReactionEvent.kind,
                         RepostEvent.kind,
+                        GenericRepostEvent.kind,
                         ReportEvent.kind,
                         LnZapEvent.kind,
-                        LnZapRequestEvent.kind,
-                        PollNoteEvent.kind,
-                        HighlightEvent.kind,
-                        AudioTrackEvent.kind,
-                        PinListEvent.kind
+                        PollNoteEvent.kind
                     ),
                     tags = mapOf("e" to listOf(it.idHex)),
-                    since = it.lastReactionsDownloadTime
+                    since = it.lastReactionsDownloadTime,
+                    limit = 1000 // Max amount of "replies" to download on a specific event.
                 )
             )
         }
@@ -121,6 +134,8 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
     }
 
     val singleEventChannel = requestNewChannel { time, relayUrl ->
+        checkNotInMainThread()
+
         eventsToWatch.forEach {
             val eose = it.lastReactionsDownloadTime[relayUrl]
             if (eose == null) {
@@ -139,7 +154,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
         val reactions = createRepliesAndReactionsFilter()
         val missing = createLoadEventsIfNotLoadedFilter()
         val addresses = createAddressFilter()
-        val addressReactions = createTagToAddressFilter()
+        val addressReactions = createReactionsToWatchInAddressFilter()
 
         singleEventChannel.typedFilters = listOfNotNull(missing, addresses, reactions, addressReactions).flatten().ifEmpty { null }
     }
@@ -158,16 +173,16 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
         }
     }
 
-    fun addAddress(aTag: Note) {
-        if (!addressesToWatch.contains(aTag)) {
-            addressesToWatch = addressesToWatch.plus(aTag)
+    fun addAddress(addressableNote: Note) {
+        if (!addressesToWatch.contains(addressableNote)) {
+            addressesToWatch = addressesToWatch.plus(addressableNote)
             invalidateFilters()
         }
     }
 
-    fun removeAddress(aTag: Note) {
-        if (addressesToWatch.contains(aTag)) {
-            addressesToWatch = addressesToWatch.minus(aTag)
+    fun removeAddress(addressableNote: Note) {
+        if (addressesToWatch.contains(addressableNote)) {
+            addressesToWatch = addressesToWatch.minus(addressableNote)
             invalidateFilters()
         }
     }

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

@@ -1,12 +1,13 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.service.model.MetadataEvent
-import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.quartz.events.MetadataEvent
+import com.vitorpamplona.quartz.events.ReportEvent
+import com.vitorpamplona.quartz.events.StatusEvent
 
 object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
     var usersToWatch = setOf<User>()
@@ -26,6 +27,21 @@ object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
         }
     }
 
+    fun createUserStatusFilter(): List<TypedFilter>? {
+        if (usersToWatch.isEmpty()) return null
+
+        return usersToWatch.map {
+            TypedFilter(
+                types = COMMON_FEED_TYPES,
+                filter = JsonFilter(
+                    kinds = listOf(StatusEvent.kind),
+                    authors = listOf(it.pubkeyHex),
+                    since = it.latestEOSEs
+                )
+            )
+        }
+    }
+
     fun createUserReportFilter(): List<TypedFilter>? {
         if (usersToWatch.isEmpty()) return null
 
@@ -50,17 +66,17 @@ object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
                 eose.time = time
             }
         }
+    }
 
+    val userChannelOnce = requestNewChannel() { time, relayUrl ->
         // Many relays operate with limits in the amount of filters.
         // As information comes, the filters will be rotated to get more data.
         invalidateFilters()
     }
 
-    val userChannelOnce = requestNewChannel()
-
     override fun updateChannelFilters() {
-        userChannel.typedFilters = listOfNotNull(createUserFilter()).flatten().ifEmpty { null }
-        userChannelOnce.typedFilters = listOfNotNull(createUserReportFilter()).flatten().ifEmpty { null }
+        userChannel.typedFilters = listOfNotNull(createUserReportFilter(), createUserStatusFilter()).flatten().ifEmpty { null }
+        userChannelOnce.typedFilters = listOfNotNull(createUserFilter()).flatten().ifEmpty { null }
     }
 
     fun add(user: User) {

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

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

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

@@ -1,10 +1,10 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.quartz.events.*
 
 object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
     var user: User? = null
@@ -28,7 +28,17 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
         TypedFilter(
             types = COMMON_FEED_TYPES,
             filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, RepostEvent.kind, LongTextNoteEvent.kind, AudioTrackEvent.kind, PinListEvent.kind, PollNoteEvent.kind, HighlightEvent.kind),
+                kinds = listOf(
+                    TextNoteEvent.kind,
+                    GenericRepostEvent.kind,
+                    RepostEvent.kind,
+                    LongTextNoteEvent.kind,
+                    AudioTrackEvent.kind,
+                    AudioHeaderEvent.kind,
+                    PinListEvent.kind,
+                    PollNoteEvent.kind,
+                    HighlightEvent.kind
+                ),
                 authors = listOf(it.pubkeyHex),
                 limit = 200
             )

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

@@ -1,15 +1,18 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.service.model.FileHeaderEvent
-import com.vitorpamplona.amethyst.service.model.FileStorageHeaderEvent
+import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import com.vitorpamplona.quartz.events.FileHeaderEvent
+import com.vitorpamplona.quartz.events.FileStorageHeaderEvent
 
 object NostrVideoDataSource : NostrDataSource("VideoFeed") {
     lateinit var account: Account
 
+    val latestEOSEs = EOSEAccount()
+
     fun createContextualFilter(): TypedFilter? {
         val follows = account.selectedUsersFollowList(account.defaultStoriesFollowList)
 
@@ -22,7 +25,8 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
             filter = JsonFilter(
                 authors = followKeys,
                 kinds = listOf(FileHeaderEvent.kind, FileStorageHeaderEvent.kind),
-                limit = 200
+                limit = 200,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultStoriesFollowList)?.relayList
             )
         )
     }
@@ -41,14 +45,41 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
                         listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
                     }.flatten()
                 ),
-                limit = 100
+                limit = 100,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultStoriesFollowList)?.relayList
             )
         )
     }
 
-    val videoFeedChannel = requestNewChannel()
+    fun createFollowGeohashesFilter(): TypedFilter? {
+        val hashToLoad = account.selectedGeohashesFollowList(account.defaultStoriesFollowList)
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter = JsonFilter(
+                kinds = listOf(FileHeaderEvent.kind, FileStorageHeaderEvent.kind),
+                tags = mapOf(
+                    "g" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 100,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultStoriesFollowList)?.relayList
+            )
+        )
+    }
+
+    val videoFeedChannel = requestNewChannel() { time, relayUrl ->
+        latestEOSEs.addOrUpdate(account.userProfile(), account.defaultStoriesFollowList, relayUrl, time)
+    }
 
     override fun updateChannelFilters() {
-        videoFeedChannel.typedFilters = listOfNotNull(createContextualFilter(), createFollowTagsFilter()).ifEmpty { null }
+        videoFeedChannel.typedFilters = listOfNotNull(
+            createContextualFilter(),
+            createFollowTagsFilter(),
+            createFollowGeohashesFilter()
+        ).ifEmpty { null }
     }
 }

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

@@ -0,0 +1,42 @@
+package com.vitorpamplona.amethyst.service
+
+import android.util.Log
+import android.util.LruCache
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.BuildConfig
+import okhttp3.Request
+
+@Immutable
+data class OnlineCheckResult(val timeInMs: Long, val online: Boolean)
+
+object OnlineChecker {
+    val checkOnlineCache = LruCache<String, OnlineCheckResult>(100)
+    val fiveMinutes = 1000 * 60 * 5
+
+    fun isOnline(url: String?): Boolean {
+        checkNotInMainThread()
+
+        if (url.isNullOrBlank()) return false
+        if ((checkOnlineCache.get(url)?.timeInMs ?: 0) > System.currentTimeMillis() - fiveMinutes) {
+            return checkOnlineCache.get(url).online
+        }
+
+        return try {
+            val request = Request.Builder()
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                .url(url)
+                .get()
+                .build()
+
+            val result = HttpClient.getHttpClient().newCall(request).execute().use {
+                it.isSuccessful
+            }
+            checkOnlineCache.put(url, OnlineCheckResult(System.currentTimeMillis(), result))
+            result
+        } catch (e: Exception) {
+            checkOnlineCache.put(url, OnlineCheckResult(System.currentTimeMillis(), false))
+            Log.e("LiveActivities", "Failed to check streaming url $url", e)
+            false
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/connectivitystatus/ConnectivityStatus.kt

@@ -0,0 +1,15 @@
+package com.vitorpamplona.amethyst.service.connectivitystatus
+
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+
+object ConnectivityStatus {
+    private val onMobileData = mutableStateOf(false)
+    val isOnMobileData: MutableState<Boolean> = onMobileData
+
+    fun updateConnectivityStatus(isOnMobileData: Boolean, isOnWifi: Boolean) {
+        if (onMobileData.value != isOnMobileData) {
+            onMobileData.value = isOnMobileData
+        }
+    }
+}

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

@@ -4,12 +4,11 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.service.HttpClient
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import kotlinx.coroutines.CoroutineScope
+import com.vitorpamplona.quartz.encoders.Bech32
+import com.vitorpamplona.quartz.encoders.LnInvoiceUtil
+import com.vitorpamplona.quartz.encoders.toLnUrl
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import nostr.postr.Bech32
 import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.Request
@@ -38,102 +37,88 @@ class LightningAddressResolver() {
         return null
     }
 
-    fun fetchLightningAddressJson(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-        val scope = CoroutineScope(Job() + Dispatchers.IO)
-        scope.launch {
-            fetchLightningAddressJsonSuspend(lnaddress, onSuccess, onError)
-        }
-    }
-
-    private suspend fun fetchLightningAddressJsonSuspend(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    private suspend fun fetchLightningAddressJson(lnaddress: String, onSuccess: suspend (String) -> Unit, onError: (String) -> Unit) = withContext(Dispatchers.IO) {
         checkNotInMainThread()
 
         val url = assembleUrl(lnaddress)
 
         if (url == null) {
             onError("Could not assemble LNUrl from Lightning Address \"${lnaddress}\". Check the user's setup")
-            return
+            return@withContext
         }
 
-        withContext(Dispatchers.IO) {
+        try {
             val request: Request = Request.Builder()
                 .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                 .url(url)
                 .build()
 
-            client.newCall(request).enqueue(object : Callback {
-                override fun onResponse(call: Call, response: Response) {
-                    response.use {
-                        if (it.isSuccessful) {
-                            onSuccess(it.body.string())
-                        } else {
-                            onError("Could not resolve $lnaddress. Error: ${it.code}. Check if the server up and if the lightning address $lnaddress is correct")
-                        }
+            client.newCall(request).execute().use {
+                if (it.isSuccessful) {
+                    onSuccess(it.body.string())
+                } else {
+                    onError("Could not resolve $lnaddress. Error: ${it.code}. Check if the server up and if the lightning address $lnaddress is correct")
+                }
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            onError("Could not resolve $url. Check if the server up and if the lightning address $lnaddress is correct")
+        }
+    }
+
+    suspend fun fetchLightningInvoice(lnCallback: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) = withContext(Dispatchers.IO) {
+        val encodedMessage = URLEncoder.encode(message, "utf-8")
+
+        val urlBinder = if (lnCallback.contains("?")) "&" else "?"
+        var url = "$lnCallback${urlBinder}amount=$milliSats&comment=$encodedMessage"
+
+        if (nostrRequest != null) {
+            val encodedNostrRequest = URLEncoder.encode(nostrRequest, "utf-8")
+            url += "&nostr=$encodedNostrRequest"
+        }
+
+        val request: Request = Request.Builder()
+            .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+            .url(url)
+            .build()
+
+        client.newCall(request).enqueue(object : Callback {
+            override fun onResponse(call: Call, response: Response) {
+                response.use {
+                    if (it.isSuccessful) {
+                        onSuccess(response.body.string())
+                    } else {
+                        onError("Could not fetch invoice from $lnCallback")
                     }
                 }
-
-                override fun onFailure(call: Call, e: java.io.IOException) {
-                    onError("Could not resolve $url. Check if the server up and if the lightning address $lnaddress is correct")
-                    e.printStackTrace()
-                }
-            })
-        }
-    }
-
-    fun fetchLightningInvoice(lnCallback: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-        val scope = CoroutineScope(Job() + Dispatchers.IO)
-        scope.launch {
-            fetchLightningInvoiceSuspend(lnCallback, milliSats, message, nostrRequest, onSuccess, onError)
-        }
-    }
-
-    private suspend fun fetchLightningInvoiceSuspend(lnCallback: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-        withContext(Dispatchers.IO) {
-            val encodedMessage = URLEncoder.encode(message, "utf-8")
-
-            val urlBinder = if (lnCallback.contains("?")) "&" else "?"
-            var url = "$lnCallback${urlBinder}amount=$milliSats&comment=$encodedMessage"
-
-            if (nostrRequest != null) {
-                val encodedNostrRequest = URLEncoder.encode(nostrRequest, "utf-8")
-                url += "&nostr=$encodedNostrRequest"
             }
 
-            val request: Request = Request.Builder()
-                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-                .url(url)
-                .build()
-
-            client.newCall(request).enqueue(object : Callback {
-                override fun onResponse(call: Call, response: Response) {
-                    response.use {
-                        if (it.isSuccessful) {
-                            onSuccess(response.body.string())
-                        } else {
-                            onError("Could not fetch invoice from $lnCallback")
-                        }
-                    }
-                }
-
-                override fun onFailure(call: Call, e: java.io.IOException) {
-                    onError("Could not fetch an invoice from $lnCallback. Message ${e.message}")
-                    e.printStackTrace()
-                }
-            })
-        }
+            override fun onFailure(call: Call, e: java.io.IOException) {
+                onError("Could not fetch an invoice from $lnCallback. Message ${e.message}")
+                e.printStackTrace()
+            }
+        })
     }
 
-    fun lnAddressToLnUrl(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    suspend fun lnAddressToLnUrl(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
         fetchLightningAddressJson(
             lnaddress,
             onSuccess = {
-                onSuccess(Bech32.encodeBytes("lnurl", it.toByteArray(), Bech32.Encoding.Bech32))
+                onSuccess(it.toByteArray().toLnUrl())
             },
             onError = onError
         )
     }
 
-    fun lnAddressInvoice(lnaddress: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit, onProgress: (percent: Float) -> Unit) {
+    suspend fun lnAddressInvoice(
+        lnaddress: String,
+        milliSats: Long,
+        message: String,
+        nostrRequest: String? = null,
+        onSuccess: (String) -> Unit,
+        onError: (String) -> Unit,
+        onProgress: (percent: Float) -> Unit
+    ) {
         val mapper = jacksonObjectMapper()
 
         fetchLightningAddressJson(
@@ -172,7 +157,7 @@ class LightningAddressResolver() {
                                 null
                             }
 
-                            lnInvoice?.get("pr")?.asText()?.let { pr ->
+                            lnInvoice?.get("pr")?.asText()?.ifBlank { null }?.let { pr ->
                                 // Forces LN Invoice amount to be the requested amount.
                                 val invoiceAmount = LnInvoiceUtil.getAmountInSats(pr)
                                 if (invoiceAmount.multiply(BigDecimal(1000)).toLong() == BigDecimal(milliSats).toLong()) {

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

@@ -1,98 +0,0 @@
-package com.vitorpamplona.amethyst.service.model
-
-import android.util.Log
-import androidx.compose.runtime.Immutable
-import com.google.gson.reflect.TypeToken
-import com.vitorpamplona.amethyst.model.HexKey
-import com.vitorpamplona.amethyst.model.decodePublicKey
-import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
-import java.util.Date
-
-@Immutable
-data class Contact(val pubKeyHex: String, val relayUri: String?)
-
-class ContactListEvent(
-    id: HexKey,
-    pubKey: HexKey,
-    createdAt: Long,
-    tags: List<List<String>>,
-    content: String,
-    sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    // This function is only used by the user logged in
-    // But it is used all the time.
-    val verifiedFollowKeySet: Set<HexKey> by lazy {
-        tags.filter { it.size > 1 && it[0] == "p" }.mapNotNull {
-            try {
-                decodePublicKey(it[1]).toHexKey()
-            } catch (e: Exception) {
-                Log.w("ContactListEvent", "Can't parse tags as a follows: ${it[1]}", e)
-                null
-            }
-        }.toSet()
-    }
-
-    val verifiedFollowTagSet: Set<String> by lazy {
-        unverifiedFollowTagSet().map { it.lowercase() }.toSet()
-    }
-
-    val verifiedFollowKeySetAndMe: Set<HexKey> by lazy {
-        verifiedFollowKeySet + pubKey
-    }
-
-    fun unverifiedFollowKeySet() = tags.filter { it[0] == "p" }.mapNotNull { it.getOrNull(1) }
-    fun unverifiedFollowTagSet() = tags.filter { it[0] == "t" }.mapNotNull { it.getOrNull(1) }
-
-    fun follows() = tags.filter { it[0] == "p" }.mapNotNull {
-        try {
-            Contact(decodePublicKey(it[1]).toHexKey(), it.getOrNull(2))
-        } catch (e: Exception) {
-            Log.w("ContactListEvent", "Can't parse tags as a follows: ${it[1]}", e)
-            null
-        }
-    }
-
-    fun followsTags() = tags.filter { it[0] == "t" }.mapNotNull {
-        it.getOrNull(2)
-    }
-
-    fun relays(): Map<String, ReadWrite>? = try {
-        if (content.isNotEmpty()) {
-            gson.fromJson(content, object : TypeToken<Map<String, ReadWrite>>() {}.type) as Map<String, ReadWrite>
-        } else {
-            null
-        }
-    } catch (e: Exception) {
-        Log.w("ContactListEvent", "Can't parse content as relay lists: $content", e)
-        null
-    }
-
-    companion object {
-        const val kind = 3
-
-        fun create(follows: List<Contact>, followTags: List<String>, relayUse: Map<String, ReadWrite>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ContactListEvent {
-            val content = if (relayUse != null) {
-                gson.toJson(relayUse)
-            } else {
-                ""
-            }
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
-            val tags = follows.map {
-                if (it.relayUri != null) {
-                    listOf("p", it.pubKeyHex, it.relayUri)
-                } else {
-                    listOf("p", it.pubKeyHex)
-                }
-            } + followTags.map {
-                listOf("t", it)
-            }
-
-            val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
-            return ContactListEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
-        }
-    }
-
-    data class ReadWrite(val read: Boolean, val write: Boolean)
-}

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

@@ -1,302 +0,0 @@
-package com.vitorpamplona.amethyst.service.model
-
-import android.util.Log
-import androidx.compose.runtime.Immutable
-import com.google.gson.*
-import com.google.gson.annotations.SerializedName
-import com.vitorpamplona.amethyst.model.HexKey
-import com.vitorpamplona.amethyst.model.toHexKey
-import fr.acinq.secp256k1.Hex
-import fr.acinq.secp256k1.Secp256k1
-import nostr.postr.Utils
-import nostr.postr.toHex
-import java.lang.reflect.Type
-import java.math.BigDecimal
-import java.security.MessageDigest
-import java.util.*
-
-@Immutable
-open class Event(
-    val id: HexKey,
-    @SerializedName("pubkey") val pubKey: HexKey,
-    @SerializedName("created_at") val createdAt: Long,
-    val kind: Int,
-    val tags: List<List<String>>,
-    val content: String,
-    val sig: HexKey
-) : EventInterface {
-    override fun id(): HexKey = id
-
-    override fun pubKey(): HexKey = pubKey
-
-    override fun createdAt(): Long = createdAt
-
-    override fun kind(): Int = kind
-
-    override fun tags(): List<List<String>> = tags
-
-    override fun content(): String = content
-
-    override fun sig(): HexKey = sig
-
-    override fun toJson(): String = gson.toJson(this)
-
-    fun hasAnyTaggedUser() = tags.any { it.size > 1 && it[0] == "p" }
-
-    fun taggedUsers() = tags.filter { it.size > 1 && it[0] == "p" }.map { it[1] }
-    fun taggedEvents() = tags.filter { it.size > 1 && it[0] == "e" }.map { it[1] }
-
-    fun taggedUrls() = tags.filter { it.size > 1 && it[0] == "r" }.map { it[1] }
-
-    override fun isSensitive() = tags.any {
-        (it.size > 0 && it[0].equals("content-warning", true)) ||
-            (it.size > 1 && it[0] == "t" && it[1].equals("nsfw", true)) ||
-            (it.size > 1 && it[0] == "t" && it[1].equals("nude", true))
-    }
-
-    override fun zapAddress() = tags.firstOrNull { it.size > 1 && it[0] == "zap" }?.get(1)
-
-    fun taggedAddresses() = tags.filter { it.size > 1 && it[0] == "a" }.mapNotNull {
-        val aTagValue = it[1]
-        val relay = it.getOrNull(2)
-
-        ATag.parse(aTagValue, relay)
-    }
-
-    override fun hashtags() = tags.filter { it.size > 1 && it[0] == "t" }.map { it[1] }
-
-    override fun isTaggedUser(idHex: String) = tags.any { it.size > 1 && it[0] == "p" && it[1] == idHex }
-
-    override fun isTaggedHash(hashtag: String) = tags.any { it.size > 1 && it[0] == "t" && it[1].equals(hashtag, true) }
-    override fun isTaggedHashes(hashtags: Set<String>) = tags.any { it.size > 1 && it[0] == "t" && it[1].lowercase() in hashtags }
-    override fun firstIsTaggedHashes(hashtags: Set<String>) = tags.firstOrNull { it.size > 1 && it[0] == "t" && it[1].lowercase() in hashtags }?.getOrNull(1)
-
-    override fun getPoWRank(): Int {
-        var rank = 0
-        for (i in 0..id.length) {
-            if (id[i] == '0') {
-                rank += 4
-            } else if (id[i] in '4'..'7') {
-                rank += 1
-                break
-            } else if (id[i] in '2'..'3') {
-                rank += 2
-                break
-            } else if (id[i] == '1') {
-                rank += 3
-                break
-            } else {
-                break
-            }
-        }
-        return rank
-    }
-
-    override fun getReward(): BigDecimal? {
-        return try {
-            tags.firstOrNull { it.size > 1 && it[0] == "reward" }?.get(1)?.let { BigDecimal(it) }
-        } catch (e: Exception) {
-            null
-        }
-    }
-
-    /**
-     * Checks if the ID is correct and then if the pubKey's secret key signed the event.
-     */
-    override fun checkSignature() {
-        if (!id.contentEquals(generateId())) {
-            throw Exception(
-                """|Unexpected ID.
-                   |  Event: ${toJson()}
-                   |  Actual ID: $id
-                   |  Generated: ${generateId()}
-                """.trimIndent()
-            )
-        }
-        if (!secp256k1.verifySchnorr(Hex.decode(sig), Hex.decode(id), Hex.decode(pubKey))) {
-            throw Exception("""Bad signature!""")
-        }
-    }
-
-    override fun hasValidSignature(): Boolean {
-        return try {
-            id.contentEquals(generateId()) && secp256k1.verifySchnorr(Hex.decode(sig), Hex.decode(id), Hex.decode(pubKey))
-        } catch (e: Exception) {
-            Log.e("Event", "Fail checking if event $id has a valid signature", e)
-            false
-        }
-    }
-
-    private fun generateId(): String {
-        val rawEvent = listOf(0, pubKey, createdAt, kind, tags, content)
-
-        // GSON decided to hardcode these replacements.
-        // They break Nostr's hash check.
-        // These lines revert their code.
-        // https://github.com/google/gson/issues/2295
-        val rawEventJson = gson.toJson(rawEvent)
-            .replace("\\u2028", "\u2028")
-            .replace("\\u2029", "\u2029")
-
-        return MessageDigest.getInstance("SHA-256").digest(rawEventJson.toByteArray()).toHexKey()
-    }
-
-    private class EventDeserializer : JsonDeserializer<Event> {
-        override fun deserialize(
-            json: JsonElement,
-            typeOfT: Type?,
-            context: JsonDeserializationContext?
-        ): Event {
-            val jsonObject = json.asJsonObject
-            return Event(
-                id = jsonObject.get("id").asString,
-                pubKey = jsonObject.get("pubkey").asString,
-                createdAt = jsonObject.get("created_at").asLong,
-                kind = jsonObject.get("kind").asInt,
-                tags = jsonObject.get("tags").asJsonArray.map {
-                    it.asJsonArray.mapNotNull { s -> if (s.isJsonNull) null else s.asString }
-                },
-                content = jsonObject.get("content").asString,
-                sig = jsonObject.get("sig").asString
-            )
-        }
-    }
-
-    private class EventSerializer : JsonSerializer<Event> {
-        override fun serialize(
-            src: Event,
-            typeOfSrc: Type?,
-            context: JsonSerializationContext?
-        ): JsonElement {
-            return JsonObject().apply {
-                addProperty("id", src.id)
-                addProperty("pubkey", src.pubKey)
-                addProperty("created_at", src.createdAt)
-                addProperty("kind", src.kind)
-                add(
-                    "tags",
-                    JsonArray().also { jsonTags ->
-                        src.tags.forEach { tag ->
-                            jsonTags.add(
-                                JsonArray().also { jsonTagElement ->
-                                    tag.forEach { tagElement ->
-                                        jsonTagElement.add(tagElement)
-                                    }
-                                }
-                            )
-                        }
-                    }
-                )
-                addProperty("content", src.content)
-                addProperty("sig", src.sig)
-            }
-        }
-    }
-
-    private class ByteArrayDeserializer : JsonDeserializer<ByteArray> {
-        override fun deserialize(
-            json: JsonElement,
-            typeOfT: Type?,
-            context: JsonDeserializationContext?
-        ): ByteArray = Hex.decode(json.asString)
-    }
-
-    private class ByteArraySerializer : JsonSerializer<ByteArray> {
-        override fun serialize(
-            src: ByteArray,
-            typeOfSrc: Type?,
-            context: JsonSerializationContext?
-        ) = JsonPrimitive(src.toHex())
-    }
-
-    companion object {
-        private val secp256k1 = Secp256k1.get()
-
-        val gson: Gson = GsonBuilder()
-            .disableHtmlEscaping()
-            .registerTypeAdapter(Event::class.java, EventSerializer())
-            .registerTypeAdapter(Event::class.java, EventDeserializer())
-            .registerTypeAdapter(ByteArray::class.java, ByteArraySerializer())
-            .registerTypeAdapter(ByteArray::class.java, ByteArrayDeserializer())
-            .registerTypeAdapter(Response::class.java, ResponseDeserializer())
-            .registerTypeAdapter(Request::class.java, RequestDeserializer())
-            .create()
-
-        fun fromJson(json: String, lenient: Boolean = false): Event = gson.fromJson(json, Event::class.java).getRefinedEvent(lenient)
-
-        fun fromJson(json: JsonElement, lenient: Boolean = false): Event = gson.fromJson(json, Event::class.java).getRefinedEvent(lenient)
-
-        fun Event.getRefinedEvent(lenient: Boolean = false): Event = when (kind) {
-            AppDefinitionEvent.kind -> AppDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
-            AppRecommendationEvent.kind -> AppRecommendationEvent(id, pubKey, createdAt, tags, content, sig)
-            AudioTrackEvent.kind -> AudioTrackEvent(id, pubKey, createdAt, tags, content, sig)
-            BadgeAwardEvent.kind -> BadgeAwardEvent(id, pubKey, createdAt, tags, content, sig)
-            BadgeDefinitionEvent.kind -> BadgeDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
-            BadgeProfilesEvent.kind -> BadgeProfilesEvent(id, pubKey, createdAt, tags, content, sig)
-            BookmarkListEvent.kind -> BookmarkListEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelCreateEvent.kind -> ChannelCreateEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelHideMessageEvent.kind -> ChannelHideMessageEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelMessageEvent.kind -> ChannelMessageEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelMetadataEvent.kind -> ChannelMetadataEvent(id, pubKey, createdAt, tags, content, sig)
-            ChannelMuteUserEvent.kind -> ChannelMuteUserEvent(id, pubKey, createdAt, tags, content, sig)
-            ContactListEvent.kind -> ContactListEvent(id, pubKey, createdAt, tags, content, sig)
-            DeletionEvent.kind -> DeletionEvent(id, pubKey, createdAt, tags, content, sig)
-
-            FileHeaderEvent.kind -> FileHeaderEvent(id, pubKey, createdAt, tags, content, sig)
-            FileStorageEvent.kind -> FileStorageEvent(id, pubKey, createdAt, tags, content, sig)
-            FileStorageHeaderEvent.kind -> FileStorageHeaderEvent(id, pubKey, createdAt, tags, content, sig)
-            HighlightEvent.kind -> HighlightEvent(id, pubKey, createdAt, tags, content, sig)
-            LnZapEvent.kind -> LnZapEvent(id, pubKey, createdAt, tags, content, sig)
-            LnZapPaymentRequestEvent.kind -> LnZapPaymentRequestEvent(id, pubKey, createdAt, tags, content, sig)
-            LnZapPaymentResponseEvent.kind -> LnZapPaymentResponseEvent(id, pubKey, createdAt, tags, content, sig)
-            LnZapRequestEvent.kind -> LnZapRequestEvent(id, pubKey, createdAt, tags, content, sig)
-            LongTextNoteEvent.kind -> LongTextNoteEvent(id, pubKey, createdAt, tags, content, sig)
-            MetadataEvent.kind -> MetadataEvent(id, pubKey, createdAt, tags, content, sig)
-            PeopleListEvent.kind -> PeopleListEvent(id, pubKey, createdAt, tags, content, sig)
-            PinListEvent.kind -> PinListEvent(id, pubKey, createdAt, tags, content, sig)
-            PollNoteEvent.kind -> PollNoteEvent(id, pubKey, createdAt, tags, content, sig)
-            PrivateDmEvent.kind -> PrivateDmEvent(id, pubKey, createdAt, tags, content, sig)
-            ReactionEvent.kind -> ReactionEvent(id, pubKey, createdAt, tags, content, sig)
-            RecommendRelayEvent.kind -> RecommendRelayEvent(id, pubKey, createdAt, tags, content, sig, lenient)
-            RelaySetEvent.kind -> RelaySetEvent(id, pubKey, createdAt, tags, content, sig)
-            ReportEvent.kind -> ReportEvent(id, pubKey, createdAt, tags, content, sig)
-            RepostEvent.kind -> RepostEvent(id, pubKey, createdAt, tags, content, sig)
-            TextNoteEvent.kind -> TextNoteEvent(id, pubKey, createdAt, tags, content, sig)
-            else -> this
-        }
-
-        fun generateId(pubKey: HexKey, createdAt: Long, kind: Int, tags: List<List<String>>, content: String): ByteArray {
-            val rawEvent = listOf(
-                0,
-                pubKey,
-                createdAt,
-                kind,
-                tags,
-                content
-            )
-
-            // GSON decided to hardcode these replacements.
-            // They break Nostr's hash check.
-            // These lines revert their code.
-            // https://github.com/google/gson/issues/2295
-            val rawEventJson = gson.toJson(rawEvent)
-                .replace("\\u2028", "\u2028")
-                .replace("\\u2029", "\u2029")
-
-            return MessageDigest.getInstance("SHA-256").digest(rawEventJson.toByteArray())
-        }
-
-        fun create(privateKey: ByteArray, kind: Int, tags: List<List<String>> = emptyList(), content: String = "", createdAt: Long = Date().time / 1000): Event {
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
-            val id = Companion.generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey).toHexKey()
-            return Event(id.toHexKey(), pubKey, createdAt, kind, tags, content, sig)
-        }
-    }
-}
-
-@Immutable
-interface AddressableEvent {
-    fun dTag(): String
-    fun address(): ATag
-}

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

@@ -1,41 +0,0 @@
-package com.vitorpamplona.amethyst.service.model
-
-import androidx.compose.runtime.Immutable
-import com.vitorpamplona.amethyst.model.HexKey
-import java.math.BigDecimal
-
-@Immutable
-interface EventInterface {
-    fun id(): HexKey
-
-    fun pubKey(): HexKey
-
-    fun createdAt(): Long
-
-    fun kind(): Int
-
-    fun tags(): List<List<String>>
-
-    fun content(): String
-
-    fun sig(): HexKey
-
-    fun toJson(): String
-
-    fun checkSignature()
-
-    fun hasValidSignature(): Boolean
-
-    fun isTaggedUser(idHex: String): Boolean
-
-    fun isTaggedHash(hashtag: String): Boolean
-    fun isTaggedHashes(hashtags: Set<String>): Boolean
-    fun firstIsTaggedHashes(hashtags: Set<String>): String?
-    fun hashtags(): List<String>
-
-    fun getReward(): BigDecimal?
-    fun getPoWRank(): Int
-
-    fun zapAddress(): String?
-    fun isSensitive(): Boolean
-}

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

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

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

@@ -1,46 +0,0 @@
-package com.vitorpamplona.amethyst.service.model
-
-import androidx.compose.runtime.Immutable
-import com.vitorpamplona.amethyst.model.HexKey
-import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
-import java.util.Date
-
-@Immutable
-class ReactionEvent(
-    id: HexKey,
-    pubKey: HexKey,
-    createdAt: Long,
-    tags: List<List<String>>,
-    content: String,
-    sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-
-    fun originalPost() = tags.filter { it.size > 1 && it[0] == "e" }.map { it[1] }
-    fun originalAuthor() = tags.filter { it.size > 1 && it[0] == "p" }.map { it[1] }
-
-    companion object {
-        const val kind = 7
-
-        fun createWarning(originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
-            return create("\u26A0\uFE0F", originalNote, privateKey, createdAt)
-        }
-
-        fun createLike(originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
-            return create("+", originalNote, privateKey, createdAt)
-        }
-
-        fun create(content: String, originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
-
-            var tags = listOf(listOf("e", originalNote.id()), listOf("p", originalNote.pubKey()))
-            if (originalNote is AddressableEvent) {
-                tags = tags + listOf(listOf("a", originalNote.address().toTag()))
-            }
-
-            val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
-            return ReactionEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
-        }
-    }
-}

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

@@ -1,73 +0,0 @@
-package com.vitorpamplona.amethyst.service.model
-
-import androidx.compose.runtime.Immutable
-import com.linkedin.urls.detection.UrlDetector
-import com.linkedin.urls.detection.UrlDetectorOptions
-import com.vitorpamplona.amethyst.model.HexKey
-import com.vitorpamplona.amethyst.model.toHexKey
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.findHashtags
-import nostr.postr.Utils
-import java.util.Date
-
-@Immutable
-class TextNoteEvent(
-    id: HexKey,
-    pubKey: HexKey,
-    createdAt: Long,
-    tags: List<List<String>>,
-    content: String,
-    sig: HexKey
-) : BaseTextNoteEvent(id, pubKey, createdAt, kind, tags, content, sig) {
-
-    companion object {
-        const val kind = 1
-
-        fun create(
-            msg: String,
-            replyTos: List<String>?,
-            mentions: List<String>?,
-            addresses: List<ATag>?,
-            extraTags: List<String>?,
-            zapReceiver: String?,
-            markAsSensitive: Boolean,
-            privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000
-        ): TextNoteEvent {
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
-            val tags = mutableListOf<List<String>>()
-            replyTos?.forEach {
-                tags.add(listOf("e", it))
-            }
-            mentions?.forEach {
-                tags.add(listOf("p", it))
-            }
-            addresses?.forEach {
-                tags.add(listOf("a", it.toTag()))
-            }
-            findHashtags(msg).forEach {
-                tags.add(listOf("t", it))
-                tags.add(listOf("t", it.lowercase()))
-            }
-            extraTags?.forEach {
-                tags.add(listOf("t", it))
-            }
-            zapReceiver?.let {
-                tags.add(listOf("zap", it))
-            }
-            findURLs(msg).forEach {
-                tags.add(listOf("r", it))
-            }
-            if (markAsSensitive) {
-                tags.add(listOf("content-warning", ""))
-            }
-
-            val id = generateId(pubKey, createdAt, kind, tags, msg)
-            val sig = Utils.sign(id, privateKey)
-            return TextNoteEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
-        }
-    }
-}
-
-fun findURLs(text: String): List<String> {
-    return UrlDetector(text, UrlDetectorOptions.Default).detect().map { it.originalUrl }
-}

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

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

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

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

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

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

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

@@ -5,30 +5,93 @@ import android.content.Context
 import androidx.core.content.ContextCompat
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.service.model.Event
-import com.vitorpamplona.amethyst.service.model.LnZapEvent
-import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
-import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendDMNotification
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendZapNotification
 import com.vitorpamplona.amethyst.ui.note.showAmount
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
+import com.vitorpamplona.quartz.encoders.toHexKey
+import com.vitorpamplona.quartz.events.ChatMessageEvent
+import com.vitorpamplona.quartz.events.ChatroomKey
+import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.events.GiftWrapEvent
+import com.vitorpamplona.quartz.events.LnZapEvent
+import com.vitorpamplona.quartz.events.LnZapRequestEvent
+import com.vitorpamplona.quartz.events.PrivateDmEvent
+import com.vitorpamplona.quartz.events.SealedGossipEvent
+import kotlinx.collections.immutable.persistentSetOf
 
 class EventNotificationConsumer(private val applicationContext: Context) {
-    fun consume(event: Event) {
-        val scope = CoroutineScope(Job() + Dispatchers.IO)
-        scope.launch {
-            if (LocalCache.notes[event.id] == null) {
-                // adds to database
-                LocalCache.verifyAndConsume(event, null)
 
-                when (event) {
-                    is PrivateDmEvent -> notify(event)
-                    is LnZapEvent -> notify(event)
+    fun consume(event: Event) {
+        if (LocalCache.notes[event.id] == null) {
+            if (LocalCache.justVerify(event)) {
+                LocalCache.justConsume(event, null)
+
+                val manager = notificationManager()
+                if (manager.areNotificationsEnabled()) {
+                    when (event) {
+                        is PrivateDmEvent -> notify(event)
+                        is LnZapEvent -> notify(event)
+                        is GiftWrapEvent -> unwrapAndNotify(event)
+                    }
+                }
+            }
+        }
+    }
+
+    fun unwrapAndConsume(event: Event, account: Account): Event? {
+        if (!LocalCache.justVerify(event)) return null
+
+        return when (event) {
+            is GiftWrapEvent -> {
+                val key = account.keyPair.privKey ?: return null
+                event.cachedGift(key)?.let {
+                    unwrapAndConsume(it, account)
+                }
+            }
+            is SealedGossipEvent -> {
+                val key = account.keyPair.privKey ?: return null
+                event.cachedGossip(key)?.let {
+                    // this is not verifiable
+                    LocalCache.justConsume(it, null)
+                    it
+                }
+            }
+            else -> {
+                LocalCache.justConsume(event, null)
+                event
+            }
+        }
+    }
+
+    private fun unwrapAndNotify(giftWrap: GiftWrapEvent) {
+        val giftWrapNote = LocalCache.notes[giftWrap.id] ?: return
+
+        LocalPreferences.allSavedAccounts().forEach {
+            val acc = LocalPreferences.loadFromEncryptedStorage(it.npub)
+
+            if (acc != null && acc.userProfile().pubkeyHex == giftWrap.recipientPubKey()) {
+                val chatEvent = unwrapAndConsume(giftWrap, account = acc)
+
+                if (chatEvent is ChatMessageEvent && acc.keyPair.privKey != null) {
+                    val chatNote = LocalCache.notes[chatEvent.id] ?: return
+                    val chatRoom = chatEvent.chatroomKey(acc.keyPair.pubKey.toHexKey())
+
+                    val followingKeySet = acc.followingKeySet()
+
+                    val isKnownRoom = (
+                        acc.userProfile().privateChatrooms[chatRoom]?.senderIntersects(followingKeySet) == true ||
+                            acc.userProfile().hasSentMessagesTo(chatRoom)
+                        ) && !acc.isAllHidden(chatRoom.users)
+
+                    if (isKnownRoom) {
+                        val content = chatNote.event?.content() ?: ""
+                        val user = chatNote.author?.toBestDisplayName() ?: ""
+                        val userPicture = chatNote.author?.profilePicture()
+                        val noteUri = chatNote.toNEvent()
+                        notificationManager().sendDMNotification(chatEvent.id, content, user, userPicture, noteUri, applicationContext)
+                    }
                 }
             }
         }
@@ -43,19 +106,21 @@ class EventNotificationConsumer(private val applicationContext: Context) {
             if (acc != null && acc.userProfile().pubkeyHex == event.verifiedRecipientPubKey()) {
                 val followingKeySet = acc.followingKeySet()
 
-                val messagingWith = acc.userProfile().privateChatrooms.keys.filter {
+                val knownChatrooms = acc.userProfile().privateChatrooms.keys.filter {
                     (
-                        it.pubkeyHex in followingKeySet || acc.userProfile()
-                            .hasSentMessagesTo(it)
-                        ) && !acc.isHidden(it)
+                        acc.userProfile().privateChatrooms[it]?.senderIntersects(followingKeySet) == true ||
+                            acc.userProfile().hasSentMessagesTo(it)
+                        ) && !acc.isAllHidden(it.users)
                 }.toSet()
 
-                if (note.author in messagingWith) {
-                    val content = acc.decryptContent(note) ?: ""
-                    val user = note.author?.toBestDisplayName() ?: ""
-                    val userPicture = note.author?.profilePicture()
-                    val noteUri = note.toNEvent()
-                    notificationManager().sendDMNotification(event.id, content, user, userPicture, noteUri, applicationContext)
+                note.author?.let {
+                    if (ChatroomKey(persistentSetOf(it.pubkeyHex)) in knownChatrooms) {
+                        val content = acc.decryptContent(note) ?: ""
+                        val user = note.author?.toBestDisplayName() ?: ""
+                        val userPicture = note.author?.profilePicture()
+                        val noteUri = note.toNEvent()
+                        notificationManager().sendDMNotification(event.id, content, user, userPicture, noteUri, applicationContext)
+                    }
                 }
             }
         }
@@ -103,7 +168,7 @@ class EventNotificationConsumer(private val applicationContext: Context) {
         }
     }
 
-    private fun notificationManager(): NotificationManager {
+    fun notificationManager(): NotificationManager {
         return ContextCompat.getSystemService(applicationContext, NotificationManager::class.java) as NotificationManager
     }
 }

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

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

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

@@ -5,11 +5,9 @@ import com.vitorpamplona.amethyst.AccountInfo
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.service.HttpClient
-import com.vitorpamplona.amethyst.service.model.RelayAuthEvent
-import kotlinx.coroutines.CoroutineScope
+import com.vitorpamplona.quartz.events.RelayAuthEvent
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -56,18 +54,17 @@ class RegisterAccounts(
 
             val client = HttpClient.getHttpClient()
 
-            client.newCall(request).execute()
+            val isSucess = client.newCall(request).execute().use {
+                it.isSuccessful
+            }
         } catch (e: java.lang.Exception) {
             Log.e("FirebaseMsgService", "Unable to register with push server", e)
         }
     }
 
-    fun go(notificationToken: String) {
-        val scope = CoroutineScope(Job() + Dispatchers.IO)
-        scope.launch {
-            postRegistrationEvent(
-                signEventsToProveControlOfAccounts(accounts, notificationToken)
-            )
-        }
+    suspend fun go(notificationToken: String) = withContext(Dispatchers.IO) {
+        postRegistrationEvent(
+            signEventsToProveControlOfAccounts(accounts, notificationToken)
+        )
     }
 }

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

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

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

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

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.service.previews
 import com.vitorpamplona.amethyst.service.HttpClient
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import okhttp3.Request
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 
@@ -61,10 +62,12 @@ private const val CONTENT = "content"
 
 suspend fun getDocument(url: String, timeOut: Int = 30000): Document =
     withContext(Dispatchers.IO) {
-        return@withContext Jsoup.connect(url)
-            .proxy(HttpClient.getProxy())
-            .timeout(timeOut)
-            .get()
+        val request: Request = Request.Builder().url(url).get().build()
+        val html = HttpClient.getHttpClient().newCall(request).execute().use {
+            it.body.string()
+        }
+
+        Jsoup.parse(html)
     }
 
 suspend fun parseHtml(url: String, document: Document): UrlInfoItem =

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

@@ -2,8 +2,8 @@ package com.vitorpamplona.amethyst.service.relays
 
 import com.vitorpamplona.amethyst.service.HttpClient
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.service.model.Event
-import com.vitorpamplona.amethyst.service.model.EventInterface
+import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.events.EventInterface
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -17,16 +17,6 @@ import java.util.UUID
  * Events are stored with their respective persona.
  */
 object Client : RelayPool.Listener {
-    /**
-     * Lenient mode:
-     *
-     * true: For maximum compatibility. If you want to play ball with sloppy counterparts, use
-     *       this.
-     * false: For developers who want to make protocol compliant counterparts. If your software
-     *        produces events that fail to deserialize in strict mode, you should probably fix
-     *        something.
-     **/
-    var lenient: Boolean = false
     private var listeners = setOf<Listener>()
     private var relays = Constants.convertDefaultRelays()
     private var subscriptions = mapOf<String, List<TypedFilter>>()
@@ -73,10 +63,18 @@ object Client : RelayPool.Listener {
         RelayPool.sendFilterOnlyIfDisconnected()
     }
 
-    fun send(signedEvent: EventInterface, relay: String? = null, feedTypes: Set<FeedType>? = null, onDone: (() -> Unit)? = null) {
+    fun send(
+        signedEvent: EventInterface,
+        relay: String? = null,
+        feedTypes: Set<FeedType>? = null,
+        relayList: List<Relay>? = null,
+        onDone: (() -> Unit)? = null
+    ) {
         checkNotInMainThread()
 
-        if (relay == null) {
+        if (relayList != null) {
+            RelayPool.sendToSelectedRelays(relayList, signedEvent)
+        } else if (relay == null) {
             RelayPool.send(signedEvent)
         } else {
             val useConnectedRelayIfPresent = RelayPool.getRelays(relay)
@@ -104,7 +102,7 @@ object Client : RelayPool.Listener {
         val relay = Relay(url, true, true, feedTypes ?: emptySet(), HttpClient.getProxy())
         RelayPool.addRelay(relay)
 
-        relay.requestAndWatch {
+        relay.connectAndRun {
             allSubscriptions().forEach {
                 relay.sendFilter(requestId = it)
             }
@@ -170,6 +168,7 @@ object Client : RelayPool.Listener {
         }
     }
 
+    @OptIn(DelicateCoroutinesApi::class)
     override fun onAuth(relay: Relay, challenge: String) {
         // Releases the Web thread for the new payload.
         // May need to add a processing queue if processing new events become too costly.

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

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

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

@@ -1,12 +1,13 @@
 package com.vitorpamplona.amethyst.service.relays
 
 import android.util.Log
-import com.google.gson.JsonElement
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.service.model.Event
-import com.vitorpamplona.amethyst.service.model.EventInterface
-import com.vitorpamplona.amethyst.service.model.RelayAuthEvent
+import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.events.EventInterface
+import com.vitorpamplona.quartz.events.RelayAuthEvent
+import com.vitorpamplona.quartz.events.bytesUsedInMemory
+import com.vitorpamplona.quartz.utils.TimeUtils
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -14,7 +15,7 @@ import okhttp3.WebSocket
 import okhttp3.WebSocketListener
 import java.net.Proxy
 import java.time.Duration
-import java.util.Date
+import java.util.concurrent.atomic.AtomicBoolean
 
 enum class FeedType {
     FOLLOWS, PUBLIC_CHATS, PRIVATE_DMS, GLOBAL, SEARCH, WALLET_CONNECT
@@ -29,14 +30,16 @@ class Relay(
     var activeTypes: Set<FeedType> = FeedType.values().toSet(),
     proxy: Proxy?
 ) {
-    val seconds = if (proxy != null) 20L else 10L
-    val duration = Duration.ofSeconds(seconds)
+    companion object {
+        // waits 3 minutes to reconnect once things fail
+        const val RECONNECTING_IN_SECONDS = 60 * 3
+    }
 
     private val httpClient = OkHttpClient.Builder()
         .proxy(proxy)
-        .readTimeout(duration)
-        .connectTimeout(duration)
-        .writeTimeout(duration)
+        .readTimeout(Duration.ofSeconds(if (proxy != null) 20L else 10L))
+        .connectTimeout(Duration.ofSeconds(if (proxy != null) 20L else 10L))
+        .writeTimeout(Duration.ofSeconds(if (proxy != null) 20L else 10L))
         .followRedirects(true)
         .followSslRedirects(true)
         .build()
@@ -50,9 +53,9 @@ class Relay(
 
     var spamCounter = 0
     var errorCounter = 0
-    var ping: Long? = null
+    var pingInMs: Long? = null
 
-    var closingTime = 0L
+    var closingTimeInSeconds = 0L
 
     var afterEOSE = false
 
@@ -68,10 +71,8 @@ class Relay(
         return socket != null
     }
 
-    @Synchronized
-    fun requestAndWatch() {
-        checkNotInMainThread()
-        requestAndWatch {
+    fun connect() {
+        connectAndRun {
             checkNotInMainThread()
 
             // Sends everything.
@@ -81,9 +82,16 @@ class Relay(
         }
     }
 
-    @Synchronized
-    fun requestAndWatch(onConnected: (Relay) -> Unit) {
+    private var connectingBlock = AtomicBoolean()
+
+    fun connectAndRun(onConnected: (Relay) -> Unit) {
+        // If there is a connection, don't wait.
+        if (connectingBlock.getAndSet(true)) {
+            return
+        }
+
         checkNotInMainThread()
+
         if (socket != null) return
 
         try {
@@ -91,132 +99,143 @@ class Relay(
                 .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                 .url(url.trim())
                 .build()
-            val listener = object : WebSocketListener() {
 
-                override fun onOpen(webSocket: WebSocket, response: Response) {
-                    checkNotInMainThread()
+            socket = httpClient.newWebSocket(request, RelayListener(onConnected))
+        } catch (e: Exception) {
+            errorCounter++
+            markConnectionAsClosed()
+            Log.e("Relay", "Relay Invalid $url")
+            e.printStackTrace()
+        } finally {
+            connectingBlock.set(false)
+        }
+    }
 
-                    afterEOSE = false
-                    isReady = true
-                    ping = response.receivedResponseAtMillis - response.sentRequestAtMillis
-                    // Log.w("Relay", "Relay OnOpen, Loading All subscriptions $url")
-                    onConnected(this@Relay)
+    inner class RelayListener(val onConnected: (Relay) -> Unit) : WebSocketListener() {
+        override fun onOpen(webSocket: WebSocket, response: Response) {
+            checkNotInMainThread()
 
-                    listeners.forEach { it.onRelayStateChange(this@Relay, Type.CONNECT, null) }
+            markConnectionAsReady(response.receivedResponseAtMillis - response.sentRequestAtMillis)
+
+            // Log.w("Relay", "Relay OnOpen, Loading All subscriptions $url")
+            onConnected(this@Relay)
+
+            listeners.forEach { it.onRelayStateChange(this@Relay, Type.CONNECT, null) }
+        }
+
+        override fun onMessage(webSocket: WebSocket, text: String) {
+            checkNotInMainThread()
+
+            eventDownloadCounterInBytes += text.bytesUsedInMemory()
+
+            try {
+                processNewRelayMessage(text)
+            } catch (t: Throwable) {
+                t.printStackTrace()
+                text.chunked(2000) { chunked ->
+                    listeners.forEach { it.onError(this@Relay, "", Error("Problem with $chunked")) }
                 }
+            }
+        }
 
-                override fun onMessage(webSocket: WebSocket, text: String) {
-                    checkNotInMainThread()
+        override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
+            checkNotInMainThread()
 
-                    eventDownloadCounterInBytes += text.bytesUsedInMemory()
+            listeners.forEach {
+                it.onRelayStateChange(
+                    this@Relay,
+                    Type.DISCONNECTING,
+                    null
+                )
+            }
+        }
 
-                    try {
-                        val msg = Event.gson.fromJson(text, JsonElement::class.java).asJsonArray
-                        val type = msg[0].asString
-                        val channel = msg[1].asString
+        override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
+            checkNotInMainThread()
 
-                        when (type) {
-                            "EVENT" -> {
-                                val event = Event.fromJson(msg[2], Client.lenient)
+            markConnectionAsClosed()
 
-                                // Log.w("Relay", "Relay onEVENT $url, $channel")
-                                listeners.forEach {
-                                    it.onEvent(this@Relay, channel, event)
-                                    if (afterEOSE) {
-                                        it.onRelayStateChange(this@Relay, Type.EOSE, channel)
-                                    }
-                                }
-                            }
-                            "EOSE" -> listeners.forEach {
-                                afterEOSE = true
-                                // Log.w("Relay", "Relay onEOSE $url, $channel")
-                                it.onRelayStateChange(this@Relay, Type.EOSE, channel)
-                            }
-                            "NOTICE" -> listeners.forEach {
-                                Log.w("Relay", "Relay onNotice $url, $channel")
-                                it.onError(this@Relay, channel, Error("Relay sent notice: " + channel))
-                            }
-                            "OK" -> listeners.forEach {
-                                Log.w("Relay", "Relay on OK $url, ${msg[1].asString}, ${msg[2].asBoolean}, ${msg[3].asString}")
-                                it.onSendResponse(this@Relay, msg[1].asString, msg[2].asBoolean, msg[3].asString)
-                            }
-                            "AUTH" -> listeners.forEach {
-                                // Log.w("Relay", "Relay$url, ${msg[1].asString}")
-                                it.onAuth(this@Relay, msg[1].asString)
-                            }
-                            else -> listeners.forEach {
-                                // Log.w("Relay", "Relay something else $url, $channel")
-                                it.onError(
-                                    this@Relay,
-                                    channel,
-                                    Error("Unknown type $type on channel $channel. Msg was $text")
-                                )
-                            }
-                        }
-                    } catch (t: Throwable) {
-                        t.printStackTrace()
-                        text.chunked(2000) { chunked ->
-                            listeners.forEach { it.onError(this@Relay, "", Error("Problem with $chunked")) }
-                        }
-                    }
-                }
+            listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECT, null) }
+        }
 
-                override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
-                    checkNotInMainThread()
+        override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+            checkNotInMainThread()
 
-                    listeners.forEach {
-                        it.onRelayStateChange(
-                            this@Relay,
-                            Type.DISCONNECTING,
-                            null
-                        )
-                    }
-                }
+            errorCounter++
 
-                override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
-                    checkNotInMainThread()
+            socket?.close(1000, "Normal close")
+            // Failures disconnect the relay.
+            markConnectionAsClosed()
 
-                    socket = null
-                    isReady = false
-                    afterEOSE = false
-                    closingTime = Date().time / 1000
-                    listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECT, null) }
-                }
+            Log.w("Relay", "Relay onFailure $url, ${response?.message} $response")
+            t.printStackTrace()
+            listeners.forEach {
+                it.onError(this@Relay, "", Error("WebSocket Failure. Response: $response. Exception: ${t.message}", t))
+            }
+        }
+    }
 
-                override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
-                    checkNotInMainThread()
+    fun markConnectionAsReady(pingInMs: Long) {
+        this.afterEOSE = false
+        this.isReady = true
+        this.pingInMs = pingInMs
+    }
 
-                    errorCounter++
+    fun markConnectionAsClosed() {
+        this.socket = null
+        this.isReady = false
+        this.afterEOSE = false
+        this.closingTimeInSeconds = TimeUtils.now()
+    }
 
-                    socket?.close(1000, "Normal close")
-                    // Failures disconnect the relay.
-                    socket = null
-                    isReady = false
-                    afterEOSE = false
-                    closingTime = Date().time / 1000
+    fun processNewRelayMessage(newMessage: String) {
+        val msgArray = Event.mapper.readTree(newMessage)
+        val type = msgArray.get(0).asText()
+        val channel = msgArray.get(1).asText()
 
-                    Log.w("Relay", "Relay onFailure $url, ${response?.message} $response")
-                    t.printStackTrace()
-                    listeners.forEach {
-                        it.onError(this@Relay, "", Error("WebSocket Failure. Response: $response. Exception: ${t.message}", t))
+        when (type) {
+            "EVENT" -> {
+                val event = Event.fromJson(msgArray.get(2))
+
+                // Log.w("Relay", "Relay onEVENT $url, $channel")
+                listeners.forEach {
+                    it.onEvent(this@Relay, channel, event)
+                    if (afterEOSE) {
+                        it.onRelayStateChange(this@Relay, Type.EOSE, channel)
                     }
                 }
             }
-
-            socket = httpClient.newWebSocket(request, listener)
-        } catch (e: Exception) {
-            errorCounter++
-            isReady = false
-            afterEOSE = false
-            closingTime = Date().time / 1000
-            Log.e("Relay", "Relay Invalid $url")
-            e.printStackTrace()
+            "EOSE" -> listeners.forEach {
+                afterEOSE = true
+                // Log.w("Relay", "Relay onEOSE $url, $channel")
+                it.onRelayStateChange(this@Relay, Type.EOSE, channel)
+            }
+            "NOTICE" -> listeners.forEach {
+                Log.w("Relay", "Relay onNotice $url, $channel")
+                it.onError(this@Relay, channel, Error("Relay sent notice: " + channel))
+            }
+            "OK" -> listeners.forEach {
+                Log.w("Relay", "Relay on OK $url, ${msgArray[1].asText()}, ${msgArray[2].asBoolean()}, ${msgArray[3].asText()}")
+                it.onSendResponse(this@Relay, msgArray[1].asText(), msgArray[2].asBoolean(), msgArray[3].asText())
+            }
+            "AUTH" -> listeners.forEach {
+                // Log.w("Relay", "Relay$url, ${msg[1].asString}")
+                it.onAuth(this@Relay, msgArray[1].asText())
+            }
+            else -> listeners.forEach {
+                // Log.w("Relay", "Relay something else $url, $channel")
+                it.onError(
+                    this@Relay,
+                    channel,
+                    Error("Unknown type $type on channel $channel. Msg was $newMessage")
+                )
+            }
         }
     }
 
     fun disconnect() {
         // httpClient.dispatcher.executorService.shutdown()
-        closingTime = Date().time / 1000
+        closingTimeInSeconds = TimeUtils.now()
         socket?.close(1000, "Normal close")
         socket = null
         isReady = false
@@ -241,9 +260,9 @@ class Relay(
                 }
             } else {
                 // waits 60 seconds to reconnect after disconnected.
-                if (Date().time / 1000 > closingTime + 60) {
+                if (TimeUtils.now() > closingTimeInSeconds + RECONNECTING_IN_SECONDS) {
                     // sends all filters after connection is successful.
-                    requestAndWatch()
+                    connect()
                 }
             }
         }
@@ -254,9 +273,9 @@ class Relay(
 
         if (socket == null) {
             // waits 60 seconds to reconnect after disconnected.
-            if (Date().time / 1000 > closingTime + 60) {
+            if (TimeUtils.now() > closingTimeInSeconds + RECONNECTING_IN_SECONDS) {
                 // println("sendfilter Only if Disconnected ${url} ")
-                requestAndWatch()
+                connect()
             }
         }
     }
@@ -265,16 +284,36 @@ class Relay(
         checkNotInMainThread()
 
         if (signedEvent is RelayAuthEvent) {
+            // specific protocol for this event.
             val event = """["AUTH",${signedEvent.toJson()}]"""
             socket?.send(event)
             eventUploadCounterInBytes += event.bytesUsedInMemory()
-        }
+        } else {
+            if (write) {
+                if (isConnected()) {
+                    if (isReady) {
+                        val event = """["EVENT",${signedEvent.toJson()}]"""
+                        socket?.send(event)
+                        eventUploadCounterInBytes += event.bytesUsedInMemory()
+                    }
+                } else {
+                    // waits 60 seconds to reconnect after disconnected.
+                    if (TimeUtils.now() > closingTimeInSeconds + RECONNECTING_IN_SECONDS) {
+                        // sends all filters after connection is successful.
+                        connectAndRun {
+                            checkNotInMainThread()
 
-        if (write) {
-            if (signedEvent !is RelayAuthEvent) {
-                val event = """["EVENT",${signedEvent.toJson()}]"""
-                socket?.send(event)
-                eventUploadCounterInBytes += event.bytesUsedInMemory()
+                            val event = """["EVENT",${signedEvent.toJson()}]"""
+                            socket?.send(event)
+                            eventUploadCounterInBytes += event.bytesUsedInMemory()
+
+                            // Sends everything.
+                            Client.allSubscriptions().forEach {
+                                sendFilter(requestId = it)
+                            }
+                        }
+                    }
+                }
             }
         }
     }
@@ -324,7 +363,3 @@ class Relay(
         fun onRelayStateChange(relay: Relay, type: Type, channel: String?)
     }
 }
-
-fun String.bytesUsedInMemory(): Int {
-    return (8 * ((((this.length) * 2) + 45) / 8))
-}

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

@@ -2,20 +2,13 @@ package com.vitorpamplona.amethyst.service.relays
 
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.service.model.Event
-import com.vitorpamplona.amethyst.service.model.EventInterface
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
+import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.events.EventInterface
 
 /**
  * RelayPool manages the connection to multiple Relays and lets consumers deal with simple events.
  */
 object RelayPool : Relay.Listener {
-
-    val scope = CoroutineScope(Job() + Dispatchers.IO)
-
     private var relays = listOf<Relay>()
     private var listeners = setOf<Listener>()
 
@@ -24,7 +17,7 @@ object RelayPool : Relay.Listener {
     }
 
     fun connectedRelays(): Int {
-        return relays.filter { it.isConnected() }.size
+        return relays.count { it.isConnected() }
     }
 
     fun getRelay(url: String): Relay? {
@@ -51,7 +44,7 @@ object RelayPool : Relay.Listener {
     fun requestAndWatch() {
         checkNotInMainThread()
 
-        relays.forEach { it.requestAndWatch() }
+        relays.forEach { it.connect() }
     }
 
     fun sendFilter(subscriptionId: String) {
@@ -62,6 +55,12 @@ object RelayPool : Relay.Listener {
         relays.forEach { it.sendFilterOnlyIfDisconnected() }
     }
 
+    fun sendToSelectedRelays(list: List<Relay>, signedEvent: EventInterface) {
+        list.forEach { relay ->
+            relays.filter { it.url == relay.url }.forEach { it.send(signedEvent) }
+        }
+    }
+
     fun send(signedEvent: EventInterface) {
         relays.forEach { it.send(signedEvent) }
     }
@@ -130,9 +129,7 @@ object RelayPool : Relay.Listener {
     val live: RelayPoolLiveData = RelayPoolLiveData(this)
 
     private fun refreshObservers() {
-        scope.launch {
-            live.refresh()
-        }
+        live.refresh()
     }
 }
 

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

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

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

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

app/src/main/java/com/vitorpamplona/amethyst/service/tts/TextToSpeechEngine.kt

@@ -0,0 +1,162 @@
+/*
+ * Created by Ayaan on 02/02/23, 10:30 pm
+ * Copyright (c) 2023 . All rights reserved.
+ * Last modified 02/02/23, 9:56 pm
+ */
+
+package com.vitorpamplona.amethyst.service.tts
+
+import android.content.Context
+import android.speech.tts.TextToSpeech
+import android.speech.tts.UtteranceProgressListener
+import java.util.Locale
+
+const val DEF_SPEECH_AND_PITCH = 0.8f
+
+fun getErrorText(errorCode: Int): String = when (errorCode) {
+    TextToSpeech.ERROR -> "ERROR"
+    TextToSpeech.ERROR_INVALID_REQUEST -> "ERROR_INVALID_REQUEST"
+    TextToSpeech.ERROR_NETWORK -> "ERROR_NETWORK"
+    TextToSpeech.ERROR_NETWORK_TIMEOUT -> "ERROR_NETWORK_TIMEOUT"
+    TextToSpeech.ERROR_SERVICE -> "ERROR_SERVICE"
+    TextToSpeech.ERROR_SYNTHESIS -> "ERROR_SYNTHESIS"
+    TextToSpeech.ERROR_NOT_INSTALLED_YET -> "ERROR_NOT_INSTALLED_YET"
+    else -> "UNKNOWN"
+}
+
+class TextToSpeechEngine private constructor() {
+    private var tts: TextToSpeech? = null
+
+    private var defaultPitch = 0.8f
+    private var defaultSpeed = 0.8f
+    private var defLanguage = Locale.getDefault()
+    private var onStartListener: (() -> Unit)? = null
+    private var onDoneListener: (() -> Unit)? = null
+    private var onErrorListener: ((String) -> Unit)? = null
+    private var onHighlightListener: ((Int, Int) -> Unit)? = null
+    private var message: String? = null
+
+    companion object {
+        private var instance: TextToSpeechEngine? = null
+        fun getInstance(): TextToSpeechEngine {
+            if (instance == null) {
+                instance = TextToSpeechEngine()
+            }
+            return instance!!
+        }
+    }
+
+    fun initTTS(context: Context, message: String) {
+        tts = TextToSpeech(context) {
+            if (it == TextToSpeech.SUCCESS) {
+                tts!!.language = defLanguage
+                tts!!.setPitch(defaultPitch)
+                tts!!.setSpeechRate(defaultSpeed)
+                tts!!.setListener(
+                    onStart = {
+                        onStartListener?.invoke()
+                    },
+                    onError = { e ->
+                        e?.let { error ->
+                            onErrorListener?.invoke(error)
+                        }
+                    },
+                    onRange = { start, end ->
+                        if (this@TextToSpeechEngine.message != null) {
+                            onHighlightListener?.invoke(start, end)
+                        }
+                    },
+                    onDone = {
+                        onStartListener?.invoke()
+                    }
+                )
+                speak(message)
+            } else {
+                onErrorListener?.invoke(getErrorText(it))
+            }
+        }
+    }
+
+    private fun speak(message: String): TextToSpeechEngine {
+        tts!!.speak(
+            message,
+            TextToSpeech.QUEUE_FLUSH,
+            null,
+            TextToSpeech.ACTION_TTS_QUEUE_PROCESSING_COMPLETED
+        )
+        return this
+    }
+
+    fun setPitchAndSpeed(pitch: Float, speed: Float) {
+        defaultPitch = pitch
+        defaultSpeed = speed
+    }
+
+    fun resetPitchAndSpeed() {
+        defaultPitch = DEF_SPEECH_AND_PITCH
+        defaultSpeed = DEF_SPEECH_AND_PITCH
+    }
+
+    fun setLanguage(local: Locale): TextToSpeechEngine {
+        this.defLanguage = local
+        return this
+    }
+
+    fun setHighlightedMessage(message: String) {
+        this.message = message
+    }
+
+    fun setOnStartListener(onStartListener: (() -> Unit)): TextToSpeechEngine {
+        this.onStartListener = onStartListener
+        return this
+    }
+
+    fun setOnCompletionListener(onDoneListener: () -> Unit): TextToSpeechEngine {
+        this.onDoneListener = onDoneListener
+        return this
+    }
+
+    fun setOnErrorListener(onErrorListener: (String) -> Unit): TextToSpeechEngine {
+        this.onErrorListener = onErrorListener
+        return this
+    }
+
+    fun setOnHighlightListener(onHighlightListener: (Int, Int) -> Unit): TextToSpeechEngine {
+        this.onHighlightListener = onHighlightListener
+        return this
+    }
+
+    fun destroy() {
+        tts?.stop()
+        tts?.shutdown()
+        tts = null
+        instance = null
+    }
+}
+
+inline fun TextToSpeech.setListener(
+    crossinline onStart: (String?) -> Unit = {},
+    crossinline onError: (String?) -> Unit = {},
+    crossinline onRange: (Int, Int) -> Unit = { _, _ -> },
+    crossinline onDone: (String?) -> Unit
+) = this.apply {
+    setOnUtteranceProgressListener(object : UtteranceProgressListener() {
+        override fun onStart(p0: String?) {
+            onStart.invoke(p0)
+        }
+
+        override fun onDone(p0: String?) {
+            onDone.invoke(p0)
+        }
+
+        @Deprecated("Deprecated in Java", ReplaceWith("onError.invoke(p0)"))
+        override fun onError(p0: String?) {
+            onError.invoke(p0)
+        }
+
+        override fun onRangeStart(utteranceId: String?, start: Int, end: Int, frame: Int) {
+            super.onRangeStart(utteranceId, start, end, frame)
+            onRange.invoke(start, end)
+        }
+    })
+}

app/src/main/java/com/vitorpamplona/amethyst/service/tts/TextToSpeechHelper.kt

@@ -0,0 +1,160 @@
+/*
+ * Created by Ayaan on 02/02/23, 10:30 pm
+ * Copyright (c) 2023 . All rights reserved.
+ * Last modified 02/02/23, 10:19 pm
+ */
+
+package com.vitorpamplona.amethyst.service.tts
+
+import android.content.Context
+import android.util.Log
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
+import java.lang.ref.WeakReference
+import java.util.Locale
+
+class TextToSpeechHelper private constructor(private val context: WeakReference<Context>) :
+    LifecycleEventObserver {
+    private val appContext
+        get() = context.get()!!.applicationContext
+
+    private var message: String? = null
+
+    private var tts: TextToSpeechEngine? = null
+
+    private var onStart: (() -> Unit)? = null
+
+    private var onDoneListener: (() -> Unit)? = null
+
+    private var onErrorListener: ((String) -> Unit)? = null
+
+    private var onHighlightListener: ((Pair<Int, Int>) -> Unit)? = null
+
+    private var customActionForDestroy: (() -> Unit)? = null
+
+    init {
+        Log.d("Init", "Init TTS")
+        initTTS()
+    }
+
+    fun registerLifecycle(owner: LifecycleOwner): TextToSpeechHelper {
+        owner.lifecycle.addObserver(this)
+        return this
+    }
+
+    private fun initTTS() = context.get()?.run {
+        tts = TextToSpeechEngine.getInstance()
+            .setOnCompletionListener { onDoneListener?.invoke() }
+            .setOnErrorListener { onErrorListener?.invoke(it) }
+            .setOnStartListener { onStart?.invoke() }
+    }
+
+    fun speak(message: String): TextToSpeechHelper {
+        if (tts == null) {
+            initTTS()
+        }
+        this.message = message
+
+        tts?.initTTS(
+            appContext,
+            message
+        )
+        return this
+    }
+
+    /**
+     * This method will highlight the text in the textView
+     *
+     * @exception Exception("Message can't be null for highlighting !! Call speak() first")
+     */
+    fun highlight(): TextToSpeechHelper {
+        if (message == null) throw Exception("Message can't be null for highlighting !! Call speak() first")
+        tts?.setHighlightedMessage(message!!)
+        tts?.setOnHighlightListener { i, i2 ->
+            onHighlightListener?.invoke(Pair(i, i2))
+        }
+        return this
+    }
+
+    fun removeHighlight(): TextToSpeechHelper {
+        message = null
+        onHighlightListener = null
+        return this
+    }
+
+    fun destroy(
+        action: (() -> Unit) = {}
+    ) {
+        tts?.destroy()
+        tts = null
+        action.invoke()
+        INSTANCE = null
+    }
+
+    fun onStart(onStartListener: () -> Unit): TextToSpeechHelper {
+        this.onStart = onStartListener
+        return this
+    }
+
+    fun onDone(onCompleteListener: () -> Unit): TextToSpeechHelper {
+        this.onDoneListener = onCompleteListener
+        return this
+    }
+
+    fun onError(onErrorListener: (String) -> Unit): TextToSpeechHelper {
+        this.onErrorListener = onErrorListener
+        return this
+    }
+
+    fun onHighlight(onHighlightListener: (Pair<Int, Int>) -> Unit): TextToSpeechHelper {
+        this.onHighlightListener = onHighlightListener
+        return this
+    }
+
+    fun setCustomActionForDestroy(action: () -> Unit): TextToSpeechHelper {
+        customActionForDestroy = action
+        return this
+    }
+
+    fun setLanguage(locale: Locale): TextToSpeechHelper {
+        tts?.setLanguage(locale)
+        return this
+    }
+
+    fun setPitchAndSpeed(
+        pitch: Float = DEF_SPEECH_AND_PITCH,
+        speed: Float = DEF_SPEECH_AND_PITCH
+    ): TextToSpeechHelper {
+        tts?.setPitchAndSpeed(pitch, speed)
+        return this
+    }
+
+    fun resetPitchAndSpeed(): TextToSpeechHelper {
+        tts?.resetPitchAndSpeed()
+        return this
+    }
+
+    companion object {
+        private var INSTANCE: TextToSpeechHelper? = null
+        fun getInstance(context: Context): TextToSpeechHelper {
+            synchronized(TextToSpeechHelper::class.java) {
+                if (INSTANCE == null) {
+                    INSTANCE = TextToSpeechHelper(WeakReference(context))
+                }
+                return INSTANCE!!
+            }
+        }
+    }
+
+    override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+        if (event == Lifecycle.Event.ON_DESTROY ||
+            event == Lifecycle.Event.ON_STOP ||
+            event == Lifecycle.Event.ON_PAUSE
+        ) {
+            destroy {
+                customActionForDestroy?.invoke()
+            }
+        }
+    }
+}