v0.60.2

- Redesign scroll to the top implementation to avoid using arguments in the navigator.

.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

.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.10" />
+    <option name="version" value="1.8.21" />
   </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.
+## 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
 
-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 Amethyst 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

@@ -15,7 +15,7 @@ Or get the latest APK from the [Releases Section](https://github.com/vitorpamplo
 
 # Current Features
 
-- [x] Event Builders / WebSocket Subscriptions (NIP-01, NIP-15)
+- [x] Event Builders / WebSocket Subscriptions (NIP-01)
 - [x] Home Feed
 - [x] Notifications Feed
 - [x] Global Feed
@@ -34,7 +34,8 @@ Or get the latest APK from the [Releases Section](https://github.com/vitorpamplo
 - [x] Lightning Tips
 - [x] Zaps (private, public, anon, non-zap) (NIP-57)
 - [x] URI Support (NIP-21)
-- [x] Event Deletion (NIP-09: like, boost, text notes and reports)
+- [x] Created_at Limits (NIP-22)
+- [x] Event Deletion (NIP-09)
 - [x] Identity Verification (NIP-05)
 - [x] Long-form Content (NIP-23)
 - [x] Parameterized Replaceable Events (NIP-33)
@@ -54,22 +55,31 @@ Or get the latest APK from the [Releases Section](https://github.com/vitorpamplo
 - [x] Markdown Support
 - [x] Relay Authentication (NIP-42)
 - [x] Content stored in relays themselves (NIP-95)
-- [ ] Local Database 
-- [ ] View Individual Reactions (Like, Boost, Zaps, Reports) per Post
+- [x] Custom Emoji (NIP-30)
+- [x] Text Note References (NIP-27)
+- [x] Audio Tracks (zapstr.live) (NIP-TBD)
+- [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)
+- [ ] Marketplace (NIP-15)
+- [ ] Image/Video Capture in the app
+- [ ] Local Database
 - [ ] Bookmarks, Pinned Posts, Muted Events (NIP-51)
-- [ ] Sensitive Content (NIP-36) 
 - [ ] Relay Pages (NIP-11)
-- [ ] Generic Tags (NIP-12)
 - [ ] 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)
 - [ ] Delegated Event Signing (NIP-26)
-- [ ] Account Creation / Backup Guidance (NIP-06)
+- [ ] Account Creation / Backup Guidance
+- [ ] Mnemonic seed phrase (NIP-06)
 - [ ] Message Sent feedback (NIP-20)
+- [ ] OpenTimestamps Attestations (NIP-03)
 
 
 # Development Overview

app/build.gradle

@@ -2,6 +2,7 @@ plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
     id 'org.jlleitschuh.gradle.ktlint' version "11.3.1"
+    id 'com.google.gms.google-services'
 }
 
 android {
@@ -12,17 +13,19 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 130
-        versionName "0.37.3"
+        versionCode 215
+        versionName "0.60.2"
 
         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" )
     }
 
     buildTypes {
         release {
+            // TODO: Make sure all of JSON parsers work when activating these.
             //minifyEnabled true
             //proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             resValue "string", "app_name", "@string/app_name_release"
@@ -70,7 +73,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "1.4.3"
+        kotlinCompilerExtensionVersion "1.4.7"
     }
 
     packagingOptions {
@@ -81,12 +84,11 @@ android {
     lint {
         disable 'MissingTranslation'
     }
-
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.10.0'
-    implementation 'androidx.activity:activity-compose:1.7.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
+    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"
 
@@ -114,7 +116,7 @@ dependencies {
     implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"
 
     // Bitcoin secp256k1 bindings to Android
-    implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.9.0'
+    implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.10.0'
 
     // Nostr Base Protocol
     implementation('com.github.vitorpamplona.NostrPostr:nostrpostrlib:master-SNAPSHOT') {
@@ -127,17 +129,20 @@ dependencies {
     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.0'
+    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 
     // link preview
-    implementation 'tw.com.oneup.www:Baha-UrlPreview:1.0.1'
+    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.6'
+    implementation 'com.google.android.exoplayer:exoplayer:2.18.7'
+    // important for proxy / tor
+    implementation 'com.google.android.exoplayer:extension-okhttp:2.18.7'
 
     // Load images from the web.
     implementation "io.coil-kt:coil-compose:$coil_version"
@@ -149,8 +154,6 @@ dependencies {
     // create blurhash
     implementation group: 'io.trbl', name: 'blurhash', version: '1.0.0'
 
-    // Rendering clickable text
-    implementation "com.google.accompanist:accompanist-flowlayout:$accompanist_version"
     // Permission to upload pictures:
     implementation "com.google.accompanist:accompanist-permissions:$accompanist_version"
 
@@ -162,9 +165,14 @@ dependencies {
     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:main-SNAPSHOT')
+    implementation('com.github.vitorpamplona.compose-richtext:richtext-ui-material:main-SNAPSHOT')
+    implementation('com.github.vitorpamplona.compose-richtext:richtext-commonmark:main-SNAPSHOT')
 
     // Local model for language identification
     playImplementation 'com.google.mlkit:language-id:17.0.4'
@@ -172,8 +180,26 @@ dependencies {
     // Google services model the translate text
     playImplementation 'com.google.mlkit:translate:17.0.1'
 
+    // PushNotifications
+    playImplementation platform('com.google.firebase:firebase-bom:32.1.0')
+    playImplementation 'com.google.firebase:firebase-messaging-ktx'
+
+    // Charts
+    implementation "com.patrykandpatrick.vico:core:${vico_version}"
+    implementation "com.patrykandpatrick.vico:compose:${vico_version}"
+    implementation "com.patrykandpatrick.vico:views:${vico_version}"
+    implementation "com.patrykandpatrick.vico:compose-m2:${vico_version}"
+
+    // immutable collections to avoid recomposition
+    implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5")
+
+    // Video compression lib
+    implementation 'com.github.AbedElazizShe:LightCompressor:1.2.3'
+    // Image compression lib
+    implementation 'id.zelory:compressor:3.0.1'
+
     // Automatic memory leak detection
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.11'
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'io.mockk:mockk:1.13.5'

app/google-services.json

@@ -0,0 +1,68 @@
+{
+  "project_info": {
+    "project_number": "768341258853",
+    "project_id": "amethyst-3057a",
+    "storage_bucket": "amethyst-3057a.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:768341258853:android:5d07c35a37b24ff36b8c8c",
+        "android_client_info": {
+          "package_name": "com.vitorpamplona.amethyst"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "768341258853-6um8ig59qstvio60gfo60fe5e45lnqqe.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyB7ZxgdpgrN6R223HCFdfv4ulP8Egp7trE"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "768341258853-6um8ig59qstvio60gfo60fe5e45lnqqe.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:768341258853:android:e0200680f552484d6b8c8c",
+        "android_client_info": {
+          "package_name": "com.vitorpamplona.amethyst.debug"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "768341258853-6um8ig59qstvio60gfo60fe5e45lnqqe.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyB7ZxgdpgrN6R223HCFdfv4ulP8Egp7trE"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "768341258853-6um8ig59qstvio60gfo60fe5e45lnqqe.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

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

@@ -0,0 +1,89 @@
+package com.vitorpamplona.amethyst
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.vitorpamplona.amethyst.service.model.Event
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import junit.framework.TestCase.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class CitationTests {
+    val json = """
+    {
+  "content": "Astral:\n\nhttps://void.cat/d/A5Fba5B1bcxwEmeyoD9nBs.webp\n\nIris:\n\nhttps://void.cat/d/44hTcVvhRps6xYYs99QsqA.webp\n\nSnort:\n\nhttps://void.cat/d/4nJD5TRePuQChM5tzteYbU.webp\n\nAmethyst agrees with Astral which I suspect are both wrong. nostr:npub13sx6fp3pxq5rl70x0kyfmunyzaa9pzt5utltjm0p8xqyafndv95q3saapa nostr:npub1v0lxxxxutpvrelsksy8cdhgfux9l6a42hsj2qzquu2zk7vc9qnkszrqj49 nostr:npub1g53mukxnjkcmr94fhryzkqutdz2ukq4ks0gvy5af25rgmwsl4ngq43drvk nostr:npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z ",
+  "created_at": 1683596206,
+  "id": "98b574c3527f0ffb30b7271084e3f07480733c7289f8de424d29eae82e36c758",
+  "kind": 1,
+  "pubkey": "46fcbe3065eaf1ae7811465924e48923363ff3f526bd6f73d7c184b16bd8ce4d",
+  "sig": "4aa5264965018fa12a326686ad3d3bd8beae3218dcc83689b19ca1e6baeb791531943c15363aa6707c7c0c8b2d601deca1f20c32078b2872d356cdca03b04cce",
+  "tags": [
+    [
+      "e",
+      "27ac621d7dc4a932e1a79f984308e7d20656dd6fddb2ce9cdfcb6a67b9a7bcc3",
+      "",
+      "root"
+    ],
+    [
+      "e",
+      "be7245af96210a0dd048cab4ad38e52dbd6c09a53ea21a7edb6be8898e5727cc",
+      "",
+      "reply"
+    ],
+    [
+      "p",
+      "22aa81510ee63fe2b16cae16e0921f78e9ba9882e2868e7e63ad6d08ae9b5954"
+    ],
+    [
+      "p",
+      "22aa81510ee63fe2b16cae16e0921f78e9ba9882e2868e7e63ad6d08ae9b5954"
+    ],
+    [
+      "p",
+      "3f770d65d3a764a9c5cb503ae123e62ec7598ad035d836e2a810f3877a745b24"
+    ],
+    [
+      "p",
+      "ec4d241c334311b3a304433ee3442be29d0e88e7ec19b85edf2bba29b93565e2"
+    ],
+    [
+      "p",
+      "0fe0b18b4dbf0e0aa40fcd47209b2a49b3431fc453b460efcf45ca0bd16bd6ac"
+    ],
+    [
+      "p",
+      "8c0da4862130283ff9e67d889df264177a508974e2feb96de139804ea66d6168"
+    ],
+    [
+      "p",
+      "63fe6318dc58583cfe16810f86dd09e18bfd76aabc24a0081ce2856f330504ed"
+    ],
+    [
+      "p",
+      "4523be58d395b1b196a9b8c82b038b6895cb02b683d0c253a955068dba1facd0"
+    ],
+    [
+      "p",
+      "460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c"
+    ]
+  ],
+  "seenOn": [
+    "wss://nostr.wine/"
+  ]
+}
+"""
+
+    @Test
+    fun parseEvent() {
+        val event = Event.fromJson(json, true) as TextNoteEvent
+
+        val expectedCitations = setOf(
+            "8c0da4862130283ff9e67d889df264177a508974e2feb96de139804ea66d6168",
+            "63fe6318dc58583cfe16810f86dd09e18bfd76aabc24a0081ce2856f330504ed",
+            "4523be58d395b1b196a9b8c82b038b6895cb02b683d0c253a955068dba1facd0",
+            "460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c"
+        )
+
+        assertEquals(expectedCitations, event.citedUsers())
+    }
+}

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

@@ -4,12 +4,12 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 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 kotlinx.coroutines.runBlocking
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import java.util.Base64
@@ -21,12 +21,12 @@ class ImageUploadTesting {
 
     @Test()
     fun testImgurUpload() = runBlocking {
-        val inputStream = Base64.getDecoder().decode(image).inputStream()
-
-        println("Uploading")
+        val bytes = Base64.getDecoder().decode(image)
+        val inputStream = bytes.inputStream()
 
         ImageUploader.uploadImage(
             inputStream,
+            bytes.size.toLong(),
             "image/gif",
             ImgurServer(),
             onSuccess = { url, contentType ->
@@ -39,18 +39,17 @@ class ImageUploadTesting {
             }
         )
 
-        delay(1000)
+        delay(5000)
     }
 
     @Test()
-    @Ignore
     fun testNostrBuildUpload() = runBlocking {
-        val inputStream = Base64.getDecoder().decode(image).inputStream()
-
-        println("Uploading")
+        val bytes = Base64.getDecoder().decode(image)
+        val inputStream = bytes.inputStream()
 
         ImageUploader.uploadImage(
             inputStream,
+            bytes.size.toLong(),
             "image/gif",
             NostrBuildServer(),
             onSuccess = { url, contentType ->
@@ -68,12 +67,12 @@ class ImageUploadTesting {
 
     @Test()
     fun testNostrImgUpload() = runBlocking {
-        val inputStream = Base64.getDecoder().decode(image).inputStream()
-
-        println("Uploading")
+        val bytes = Base64.getDecoder().decode(image)
+        val inputStream = bytes.inputStream()
 
         ImageUploader.uploadImage(
             inputStream,
+            bytes.size.toLong(),
             "image/gif",
             NostrImgServer(),
             onSuccess = { url, contentType ->
@@ -88,4 +87,27 @@ class ImageUploadTesting {
 
         delay(1000)
     }
+
+    @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)
+    }
 }

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

@@ -78,7 +78,7 @@ class PrivateZapTests {
         if (recepientPK != null && recepientPost != null) {
             val privateKey = createEncryptionPrivateKey(loggedIn.toHexKey(), recepientPost, privateZapRequest.createdAt)
             val decodedPrivateZap =
-                LnZapRequestEvent.checkForPrivateZap(privateZapRequest, privateKey, recepientPK)
+                privateZapRequest.getPrivateZapEvent(privateKey, recepientPK)
 
             println(decodedPrivateZap?.toJson())
             assertNotNull(decodedPrivateZap)
@@ -127,8 +127,7 @@ class PrivateZapTests {
 
         if (recepientPK != null && recepientPost != null) {
             val privateKey = createEncryptionPrivateKey(loggedIn.toHexKey(), recepientPost, privateZapRequest.createdAt)
-            val decodedPrivateZap =
-                LnZapRequestEvent.checkForPrivateZap(privateZapRequest, privateKey, recepientPK)
+            val decodedPrivateZap = privateZapRequest.getPrivateZapEvent(privateKey, recepientPK)
 
             println(decodedPrivateZap?.toJson())
             assertNotNull(decodedPrivateZap)

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

@@ -0,0 +1,8 @@
+package com.vitorpamplona.amethyst.service.notifications
+
+import com.vitorpamplona.amethyst.AccountInfo
+
+class PushNotificationUtils {
+    fun init(accounts: List<AccountInfo>) {
+    }
+}

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

@@ -1,9 +1,10 @@
 package com.vitorpamplona.amethyst.ui.components
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
@@ -11,10 +12,10 @@ fun TranslatableRichTextViewer(
     content: String,
     canPreview: Boolean,
     modifier: Modifier = Modifier,
-    tags: List<List<String>>?,
-    backgroundColor: Color,
+    tags: ImmutableListOfLists<String>,
+    backgroundColor: MutableState<Color>,
     accountViewModel: AccountViewModel,
-    navController: NavController
+    nav: (String) -> Unit
 ) = ExpandableRichTextViewer(
     content,
     canPreview,
@@ -22,5 +23,5 @@ fun TranslatableRichTextViewer(
     tags,
     backgroundColor,
     accountViewModel,
-    navController
+    nav
 )

app/src/main/AndroidManifest.xml

@@ -1,17 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
+    <queries>
+        <package android:name="org.torproject.android"/>
+    </queries>
 
+    <!-- Doesn't require a camera -->
     <uses-feature android:name="android.hardware.camera" android:required="false" />
 
+    <!-- To connect with relays -->
     <uses-permission android:name="android.permission.INTERNET"/>
+
+    <!-- To Upload media (newer devices) -->
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
+
+    <!-- To Upload media (old devices) -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+
+    <!-- To read QRs that contain nostr:<NIP19> -->
     <uses-permission android:name="android.permission.CAMERA" />
 
-    <!-- Used for SDK < 29 -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+    <!-- To read NFCs that contain nostr:<NIP19> -->
+    <uses-permission android:name="android.permission.NFC" />
+
+    <!-- To know receive notifications when the app connects/disconnects from the web -->
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+
+    <!-- Old permission to access media -->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"
         tools:ignore="ScopedStorage" />
 
     <application
@@ -27,11 +46,13 @@
         android:largeHeap="true"
         android:usesCleartextTraffic="true"
         android:hardwareAccelerated="true"
+        android:localeConfig="@xml/locales_config"
         tools:targetApi="33">
         <activity
             android:name=".ui.MainActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustResize"
+            android:configChanges="orientation|screenSize|screenLayout"
             android:theme="@style/Theme.Amethyst">
 
             <intent-filter android:label="Amethyst">
@@ -46,6 +67,12 @@
                 <data android:scheme="nostr" />
             </intent-filter>
 
+            <intent-filter android:label="Amethyst">
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="nostr" />
+            </intent-filter>
+
             <intent-filter android:label="Amethyst">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -63,6 +90,7 @@
             android:name="com.journeyapps.barcodescanner.CaptureActivity"
             android:screenOrientation="fullSensor"
             tools:replace="screenOrientation" />
+
     </application>
 
 </manifest>

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

@@ -3,11 +3,15 @@ package com.vitorpamplona.amethyst
 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.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
+import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
-import com.vitorpamplona.amethyst.model.toByteArray
+import com.vitorpamplona.amethyst.model.hexToByteArray
+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
@@ -27,6 +31,7 @@ import java.util.Locale
 private const val DEBUG_PLAINTEXT_PREFERENCES = false
 private const val DEBUG_PREFERENCES_NAME = "debug_prefs"
 
+@Immutable
 data class AccountInfo(
     val npub: String,
     val hasPrivKey: Boolean = false
@@ -44,12 +49,22 @@ private object PrefKeys {
     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 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 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"
     val LAST_READ: (String) -> String = { route -> "last_read_route_$route" }
 }
 
@@ -195,17 +210,38 @@ object LocalPreferences {
             putString(PrefKeys.LANGUAGE_PREFS, gson.toJson(account.languagePreferences))
             putString(PrefKeys.TRANSLATE_TO, account.translateTo)
             putString(PrefKeys.ZAP_AMOUNTS, gson.toJson(account.zapAmountChoices))
+            putString(PrefKeys.REACTION_CHOICES, gson.toJson(account.reactionChoices))
             putString(PrefKeys.DEFAULT_ZAPTYPE, gson.toJson(account.defaultZapType))
             putString(PrefKeys.DEFAULT_FILE_SERVER, gson.toJson(account.defaultFileServer))
+            putString(PrefKeys.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))
             putBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, account.hideDeleteRequestDialog)
             putBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, account.hideBlockAlertDialog)
+            putBoolean(PrefKeys.USE_PROXY, account.proxy != null)
+            putInt(PrefKeys.PROXY_PORT, account.proxyPort)
+            putBoolean(PrefKeys.WARN_ABOUT_REPORTS, account.warnAboutPostsWithReports)
+            putBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, account.filterSpamFromStrangers)
+            putString(PrefKeys.LAST_READ_PER_ROUTE, gson.toJson(account.lastReadPerRoute))
+
+            if (account.showSensitiveContent == null) {
+                remove(PrefKeys.SHOW_SENSITIVE_CONTENT)
+            } else {
+                putBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, account.showSensitiveContent!!)
+            }
         }.apply()
     }
 
     fun loadFromEncryptedStorage(): Account? {
-        encryptedPreferences(currentAccount()).apply {
+        val acc = loadFromEncryptedStorage(currentAccount())
+        acc?.registerObservers()
+        return acc
+    }
+
+    fun loadFromEncryptedStorage(npub: String?): Account? {
+        encryptedPreferences(npub).apply {
             val pubKey = getString(PrefKeys.NOSTR_PUBKEY, null) ?: return null
             val privKey = getString(PrefKeys.NOSTR_PRIVKEY, null)
             val followingChannels = getStringSet(PrefKeys.FOLLOWING_CHANNELS, null) ?: setOf()
@@ -217,21 +253,29 @@ object LocalPreferences {
 
             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 zapAmountChoices = gson.fromJson(
                 getString(PrefKeys.ZAP_AMOUNTS, "[]"),
                 object : TypeToken<List<Long>>() {}.type
             ) ?: listOf(500L, 1000L, 5000L)
 
+            val reactionChoices = gson.fromJson<List<String>>(
+                getString(PrefKeys.REACTION_CHOICES, "[]"),
+                object : TypeToken<List<String>>() {}.type
+            ).ifEmpty { listOf("+") } ?: listOf("+")
+
             val defaultZapType = gson.fromJson(
                 getString(PrefKeys.DEFAULT_ZAPTYPE, "PUBLIC"),
                 object : TypeToken<LnZapEvent.ZapType>() {}.type
             ) ?: LnZapEvent.ZapType.PUBLIC
 
             val defaultFileServer = gson.fromJson(
-                getString(PrefKeys.DEFAULT_FILE_SERVER, "IMGUR"),
+                getString(PrefKeys.DEFAULT_FILE_SERVER, "NOSTR_BUILD"),
                 object : TypeToken<ServersAvailable>() {}.type
-            ) ?: ServersAvailable.IMGUR
+            ) ?: ServersAvailable.NOSTR_BUILD
 
             val zapPaymentRequestServer = try {
                 getString(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, null)?.let {
@@ -266,40 +310,61 @@ object LocalPreferences {
 
             val hideDeleteRequestDialog = getBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, false)
             val hideBlockAlertDialog = getBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, false)
+            val useProxy = getBoolean(PrefKeys.USE_PROXY, false)
+            val proxyPort = getInt(PrefKeys.PROXY_PORT, 9050)
+            val proxy = HttpClient.initProxy(useProxy, "127.0.0.1", proxyPort)
+
+            val showSensitiveContent = if (contains(PrefKeys.SHOW_SENSITIVE_CONTENT)) {
+                getBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, false)
+            } else {
+                null
+            }
+            val filterSpam = getBoolean(PrefKeys.FILTER_SPAM_FROM_STRANGERS, true)
+            val warnAboutReports = getBoolean(PrefKeys.WARN_ABOUT_REPORTS, true)
+
+            val lastReadPerRoute = try {
+                getString(PrefKeys.LAST_READ_PER_ROUTE, null)?.let {
+                    gson.fromJson(
+                        it,
+                        object : TypeToken<Map<String, Long>>() {}.type
+                    ) as Map<String, Long>
+                } ?: mapOf()
+            } catch (e: Throwable) {
+                e.printStackTrace()
+                mapOf()
+            }
 
             val a = Account(
-                Persona(privKey = privKey?.toByteArray(), pubKey = pubKey.toByteArray()),
-                followingChannels,
-                hiddenUsers,
-                localRelays,
-                dontTranslateFrom,
-                languagePreferences,
-                translateTo,
-                zapAmountChoices,
-                defaultZapType,
-                defaultFileServer,
-                zapPaymentRequestServer,
-                hideDeleteRequestDialog,
-                hideBlockAlertDialog,
-                latestContactList
+                loggedIn = Persona(privKey = privKey?.hexToByteArray(), pubKey = pubKey.hexToByteArray()),
+                followingChannels = followingChannels,
+                hiddenUsers = hiddenUsers,
+                localRelays = localRelays,
+                dontTranslateFrom = dontTranslateFrom,
+                languagePreferences = languagePreferences,
+                translateTo = translateTo,
+                zapAmountChoices = zapAmountChoices,
+                reactionChoices = reactionChoices,
+                defaultZapType = defaultZapType,
+                defaultFileServer = defaultFileServer,
+                defaultHomeFollowList = defaultHomeFollowList,
+                defaultStoriesFollowList = defaultStoriesFollowList,
+                defaultNotificationFollowList = defaultNotificationFollowList,
+                zapPaymentRequest = zapPaymentRequestServer,
+                hideDeleteRequestDialog = hideDeleteRequestDialog,
+                hideBlockAlertDialog = hideBlockAlertDialog,
+                backupContactList = latestContactList,
+                proxy = proxy,
+                proxyPort = proxyPort,
+                showSensitiveContent = showSensitiveContent,
+                warnAboutPostsWithReports = warnAboutReports,
+                filterSpamFromStrangers = filterSpam,
+                lastReadPerRoute = lastReadPerRoute
             )
 
             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/NotificationCache.kt

@@ -1,56 +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 {
-    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.Main) {
-        if (hasActiveObservers()) {
-            refresh()
-        }
-    }
-
-    fun invalidateData() {
-        bundler.invalidate()
-    }
-
-    fun refresh() {
-        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/ServiceManager.kt

@@ -1,7 +1,16 @@
 package com.vitorpamplona.amethyst
 
+import android.content.Context
+import android.os.Build
+import android.util.Log
+import coil.Coil
+import coil.ImageLoader
+import coil.decode.GifDecoder
+import coil.decode.ImageDecoderDecoder
+import coil.decode.SvgDecoder
 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.NostrChatroomListDataSource
@@ -12,20 +21,43 @@ import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.service.NostrThreadDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
+import com.vitorpamplona.amethyst.service.NostrVideoDataSource
 import com.vitorpamplona.amethyst.service.relays.Client
-import com.vitorpamplona.amethyst.service.relays.Constants
 
 object ServiceManager {
     private var account: Account? = null
 
-    fun start(account: Account) {
+    fun start(account: Account, context: Context) {
         this.account = account
-        start()
+        start(context)
     }
 
-    fun start() {
+    @Synchronized
+    fun start(context: Context) {
+        Log.d("ServiceManager", "Starting Relay Services")
+
         val myAccount = account
 
+        // 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) {
+                    add(ImageDecoderDecoder.Factory())
+                } else {
+                    add(GifDecoder.Factory())
+                }
+                add(SvgDecoder.Factory())
+            } // .logger(DebugLogger())
+                .okHttpClient { HttpClient.getHttpClient() }
+                .respectCacheHeaders(false)
+                .build()
+        }
+
+        // Initializes video cache.
+        VideoCache.init(context.applicationContext)
+
         if (myAccount != null) {
             Client.connect(myAccount.activeRelays() ?: myAccount.convertLocalRelays())
 
@@ -33,23 +65,23 @@ object ServiceManager {
             NostrAccountDataSource.account = myAccount
             NostrHomeDataSource.account = myAccount
             NostrChatroomListDataSource.account = myAccount
+            NostrVideoDataSource.account = myAccount
 
             // Notification Elements
-            NostrAccountDataSource.start()
             NostrHomeDataSource.start()
+            NostrAccountDataSource.start()
             NostrChatroomListDataSource.start()
 
             // More Info Data Sources
             NostrSingleEventDataSource.start()
             NostrSingleChannelDataSource.start()
             NostrSingleUserDataSource.start()
-        } else {
-            // if not logged in yet, start a basic service wit default relays
-            Client.connect(Constants.convertDefaultRelays())
         }
     }
 
     fun pause() {
+        Log.d("ServiceManager", "Pausing Relay Services")
+
         NostrAccountDataSource.stop()
         NostrHomeDataSource.stop()
         NostrChannelDataSource.stop()
@@ -61,6 +93,7 @@ object ServiceManager {
         NostrSingleUserDataSource.stop()
         NostrThreadDataSource.stop()
         NostrUserProfileDataSource.stop()
+        NostrVideoDataSource.stop()
 
         Client.disconnect()
     }
@@ -72,7 +105,6 @@ object ServiceManager {
             LocalCache.pruneOldAndHiddenMessages(it)
             LocalCache.pruneHiddenMessages(it)
             LocalCache.pruneContactLists(it)
-            LocalCache.pruneFileStorageEvents(it)
             // LocalCache.pruneNonFollows(it)
         }
     }

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

@@ -2,10 +2,11 @@ package com.vitorpamplona.amethyst
 
 import android.content.Context
 import com.google.android.exoplayer2.database.StandaloneDatabaseProvider
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
+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
 
 object VideoCache {
 
@@ -18,6 +19,7 @@ object VideoCache {
 
     lateinit var cacheDataSourceFactory: CacheDataSource.Factory
 
+    @Synchronized
     fun init(context: Context) {
         if (!this::simpleCache.isInitialized) {
             exoDatabaseProvider = StandaloneDatabaseProvider(context)
@@ -31,7 +33,14 @@ object VideoCache {
             cacheDataSourceFactory = CacheDataSource.Factory()
                 .setCache(simpleCache)
                 .setUpstreamDataSourceFactory(
-                    DefaultHttpDataSource.Factory().setAllowCrossProtocolRedirects(true)
+                    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)
         }

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

@@ -2,8 +2,11 @@ package com.vitorpamplona.amethyst.model
 
 import android.content.res.Resources
 import android.util.Log
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.Stable
 import androidx.core.os.ConfigurationCompat
 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.OptOutFromFilters
 import com.vitorpamplona.amethyst.service.FileHeader
 import com.vitorpamplona.amethyst.service.NostrLnZapPaymentResponseDataSource
 import com.vitorpamplona.amethyst.service.model.*
@@ -20,6 +23,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import nostr.postr.Persona
+import nostr.postr.Utils
+import java.math.BigDecimal
+import java.net.Proxy
 import java.util.Locale
 
 val DefaultChannels = setOf(
@@ -36,7 +42,11 @@ fun getLanguagesSpokenByUser(): Set<String> {
     return codedList
 }
 
+val GLOBAL_FOLLOWS = " Global "
+val KIND3_FOLLOWS = " All Follows "
+
 @OptIn(DelicateCoroutinesApi::class)
+@Stable
 class Account(
     val loggedIn: Persona,
     var followingChannels: Set<String> = DefaultChannels,
@@ -46,22 +56,44 @@ class Account(
     var languagePreferences: Map<String, String> = mapOf(),
     var translateTo: String = Locale.getDefault().language,
     var zapAmountChoices: List<Long> = listOf(500L, 1000L, 5000L),
+    var reactionChoices: List<String> = listOf("+"),
     var defaultZapType: LnZapEvent.ZapType = LnZapEvent.ZapType.PRIVATE,
-    var defaultFileServer: ServersAvailable = ServersAvailable.IMGUR,
+    var defaultFileServer: ServersAvailable = ServersAvailable.NOSTR_BUILD,
+    var defaultHomeFollowList: String = KIND3_FOLLOWS,
+    var defaultStoriesFollowList: String = GLOBAL_FOLLOWS,
+    var defaultNotificationFollowList: String = GLOBAL_FOLLOWS,
     var zapPaymentRequest: Nip47URI? = null,
     var hideDeleteRequestDialog: Boolean = false,
     var hideBlockAlertDialog: Boolean = false,
-    var backupContactList: ContactListEvent? = null
+    var backupContactList: ContactListEvent? = null,
+    var proxy: Proxy?,
+    var proxyPort: Int,
+    var showSensitiveContent: Boolean? = null,
+    var warnAboutPostsWithReports: Boolean = true,
+    var filterSpamFromStrangers: Boolean = true,
+    var lastReadPerRoute: Map<String, Long> = mapOf<String, Long>()
 ) {
     var transientHiddenUsers: Set<String> = setOf()
 
     // Observers line up here.
     val live: AccountLiveData = AccountLiveData(this)
     val liveLanguages: AccountLiveData = AccountLiveData(this)
+    val liveLastRead: AccountLiveData = AccountLiveData(this)
     val saveable: AccountLiveData = AccountLiveData(this)
 
     var userProfileCache: User? = null
 
+    fun updateOptOutOptions(warnReports: Boolean, filterSpam: Boolean) {
+        warnAboutPostsWithReports = warnReports
+        filterSpamFromStrangers = filterSpam
+        OptOutFromFilters.start(warnAboutPostsWithReports, filterSpamFromStrangers)
+        if (!filterSpamFromStrangers) {
+            transientHiddenUsers = setOf()
+        }
+        live.invalidateData()
+        saveable.invalidateData()
+    }
+
     fun userProfile(): User {
         return userProfileCache ?: run {
             val myUser: User = LocalCache.getOrCreateUser(loggedIn.pubKey.toHexKey())
@@ -74,10 +106,6 @@ class Account(
         return followingChannels.map { LocalCache.getOrCreateChannel(it) }
     }
 
-    fun hiddenUsers(): List<User> {
-        return (hiddenUsers + transientHiddenUsers).map { LocalCache.getOrCreateUser(it) }
-    }
-
     fun isWriteable(): Boolean {
         return loggedIn.privKey != null
     }
@@ -118,8 +146,8 @@ class Account(
         }
     }
 
-    fun reactionTo(note: Note): List<Note> {
-        return note.reactedBy(userProfile(), "+")
+    fun reactionTo(note: Note, reaction: String): List<Note> {
+        return note.reactedBy(userProfile(), reaction)
     }
 
     fun hasBoosted(note: Note): Boolean {
@@ -130,20 +158,20 @@ class Account(
         return note.boostedBy(userProfile())
     }
 
-    fun hasReacted(note: Note): Boolean {
-        return note.hasReacted(userProfile(), "+")
+    fun hasReacted(note: Note, reaction: String): Boolean {
+        return note.hasReacted(userProfile(), reaction)
     }
 
-    fun reactTo(note: Note) {
+    fun reactTo(note: Note, reaction: String) {
         if (!isWriteable()) return
 
-        if (hasReacted(note)) {
+        if (hasReacted(note, reaction)) {
             // has already liked this note
             return
         }
 
         note.event?.let {
-            val event = ReactionEvent.createLike(it, loggedIn.privKey!!)
+            val event = ReactionEvent.create(reaction, it, loggedIn.privKey!!)
             Client.send(event)
             LocalCache.consume(event)
         }
@@ -170,20 +198,55 @@ class Account(
         return zapPaymentRequest != null
     }
 
-    fun sendZapPaymentRequestFor(bolt11: String, onResponse: (Response?) -> Unit) {
+    fun isNIP47Author(pubkeyHex: String?): Boolean {
+        val privKey = zapPaymentRequest?.secret?.hexToByteArray() ?: loggedIn.privKey
+
+        if (privKey == null) return false
+
+        val pubKey = Utils.pubkeyCreate(privKey).toHexKey()
+        return (pubKey == pubkeyHex)
+    }
+
+    fun decryptZapPaymentResponseEvent(zapResponseEvent: LnZapPaymentResponseEvent): Response? {
+        val myNip47 = zapPaymentRequest ?: return null
+
+        val privKey = myNip47.secret?.hexToByteArray() ?: loggedIn.privKey
+        val pubKey = myNip47.pubKeyHex.hexToByteArray()
+
+        if (privKey == null) return null
+
+        return zapResponseEvent.response(privKey, pubKey)
+    }
+
+    fun calculateIfNoteWasZappedByAccount(zappedNote: Note?): Boolean {
+        return zappedNote?.isZappedBy(userProfile(), this) == true
+    }
+
+    fun calculateZappedAmount(zappedNote: Note?): BigDecimal {
+        val privKey = zapPaymentRequest?.secret?.hexToByteArray() ?: loggedIn.privKey
+        val pubKey = zapPaymentRequest?.pubKeyHex?.hexToByteArray()
+        return zappedNote?.zappedAmount(privKey, pubKey) ?: BigDecimal.ZERO
+    }
+
+    fun sendZapPaymentRequestFor(bolt11: String, zappedNote: Note?, onResponse: (Response?) -> Unit) {
         if (!isWriteable()) return
 
         zapPaymentRequest?.let { nip47 ->
-            val event = LnZapPaymentRequestEvent.create(bolt11, nip47.pubKeyHex, nip47.secret?.toByteArray() ?: loggedIn.privKey!!)
+            val event = LnZapPaymentRequestEvent.create(bolt11, nip47.pubKeyHex, nip47.secret?.hexToByteArray() ?: loggedIn.privKey!!)
 
-            val wcListener = NostrLnZapPaymentResponseDataSource(nip47.pubKeyHex, event.pubKey, event.id)
+            val wcListener = NostrLnZapPaymentResponseDataSource(
+                fromServiceHex = nip47.pubKeyHex,
+                toUserHex = event.pubKey,
+                replyingToHex = event.id,
+                authSigningKey = nip47.secret?.hexToByteArray() ?: loggedIn.privKey!!
+            )
             wcListener.start()
 
-            LocalCache.consume(event) {
+            LocalCache.consume(event, zappedNote) {
                 // After the response is received.
-                val privKey = nip47.secret?.toByteArray()
+                val privKey = nip47.secret?.hexToByteArray()
                 if (privKey != null) {
-                    onResponse(it.response(privKey, event.pubKey.toByteArray()))
+                    onResponse(it.response(privKey, nip47.pubKeyHex.hexToByteArray()))
                 }
             }
 
@@ -268,9 +331,15 @@ class Account(
         }
 
         note.event?.let {
-            val event = RepostEvent.create(it, loggedIn.privKey!!)
-            Client.send(event)
-            LocalCache.consume(event)
+            if (it.kind() == 1) {
+                val event = RepostEvent.create(it, loggedIn.privKey!!)
+                Client.send(event)
+                LocalCache.consume(event)
+            } else {
+                val event = GenericRepostEvent.create(it, loggedIn.privKey!!)
+                Client.send(event)
+                LocalCache.consume(event)
+            }
         }
     }
 
@@ -376,12 +445,12 @@ class Account(
         }
     }
 
-    fun sendNip95(data: ByteArray, headerInfo: FileHeader): Note? {
+    fun createNip95(byteArray: ByteArray, headerInfo: FileHeader): Pair<FileStorageEvent, FileStorageHeaderEvent>? {
         if (!isWriteable()) return null
 
         val data = FileStorageEvent.create(
             mimeType = headerInfo.mimeType ?: "",
-            data = data,
+            data = byteArray,
             privateKey = loggedIn.privKey!!
         )
 
@@ -390,16 +459,23 @@ class Account(
             mimeType = headerInfo.mimeType,
             hash = headerInfo.hash,
             size = headerInfo.size.toString(),
+            dimensions = headerInfo.dim,
             blurhash = headerInfo.blurHash,
             description = headerInfo.description,
             privateKey = loggedIn.privKey!!
         )
 
+        return Pair(data, signedEvent)
+    }
+
+    fun sendNip95(data: FileStorageEvent, signedEvent: FileStorageHeaderEvent): Note? {
+        if (!isWriteable()) return null
+
         Client.send(data)
-        LocalCache.consume(data)
+        LocalCache.consume(data, null)
 
         Client.send(signedEvent)
-        LocalCache.consume(signedEvent)
+        LocalCache.consume(signedEvent, null)
 
         return LocalCache.notes[signedEvent.id]
     }
@@ -412,18 +488,30 @@ class Account(
             mimeType = headerInfo.mimeType,
             hash = headerInfo.hash,
             size = headerInfo.size.toString(),
+            dimensions = headerInfo.dim,
             blurhash = headerInfo.blurHash,
             description = headerInfo.description,
             privateKey = loggedIn.privKey!!
         )
 
         Client.send(signedEvent)
-        LocalCache.consume(signedEvent)
+        LocalCache.consume(signedEvent, null)
 
         return LocalCache.notes[signedEvent.id]
     }
 
-    fun sendPost(message: String, replyTo: List<Note>?, mentions: List<User>?, tags: List<String>? = null, zapReceiver: String? = null) {
+    fun sendPost(
+        message: String,
+        replyTo: List<Note>?,
+        mentions: List<User>?,
+        tags: List<String>? = null,
+        zapReceiver: String? = null,
+        wantsToMarkAsSensitive: Boolean,
+        zapRaiserAmount: Long? = null,
+        replyingTo: String?,
+        root: String?,
+        directMentions: Set<HexKey>
+    ) {
         if (!isWriteable()) return
 
         val repliesToHex = replyTo?.filter { it.address() == null }?.map { it.idHex }
@@ -437,6 +525,11 @@ class Account(
             addresses = addresses,
             extraTags = tags,
             zapReceiver = zapReceiver,
+            markAsSensitive = wantsToMarkAsSensitive,
+            zapRaiserAmount = zapRaiserAmount,
+            replyingTo = replyingTo,
+            root = root,
+            directMentions = directMentions,
             privateKey = loggedIn.privKey!!
         )
 
@@ -453,7 +546,9 @@ class Account(
         valueMinimum: Int?,
         consensusThreshold: Int?,
         closedAt: Int?,
-        zapReceiver: String? = null
+        zapReceiver: String? = null,
+        wantsToMarkAsSensitive: Boolean,
+        zapRaiserAmount: Long? = null
     ) {
         if (!isWriteable()) return
 
@@ -472,14 +567,16 @@ class Account(
             valueMinimum = valueMinimum,
             consensusThreshold = consensusThreshold,
             closedAt = closedAt,
-            zapReceiver = zapReceiver
+            zapReceiver = zapReceiver,
+            markAsSensitive = wantsToMarkAsSensitive,
+            zapRaiserAmount = zapRaiserAmount
         )
         // println("Sending new PollNoteEvent: %s".format(signedEvent.toJson()))
         Client.send(signedEvent)
         LocalCache.consume(signedEvent)
     }
 
-    fun sendChannelMessage(message: String, toChannel: String, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: String? = null) {
+    fun sendChannelMessage(message: String, toChannel: String, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null) {
         if (!isWriteable()) return
 
         // val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
@@ -492,26 +589,29 @@ class Account(
             replyTos = repliesToHex,
             mentions = mentionsHex,
             zapReceiver = zapReceiver,
+            markAsSensitive = wantsToMarkAsSensitive,
+            zapRaiserAmount = zapRaiserAmount,
             privateKey = loggedIn.privKey!!
         )
         Client.send(signedEvent)
         LocalCache.consume(signedEvent, null)
     }
 
-    fun sendPrivateMessage(message: String, toUser: String, replyingTo: Note? = null, mentions: List<User>?, zapReceiver: String? = null) {
+    fun sendPrivateMessage(message: String, toUser: User, replyingTo: Note? = null, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean, zapRaiserAmount: Long? = null) {
         if (!isWriteable()) return
-        val user = LocalCache.users[toUser] ?: return
 
         val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
         val mentionsHex = mentions?.map { it.pubkeyHex }
 
         val signedEvent = PrivateDmEvent.create(
-            recipientPubKey = user.pubkey(),
-            publishedRecipientPubKey = user.pubkey(),
+            recipientPubKey = toUser.pubkey(),
+            publishedRecipientPubKey = toUser.pubkey(),
             msg = message,
             replyTos = repliesToHex,
             mentions = mentionsHex,
             zapReceiver = zapReceiver,
+            markAsSensitive = wantsToMarkAsSensitive,
+            zapRaiserAmount = zapRaiserAmount,
             privateKey = loggedIn.privKey!!,
             advertiseNip18 = false
         )
@@ -544,18 +644,33 @@ class Account(
 
         val bookmarks = userProfile().latestBookmarkList
 
-        val event = BookmarkListEvent.create(
-            "bookmark",
-            bookmarks?.taggedEvents() ?: emptyList(),
-            bookmarks?.taggedUsers() ?: emptyList(),
-            bookmarks?.taggedAddresses() ?: emptyList(),
+        val event = if (note is AddressableNote) {
+            BookmarkListEvent.create(
+                "bookmark",
+                bookmarks?.taggedEvents() ?: emptyList(),
+                bookmarks?.taggedUsers() ?: emptyList(),
+                bookmarks?.taggedAddresses() ?: emptyList(),
 
-            bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!)?.plus(note.idHex) ?: listOf(note.idHex),
-            bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
-            bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!)?.plus(note.address) ?: listOf(note.address),
 
-            loggedIn.privKey!!
-        )
+                loggedIn.privKey!!
+            )
+        } else {
+            BookmarkListEvent.create(
+                "bookmark",
+                bookmarks?.taggedEvents() ?: emptyList(),
+                bookmarks?.taggedUsers() ?: emptyList(),
+                bookmarks?.taggedAddresses() ?: emptyList(),
+
+                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!)?.plus(note.idHex) ?: listOf(note.idHex),
+                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+
+                loggedIn.privKey!!
+            )
+        }
 
         Client.send(event)
         LocalCache.consume(event)
@@ -566,18 +681,33 @@ class Account(
 
         val bookmarks = userProfile().latestBookmarkList
 
-        val event = BookmarkListEvent.create(
-            "bookmark",
-            bookmarks?.taggedEvents()?.plus(note.idHex) ?: listOf(note.idHex),
-            bookmarks?.taggedUsers() ?: emptyList(),
-            bookmarks?.taggedAddresses() ?: emptyList(),
+        val event = if (note is AddressableNote) {
+            BookmarkListEvent.create(
+                "bookmark",
+                bookmarks?.taggedEvents() ?: emptyList(),
+                bookmarks?.taggedUsers() ?: emptyList(),
+                bookmarks?.taggedAddresses()?.plus(note.address) ?: listOf(note.address),
 
-            bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
-            bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
-            bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
 
-            loggedIn.privKey!!
-        )
+                loggedIn.privKey!!
+            )
+        } else {
+            BookmarkListEvent.create(
+                "bookmark",
+                bookmarks?.taggedEvents()?.plus(note.idHex) ?: listOf(note.idHex),
+                bookmarks?.taggedUsers() ?: emptyList(),
+                bookmarks?.taggedAddresses() ?: emptyList(),
+
+                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+
+                loggedIn.privKey!!
+            )
+        }
 
         Client.send(event)
         LocalCache.consume(event)
@@ -588,18 +718,33 @@ class Account(
 
         val bookmarks = userProfile().latestBookmarkList
 
-        val event = BookmarkListEvent.create(
-            "bookmark",
-            bookmarks?.taggedEvents() ?: emptyList(),
-            bookmarks?.taggedUsers() ?: emptyList(),
-            bookmarks?.taggedAddresses() ?: emptyList(),
+        val event = if (note is AddressableNote) {
+            BookmarkListEvent.create(
+                "bookmark",
+                bookmarks?.taggedEvents() ?: emptyList(),
+                bookmarks?.taggedUsers() ?: emptyList(),
+                bookmarks?.taggedAddresses() ?: emptyList(),
 
-            bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!)?.minus(note.idHex) ?: listOf(),
-            bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
-            bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!)?.minus(note.address) ?: listOf(),
 
-            loggedIn.privKey!!
-        )
+                loggedIn.privKey!!
+            )
+        } else {
+            BookmarkListEvent.create(
+                "bookmark",
+                bookmarks?.taggedEvents() ?: emptyList(),
+                bookmarks?.taggedUsers() ?: emptyList(),
+                bookmarks?.taggedAddresses() ?: emptyList(),
+
+                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!)?.minus(note.idHex) ?: listOf(),
+                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+
+                loggedIn.privKey!!
+            )
+        }
 
         Client.send(event)
         LocalCache.consume(event)
@@ -616,18 +761,33 @@ class Account(
 
         val bookmarks = userProfile().latestBookmarkList
 
-        val event = BookmarkListEvent.create(
-            "bookmark",
-            bookmarks?.taggedEvents()?.minus(note.idHex),
-            bookmarks?.taggedUsers() ?: emptyList(),
-            bookmarks?.taggedAddresses() ?: emptyList(),
+        val event = if (note is AddressableNote) {
+            BookmarkListEvent.create(
+                "bookmark",
+                bookmarks?.taggedEvents() ?: emptyList(),
+                bookmarks?.taggedUsers() ?: emptyList(),
+                bookmarks?.taggedAddresses()?.minus(note.address),
 
-            bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
-            bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
-            bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
 
-            loggedIn.privKey!!
-        )
+                loggedIn.privKey!!
+            )
+        } else {
+            BookmarkListEvent.create(
+                "bookmark",
+                bookmarks?.taggedEvents()?.minus(note.idHex),
+                bookmarks?.taggedUsers() ?: emptyList(),
+                bookmarks?.taggedAddresses() ?: emptyList(),
+
+                bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
+                bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+
+                loggedIn.privKey!!
+            )
+        }
 
         Client.send(event)
         LocalCache.consume(event)
@@ -694,18 +854,73 @@ class Account(
         saveable.invalidateData()
     }
 
+    fun changeDefaultHomeFollowList(name: String) {
+        defaultHomeFollowList = name
+        live.invalidateData()
+        saveable.invalidateData()
+    }
+
+    fun changeDefaultStoriesFollowList(name: String) {
+        defaultStoriesFollowList = name
+        live.invalidateData()
+        saveable.invalidateData()
+    }
+
+    fun changeDefaultNotificationFollowList(name: String) {
+        defaultNotificationFollowList = name
+        live.invalidateData()
+        saveable.invalidateData()
+    }
+
     fun changeZapAmounts(newAmounts: List<Long>) {
         zapAmountChoices = newAmounts
         live.invalidateData()
         saveable.invalidateData()
     }
 
+    fun changeReactionTypes(newTypes: List<String>) {
+        reactionChoices = newTypes
+        live.invalidateData()
+        saveable.invalidateData()
+    }
+
     fun changeZapPaymentRequest(newServer: Nip47URI?) {
         zapPaymentRequest = newServer
         live.invalidateData()
         saveable.invalidateData()
     }
 
+    fun selectedUsersFollowList(listName: String?): Set<String>? {
+        if (listName == GLOBAL_FOLLOWS) return null
+        if (listName == KIND3_FOLLOWS) return userProfile().cachedFollowingKeySet()
+
+        val privKey = loggedIn.privKey
+
+        return if (listName != null) {
+            val aTag = ATag(PeopleListEvent.kind, userProfile().pubkeyHex, listName, null).toTag()
+            val list = LocalCache.addressables[aTag]
+            if (list != null) {
+                val publicHexList = (list.event as? PeopleListEvent)?.bookmarkedPeople() ?: emptySet()
+                val privateHexList = privKey?.let {
+                    (list.event as? PeopleListEvent)?.privateTaggedUsers(it)
+                } ?: emptySet()
+
+                (publicHexList + privateHexList).toSet()
+            } else {
+                emptySet()
+            }
+        } else {
+            emptySet()
+        }
+    }
+
+    fun selectedTagsFollowList(listName: String?): Set<String>? {
+        if (listName == GLOBAL_FOLLOWS) return null
+        if (listName == KIND3_FOLLOWS) return userProfile().cachedFollowingTagSet()
+
+        return emptySet()
+    }
+
     fun sendChangeChannel(name: String, about: String, picture: String, channel: Channel) {
         if (!isWriteable()) return
 
@@ -730,15 +945,7 @@ class Account(
     fun decryptContent(note: Note): String? {
         val event = note.event
         return if (event is PrivateDmEvent && loggedIn.privKey != null) {
-            var pubkeyToUse = event.pubKey
-
-            val recepientPK = event.recipientPubKey()
-
-            if (note.author == userProfile() && recepientPK != null) {
-                pubkeyToUse = recepientPK
-            }
-
-            event.plainContent(loggedIn.privKey!!, pubkeyToUse.toByteArray())
+            event.plainContent(loggedIn.privKey!!, event.talkingWith(userProfile().pubkeyHex).hexToByteArray())
         } else if (event is LnZapRequestEvent && loggedIn.privKey != null) {
             decryptZapContentAuthor(note)?.content()
         } else {
@@ -759,7 +966,7 @@ class Account(
                 val privateKeyToUse = loggedInPrivateKey
                 val pubkeyToUse = event.pubKey
 
-                LnZapRequestEvent.checkForPrivateZap(event, privateKeyToUse, pubkeyToUse)
+                event.getPrivateZapEvent(privateKeyToUse, pubkeyToUse)
             } else {
                 // if the sender is logged in, these are the params
                 val altPubkeyToUse = recipientPK
@@ -779,13 +986,28 @@ class Account(
                     null
                 }
 
-                if (altPrivateKeyToUse != null && altPubkeyToUse != null) {
-                    val result = LnZapRequestEvent.checkForPrivateZap(event, altPrivateKeyToUse, altPubkeyToUse)
-                    if (result == null) {
-                        Log.w("Private ZAP Decrypt", "Fail to decrypt Zap from ${note.author?.toBestDisplayName()} ${note.idNote()}")
+                try {
+                    if (altPrivateKeyToUse != null && altPubkeyToUse != null) {
+                        val altPubKeyFromPrivate = Utils.pubkeyCreate(altPrivateKeyToUse).toHexKey()
+
+                        if (altPubKeyFromPrivate == event.pubKey) {
+                            val result = event.getPrivateZapEvent(altPrivateKeyToUse, altPubkeyToUse)
+
+                            if (result == null) {
+                                Log.w(
+                                    "Private ZAP Decrypt",
+                                    "Fail to decrypt Zap from ${note.author?.toBestDisplayName()} ${note.idNote()}"
+                                )
+                            }
+                            result
+                        } else {
+                            null
+                        }
+                    } else {
+                        null
                     }
-                    result
-                } else {
+                } catch (e: Exception) {
+                    Log.e("Account", "Failed to create pubkey for ZapRequest ${event.id}", e)
                     null
                 }
             }
@@ -818,10 +1040,10 @@ class Account(
     }
 
     private fun updateContactListTo(newContactList: ContactListEvent?) {
-        if (newContactList?.unverifiedFollowKeySet().isNullOrEmpty()) return
+        if (newContactList == null || newContactList.tags.isEmpty()) return
 
         // Events might be different objects, we have to compare their ids.
-        if (backupContactList?.id != newContactList?.id) {
+        if (backupContactList?.id != newContactList.id) {
             backupContactList = newContactList
             saveable.invalidateData()
         }
@@ -831,7 +1053,7 @@ class Account(
     fun activeRelays(): Array<Relay>? {
         var usersRelayList = userProfile().latestContactList?.relays()?.map {
             val localFeedTypes = localRelays.firstOrNull() { localRelay -> localRelay.url == it.key }?.feedTypes ?: FeedType.values().toSet()
-            Relay(it.key, it.value.read, it.value.write, localFeedTypes)
+            Relay(it.key, it.value.read, it.value.write, localFeedTypes, proxy)
         } ?: return null
 
         // Ugly, but forces nostr.band as the only search-supporting relay today.
@@ -841,7 +1063,8 @@ class Account(
                 Constants.forcedRelayForSearch.url,
                 Constants.forcedRelayForSearch.read,
                 Constants.forcedRelayForSearch.write,
-                Constants.forcedRelayForSearch.feedTypes
+                Constants.forcedRelayForSearch.feedTypes,
+                proxy
             )
         }
 
@@ -850,7 +1073,7 @@ class Account(
 
     fun convertLocalRelays(): Array<Relay> {
         return localRelays.map {
-            Relay(it.url, it.read, it.write, it.feedTypes)
+            Relay(it.url, it.read, it.write, it.feedTypes, proxy)
         }.toTypedArray()
     }
 
@@ -875,12 +1098,19 @@ class Account(
     }
 
     fun isAcceptable(user: User): Boolean {
+        if (!warnAboutPostsWithReports) {
+            return !isHidden(user) && // if user hasn't hided this author
+                user.reportsBy(userProfile()).isEmpty() // if user has not reported this post
+        }
         return !isHidden(user) && // if user hasn't hided this author
             user.reportsBy(userProfile()).isEmpty() && // if user has not reported this post
             user.countReportAuthorsBy(followingKeySet()) < 5
     }
 
     fun isAcceptableDirect(note: Note): Boolean {
+        if (!warnAboutPostsWithReports) {
+            return note.reportsBy(userProfile()).isEmpty()
+        }
         return note.reportsBy(userProfile()).isEmpty() && // if user has not reported this post
             note.countReportAuthorsBy(followingKeySet()) < 5 // if it has 5 reports by reliable users
     }
@@ -893,7 +1123,7 @@ class Account(
         return note.author?.let { isAcceptable(it) } ?: true && // if user hasn't hided this author
             isAcceptableDirect(note) &&
             (
-                note.event !is RepostEvent ||
+                (note.event !is RepostEvent && note.event !is GenericRepostEvent) ||
                     (note.replyTo?.firstOrNull { isAcceptableDirect(it) } != null)
                 ) // is not a reaction about a blocked post
     }
@@ -901,7 +1131,7 @@ class Account(
     fun getRelevantReports(note: Note): Set<Note> {
         val followsPlusMe = userProfile().latestContactList?.verifiedFollowKeySetAndMe ?: emptySet()
 
-        val innerReports = if (note.event is RepostEvent) {
+        val innerReports = if (note.event is RepostEvent || note.event is GenericRepostEvent) {
             note.replyTo?.map { getRelevantReports(it) }?.flatten() ?: emptyList()
         } else {
             emptyList()
@@ -932,14 +1162,26 @@ class Account(
         saveable.invalidateData()
     }
 
-    init {
-        backupContactList?.let {
-            println("Loading saved contacts ${it.toJson()}")
-            if (userProfile().latestContactList == null) {
-                LocalCache.consume(it)
-            }
-        }
+    fun updateShowSensitiveContent(show: Boolean?) {
+        showSensitiveContent = show
+        saveable.invalidateData()
+        live.invalidateData()
+    }
 
+    fun markAsRead(route: String, timestampInSecs: Long) {
+        val lastTime = lastReadPerRoute[route]
+        if (lastTime == null || timestampInSecs > lastTime) {
+            lastReadPerRoute = lastReadPerRoute + Pair(route, timestampInSecs)
+            saveable.invalidateData()
+            liveLastRead.invalidateData()
+        }
+    }
+
+    fun loadLastRead(route: String): Long {
+        return lastReadPerRoute[route] ?: 0
+    }
+
+    fun registerObservers() {
         // Observes relays to restart connections
         userProfile().live().relays.observeForever {
             GlobalScope.launch(Dispatchers.IO) {
@@ -949,7 +1191,9 @@ class Account(
 
         // saves contact list for the next time.
         userProfile().live().follows.observeForever {
-            updateContactListTo(userProfile().latestContactList)
+            GlobalScope.launch(Dispatchers.IO) {
+                updateContactListTo(userProfile().latestContactList)
+            }
         }
 
         // imports transient blocks due to spam.
@@ -960,24 +1204,34 @@ class Account(
                         val userToBlock = LocalCache.getOrCreateUser(it.pubkeyHex)
                         if (userToBlock != userProfile() && userToBlock.pubkeyHex !in followingKeySet()) {
                             transientHiddenUsers = transientHiddenUsers + it.pubkeyHex
+                            live.invalidateData()
                         }
                     }
                 }
             }
         }
     }
+
+    init {
+        backupContactList?.let {
+            println("Loading saved contacts ${it.toJson()}")
+            if (userProfile().latestContactList == null) {
+                LocalCache.consume(it)
+            }
+        }
+    }
 }
 
 class AccountLiveData(private val account: Account) : LiveData<AccountState>(AccountState(account)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.Default) {
-        if (hasActiveObservers()) {
-            refresh()
-        }
-    }
+    private val bundler = BundledUpdate(300, Dispatchers.Default)
 
     fun invalidateData() {
-        bundler.invalidate()
+        bundler.invalidate() {
+            if (hasActiveObservers()) {
+                refresh()
+            }
+        }
     }
 
     fun refresh() {
@@ -985,4 +1239,5 @@ class AccountLiveData(private val account: Account) : LiveData<AccountState>(Acc
     }
 }
 
+@Immutable
 class AccountState(val account: Account)

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

@@ -3,7 +3,10 @@ package com.vitorpamplona.amethyst.model
 import android.util.Log
 import android.util.LruCache
 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 kotlinx.coroutines.Dispatchers
@@ -16,11 +19,20 @@ class AntiSpamFilter {
 
     @Synchronized
     fun isSpam(event: Event, relay: Relay?): Boolean {
+        checkNotInMainThread()
+
+        if (!OptOutFromFilters.filterSpamFromStrangers) return false
+
         val idHex = event.id
 
         // if short message, ok
+        // The idea here is to avoid considering repeated "GM" messages spam.
         if (event.content.length < 50) return false
 
+        // if the message is actually short but because it cites a user/event, the nostr: string is really long, make it ok.
+        // The idea here is to avoid considering repeated "@Bot, command" messages spam, while still blocking repeated "lnbc..." invoices or fishing urls
+        if (event.content.length < 180 && Nip19.nip19regex.matcher(event.content).find()) return false
+
         // double list strategy:
         // if duplicated, it goes into spam. 1000 spam messages are saved into the spam list.
 
@@ -28,6 +40,7 @@ class AntiSpamFilter {
         val hash = (event.content + event.tags.flatten().joinToString(",")).hashCode()
 
         if ((recentMessages[hash] != null && recentMessages[hash] != idHex) || spamMessages[hash] != null) {
+            Log.w("Potential SPAM Message for sharing", "${Nip19.createNEvent(event.id, event.pubKey, event.kind, null)}")
             Log.w("Potential SPAM Message", "${event.id} ${recentMessages[hash]} ${spamMessages[hash] != null} ${relay?.url} ${event.content.replace("\n", " | ")}")
 
             // Log down offenders
@@ -55,18 +68,14 @@ class AntiSpamFilter {
 class AntiSpamLiveData(val cache: AntiSpamFilter) : LiveData<AntiSpamState>(AntiSpamState(cache)) {
 
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.Main) {
-        if (hasActiveObservers()) {
-            refresh()
-        }
-    }
+    private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateData() {
-        bundler.invalidate()
-    }
-
-    private fun refresh() {
-        postValue(AntiSpamState(cache))
+        bundler.invalidate() {
+            if (hasActiveObservers()) {
+                postValue(AntiSpamState(cache))
+            }
+        }
     }
 }
 

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

@@ -1,5 +1,6 @@
 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
@@ -9,6 +10,7 @@ import fr.acinq.secp256k1.Hex
 import kotlinx.coroutines.Dispatchers
 import java.util.concurrent.ConcurrentHashMap
 
+@Stable
 class Channel(val idHex: String) {
     var creator: User? = null
     var info = ChannelCreateEvent.ChannelData(null, null, null)
@@ -33,6 +35,10 @@ class Channel(val idHex: String) {
         notes.remove(note.idHex)
     }
 
+    fun removeNote(noteHex: String) {
+        notes.remove(noteHex)
+    }
+
     fun updateChannelInfo(creator: User, channelInfo: ChannelCreateEvent.ChannelData, updatedAt: Long) {
         this.creator = creator
         this.info = channelInfo
@@ -57,7 +63,7 @@ class Channel(val idHex: String) {
     fun pruneOldAndHiddenMessages(account: Account): Set<Note> {
         val important = notes.values
             .filter { it.author?.let { it1 -> account.isHidden(it1) } == false }
-            .sortedBy { it.createdAt() }
+            .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
             .reversed()
             .take(1000)
             .toSet()
@@ -74,18 +80,14 @@ class Channel(val idHex: String) {
 
 class ChannelLiveData(val channel: Channel) : LiveData<ChannelState>(ChannelState(channel)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.Main) {
-        if (hasActiveObservers()) {
-            refresh()
-        }
-    }
+    private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateData() {
-        bundler.invalidate()
-    }
-
-    private fun refresh() {
-        postValue(ChannelState(channel))
+        bundler.invalidate() {
+            if (hasActiveObservers()) {
+                postValue(ChannelState(channel))
+            }
+        }
     }
 
     override fun onActive() {

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

@@ -11,11 +11,13 @@ fun checkForHashtagWithIcon(tag: String): HashtagIcon? {
         "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))
         "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", "#permaculture", "#gardening", "#garden" -> HashtagIcon(R.drawable.grownostr, "GrowNostr", Color.Unspecified, Modifier.padding(0.dp, 1.dp, 0.dp, 1.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))
+        "weed", "weedstr", "420", "cannabis", "marijuana" -> HashtagIcon(R.drawable.weed, "Weed", Color.Unspecified, Modifier.padding(0.dp, 0.dp, 0.dp, 0.dp))
         else -> null
     }
 }

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

@@ -29,7 +29,7 @@ fun ByteArray.toHexKey(): HexKey {
     return toHex()
 }
 
-fun HexKey.toByteArray(): ByteArray {
+fun HexKey.hexToByteArray(): ByteArray {
     return Hex.decode(this)
 }
 
@@ -39,7 +39,7 @@ fun HexKey.toDisplayHexKey(): String {
 
 fun decodePublicKey(key: String): ByteArray {
     val parsed = Nip19.uriToRoute(key)
-    val pubKeyParsed = parsed?.hex?.toByteArray()
+    val pubKeyParsed = parsed?.hex?.hexToByteArray()
 
     return if (key.startsWith("nsec")) {
         Persona(privKey = key.bechToBytes()).pubKey
@@ -50,6 +50,23 @@ fun decodePublicKey(key: String): ByteArray {
     }
 }
 
+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? {

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

@@ -1,29 +1,26 @@
 package com.vitorpamplona.amethyst.model
 
 import android.util.Log
-import androidx.lifecycle.LiveData
-import com.fasterxml.jackson.databind.DeserializationFeature
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.vitorpamplona.amethyst.service.NostrAccountDataSource.account
+import com.vitorpamplona.amethyst.Amethyst
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.*
+import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.BundledInsert
 import fr.acinq.secp256k1.Hex
 import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import nostr.postr.toNpub
-import java.io.ByteArrayInputStream
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.util.concurrent.ConcurrentHashMap
 
 object LocalCache {
-    val metadataParser by lazy {
-        jacksonObjectMapper()
-            .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-            .readerFor(UserMetadata::class.java)
-    }
-
     val antiSpam = AntiSpamFilter()
 
     val users = ConcurrentHashMap<HexKey, User>(5000)
@@ -31,9 +28,12 @@ object LocalCache {
     val channels = ConcurrentHashMap<HexKey, Channel>()
     val addressables = ConcurrentHashMap<String, AddressableNote>(100)
 
-    val awaitingPaymentRequests = ConcurrentHashMap<HexKey, (LnZapPaymentResponseEvent) -> Unit>(10)
+    val awaitingPaymentRequests =
+        ConcurrentHashMap<HexKey, Pair<Note?, (LnZapPaymentResponseEvent) -> Unit>>(10)
 
     fun checkGetOrCreateUser(key: String): User? {
+        checkNotInMainThread()
+
         if (isValidHexNpub(key)) {
             return getOrCreateUser(key)
         }
@@ -42,6 +42,8 @@ object LocalCache {
 
     @Synchronized
     fun getOrCreateUser(key: HexKey): User {
+        // checkNotInMainThread()
+
         return users[key] ?: run {
             val answer = User(key)
             users.put(key, answer)
@@ -49,18 +51,41 @@ object LocalCache {
         }
     }
 
+    fun getUserIfExists(key: String): User? {
+        return users[key]
+    }
+
+    fun getNoteIfExists(key: String): Note? {
+        return addressables[key] ?: notes[key]
+    }
+
+    fun getChannelIfExists(key: String): Channel? {
+        return channels[key]
+    }
+
     fun checkGetOrCreateNote(key: String): Note? {
+        checkNotInMainThread()
+
         if (ATag.isATag(key)) {
             return checkGetOrCreateAddressableNote(key)
         }
         if (isValidHexNpub(key)) {
-            return getOrCreateNote(key)
+            val note = getOrCreateNote(key)
+            val noteEvent = note.event
+            if (noteEvent is AddressableEvent) {
+                // upgrade to the latest
+                return checkGetOrCreateAddressableNote(noteEvent.address().toTag())
+            } else {
+                return note
+            }
         }
         return null
     }
 
     @Synchronized
     fun getOrCreateNote(idHex: String): Note {
+        checkNotInMainThread()
+
         return notes[idHex] ?: run {
             val answer = Note(idHex)
             notes.put(idHex, answer)
@@ -69,6 +94,8 @@ object LocalCache {
     }
 
     fun checkGetOrCreateChannel(key: String): Channel? {
+        checkNotInMainThread()
+
         if (isValidHexNpub(key)) {
             return getOrCreateChannel(key)
         }
@@ -87,6 +114,8 @@ object LocalCache {
 
     @Synchronized
     fun getOrCreateChannel(key: String): Channel {
+        checkNotInMainThread()
+
         return channels[key] ?: run {
             val answer = Channel(key)
             channels.put(key, answer)
@@ -109,33 +138,35 @@ object LocalCache {
     }
 
     @Synchronized
-    fun getOrCreateAddressableNote(key: ATag): AddressableNote {
+    fun getOrCreateAddressableNoteInternal(key: ATag): AddressableNote {
+        checkNotInMainThread()
+
         // we can't use naddr here because naddr might include relay info and
         // the preferred relay should not be part of the index.
         return addressables[key.toTag()] ?: run {
             val answer = AddressableNote(key)
-            answer.author = checkGetOrCreateUser(key.pubKeyHex)
             addressables.put(key.toTag(), answer)
             answer
         }
     }
 
+    fun getOrCreateAddressableNote(key: ATag): AddressableNote {
+        val note = getOrCreateAddressableNoteInternal(key)
+        // Loads the user outside a Syncronized block to avoid blocking
+        if (note.author == null) {
+            note.author = checkGetOrCreateUser(key.pubKeyHex)
+        }
+        return note
+    }
+
     fun consume(event: MetadataEvent) {
         // new event
         val oldUser = getOrCreateUser(event.pubKey)
         if (oldUser.info == null || event.createdAt > oldUser.info!!.updatedMetadataAt) {
-            val newUser = try {
-                metadataParser.readValue(
-                    ByteArrayInputStream(event.content.toByteArray(Charsets.UTF_8)),
-                    UserMetadata::class.java
-                )
-            } catch (e: Exception) {
-                e.printStackTrace()
-                Log.w("MT", "Content Parse Error ${e.localizedMessage} ${event.content}")
-                return
+            val newUserMetadata = event.contactMetaData()
+            if (newUserMetadata != null) {
+                oldUser.updateUserInfo(newUserMetadata, event)
             }
-
-            oldUser.updateUserInfo(newUser, event)
             // Log.d("MT", "New User Metadata ${oldUser.pubkeyDisplayHex} ${oldUser.toBestDisplayName()}")
         } else {
             // Log.d("MT","Relay sent a previous Metadata Event ${oldUser.toBestDisplayName()} ${formattedDateTime(event.createdAt)} > ${formattedDateTime(oldUser.updatedAt)}")
@@ -154,6 +185,26 @@ object LocalCache {
         }
     }
 
+    fun consume(event: PeopleListEvent) {
+        val version = getOrCreateNote(event.id)
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
+        // Already processed this event.
+        if (note.event?.id() == event.id()) return
+
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList())
+
+            refreshObservers(note)
+        }
+    }
+
     fun formattedDateTime(timestamp: Long): String {
         return Instant.ofEpochSecond(timestamp).atZone(ZoneId.systemDefault())
             .format(DateTimeFormatter.ofPattern("uuuu MMM d hh:mm a"))
@@ -196,9 +247,15 @@ object LocalCache {
     }
 
     fun consume(event: LongTextNoteEvent, relay: Relay?) {
+        val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
 
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
         if (relay != null) {
             author.addRelayBeingUsed(relay, event.createdAt)
             note.addRelay(relay)
@@ -261,10 +318,93 @@ object LocalCache {
         refreshObservers(note)
     }
 
-    fun consume(event: BadgeDefinitionEvent) {
+    private fun consume(event: LiveActivitiesEvent, relay: Relay?) {
+        val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
 
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
+        if (note.event?.id() == event.id()) return
+
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList())
+
+            refreshObservers(note)
+        }
+    }
+
+    private fun consume(event: PinListEvent) {
+        val version = getOrCreateNote(event.id)
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
+        if (note.event?.id() == event.id()) return
+
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList())
+
+            refreshObservers(note)
+        }
+    }
+
+    private fun consume(event: RelaySetEvent) {
+        val version = getOrCreateNote(event.id)
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
+        if (note.event?.id() == event.id()) return
+
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList())
+
+            refreshObservers(note)
+        }
+    }
+
+    private fun consume(event: AudioTrackEvent) {
+        val version = getOrCreateNote(event.id)
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
+        // Already processed this event.
+        if (note.event?.id() == event.id()) return
+
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList())
+
+            refreshObservers(note)
+        }
+    }
+
+    fun consume(event: BadgeDefinitionEvent) {
+        val version = getOrCreateNote(event.id)
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
         // Already processed this event.
         if (note.event?.id() == event.id()) return
 
@@ -276,9 +416,15 @@ object LocalCache {
     }
 
     fun consume(event: BadgeProfilesEvent) {
+        val version = getOrCreateNote(event.id)
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
 
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
         // Already processed this event.
         if (note.event?.id() == event.id()) return
 
@@ -313,6 +459,46 @@ object LocalCache {
         refreshObservers(note)
     }
 
+    fun consume(event: AppDefinitionEvent) {
+        val version = getOrCreateNote(event.id)
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList())
+
+            refreshObservers(note)
+        }
+    }
+
+    fun consume(event: AppRecommendationEvent) {
+        val version = getOrCreateNote(event.id)
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
+        // Already processed this event.
+        if (note.event?.id() == event.id()) return
+
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList())
+
+            refreshObservers(note)
+        }
+    }
+
     @Suppress("UNUSED_PARAMETER")
     fun consume(event: RecommendRelayEvent) {
 //        // Log.d("RR", event.toJson())
@@ -328,7 +514,7 @@ object LocalCache {
         }
     }
 
-    fun consume(event: PrivateDmEvent, relay: Relay?) {
+    fun consume(event: PrivateDmEvent, relay: Relay?): Note {
         val note = getOrCreateNote(event.id)
         val author = getOrCreateUser(event.pubKey)
 
@@ -338,9 +524,9 @@ object LocalCache {
         }
 
         // Already processed this event.
-        if (note.event != null) return
+        if (note.event != null) return note
 
-        val recipient = event.recipientPubKey()?.let { getOrCreateUser(it) }
+        val recipient = event.verifiedRecipientPubKey()?.let { getOrCreateUser(it) }
 
         // Log.d("PM", "${author.toBestDisplayName()} to ${recipient?.toBestDisplayName()}")
 
@@ -355,6 +541,8 @@ object LocalCache {
         }
 
         refreshObservers(note)
+
+        return note
     }
 
     fun consume(event: DeletionEvent) {
@@ -379,15 +567,18 @@ object LocalCache {
                     masterNote.removeBoost(deleteNote)
                     masterNote.removeReaction(deleteNote)
                     masterNote.removeZap(deleteNote)
+                    masterNote.removeZapPayment(deleteNote)
                     masterNote.removeReport(deleteNote)
                 }
 
-                val channel = deleteNote.channel()
-                channel?.removeNote(deleteNote)
+                deleteNote.channelHex()?.let {
+                    val channel = checkGetOrCreateChannel(it)
+                    channel?.removeNote(deleteNote)
+                }
 
                 if (deleteNote.event is PrivateDmEvent) {
                     val author = deleteNote.author
-                    val recipient = (deleteNote.event as? PrivateDmEvent)?.recipientPubKey()?.let { checkGetOrCreateUser(it) }
+                    val recipient = (deleteNote.event as? PrivateDmEvent)?.verifiedRecipientPubKey()?.let { checkGetOrCreateUser(it) }
 
                     if (recipient != null && author != null) {
                         author.removeMessage(recipient, deleteNote)
@@ -431,6 +622,31 @@ object LocalCache {
         refreshObservers(note)
     }
 
+    fun consume(event: GenericRepostEvent) {
+        val note = getOrCreateNote(event.id)
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        // Log.d("TN", "New Boost (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+
+        val author = getOrCreateUser(event.pubKey)
+        val repliesTo = event.boostedPost().mapNotNull { checkGetOrCreateNote(it) } +
+            event.taggedAddresses().mapNotNull { getOrCreateAddressableNote(it) }
+
+        note.loadEvent(event, author, repliesTo)
+
+        // Prepares user's profile view.
+        author.addNote(note)
+
+        // Counts the replies
+        repliesTo.forEach {
+            it.addBoost(note)
+        }
+
+        refreshObservers(note)
+    }
+
     fun consume(event: ReactionEvent) {
         val note = getOrCreateNote(event.id)
 
@@ -445,26 +661,8 @@ object LocalCache {
 
         // Log.d("RE", "New Reaction ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
 
-        if (
-            event.content == "" ||
-            event.content == "+" ||
-            event.content == "\u2764\uFE0F" || // red heart
-            event.content == "\uD83E\uDD19" || // call me hand
-            event.content == "\uD83D\uDC4D" // thumbs up
-        ) {
-            // Counts the replies
-            repliesTo.forEach {
-                it.addReaction(note)
-            }
-        }
-
-        if (event.content == "!" || // nostr_console hide.
-            event.content == "\u26A0\uFE0F" // Warning sign
-        ) {
-            // Counts the replies
-            repliesTo.forEach {
-                it.addReport(note)
-            }
+        repliesTo.forEach {
+            it.addReaction(note)
         }
 
         refreshObservers(note)
@@ -494,9 +692,15 @@ object LocalCache {
             mentions.forEach {
                 it.addReport(note)
             }
-        }
-        repliesTo.forEach {
-            it.addReport(note)
+        } else {
+            repliesTo.forEach {
+                it.addReport(note)
+            }
+
+            mentions.forEach {
+                // doesn't add to reports, but triggers recounts
+                it.liveSet?.reports?.invalidateData()
+            }
         }
 
         refreshObservers(note)
@@ -506,17 +710,20 @@ object LocalCache {
         // Log.d("MT", "New Event ${event.content} ${event.id.toHex()}")
         val oldChannel = getOrCreateChannel(event.id)
         val author = getOrCreateUser(event.pubKey)
+
+        val note = getOrCreateNote(event.id)
+        if (note.event == null) {
+            oldChannel.addNote(note)
+            note.loadEvent(event, author, emptyList())
+
+            refreshObservers(note)
+        }
+
         if (event.createdAt <= oldChannel.updatedMetadataAt) {
             return // older data, does nothing
         }
         if (oldChannel.creator == null || oldChannel.creator == author) {
             oldChannel.updateChannelInfo(author, event.channelInfo(), event.createdAt)
-
-            val note = getOrCreateNote(event.id)
-            oldChannel.addNote(note)
-            note.loadEvent(event, author, emptyList())
-
-            refreshObservers(note)
         }
     }
 
@@ -531,16 +738,18 @@ object LocalCache {
         if (event.createdAt > oldChannel.updatedMetadataAt) {
             if (oldChannel.creator == null || oldChannel.creator == author) {
                 oldChannel.updateChannelInfo(author, event.channelInfo(), event.createdAt)
-
-                val note = getOrCreateNote(event.id)
-                oldChannel.addNote(note)
-                note.loadEvent(event, author, emptyList())
-
-                refreshObservers(note)
             }
         } else {
             // Log.d("MT","Relay sent a previous Metadata Event ${oldUser.toBestDisplayName()} ${formattedDateTime(event.createdAt)} > ${formattedDateTime(oldUser.updatedAt)}")
         }
+
+        val note = getOrCreateNote(event.id)
+        if (note.event == null) {
+            oldChannel.addNote(note)
+            note.loadEvent(event, author, emptyList())
+
+            refreshObservers(note)
+        }
     }
 
     fun consume(event: ChannelMessageEvent, relay: Relay?) {
@@ -653,41 +862,90 @@ object LocalCache {
         refreshObservers(note)
     }
 
-    fun consume(event: FileHeaderEvent) {
+    fun consume(event: FileHeaderEvent, relay: Relay?) {
         val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
 
         // Already processed this event.
         if (note.event != null) return
 
-        val author = getOrCreateUser(event.pubKey)
-
         note.loadEvent(event, author, emptyList())
 
         refreshObservers(note)
     }
 
-    fun consume(event: FileStorageHeaderEvent) {
+    fun consume(event: FileStorageHeaderEvent, relay: Relay?) {
         val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
 
         // Already processed this event.
         if (note.event != null) return
 
-        val author = getOrCreateUser(event.pubKey)
-
         note.loadEvent(event, author, emptyList())
 
         refreshObservers(note)
     }
 
-    fun consume(event: FileStorageEvent) {
+    fun consume(event: HighlightEvent, relay: Relay?) {
         val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
 
         // Already processed this event.
         if (note.event != null) return
 
+        note.loadEvent(event, author, emptyList())
+
+        // Adds to user profile
+        author.addNote(note)
+
+        refreshObservers(note)
+    }
+
+    fun consume(event: FileStorageEvent, relay: Relay?) {
+        val note = getOrCreateNote(event.id)
         val author = getOrCreateUser(event.pubKey)
 
-        note.loadEvent(event, author, emptyList())
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        try {
+            val cachePath = File(Amethyst.instance.applicationContext.externalCacheDir, "NIP95")
+            cachePath.mkdirs()
+            val file = File(cachePath, event.id)
+            if (!file.exists()) {
+                val stream = FileOutputStream(file)
+                stream.write(event.decode())
+                stream.close()
+                Log.i("FileStorageEvent", "NIP95 File received from ${relay?.url} and saved to disk as $file")
+            }
+        } catch (e: IOException) {
+            Log.e("FileStorageEvent", "FileStorageEvent save to disk error: " + event.id, e)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        // this is an invalid event. But we don't need to keep the data in memory.
+        val eventNoData = FileStorageEvent(event.id, event.pubKey, event.createdAt, event.tags, "", event.sig)
+
+        note.loadEvent(eventNoData, author, emptyList())
 
         refreshObservers(note)
     }
@@ -696,12 +954,41 @@ object LocalCache {
         // Does nothing without a response callback.
     }
 
-    fun consume(event: LnZapPaymentRequestEvent, onResponse: (LnZapPaymentResponseEvent) -> Unit) {
-        awaitingPaymentRequests.put(event.id, onResponse)
+    fun consume(event: LnZapPaymentRequestEvent, zappedNote: Note?, onResponse: (LnZapPaymentResponseEvent) -> Unit) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        zappedNote?.addZapPayment(note, null)
+
+        awaitingPaymentRequests.put(event.id, Pair(zappedNote, onResponse))
+
+        refreshObservers(note)
     }
 
     fun consume(event: LnZapPaymentResponseEvent) {
-        val responseCallback = awaitingPaymentRequests[event.requestId()]
+        val requestId = event.requestId()
+        val pair = awaitingPaymentRequests[requestId] ?: return
+
+        val (zappedNote, responseCallback) = pair
+
+        val requestNote = requestId?.let { checkGetOrCreateNote(requestId) }
+
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        requestNote?.let { request ->
+            zappedNote?.addZapPayment(request, note)
+        }
 
         if (responseCallback != null) {
             responseCallback(event)
@@ -709,6 +996,14 @@ object LocalCache {
     }
 
     fun findUsersStartingWith(username: String): List<User> {
+        checkNotInMainThread()
+
+        val key = decodePublicKeyAsHexOrNull(username)
+
+        if (key != null && users[key] != null) {
+            return listOfNotNull(users[key])
+        }
+
         return users.values.filter {
             (it.anyNameStartsWith(username)) ||
                 it.pubkeyHex.startsWith(username, true) ||
@@ -717,6 +1012,18 @@ object LocalCache {
     }
 
     fun findNotesStartingWith(text: String): List<Note> {
+        checkNotInMainThread()
+
+        val key = try {
+            Nip19.uriToRoute(text)?.hex ?: Hex.decode(text).toHexKey()
+        } catch (e: Exception) {
+            null
+        }
+
+        if (key != null && (notes[key] ?: addressables[key]) != null) {
+            return listOfNotNull(notes[key] ?: addressables[key])
+        }
+
         return notes.values.filter {
             (it.event is TextNoteEvent && it.event?.content()?.contains(text, true) ?: false) ||
                 (it.event is PollNoteEvent && it.event?.content()?.contains(text, true) ?: false) ||
@@ -732,6 +1039,18 @@ object LocalCache {
     }
 
     fun findChannelsStartingWith(text: String): List<Channel> {
+        checkNotInMainThread()
+
+        val key = try {
+            Nip19.uriToRoute(text)?.hex ?: Hex.decode(text).toHexKey()
+        } catch (e: Exception) {
+            null
+        }
+
+        if (key != null && channels[key] != null) {
+            return listOfNotNull(channels[key])
+        }
+
         return channels.values.filter {
             it.anyNameStartsWith(text) ||
                 it.idHex.startsWith(text, true) ||
@@ -749,15 +1068,9 @@ object LocalCache {
         }
     }
 
-    fun pruneFileStorageEvents(account: Account) {
-        val toBeRemoved = notes.filter { it.value.event is FileStorageEvent }
-
-        toBeRemoved.forEach {
-            notes.remove(it.key)
-        }
-    }
-
     fun pruneOldAndHiddenMessages(account: Account) {
+        checkNotInMainThread()
+
         channels.forEach { it ->
             val toBeRemoved = it.value.pruneOldAndHiddenMessages(account)
 
@@ -776,6 +1089,8 @@ object LocalCache {
     }
 
     fun pruneHiddenMessages(account: Account) {
+        checkNotInMainThread()
+
         val toBeRemoved = account.hiddenUsers.map {
             (users[it]?.notes ?: emptySet())
         }.flatten()
@@ -803,6 +1118,8 @@ object LocalCache {
     }
 
     fun pruneContactLists(userAccount: Account) {
+        checkNotInMainThread()
+
         var removingContactList = 0
         users.values.forEach {
             if (it != userAccount.userProfile() && (it.liveSet == null || it.liveSet?.isInUse() == false) && it.latestContactList != null) {
@@ -820,18 +1137,93 @@ object LocalCache {
     private fun refreshObservers(newNote: Note) {
         live.invalidateData(newNote)
     }
-}
 
-class LocalCacheLiveData : LiveData<Set<Note>>(setOf<Note>()) {
+    fun verifyAndConsume(event: Event, relay: Relay?) {
+        checkNotInMainThread()
 
-    // Refreshes observers in batches.
-    private val bundler = BundledInsert<Note>(300, Dispatchers.Main)
-
-    fun invalidateData(newNote: Note) {
-        bundler.invalidateList(newNote) { bundledNewNotes ->
-            if (hasActiveObservers()) {
-                postValue(bundledNewNotes)
+        if (!event.hasValidSignature()) {
+            try {
+                event.checkSignature()
+            } catch (e: Exception) {
+                Log.w("Event failed retest ${event.kind}", e.message ?: "")
             }
+            return
+        }
+
+        try {
+            when (event) {
+                is AppDefinitionEvent -> consume(event)
+                is AppRecommendationEvent -> consume(event)
+                is AudioTrackEvent -> consume(event)
+                is BadgeAwardEvent -> consume(event)
+                is BadgeDefinitionEvent -> consume(event)
+                is BadgeProfilesEvent -> consume(event)
+                is BookmarkListEvent -> consume(event)
+                is ChannelCreateEvent -> consume(event)
+                is ChannelHideMessageEvent -> consume(event)
+                is ChannelMessageEvent -> consume(event, relay)
+                is ChannelMetadataEvent -> consume(event)
+                is ChannelMuteUserEvent -> consume(event)
+                is ContactListEvent -> consume(event)
+                is DeletionEvent -> consume(event)
+
+                is FileHeaderEvent -> consume(event, relay)
+                is FileStorageEvent -> consume(event, relay)
+                is FileStorageHeaderEvent -> consume(event, relay)
+                is HighlightEvent -> consume(event, relay)
+                is LiveActivitiesEvent -> consume(event, relay)
+                is LnZapEvent -> {
+                    event.zapRequest?.let {
+                        verifyAndConsume(it, relay)
+                    }
+                    consume(event)
+                }
+                is LnZapRequestEvent -> consume(event)
+                is LnZapPaymentRequestEvent -> consume(event)
+                is LnZapPaymentResponseEvent -> consume(event)
+                is LongTextNoteEvent -> consume(event, relay)
+                is MetadataEvent -> consume(event)
+                is PrivateDmEvent -> consume(event, relay)
+                is PinListEvent -> consume(event)
+                is PeopleListEvent -> consume(event)
+                is ReactionEvent -> consume(event)
+                is RecommendRelayEvent -> consume(event)
+                is RelaySetEvent -> consume(event)
+                is ReportEvent -> consume(event, relay)
+                is RepostEvent -> {
+                    event.containedPost()?.let {
+                        verifyAndConsume(it, relay)
+                    }
+                    consume(event)
+                }
+                is GenericRepostEvent -> {
+                    event.containedPost()?.let {
+                        verifyAndConsume(it, relay)
+                    }
+                    consume(event)
+                }
+                is TextNoteEvent -> consume(event, relay)
+                is PollNoteEvent -> consume(event, relay)
+                else -> {
+                    Log.w("Event Not Supported", event.toJson())
+                }
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+}
+
+class LocalCacheLiveData {
+    private val _newEventBundles = MutableSharedFlow<Set<Note>>()
+    val newEventBundles = _newEventBundles.asSharedFlow() // read-only public view
+
+    // Refreshes observers in batches.
+    private val bundler = BundledInsert<Note>(300, Dispatchers.IO)
+
+    fun invalidateData(newNote: Note) {
+        bundler.invalidateList(newNote) { bundledNewNotes ->
+            _newEventBundles.emit(bundledNewNotes)
         }
     }
 }

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

@@ -1,11 +1,16 @@
 package com.vitorpamplona.amethyst.model
 
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
 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.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.toShortenHex
 import fr.acinq.secp256k1.Hex
@@ -19,6 +24,7 @@ import java.util.regex.Pattern
 
 val tagSearch = Pattern.compile("(?:\\s|\\A)\\#\\[([0-9]+)\\]")
 
+@Stable
 class AddressableNote(val address: ATag) : Note(address.toTag()) {
     override fun idNote() = address.toNAddr()
     override fun toNEvent() = address.toNAddr()
@@ -27,6 +33,7 @@ class AddressableNote(val address: ATag) : Note(address.toTag()) {
     override fun createdAt() = (event as? LongTextNoteEvent)?.publishedAt() ?: event?.createdAt()
 }
 
+@Stable
 open class Note(val idHex: String) {
     // These fields are only available after the Text Note event is received.
     // They are immutable after that.
@@ -37,7 +44,7 @@ open class Note(val idHex: String) {
     // These fields are updated every time an event related to this note is received.
     var replies = setOf<Note>()
         private set
-    var reactions = setOf<Note>()
+    var reactions = mapOf<String, Set<Note>>()
         private set
     var boosts = setOf<Note>()
         private set
@@ -45,6 +52,8 @@ open class Note(val idHex: String) {
         private set
     var zaps = mapOf<Note, Note?>()
         private set
+    var zapPayments = mapOf<Note, Note?>()
+        private set
 
     var relays = setOf<String>()
         private set
@@ -66,10 +75,6 @@ open class Note(val idHex: String) {
             ?: (event as? ChannelCreateEvent)?.id
     }
 
-    fun channel(): Channel? {
-        return channelHex()?.let { LocalCache.checkGetOrCreateChannel(it) }
-    }
-
     open fun address(): ATag? = null
 
     open fun createdAt() = event?.createdAt()
@@ -92,7 +97,7 @@ open class Note(val idHex: String) {
      */
     fun replyLevelSignature(cachedSignatures: MutableMap<Note, String> = mutableMapOf()): String {
         val replyTo = replyTo
-        if (replyTo == null || replyTo.isEmpty()) {
+        if (event is RepostEvent || event is GenericRepostEvent || replyTo == null || replyTo.isEmpty()) {
             return "/" + formattedDateTime(createdAt() ?: 0) + ";"
         }
 
@@ -105,7 +110,7 @@ open class Note(val idHex: String) {
 
     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
         }
 
@@ -130,8 +135,20 @@ open class Note(val idHex: String) {
         liveSet?.boosts?.invalidateData()
     }
     fun removeReaction(note: Note) {
-        reactions = reactions - note
-        liveSet?.reactions?.invalidateData()
+        val reaction = note.event?.content() ?: "+"
+
+        if (reaction in reactions.keys && reactions[reaction]?.contains(note) == true) {
+            reactions[reaction]?.let {
+                val newList = it.minus(note)
+                if (newList.isEmpty()) {
+                    reactions = reactions.minus(reaction)
+                } else {
+                    reactions = reactions + Pair(reaction, newList)
+                }
+
+                liveSet?.reactions?.invalidateData()
+            }
+        }
     }
 
     fun removeReport(deleteNote: Note) {
@@ -156,6 +173,17 @@ open class Note(val idHex: String) {
         }
     }
 
+    fun removeZapPayment(note: Note) {
+        if (zapPayments[note] != null) {
+            zapPayments = zapPayments.minus(note)
+            liveSet?.zaps?.invalidateData()
+        } else if (zapPayments.containsValue(note)) {
+            val toRemove = zapPayments.filterValues { it == note }
+            zapPayments = zapPayments.minus(toRemove.keys)
+            liveSet?.zaps?.invalidateData()
+        }
+    }
+
     fun addBoost(note: Note) {
         if (note !in boosts) {
             boosts = boosts + note
@@ -165,6 +193,7 @@ open class Note(val idHex: String) {
 
     @Synchronized
     fun addZap(zapRequest: Note, zap: Note?) {
+        checkNotInMainThread()
         if (zapRequest !in zaps.keys) {
             zaps = zaps + Pair(zapRequest, zap)
             liveSet?.zaps?.invalidateData()
@@ -174,9 +203,26 @@ open class Note(val idHex: String) {
         }
     }
 
+    @Synchronized
+    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()
+        }
+    }
+
     fun addReaction(note: Note) {
-        if (note !in reactions) {
-            reactions = reactions + note
+        val reaction = note.event?.content() ?: "+"
+
+        if (reaction !in reactions.keys) {
+            reactions = reactions + Pair(reaction, setOf(note))
+            liveSet?.reactions?.invalidateData()
+        } else if (reactions[reaction]?.contains(note) == false) {
+            reactions = reactions + Pair(reaction, (reactions[reaction] ?: emptySet()) + note)
             liveSet?.reactions?.invalidateData()
         }
     }
@@ -203,16 +249,26 @@ open class Note(val idHex: String) {
     fun isZappedBy(user: User, account: Account): Boolean {
         // Zaps who the requester was the user
         return zaps.any {
-            it.key.author === user || account.decryptZapContentAuthor(it.key)?.pubKey == user.pubkeyHex
+            it.key.author?.pubkeyHex == user.pubkeyHex || account.decryptZapContentAuthor(it.key)?.pubKey == user.pubkeyHex
+        } || zapPayments.any {
+            val zapResponseEvent = it.value?.event as? LnZapPaymentResponseEvent
+            val response = if (zapResponseEvent != null) {
+                account.decryptZapPaymentResponseEvent(zapResponseEvent)
+            } else {
+                null
+            }
+            response is PayInvoiceSuccessResponse && account.isNIP47Author(zapResponseEvent?.requestAuthor())
         }
     }
 
-    fun isReactedBy(user: User): Boolean {
-        return reactions.any { it.author === user }
+    fun isReactedBy(user: User): String? {
+        return reactions.filter {
+            it.value.any { it.author?.pubkeyHex == user.pubkeyHex }
+        }.keys.firstOrNull()
     }
 
     fun isBoostedBy(user: User): Boolean {
-        return boosts.any { it.author === user }
+        return boosts.any { it.author?.pubkeyHex == user.pubkeyHex }
     }
 
     fun reportsBy(user: User): Set<Note> {
@@ -233,12 +289,48 @@ open class Note(val idHex: String) {
         }.flatten()
     }
 
-    fun zappedAmount(): BigDecimal {
-        return zaps.mapNotNull { it.value?.event }
+    fun countReactions(): Int {
+        return reactions.values.sumOf { it.size }
+    }
+
+    fun zappedAmount(privKey: ByteArray?, walletServicePubkey: ByteArray?): BigDecimal {
+        // Regular Zap Receipts
+        val completedZaps = zaps.asSequence()
+            .mapNotNull { it.value?.event }
             .filterIsInstance<LnZapEvent>()
-            .mapNotNull {
-                it.amount
-            }.sumOf { it }
+            .filter { it.amount != null }
+            .associate {
+                it.lnInvoice() to it.amount
+            }
+            .toMap()
+
+        val completedPayments = if (privKey != null && walletServicePubkey != null) {
+            // Payments confirmed by the User's Wallet
+            zapPayments
+                .asSequence()
+                .filter {
+                    val response = (it.value?.event as? LnZapPaymentResponseEvent)?.response(privKey, walletServicePubkey)
+                    response is PayInvoiceSuccessResponse
+                }
+                .associate {
+                    val lnInvoice = (it.key.event as? LnZapPaymentRequestEvent)?.lnInvoice(privKey, walletServicePubkey)
+                    val amount = try {
+                        if (lnInvoice == null) {
+                            null
+                        } else {
+                            LnInvoiceUtil.getAmountInSats(lnInvoice)
+                        }
+                    } catch (e: java.lang.Exception) {
+                        null
+                    }
+                    lnInvoice to amount
+                }
+                .toMap()
+        } else {
+            emptyMap()
+        }
+
+        return (completedZaps + completedPayments).values.filterNotNull().sumOf { it }
     }
 
     fun hasPledgeBy(user: User): Boolean {
@@ -281,7 +373,7 @@ 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
     }
 
     fun hasZapped(loggedIn: User): Boolean {
@@ -293,7 +385,11 @@ 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 && it.event?.content() == content } ?: emptyList()
+    }
+
+    fun reactedBy(loggedIn: User): List<String> {
+        return reactions.filter { it.value.any { it.author == loggedIn } }.mapNotNull { it.key }
     }
 
     fun hasBoostedInTheLast5Minutes(loggedIn: User): Boolean {
@@ -305,6 +401,42 @@ open class Note(val idHex: String) {
         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 = emptySet()
+        reactions = emptyMap()
+        boosts = emptySet()
+        reports = emptyMap()
+        zaps = emptyMap()
+    }
+
     var liveSet: NoteLiveSet? = null
 
     fun live(): NoteLiveSet {
@@ -345,18 +477,14 @@ class NoteLiveSet(u: Note) {
 
 class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.Main) {
-        if (hasActiveObservers()) {
-            refresh()
-        }
-    }
+    private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateData() {
-        bundler.invalidate()
-    }
-
-    private fun refresh() {
-        postValue(NoteState(note))
+        bundler.invalidate() {
+            // if (hasObservers()) {
+            postValue(NoteState(note))
+            // }
+        }
     }
 
     override fun onActive() {
@@ -378,4 +506,5 @@ class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
     }
 }
 
+@Immutable
 class NoteState(val note: Note)

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

@@ -1,7 +1,9 @@
 package com.vitorpamplona.amethyst.model
 
+import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.service.relays.FeedType
 
+@Immutable
 data class RelaySetupInfo(
     val url: String,
     val read: Boolean,

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

@@ -1,14 +1,19 @@
 package com.vitorpamplona.amethyst.model
 
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.ATag
+import com.vitorpamplona.amethyst.service.model.GenericRepostEvent
+import com.vitorpamplona.amethyst.service.model.RepostEvent
 import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
 
 class ThreadAssembler {
 
-    fun searchRoot(note: Note, testedNotes: MutableSet<Note> = mutableSetOf()): Note? {
+    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)
@@ -35,6 +40,8 @@ class ThreadAssembler {
 
     @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)

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

@@ -1,46 +1,56 @@
 package com.vitorpamplona.amethyst.model
 
-import com.baha.url.preview.BahaUrlPreview
-import com.baha.url.preview.IUrlPreviewCallback
-import com.baha.url.preview.UrlInfoItem
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
+import android.util.LruCache
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.service.previews.BahaUrlPreview
+import com.vitorpamplona.amethyst.service.previews.IUrlPreviewCallback
+import com.vitorpamplona.amethyst.service.previews.UrlInfoItem
+import com.vitorpamplona.amethyst.ui.components.UrlPreviewState
 
 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) {
+    fun previewInfo(url: String, onReady: (UrlPreviewState) -> Unit) {
+        checkNotInMainThread()
+
         cache[url]?.let {
-            callback?.onComplete(it)
+            onReady(it)
             return
         }
 
-        failures[url]?.let {
-            callback?.onFailed(it)
-            return
-        }
-
-        val scope = CoroutineScope(Job() + Dispatchers.IO)
-        scope.launch {
-            BahaUrlPreview(
-                url,
-                object : IUrlPreviewCallback {
-                    override fun onComplete(urlInfo: UrlInfoItem) {
-                        cache = cache + Pair(url, urlInfo)
-                        callback?.onComplete(urlInfo)
+        BahaUrlPreview(
+            url,
+            object : IUrlPreviewCallback {
+                override fun onComplete(urlInfo: UrlInfoItem) {
+                    cache[url]?.let {
+                        if (it is UrlPreviewState.Loaded || it is UrlPreviewState.Empty) {
+                            onReady(it)
+                            return
+                        }
                     }
 
-                    override fun onFailed(throwable: Throwable) {
-                        failures = failures + Pair(url, throwable)
-                        callback?.onFailed(throwable)
+                    val state = if (urlInfo.allFetchComplete() && urlInfo.url == url) {
+                        UrlPreviewState.Loaded(urlInfo)
+                    } else {
+                        UrlPreviewState.Empty
                     }
+
+                    cache.put(url, state)
+                    onReady(state)
                 }
-            ).fetchUrlPreview()
-        }
+
+                override fun onFailed(throwable: Throwable) {
+                    cache[url]?.let {
+                        onReady(it)
+                        return
+                    }
+
+                    val state = UrlPreviewState.Error(throwable.message ?: "Error Loading url preview")
+                    cache.put(url, state)
+                    onReady(state)
+                }
+            }
+        ).fetchUrlPreview()
     }
 }

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

@@ -1,7 +1,10 @@
 package com.vitorpamplona.amethyst.model
 
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
 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
@@ -20,6 +23,7 @@ import java.util.regex.Pattern
 
 val lnurlpPattern = Pattern.compile("(?i:http|https):\\/\\/((.+)\\/)*\\.well-known\\/lnurlp\\/(.*)")
 
+@Stable
 class User(val pubkeyHex: String) {
     var info: UserMetadata? = null
 
@@ -92,10 +96,10 @@ 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()
@@ -181,7 +185,9 @@ class User(val pubkeyHex: String) {
     }
 
     @Synchronized
-    fun getOrCreatePrivateChatroom(user: User): Chatroom {
+    private fun getOrCreatePrivateChatroom(user: User): Chatroom {
+        checkNotInMainThread()
+
         return privateChatrooms[user] ?: run {
             val privateChatroom = Chatroom(setOf<Note>())
             privateChatrooms = privateChatrooms + Pair(user, privateChatroom)
@@ -191,6 +197,8 @@ class User(val pubkeyHex: String) {
 
     @Synchronized
     fun addMessage(user: User, msg: Note) {
+        checkNotInMainThread()
+
         val privateChatroom = getOrCreatePrivateChatroom(user)
         if (msg !in privateChatroom.roomMessages) {
             privateChatroom.roomMessages = privateChatroom.roomMessages + msg
@@ -200,6 +208,8 @@ class User(val pubkeyHex: String) {
 
     @Synchronized
     fun removeMessage(user: User, msg: Note) {
+        checkNotInMainThread()
+
         val privateChatroom = getOrCreatePrivateChatroom(user)
         if (msg in privateChatroom.roomMessages) {
             privateChatroom.roomMessages = privateChatroom.roomMessages - msg
@@ -246,15 +256,11 @@ class User(val pubkeyHex: String) {
     }
 
     fun isFollowing(user: User): Boolean {
-        return latestContactList?.unverifiedFollowKeySet()?.toSet()?.let {
-            return user.pubkeyHex in it
-        } ?: false
+        return latestContactList?.isTaggedUser(user.pubkeyHex) ?: false
     }
 
     fun isFollowingHashtag(tag: String): Boolean {
-        return latestContactList?.unverifiedFollowTagSet()?.toSet()?.let {
-            return tag in it
-        } ?: false
+        return latestContactList?.isTaggedHash(tag) ?: false
     }
 
     fun isFollowingHashtagCached(tag: String): Boolean {
@@ -269,11 +275,17 @@ class User(val pubkeyHex: String) {
         } ?: false
     }
 
+    fun isFollowingCached(userHex: String): Boolean {
+        return latestContactList?.verifiedFollowKeySet?.let {
+            return userHex in it
+        } ?: false
+    }
+
     fun transientFollowCount(): Int? {
         return latestContactList?.unverifiedFollowKeySet()?.size
     }
 
-    fun transientFollowerCount(): Int {
+    suspend fun transientFollowerCount(): Int {
         return LocalCache.users.values.count { it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
     }
 
@@ -289,14 +301,14 @@ class User(val pubkeyHex: String) {
         return latestContactList?.verifiedFollowKeySet?.size
     }
 
-    fun cachedFollowerCount(): Int {
+    suspend fun cachedFollowerCount(): Int {
         return LocalCache.users.values.count { it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
     }
 
     fun hasSentMessagesTo(user: User?): Boolean {
         val messagesToUser = privateChatrooms[user] ?: return false
 
-        return messagesToUser.roomMessages.any { this === it.author }
+        return messagesToUser.roomMessages.any { this.pubkeyHex == it.author?.pubkeyHex }
     }
 
     fun hasReport(loggedIn: User, type: ReportEvent.ReportType): Boolean {
@@ -328,6 +340,7 @@ class User(val pubkeyHex: String) {
 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)
@@ -339,6 +352,7 @@ class UserLiveSet(u: User) {
 
     fun isInUse(): Boolean {
         return follows.hasObservers() ||
+            followers.hasObservers() ||
             reports.hasObservers() ||
             messages.hasObservers() ||
             relays.hasObservers() ||
@@ -350,6 +364,7 @@ class UserLiveSet(u: User) {
     }
 }
 
+@Immutable
 data class RelayInfo(
     val url: String,
     var lastEvent: Long,
@@ -358,6 +373,7 @@ data class RelayInfo(
 
 data class Chatroom(var roomMessages: Set<Note>)
 
+@Stable
 class UserMetadata {
     var name: String? = null
     var username: String? = null
@@ -384,9 +400,13 @@ class UserMetadata {
     var updatedMetadataAt: Long = 0
     var latestMetadata: MetadataEvent? = null
 
+    fun anyName(): String? {
+        return display_name ?: displayName ?: name ?: username
+    }
+
     fun anyNameStartsWith(prefix: String): Boolean {
         return listOfNotNull(name, username, display_name, displayName, nip05, lud06, lud16)
-            .any { it.startsWith(prefix, true) }
+            .any { it.contains(prefix, true) }
     }
 
     fun lnAddress(): String? {
@@ -396,18 +416,14 @@ class UserMetadata {
 
 class UserLiveData(val user: User) : LiveData<UserState>(UserState(user)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.Main) {
-        if (hasActiveObservers()) {
-            refresh()
-        }
-    }
+    private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateData() {
-        bundler.invalidate()
-    }
-
-    private fun refresh() {
-        postValue(UserState(user))
+        bundler.invalidate() {
+            if (hasActiveObservers()) {
+                postValue(UserState(user))
+            }
+        }
     }
 
     override fun onActive() {
@@ -421,4 +437,5 @@ class UserLiveData(val user: User) : LiveData<UserState>(UserState(user)) {
     }
 }
 
+@Immutable
 class UserState(val user: User)

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

@@ -20,6 +20,8 @@ class BlurHashFetcher(
 ) : Fetcher {
 
     override suspend fun fetch(): FetchResult {
+        checkNotInMainThread()
+
         val encodedHash = data.toString().removePrefix("bluehash:")
         val hash = URLDecoder.decode(encodedHash, "utf-8")
 
@@ -59,7 +61,6 @@ object BlurHashRequester {
             .Builder(context)
             .data("bluehash:$encodedMessage")
             .fetcherFactory(BlurHashFetcher.Factory)
-            .crossfade(100)
             .build()
     }
 }

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

@@ -4,8 +4,8 @@ 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 io.trbl.blurhash.BlurHash
-import java.net.URL
 import java.security.MessageDigest
 import kotlin.math.roundToInt
 
@@ -14,24 +14,41 @@ class FileHeader(
     val mimeType: String?,
     val hash: String,
     val size: Int,
+    val dim: String?,
     val blurHash: String?,
     val description: String? = null
 ) {
     companion object {
-        fun prepare(fileUrl: String, mimeType: String?, description: String?, onReady: (FileHeader) -> Unit, onError: () -> Unit) {
-            val imageData = URL(fileUrl).readBytes()
+        suspend fun prepare(fileUrl: String, mimeType: String?, description: String?, onReady: (FileHeader) -> Unit, onError: () -> Unit) {
+            try {
+                val imageData: ByteArray? = ImageDownloader().waitAndGetImage(fileUrl)
 
-            prepare(imageData, fileUrl, mimeType, description, onReady, onError)
+                if (imageData != null) {
+                    prepare(imageData, fileUrl, mimeType, description, onReady, onError)
+                } else {
+                    onError()
+                }
+            } catch (e: Exception) {
+                Log.e("ImageDownload", "Couldn't download image from server: ${e.message}")
+                onError()
+            }
         }
 
-        fun prepare(data: ByteArray, fileUrl: String, mimeType: String?, description: String?, onReady: (FileHeader) -> Unit, onError: () -> Unit) {
+        fun prepare(
+            data: ByteArray,
+            fileUrl: String,
+            mimeType: String?,
+            description: String?,
+            onReady: (FileHeader) -> Unit,
+            onError: () -> Unit
+        ) {
             try {
                 val sha256 = MessageDigest.getInstance("SHA-256")
 
                 val hash = sha256.digest(data).toHexKey()
                 val size = data.size
 
-                val blurHash = if (mimeType?.startsWith("image/") == true) {
+                val (blurHash, dim) = if (mimeType?.startsWith("image/") == true) {
                     val opt = BitmapFactory.Options()
                     opt.inPreferredConfig = Bitmap.Config.ARGB_8888
                     val mBitmap = BitmapFactory.decodeByteArray(data, 0, data.size, opt)
@@ -47,20 +64,22 @@ class FileHeader(
                         mBitmap.height
                     )
 
+                    val dim = "${mBitmap.width}x${mBitmap.height}"
+
                     val aspectRatio = (mBitmap.width).toFloat() / (mBitmap.height).toFloat()
 
                     if (aspectRatio > 1) {
-                        BlurHash.encode(intArray, mBitmap.width, mBitmap.height, 9, (9 * (1 / aspectRatio)).roundToInt())
+                        Pair(BlurHash.encode(intArray, mBitmap.width, mBitmap.height, 9, (9 * (1 / aspectRatio)).roundToInt()), dim)
                     } else if (aspectRatio < 1) {
-                        BlurHash.encode(intArray, mBitmap.width, mBitmap.height, (9 * aspectRatio).roundToInt(), 9)
+                        Pair(BlurHash.encode(intArray, mBitmap.width, mBitmap.height, (9 * aspectRatio).roundToInt(), 9), dim)
                     } else {
-                        BlurHash.encode(intArray, mBitmap.width, mBitmap.height, 4, 4)
+                        Pair(BlurHash.encode(intArray, mBitmap.width, mBitmap.height, 4, 4), dim)
                     }
                 } else {
-                    null
+                    Pair(null, null)
                 }
 
-                onReady(FileHeader(fileUrl, mimeType, hash, size, blurHash, description))
+                onReady(FileHeader(fileUrl, mimeType, hash, size, dim, blurHash, description))
             } 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

@@ -0,0 +1,34 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.Account
+import okhttp3.OkHttpClient
+import java.net.InetSocketAddress
+import java.net.Proxy
+import java.time.Duration
+
+object HttpClient {
+    private var proxy: Proxy? = null
+
+    fun start(account: Account?) {
+        this.proxy = account?.proxy
+    }
+
+    fun getHttpClient(): OkHttpClient {
+        val seconds = if (proxy != null) 20L else 10L
+        val duration = Duration.ofSeconds(seconds)
+        return OkHttpClient.Builder()
+            .proxy(proxy)
+            .readTimeout(duration)
+            .connectTimeout(duration)
+            .writeTimeout(duration)
+            .build()
+    }
+
+    fun getProxy(): Proxy? {
+        return proxy
+    }
+
+    fun initProxy(useProxy: Boolean, hostname: String, port: Int): Proxy? {
+        return if (useProxy) Proxy(Proxy.Type.SOCKS, InetSocketAddress(hostname, port)) else null
+    }
+}

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

@@ -0,0 +1,12 @@
+package com.vitorpamplona.amethyst.service
+
+import android.os.Looper
+import com.vitorpamplona.amethyst.BuildConfig
+
+fun checkNotInMainThread() {
+    if (BuildConfig.DEBUG && isMainThread()) throw OnMainThreadException("It should not be in the MainThread")
+}
+
+fun isMainThread() = Looper.myLooper() == Looper.getMainLooper()
+
+class OnMainThreadException(str: String) : RuntimeException(str)

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

@@ -0,0 +1,32 @@
+package com.vitorpamplona.amethyst.service
+
+import java.util.regex.Pattern
+
+class NIP30Parser {
+    val customEmojiPattern: Pattern = Pattern.compile("\\:([A-Za-z0-9_\\-]+)\\:", Pattern.CASE_INSENSITIVE)
+
+    fun buildArray(input: String): List<String> {
+        val matcher = customEmojiPattern.matcher(input)
+        val list = mutableListOf<String>()
+        while (matcher.find()) {
+            list.add(matcher.group())
+        }
+
+        if (list.isEmpty()) {
+            return listOf(input)
+        }
+
+        val regularChars = input.split(customEmojiPattern.toRegex())
+
+        var finalList = mutableListOf<String>()
+        var index = 0
+        for (e in regularChars) {
+            finalList.add(e)
+            if (index < list.size) {
+                finalList.add(list[index])
+            }
+            index++
+        }
+        return finalList
+    }
+}

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

@@ -9,13 +9,10 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import okhttp3.Call
 import okhttp3.Callback
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 
-class Nip05Verifier {
-    val client = OkHttpClient.Builder().build()
-
+class Nip05Verifier() {
     fun assembleUrl(nip05address: String): String? {
         val parts = nip05address.trim().split("@")
 
@@ -34,6 +31,8 @@ class Nip05Verifier {
     }
 
     private suspend fun fetchNip05JsonSuspend(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        // checkNotInMainThread()
+
         val url = assembleUrl(nip05)
 
         if (url == null) {
@@ -48,7 +47,7 @@ class Nip05Verifier {
                     .url(url)
                     .build()
 
-                client.newCall(request).enqueue(object : Callback {
+                HttpClient.getHttpClient().newCall(request).enqueue(object : Callback {
                     override fun onResponse(call: Call, response: Response) {
                         response.use {
                             if (it.isSuccessful) {
@@ -71,19 +70,25 @@ class Nip05Verifier {
     }
 
     fun verifyNip05(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        // check fails on tests
+        // checkNotInMainThread()
+
         val mapper = jacksonObjectMapper()
 
         fetchNip05Json(
             nip05,
             onSuccess = {
+                // 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.
                 val nip05url = try {
-                    mapper.readTree(it)
+                    mapper.readTree(it.lowercase())
                 } catch (t: Throwable) {
                     onError("Error Parsing JSON from Lightning Address. Check the user's lightning setup")
                     null
                 }
 
-                val user = nip05.split("@")[0]
+                val user = nip05.split("@")[0].lowercase()
 
                 val hexKey = nip05url?.get("names")?.get(user)?.asText()
 

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

@@ -62,9 +62,9 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
         return TypedFilter(
             types = COMMON_FEED_TYPES,
             filter = JsonFilter(
-                kinds = listOf(BookmarkListEvent.kind),
+                kinds = listOf(BookmarkListEvent.kind, PeopleListEvent.kind),
                 authors = listOf(account.userProfile().pubkeyHex),
-                limit = 1
+                limit = 100
             )
         )
     }
@@ -75,7 +75,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
             filter = JsonFilter(
                 kinds = listOf(ReportEvent.kind),
                 authors = listOf(account.userProfile().pubkeyHex),
-                since = latestEOSEs.users[account.userProfile()]?.relayList
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultNotificationFollowList)?.relayList
             )
         )
     }
@@ -88,6 +88,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                 PollNoteEvent.kind,
                 ReactionEvent.kind,
                 RepostEvent.kind,
+                GenericRepostEvent.kind,
                 ReportEvent.kind,
                 LnZapEvent.kind,
                 LnZapPaymentResponseEvent.kind,
@@ -95,13 +96,13 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                 BadgeAwardEvent.kind
             ),
             tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
-            limit = 400,
-            since = latestEOSEs.users[account.userProfile()]?.relayList
+            limit = 4000,
+            since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultNotificationFollowList)?.relayList
         )
     )
 
     val accountChannel = requestNewChannel { time, relayUrl ->
-        latestEOSEs.addOrUpdate(account.userProfile(), relayUrl, time)
+        latestEOSEs.addOrUpdate(account.userProfile(), account.defaultNotificationFollowList, relayUrl, time)
     }
 
     override fun updateChannelFilters() {

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

@@ -2,7 +2,6 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
@@ -12,9 +11,9 @@ object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
     var account: Account? = null
     var channel: Channel? = null
 
-    fun loadMessagesBetween(account: Account, channelId: String) {
+    fun loadMessagesBetween(account: Account, channel: Channel) {
         this.account = account
-        channel = LocalCache.getOrCreateChannel(channelId)
+        this.channel = channel
         resetFilters()
     }
 

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

@@ -1,7 +1,6 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
@@ -12,9 +11,9 @@ object NostrChatroomDataSource : NostrDataSource("ChatroomFeed") {
     lateinit var account: Account
     var withUser: User? = null
 
-    fun loadMessagesBetween(accountIn: Account, userId: String) {
+    fun loadMessagesBetween(accountIn: Account, user: User) {
         account = accountIn
-        withUser = LocalCache.users[userId]
+        withUser = user
         resetFilters()
     }
 

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

@@ -15,13 +15,14 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
     lateinit var account: Account
 
     val latestEOSEs = EOSEAccount()
+    val chatRoomList = "ChatroomList"
 
     fun createMessagesToMeFilter() = TypedFilter(
         types = setOf(FeedType.PRIVATE_DMS),
         filter = JsonFilter(
             kinds = listOf(PrivateDmEvent.kind),
             tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
-            since = latestEOSEs.users[account.userProfile()]?.relayList
+            since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList
         )
     )
 
@@ -30,7 +31,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
         filter = JsonFilter(
             kinds = listOf(PrivateDmEvent.kind),
             authors = listOf(account.userProfile().pubkeyHex),
-            since = latestEOSEs.users[account.userProfile()]?.relayList
+            since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList
         )
     )
 
@@ -39,7 +40,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
         filter = JsonFilter(
             kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind),
             authors = listOf(account.userProfile().pubkeyHex),
-            since = latestEOSEs.users[account.userProfile()]?.relayList
+            since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList
         )
     )
 
@@ -48,7 +49,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
         filter = JsonFilter(
             kinds = listOf(ChannelCreateEvent.kind),
             ids = account.followingChannels.toList(),
-            since = latestEOSEs.users[account.userProfile()]?.relayList
+            since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList
         )
     )
 
@@ -72,7 +73,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
                 filter = JsonFilter(
                     kinds = listOf(ChannelMessageEvent.kind),
                     tags = mapOf("e" to listOf(it)),
-                    since = latestEOSEs.users[account.userProfile()]?.relayList,
+                    since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList,
                     limit = 25 // Remember to consider spam that is being removed from the UI
                 )
             )
@@ -80,7 +81,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
     }
 
     val chatroomListChannel = requestNewChannel { time, relayUrl ->
-        latestEOSEs.addOrUpdate(account.userProfile(), relayUrl, time)
+        latestEOSEs.addOrUpdate(account.userProfile(), chatRoomList, relayUrl, time)
     }
 
     override fun updateChannelFilters() {

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

@@ -3,28 +3,7 @@ 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.BadgeAwardEvent
-import com.vitorpamplona.amethyst.service.model.BadgeDefinitionEvent
-import com.vitorpamplona.amethyst.service.model.BadgeProfilesEvent
-import com.vitorpamplona.amethyst.service.model.BookmarkListEvent
-import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
-import com.vitorpamplona.amethyst.service.model.ChannelHideMessageEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMuteUserEvent
-import com.vitorpamplona.amethyst.service.model.ContactListEvent
-import com.vitorpamplona.amethyst.service.model.DeletionEvent
 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.LongTextNoteEvent
-import com.vitorpamplona.amethyst.service.model.MetadataEvent
-import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
-import com.vitorpamplona.amethyst.service.model.ReactionEvent
-import com.vitorpamplona.amethyst.service.model.RecommendRelayEvent
-import com.vitorpamplona.amethyst.service.model.ReportEvent
-import com.vitorpamplona.amethyst.service.model.RepostEvent
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.service.relays.Subscription
@@ -52,8 +31,6 @@ abstract class NostrDataSource(val debugName: String) {
     private val clientListener = object : Client.Listener() {
         override fun onEvent(event: Event, subscriptionId: String, relay: Relay) {
             if (subscriptionId in subscriptions.keys) {
-                if (!event.hasValidSignature()) return
-
                 val key = "$debugName $subscriptionId ${event.kind}"
                 val keyValue = eventCounter.get(key)
                 if (keyValue != null) {
@@ -62,49 +39,7 @@ abstract class NostrDataSource(val debugName: String) {
                     eventCounter = eventCounter + Pair(key, Counter(1))
                 }
 
-                try {
-                    when (event) {
-                        is BadgeAwardEvent -> LocalCache.consume(event)
-                        is BadgeDefinitionEvent -> LocalCache.consume(event)
-                        is BadgeProfilesEvent -> LocalCache.consume(event)
-                        is BookmarkListEvent -> LocalCache.consume(event)
-                        is ChannelCreateEvent -> LocalCache.consume(event)
-                        is ChannelHideMessageEvent -> LocalCache.consume(event)
-                        is ChannelMessageEvent -> LocalCache.consume(event, relay)
-                        is ChannelMetadataEvent -> LocalCache.consume(event)
-                        is ChannelMuteUserEvent -> LocalCache.consume(event)
-                        is ContactListEvent -> LocalCache.consume(event)
-                        is DeletionEvent -> LocalCache.consume(event)
-
-                        is FileHeaderEvent -> LocalCache.consume(event)
-                        is FileStorageEvent -> LocalCache.consume(event)
-                        is FileStorageHeaderEvent -> LocalCache.consume(event)
-                        is LnZapEvent -> {
-                            event.zapRequest?.let { onEvent(it, subscriptionId, relay) }
-                            LocalCache.consume(event)
-                        }
-                        is LnZapRequestEvent -> LocalCache.consume(event)
-                        is LnZapPaymentRequestEvent -> LocalCache.consume(event)
-                        is LnZapPaymentResponseEvent -> LocalCache.consume(event)
-                        is LongTextNoteEvent -> LocalCache.consume(event, relay)
-                        is MetadataEvent -> LocalCache.consume(event)
-                        is PrivateDmEvent -> LocalCache.consume(event, relay)
-                        is ReactionEvent -> LocalCache.consume(event)
-                        is RecommendRelayEvent -> LocalCache.consume(event)
-                        is ReportEvent -> LocalCache.consume(event, relay)
-                        is RepostEvent -> {
-                            event.containedPost()?.let { onEvent(it, subscriptionId, relay) }
-                            LocalCache.consume(event)
-                        }
-                        is TextNoteEvent -> LocalCache.consume(event, relay)
-                        is PollNoteEvent -> LocalCache.consume(event, relay)
-                        else -> {
-                            Log.w("Event Not Supported", event.toJson())
-                        }
-                    }
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                }
+                LocalCache.verifyAndConsume(event, relay)
             }
         }
 
@@ -168,16 +103,16 @@ abstract class NostrDataSource(val debugName: String) {
     }
 
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(250, Dispatchers.IO) {
-        // 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()
-    }
+    private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateFilters() {
-        bundler.invalidate()
+        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()
+        }
     }
 
     fun resetFilters() {
@@ -188,6 +123,8 @@ abstract class NostrDataSource(val debugName: String) {
     }
 
     fun resetFiltersSuspend() {
+        checkNotInMainThread()
+
         // saves the channels that are currently active
         val activeSubscriptions = subscriptions.values.filter { it.typedFilters != null }
         // saves the current content to only update if it changes

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

@@ -1,7 +1,10 @@
 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
@@ -12,7 +15,7 @@ object NostrGlobalDataSource : NostrDataSource("GlobalFeed") {
     fun createGlobalFilter() = TypedFilter(
         types = setOf(FeedType.GLOBAL),
         filter = JsonFilter(
-            kinds = listOf(TextNoteEvent.kind, PollNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind),
+            kinds = listOf(TextNoteEvent.kind, PollNoteEvent.kind, ChannelMessageEvent.kind, AudioTrackEvent.kind, PinListEvent.kind, LongTextNoteEvent.kind, HighlightEvent.kind),
             limit = 200
         )
     )

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

@@ -3,6 +3,7 @@ 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
@@ -25,7 +26,7 @@ object NostrHashtagDataSource : NostrDataSource("SingleHashtagFeed") {
                         hashToLoad.capitalize()
                     )
                 ),
-                kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind),
+                kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind),
                 limit = 200
             )
         )

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

@@ -2,8 +2,13 @@ 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.GenericRepostEvent
+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.RepostEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.amethyst.service.relays.FeedType
@@ -44,7 +49,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
     }
 
     fun createFollowAccountsFilter(): TypedFilter {
-        val follows = account.followingKeySet()
+        val follows = account.selectedUsersFollowList(account.defaultHomeFollowList) ?: emptySet()
 
         val followKeys = follows.map {
             it.substring(0, 6)
@@ -55,36 +60,45 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
         return TypedFilter(
             types = setOf(FeedType.FOLLOWS),
             filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind),
+                kinds = listOf(
+                    TextNoteEvent.kind,
+                    RepostEvent.kind,
+                    GenericRepostEvent.kind,
+                    LongTextNoteEvent.kind,
+                    PollNoteEvent.kind,
+                    HighlightEvent.kind,
+                    AudioTrackEvent.kind,
+                    PinListEvent.kind
+                ),
                 authors = followSet,
                 limit = 400,
-                since = latestEOSEs.users[account.userProfile()]?.relayList
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultHomeFollowList)?.relayList
             )
         )
     }
 
     fun createFollowTagsFilter(): TypedFilter? {
-        val hashToLoad = account.followingTagSet()
+        val hashToLoad = account.selectedTagsFollowList(account.defaultHomeFollowList) ?: emptySet()
 
         if (hashToLoad.isEmpty()) return null
 
         return TypedFilter(
             types = setOf(FeedType.FOLLOWS),
             filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind),
+                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, HighlightEvent.kind, AudioTrackEvent.kind, PinListEvent.kind),
                 tags = mapOf(
                     "t" to hashToLoad.map {
                         listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
                     }.flatten()
                 ),
                 limit = 100,
-                since = latestEOSEs.users[account.userProfile()]?.relayList
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultHomeFollowList)?.relayList
             )
         )
     }
 
     val followAccountChannel = requestNewChannel { time, relayUrl ->
-        latestEOSEs.addOrUpdate(account.userProfile(), relayUrl, time)
+        latestEOSEs.addOrUpdate(account.userProfile(), account.defaultHomeFollowList, relayUrl, time)
     }
 
     override fun updateChannelFilters() {

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

@@ -1,14 +1,18 @@
 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
 
 class NostrLnZapPaymentResponseDataSource(
-    private var fromServiceHex: String,
-    private var toUserHex: String,
-    private var replyingToHex: String
+    private val fromServiceHex: String,
+    private val toUserHex: String,
+    private val replyingToHex: String,
+    private val authSigningKey: ByteArray
 ) : NostrDataSource("LnZapPaymentResponseFeed") {
 
     val feedTypes = setOf(FeedType.WALLET_CONNECT)
@@ -36,4 +40,14 @@ class NostrLnZapPaymentResponseDataSource(
 
         channel.typedFilters = listOfNotNull(wc).ifEmpty { null }
     }
+
+    override fun auth(relay: Relay, challenge: String) {
+        super.auth(relay, challenge)
+
+        val event = RelayAuthEvent.create(relay.url, challenge, authSigningKey)
+        Client.send(
+            event,
+            relay.url
+        )
+    }
 }

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

@@ -1,12 +1,13 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.decodePublicKey
+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 nostr.postr.bechToBytes
-import nostr.postr.toHex
+import fr.acinq.secp256k1.Hex
 
 object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
     private var searchString: String? = null
@@ -18,15 +19,8 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
         }
 
         val hexToWatch = try {
-            if (mySearchString.startsWith("npub") || mySearchString.startsWith("nsec")) {
-                decodePublicKey(mySearchString).toHex()
-            } else if (mySearchString.startsWith("note")) {
-                mySearchString.bechToBytes().toHex()
-            } else {
-                mySearchString
-            }
+            Nip19.uriToRoute(mySearchString)?.hex ?: Hex.decode(mySearchString).toHexKey()
         } catch (e: Exception) {
-            // Usually when people add an incomplete npub or note.
             null
         }
 
@@ -50,19 +44,18 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
                 )
             },
             TypedFilter(
-                types = COMMON_FEED_TYPES,
+                types = setOf(FeedType.SEARCH),
                 filter = JsonFilter(
                     kinds = listOf(MetadataEvent.kind),
                     search = mySearchString,
-                    limit = 20
+                    limit = 100
                 )
             ),
             TypedFilter(
-                types = COMMON_FEED_TYPES,
+                types = setOf(FeedType.SEARCH),
                 filter = JsonFilter(
-                    kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind, ChannelMetadataEvent.kind, ChannelCreateEvent.kind, ChannelMessageEvent.kind),
                     search = mySearchString,
-                    limit = 20
+                    limit = 100
                 )
             )
         )

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

@@ -26,10 +26,11 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                     filter = JsonFilter(
                         kinds = listOf(
                             TextNoteEvent.kind, LongTextNoteEvent.kind,
-                            ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind,
+                            ReactionEvent.kind, RepostEvent.kind, GenericRepostEvent.kind, ReportEvent.kind,
                             LnZapEvent.kind, LnZapRequestEvent.kind,
                             BadgeAwardEvent.kind, BadgeDefinitionEvent.kind, BadgeProfilesEvent.kind,
-                            PollNoteEvent.kind
+                            PollNoteEvent.kind, AudioTrackEvent.kind, PinListEvent.kind,
+                            PeopleListEvent.kind, BookmarkListEvent.kind
                         ),
                         tags = mapOf("a" to listOf(aTag.toTag())),
                         since = it.lastReactionsDownloadTime
@@ -76,10 +77,14 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                         LongTextNoteEvent.kind,
                         ReactionEvent.kind,
                         RepostEvent.kind,
+                        GenericRepostEvent.kind,
                         ReportEvent.kind,
                         LnZapEvent.kind,
                         LnZapRequestEvent.kind,
-                        PollNoteEvent.kind
+                        PollNoteEvent.kind,
+                        HighlightEvent.kind,
+                        AudioTrackEvent.kind,
+                        PinListEvent.kind
                     ),
                     tags = mapOf("e" to listOf(it.idHex)),
                     since = it.lastReactionsDownloadTime
@@ -110,15 +115,6 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
             TypedFilter(
                 types = COMMON_FEED_TYPES,
                 filter = JsonFilter(
-                    kinds = listOf(
-                        TextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind,
-                        ReactionEvent.kind, RepostEvent.kind,
-                        LnZapEvent.kind, LnZapRequestEvent.kind,
-                        ChannelMessageEvent.kind, ChannelCreateEvent.kind, ChannelMetadataEvent.kind,
-                        BadgeDefinitionEvent.kind, BadgeAwardEvent.kind, BadgeProfilesEvent.kind,
-                        PrivateDmEvent.kind,
-                        FileHeaderEvent.kind, FileStorageEvent.kind, FileStorageHeaderEvent.kind
-                    ),
                     ids = interestedEvents.toList()
                 )
             )
@@ -150,22 +146,30 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
     }
 
     fun add(eventId: Note) {
-        eventsToWatch = eventsToWatch.plus(eventId)
-        invalidateFilters()
+        if (!eventsToWatch.contains(eventId)) {
+            eventsToWatch = eventsToWatch.plus(eventId)
+            invalidateFilters()
+        }
     }
 
     fun remove(eventId: Note) {
-        eventsToWatch = eventsToWatch.minus(eventId)
-        invalidateFilters()
+        if (eventsToWatch.contains(eventId)) {
+            eventsToWatch = eventsToWatch.minus(eventId)
+            invalidateFilters()
+        }
     }
 
     fun addAddress(aTag: Note) {
-        addressesToWatch = addressesToWatch.plus(aTag)
-        invalidateFilters()
+        if (!addressesToWatch.contains(aTag)) {
+            addressesToWatch = addressesToWatch.plus(aTag)
+            invalidateFilters()
+        }
     }
 
     fun removeAddress(aTag: Note) {
-        addressesToWatch = addressesToWatch.minus(aTag)
-        invalidateFilters()
+        if (addressesToWatch.contains(aTag)) {
+            addressesToWatch = addressesToWatch.minus(aTag)
+            invalidateFilters()
+        }
     }
 }

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

@@ -64,12 +64,16 @@ object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
     }
 
     fun add(user: User) {
-        usersToWatch = usersToWatch.plus(user)
-        invalidateFilters()
+        if (!usersToWatch.contains(user)) {
+            usersToWatch = usersToWatch.plus(user)
+            invalidateFilters()
+        }
     }
 
     fun remove(user: User) {
-        usersToWatch = usersToWatch.minus(user)
-        invalidateFilters()
+        if (usersToWatch.contains(user)) {
+            usersToWatch = usersToWatch.minus(user)
+            invalidateFilters()
+        }
     }
 }

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

@@ -1,6 +1,5 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
@@ -10,14 +9,8 @@ import com.vitorpamplona.amethyst.service.relays.TypedFilter
 object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
     var user: User? = null
 
-    fun loadUserProfile(userId: String?) {
-        if (userId != null) {
-            user = LocalCache.getOrCreateUser(userId)
-        } else {
-            user = null
-        }
-
-        resetFilters()
+    fun loadUserProfile(user: User?) {
+        this.user = user
     }
 
     fun createUserInfoFilter() = user?.let {
@@ -35,7 +28,16 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
         TypedFilter(
             types = COMMON_FEED_TYPES,
             filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, RepostEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind),
+                kinds = listOf(
+                    TextNoteEvent.kind,
+                    GenericRepostEvent.kind,
+                    RepostEvent.kind,
+                    LongTextNoteEvent.kind,
+                    AudioTrackEvent.kind,
+                    PinListEvent.kind,
+                    PollNoteEvent.kind,
+                    HighlightEvent.kind
+                ),
                 authors = listOf(it.pubkeyHex),
                 limit = 200
             )
@@ -88,9 +90,9 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
         TypedFilter(
             types = COMMON_FEED_TYPES,
             filter = JsonFilter(
-                kinds = listOf(BookmarkListEvent.kind),
+                kinds = listOf(BookmarkListEvent.kind, PeopleListEvent.kind, AppRecommendationEvent.kind),
                 authors = listOf(it.pubkeyHex),
-                limit = 1
+                limit = 100
             )
         )
     }

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

@@ -0,0 +1,54 @@
+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.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+
+object NostrVideoDataSource : NostrDataSource("VideoFeed") {
+    lateinit var account: Account
+
+    fun createContextualFilter(): TypedFilter? {
+        val follows = account.selectedUsersFollowList(account.defaultStoriesFollowList)
+
+        val followKeys = follows?.map {
+            it.substring(0, 6)
+        }
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter = JsonFilter(
+                authors = followKeys,
+                kinds = listOf(FileHeaderEvent.kind, FileStorageHeaderEvent.kind),
+                limit = 200
+            )
+        )
+    }
+
+    fun createFollowTagsFilter(): TypedFilter? {
+        val hashToLoad = account.selectedTagsFollowList(account.defaultStoriesFollowList)
+
+        if (hashToLoad.isNullOrEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.GLOBAL),
+            filter = JsonFilter(
+                kinds = listOf(FileHeaderEvent.kind, FileStorageHeaderEvent.kind),
+                tags = mapOf(
+                    "t" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 100
+            )
+        )
+    }
+
+    val videoFeedChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        videoFeedChannel.typedFilters = listOfNotNull(createContextualFilter(), createFollowTagsFilter()).ifEmpty { null }
+    }
+}

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

@@ -2,6 +2,8 @@ package com.vitorpamplona.amethyst.service.lnurl
 
 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 kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -10,14 +12,13 @@ import kotlinx.coroutines.withContext
 import nostr.postr.Bech32
 import okhttp3.Call
 import okhttp3.Callback
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import java.math.BigDecimal
 import java.net.URLEncoder
 
-class LightningAddressResolver {
-    val client = OkHttpClient.Builder().build()
+class LightningAddressResolver() {
+    val client = HttpClient.getHttpClient()
 
     fun assembleUrl(lnaddress: String): String? {
         val parts = lnaddress.split("@")
@@ -45,6 +46,8 @@ class LightningAddressResolver {
     }
 
     private suspend fun fetchLightningAddressJsonSuspend(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        checkNotInMainThread()
+
         val url = assembleUrl(lnaddress)
 
         if (url == null) {

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.service.lnurl
 
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import java.math.BigDecimal
 import java.util.Locale
 import java.util.regex.Pattern
@@ -98,7 +99,7 @@ object LnInvoiceUtil {
      * @return invoice amount in bitcoins, zero if the invoice has no amount
      * @throws RuntimeException if invoice format is incorrect
      */
-    fun getAmount(invoice: String): BigDecimal {
+    private fun getAmount(invoice: String): BigDecimal {
         try {
             decodeUnlimitedLength(invoice) // checksum must match
         } catch (e: AddressFormatException) {
@@ -121,6 +122,8 @@ object LnInvoiceUtil {
     }
 
     fun getAmountInSats(invoice: String): BigDecimal {
+        checkNotInMainThread()
+
         return getAmount(invoice).multiply(BigDecimal(100000000))
     }
 

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

@@ -4,7 +4,7 @@ import java.util.regex.Pattern
 
 object LnWithdrawalUtil {
     private val withdrawalPattern = Pattern.compile(
-        "lnurl.*",
+        "lnurl.+",
         Pattern.CASE_INSENSITIVE
     )
 

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

@@ -1,7 +1,8 @@
 package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
-import com.vitorpamplona.amethyst.model.toByteArray
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.hexToByteArray
 import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.nip19.Tlv
 import fr.acinq.secp256k1.Hex
@@ -9,12 +10,13 @@ import nostr.postr.Bech32
 import nostr.postr.bechToBytes
 import nostr.postr.toByteArray
 
+@Immutable
 data class ATag(val kind: Int, val pubKeyHex: String, val dTag: String, val relay: String?) {
     fun toTag() = "$kind:$pubKeyHex:$dTag"
 
     fun toNAddr(): String {
         val kind = kind.toByteArray()
-        val author = pubKeyHex.toByteArray()
+        val author = pubKeyHex.hexToByteArray()
         val dTag = dTag.toByteArray(Charsets.UTF_8)
         val relay = relay?.toByteArray(Charsets.UTF_8)
 

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

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

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

@@ -0,0 +1,27 @@
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+
+@Immutable
+class AppRecommendationEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+    fun recommendations() = tags.filter { it.size > 1 && it[0] == "a" }.mapNotNull {
+        ATag.parse(it[1], it.getOrNull(2))
+    }
+
+    fun forKind() = runCatching { dTag().toInt() }.getOrNull()
+
+    override fun dTag() = tags.firstOrNull { it.size > 1 && it[0] == "d" }?.get(1) ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
+
+    companion object {
+        const val kind = 31989
+    }
+}

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

@@ -0,0 +1,63 @@
+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 AudioTrackEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+
+    override fun dTag() = tags.firstOrNull { it.size > 1 && it[0] == "d" }?.get(1) ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
+
+    fun participants() = tags.filter { it.size > 1 && it[0] == "p" }.map { Participant(it[1], it.getOrNull(2)) }
+    fun type() = tags.firstOrNull { it.size > 1 && it[0] == TYPE }?.get(1)
+    fun price() = tags.firstOrNull { it.size > 1 && it[0] == PRICE }?.get(1)
+    fun cover() = tags.firstOrNull { it.size > 1 && it[0] == COVER }?.get(1)
+    fun subject() = tags.firstOrNull { it.size > 1 && it[0] == SUBJECT }?.get(1)
+    fun media() = tags.firstOrNull { it.size > 1 && it[0] == MEDIA }?.get(1)
+
+    companion object {
+        const val kind = 31337
+
+        private const val TYPE = "c"
+        private const val PRICE = "price"
+        private const val COVER = "cover"
+        private const val SUBJECT = "subject"
+        private const val MEDIA = "media"
+
+        fun create(
+            type: String,
+            media: String,
+            price: String? = null,
+            cover: String? = null,
+            subject: String? = null,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): AudioTrackEvent {
+            val tags = listOfNotNull(
+                listOf(MEDIA, media),
+                listOf(TYPE, type),
+                price?.let { listOf(PRICE, it) },
+                cover?.let { listOf(COVER, it) },
+                subject?.let { listOf(SUBJECT, it) }
+            )
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val id = generateId(pubKey, createdAt, kind, tags, "")
+            val sig = Utils.sign(id, privateKey)
+            return AudioTrackEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
+        }
+    }
+}
+
+data class Participant(val key: String, val role: String?)

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

@@ -1,7 +1,9 @@
 package com.vitorpamplona.amethyst.service.model
 
+import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 
+@Immutable
 class BadgeAwardEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -10,13 +12,9 @@ class BadgeAwardEvent(
     content: String,
     sig: HexKey
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun awardees() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
-    fun awardDefinition() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
-        val aTagValue = it.getOrNull(1)
-        val relay = it.getOrNull(2)
+    fun awardees() = taggedUsers()
 
-        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
-    }
+    fun awardDefinition() = taggedAddresses()
 
     companion object {
         const val kind = 8

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

@@ -1,7 +1,9 @@
 package com.vitorpamplona.amethyst.service.model
 
+import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 
+@Immutable
 class BadgeDefinitionEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -9,14 +11,14 @@ class BadgeDefinitionEvent(
     tags: List<List<String>>,
     content: String,
     sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
-    fun address() = ATag(kind, pubKey, dTag(), null)
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+    override fun dTag() = tags.firstOrNull { it.size > 1 && it[0] == "d" }?.get(1) ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
 
-    fun name() = tags.filter { it.firstOrNull() == "name" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
-    fun thumb() = tags.filter { it.firstOrNull() == "thumb" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
-    fun image() = tags.filter { it.firstOrNull() == "image" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
-    fun description() = tags.filter { it.firstOrNull() == "description" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+    fun name() = tags.firstOrNull { it.size > 1 && it[0] == "name" }?.get(1)
+    fun thumb() = tags.firstOrNull { it.size > 1 && it[0] == "thumb" }?.get(1)
+    fun image() = tags.firstOrNull { it.size > 1 && it[0] == "image" }?.get(1)
+    fun description() = tags.firstOrNull { it.size > 1 && it[0] == "description" }?.get(1)
 
     companion object {
         const val kind = 30009

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

@@ -1,7 +1,9 @@
 package com.vitorpamplona.amethyst.service.model
 
+import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 
+@Immutable
 class BadgeProfilesEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -9,7 +11,7 @@ class BadgeProfilesEvent(
     tags: List<List<String>>,
     content: String,
     sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
     fun badgeAwardEvents() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
     fun badgeAwardDefinitions() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
         val aTagValue = it.getOrNull(1)
@@ -18,8 +20,8 @@ class BadgeProfilesEvent(
         if (aTagValue != null) ATag.parse(aTagValue, relay) else null
     }
 
-    fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
-    fun address() = ATag(kind, pubKey, dTag(), null)
+    override fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
 
     companion object {
         const val kind = 30008

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

@@ -1,10 +1,13 @@
 package com.vitorpamplona.amethyst.service.model
 
+import android.util.Log
+import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.tagSearch
 import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.nip19.Nip19.nip19regex
 
+@Immutable
 open class BaseTextNoteEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -18,6 +21,7 @@ open class BaseTextNoteEvent(
     open fun replyTos() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
 
     private var citedUsersCache: Set<HexKey>? = null
+    private var citedNotesCache: Set<HexKey>? = null
 
     fun citedUsers(): Set<HexKey> {
         citedUsersCache?.let { return it }
@@ -41,17 +45,18 @@ open class BaseTextNoteEvent(
             val key = matcher2.group(3) // bech32
             val additionalChars = matcher2.group(4) // additional chars
 
-            val parsed = Nip19.parseComponents(uriScheme, type, key, additionalChars)
+            try {
+                val parsed = Nip19.parseComponents(uriScheme, type, key, additionalChars)
 
-            if (parsed != null) {
-                try {
+                if (parsed != null) {
                     val tag = tags.firstOrNull { it.size > 1 && it[1] == parsed.hex }
 
                     if (tag != null && tag[0] == "p") {
                         returningList.add(tag[1])
                     }
-                } catch (e: Exception) {
                 }
+            } catch (e: Exception) {
+                Log.w("Unable to parse cited users that matched a NIP19 regex", e)
             }
         }
 
@@ -59,8 +64,10 @@ open class BaseTextNoteEvent(
         return returningList
     }
 
-    fun findCitations(): Set<String> {
-        var citations = mutableSetOf<String>()
+    fun findCitations(): Set<HexKey> {
+        citedNotesCache?.let { return it }
+
+        val citations = mutableSetOf<HexKey>()
         // Removes citations from replies:
         val matcher = tagSearch.matcher(content)
         while (matcher.find()) {
@@ -86,10 +93,6 @@ open class BaseTextNoteEvent(
             val parsed = Nip19.parseComponents(uriScheme, type, key, additionalChars)
 
             if (parsed != null) {
-                if (content.contains("Testing event")) {
-                    println("AAAA $key")
-                }
-
                 try {
                     val tag = tags.firstOrNull { it.size > 1 && it[1] == parsed.hex }
 
@@ -104,6 +107,7 @@ open class BaseTextNoteEvent(
             }
         }
 
+        citedNotesCache = citations
         return citations
     }
 

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

@@ -1,13 +1,12 @@
 package com.vitorpamplona.amethyst.service.model
 
-import android.util.Log
-import com.google.gson.reflect.TypeToken
+import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
-import com.vitorpamplona.amethyst.model.toByteArray
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
 import java.util.Date
 
+@Immutable
 class BookmarkListEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -15,50 +14,7 @@ class BookmarkListEvent(
     tags: List<List<String>>,
     content: String,
     sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
-    fun address() = ATag(kind, pubKey, dTag(), null)
-
-    fun category() = dTag()
-    fun bookmarkedPosts() = tags.filter { it[0] == "e" }.mapNotNull { it.getOrNull(1) }
-
-    fun plainContent(privKey: ByteArray): String? {
-        return try {
-            val sharedSecret = Utils.getSharedSecret(privKey, pubKey.toByteArray())
-
-            return Utils.decrypt(content, sharedSecret)
-        } catch (e: Exception) {
-            Log.w("BookmarkList", "Error decrypting the message ${e.message}")
-            null
-        }
-    }
-
-    @Transient
-    private var privateTagsCache: List<List<String>>? = null
-
-    fun privateTags(privKey: ByteArray): List<List<String>>? {
-        if (privateTagsCache != null) {
-            return privateTagsCache
-        }
-
-        privateTagsCache = try {
-            gson.fromJson(plainContent(privKey), object : TypeToken<List<List<String>>>() {}.type)
-        } catch (e: Throwable) {
-            Log.w("BookmarkList", "Error parsing the JSON ${e.message}")
-            null
-        }
-        return privateTagsCache
-    }
-
-    fun privateTaggedUsers(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "p" }?.mapNotNull { it.getOrNull(1) }
-    fun privateTaggedEvents(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "e" }?.mapNotNull { it.getOrNull(1) }
-    fun privateTaggedAddresses(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "a" }?.mapNotNull {
-        val aTagValue = it.getOrNull(1)
-        val relay = it.getOrNull(2)
-
-        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
-    }
-
+) : GeneralListEvent(id, pubKey, createdAt, kind, tags, content, sig) {
     companion object {
         const val kind = 30001
 
@@ -77,24 +33,7 @@ class BookmarkListEvent(
             createdAt: Long = Date().time / 1000
         ): BookmarkListEvent {
             val pubKey = Utils.pubkeyCreate(privateKey)
-
-            val privTags = mutableListOf<List<String>>()
-            privEvents?.forEach {
-                privTags.add(listOf("e", it))
-            }
-            privUsers?.forEach {
-                privTags.add(listOf("p", it))
-            }
-            privAddresses?.forEach {
-                privTags.add(listOf("a", it.toTag()))
-            }
-            val msg = gson.toJson(privTags)
-
-            val content = Utils.encrypt(
-                msg,
-                privateKey,
-                pubKey
-            )
+            val content = createPrivateTags(privEvents, privUsers, privAddresses, privateKey, pubKey)
 
             val tags = mutableListOf<List<String>>()
             tags.add(listOf("d", name))

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

@@ -1,11 +1,13 @@
 package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
+import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
 import java.util.Date
 
+@Immutable
 class ChannelCreateEvent(
     id: HexKey,
     pubKey: HexKey,

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

@@ -1,10 +1,12 @@
 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 ChannelHideMessageEvent(
     id: HexKey,
     pubKey: HexKey,

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

@@ -1,10 +1,12 @@
 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 ChannelMessageEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -14,13 +16,28 @@ class ChannelMessageEvent(
     sig: HexKey
 ) : BaseTextNoteEvent(id, pubKey, createdAt, kind, tags, content, sig) {
 
-    fun channel() = tags.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1) ?: tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
+    fun channel() = tags.firstOrNull {
+        it.size > 3 && it[0] == "e" && it[3] == "root"
+    }?.get(1) ?: tags.firstOrNull {
+        it.size > 1 && it[0] == "e"
+    }?.get(1)
+
     override fun replyTos() = tags.filter { it.firstOrNull() == "e" && it.getOrNull(1) != channel() }.mapNotNull { it.getOrNull(1) }
 
     companion object {
         const val kind = 42
 
-        fun create(message: String, channel: String, replyTos: List<String>? = null, mentions: List<String>? = null, zapReceiver: String?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMessageEvent {
+        fun create(
+            message: String,
+            channel: String,
+            replyTos: List<String>? = null,
+            mentions: List<String>? = null,
+            zapReceiver: String?,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000,
+            markAsSensitive: Boolean,
+            zapRaiserAmount: Long?
+        ): ChannelMessageEvent {
             val content = message
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf(
@@ -35,6 +52,12 @@ class ChannelMessageEvent(
             zapReceiver?.let {
                 tags.add(listOf("zap", it))
             }
+            if (markAsSensitive) {
+                tags.add(listOf("content-warning", ""))
+            }
+            zapRaiserAmount?.let {
+                tags.add(listOf("zapraiser", "$it"))
+            }
 
             val id = generateId(pubKey, createdAt, kind, tags, content)
             val sig = Utils.sign(id, privateKey)

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

@@ -1,11 +1,13 @@
 package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
+import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
 import java.util.Date
 
+@Immutable
 class ChannelMetadataEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -14,7 +16,7 @@ class ChannelMetadataEvent(
     content: String,
     sig: HexKey
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun channel() = tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
+    fun channel() = tags.firstOrNull { it.size > 1 && it[0] == "e" }?.get(1)
     fun channelInfo() =
         try {
             MetadataEvent.gson.fromJson(content, ChannelCreateEvent.ChannelData::class.java)

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

@@ -1,10 +1,12 @@
 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 ChannelMuteUserEvent(
     id: HexKey,
     pubKey: HexKey,

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

@@ -1,6 +1,7 @@
 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
@@ -8,6 +9,7 @@ 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(
@@ -21,14 +23,12 @@ class ContactListEvent(
     // 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[0] == "p" }.mapNotNull {
-            it.getOrNull(1)?.let { unverifiedHex: String ->
-                try {
-                    decodePublicKey(unverifiedHex).toHexKey()
-                } catch (e: Exception) {
-                    Log.w("ContactListEvent", "Can't parse tags as a follows: ${it[1]}", e)
-                    null
-                }
+        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()
     }

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

@@ -1,10 +1,12 @@
 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 DeletionEvent(
     id: HexKey,
     pubKey: HexKey,

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

@@ -1,5 +1,7 @@
 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
@@ -13,6 +15,7 @@ import java.math.BigDecimal
 import java.security.MessageDigest
 import java.util.*
 
+@Immutable
 open class Event(
     val id: HexKey,
     @SerializedName("pubkey") val pubKey: HexKey,
@@ -38,9 +41,23 @@ open class Event(
 
     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 zapraiserAmount() = tags.firstOrNull() {
+        (it.size > 1 && it[0].equals("zapraiser", true))
+    }?.get(1)?.toLongOrNull()
+
     override fun zapAddress() = tags.firstOrNull { it.size > 1 && it[0] == "zap" }?.get(1)
 
     fun taggedAddresses() = tags.filter { it.size > 1 && it[0] == "a" }.mapNotNull {
@@ -81,7 +98,7 @@ open class Event(
 
     override fun getReward(): BigDecimal? {
         return try {
-            tags.filter { it.firstOrNull() == "reward" }.mapNotNull { it.getOrNull(1)?.let { BigDecimal(it) } }.firstOrNull()
+            tags.firstOrNull { it.size > 1 && it[0] == "reward" }?.get(1)?.let { BigDecimal(it) }
         } catch (e: Exception) {
             null
         }
@@ -106,11 +123,12 @@ open class Event(
     }
 
     override fun hasValidSignature(): Boolean {
-        if (!id.contentEquals(generateId())) {
-            return false
+        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
         }
-
-        return secp256k1.verifySchnorr(Hex.decode(sig), Hex.decode(id), Hex.decode(pubKey))
     }
 
     private fun generateId(): String {
@@ -124,7 +142,7 @@ open class Event(
             .replace("\\u2028", "\u2028")
             .replace("\\u2029", "\u2029")
 
-        return sha256.digest(rawEventJson.toByteArray()).toHexKey()
+        return MessageDigest.getInstance("SHA-256").digest(rawEventJson.toByteArray()).toHexKey()
     }
 
     private class EventDeserializer : JsonDeserializer<Event> {
@@ -198,13 +216,14 @@ open class Event(
     companion object {
         private val secp256k1 = Secp256k1.get()
 
-        val sha256: MessageDigest = MessageDigest.getInstance("SHA-256")
         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)
@@ -212,6 +231,9 @@ open class Event(
         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)
@@ -227,16 +249,22 @@ open class Event(
             FileHeaderEvent.kind -> FileHeaderEvent(id, pubKey, createdAt, tags, content, sig)
             FileStorageEvent.kind -> FileStorageEvent(id, pubKey, createdAt, tags, content, sig)
             FileStorageHeaderEvent.kind -> FileStorageHeaderEvent(id, pubKey, createdAt, tags, content, sig)
+            GenericRepostEvent.kind -> GenericRepostEvent(id, pubKey, createdAt, tags, content, sig)
+            HighlightEvent.kind -> HighlightEvent(id, pubKey, createdAt, tags, content, sig)
+            LiveActivitiesEvent.kind -> LiveActivitiesEvent(id, pubKey, createdAt, tags, content, sig)
             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)
@@ -261,7 +289,7 @@ open class Event(
                 .replace("\\u2028", "\u2028")
                 .replace("\\u2029", "\u2029")
 
-            return sha256.digest(rawEventJson.toByteArray())
+            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 {
@@ -272,3 +300,9 @@ open class Event(
         }
     }
 }
+
+@Immutable
+interface AddressableEvent {
+    fun dTag(): String
+    fun address(): ATag
+}

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

@@ -1,8 +1,10 @@
 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
 
@@ -35,4 +37,6 @@ interface EventInterface {
     fun getPoWRank(): Int
 
     fun zapAddress(): String?
+    fun isSensitive(): Boolean
+    fun zapraiserAmount(): Long?
 }

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

@@ -1,10 +1,12 @@
 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 FileHeaderEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -19,6 +21,7 @@ class FileHeaderEvent(
     fun mimeType() = tags.firstOrNull { it.size > 1 && it[0] == MIME_TYPE }?.get(1)
     fun hash() = tags.firstOrNull { it.size > 1 && it[0] == HASH }?.get(1)
     fun size() = tags.firstOrNull { it.size > 1 && it[0] == FILE_SIZE }?.get(1)
+    fun dimensions() = tags.firstOrNull { it.size > 1 && it[0] == DIMENSION }?.get(1)
     fun magnetURI() = tags.firstOrNull { it.size > 1 && it[0] == MAGNET_URI }?.get(1)
     fun torrentInfoHash() = tags.firstOrNull { it.size > 1 && it[0] == TORRENT_INFOHASH }?.get(1)
     fun blurhash() = tags.firstOrNull { it.size > 1 && it[0] == BLUR_HASH }?.get(1)
@@ -30,6 +33,7 @@ class FileHeaderEvent(
         private const val ENCRYPTION_KEY = "aes-256-gcm"
         private const val MIME_TYPE = "m"
         private const val FILE_SIZE = "size"
+        private const val DIMENSION = "dim"
         private const val HASH = "x"
         private const val MAGNET_URI = "magnet"
         private const val TORRENT_INFOHASH = "i"
@@ -41,6 +45,7 @@ class FileHeaderEvent(
             description: String? = null,
             hash: String? = null,
             size: String? = null,
+            dimensions: String? = null,
             blurhash: String? = null,
             magnetURI: String? = null,
             torrentInfoHash: String? = null,
@@ -53,6 +58,7 @@ class FileHeaderEvent(
                 mimeType?.let { listOf(MIME_TYPE, mimeType) },
                 hash?.let { listOf(HASH, it) },
                 size?.let { listOf(FILE_SIZE, it) },
+                dimensions?.let { listOf(DIMENSION, it) },
                 blurhash?.let { listOf(BLUR_HASH, it) },
                 magnetURI?.let { listOf(MAGNET_URI, it) },
                 torrentInfoHash?.let { listOf(TORRENT_INFOHASH, it) },

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

@@ -1,12 +1,14 @@
 package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
+import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
 import java.util.Base64
 import java.util.Date
 
+@Immutable
 class FileStorageEvent(
     id: HexKey,
     pubKey: HexKey,

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

@@ -1,10 +1,12 @@
 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 FileStorageHeaderEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -20,6 +22,7 @@ class FileStorageHeaderEvent(
     fun mimeType() = tags.firstOrNull { it.size > 1 && it[0] == MIME_TYPE }?.get(1)
     fun hash() = tags.firstOrNull { it.size > 1 && it[0] == HASH }?.get(1)
     fun size() = tags.firstOrNull { it.size > 1 && it[0] == FILE_SIZE }?.get(1)
+    fun dimensions() = tags.firstOrNull { it.size > 1 && it[0] == DIMENSION }?.get(1)
     fun magnetURI() = tags.firstOrNull { it.size > 1 && it[0] == MAGNET_URI }?.get(1)
     fun torrentInfoHash() = tags.firstOrNull { it.size > 1 && it[0] == TORRENT_INFOHASH }?.get(1)
     fun blurhash() = tags.firstOrNull { it.size > 1 && it[0] == BLUR_HASH }?.get(1)
@@ -30,6 +33,7 @@ class FileStorageHeaderEvent(
         private const val ENCRYPTION_KEY = "aes-256-gcm"
         private const val MIME_TYPE = "m"
         private const val FILE_SIZE = "size"
+        private const val DIMENSION = "dim"
         private const val HASH = "x"
         private const val MAGNET_URI = "magnet"
         private const val TORRENT_INFOHASH = "i"
@@ -41,6 +45,7 @@ class FileStorageHeaderEvent(
             description: String? = null,
             hash: String? = null,
             size: String? = null,
+            dimensions: String? = null,
             blurhash: String? = null,
             magnetURI: String? = null,
             torrentInfoHash: String? = null,
@@ -53,6 +58,7 @@ class FileStorageHeaderEvent(
                 mimeType?.let { listOf(MIME_TYPE, mimeType) },
                 hash?.let { listOf(HASH, it) },
                 size?.let { listOf(FILE_SIZE, it) },
+                dimensions?.let { listOf(DIMENSION, it) },
                 blurhash?.let { listOf(BLUR_HASH, it) },
                 magnetURI?.let { listOf(MAGNET_URI, it) },
                 torrentInfoHash?.let { listOf(TORRENT_INFOHASH, it) },

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

@@ -0,0 +1,94 @@
+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.hexToByteArray
+import nostr.postr.Utils
+
+@Immutable
+abstract class GeneralListEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    kind: Int,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+    override fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
+
+    fun category() = dTag()
+    fun bookmarkedPosts() = taggedEvents()
+    fun bookmarkedPeople() = taggedUsers()
+
+    fun plainContent(privKey: ByteArray): String? {
+        if (content.isBlank()) return null
+
+        return try {
+            val sharedSecret = Utils.getSharedSecret(privKey, pubKey.hexToByteArray())
+
+            return Utils.decrypt(content, sharedSecret)
+        } catch (e: Exception) {
+            Log.w("GeneralList", "Error decrypting the message ${e.message} for ${dTag()}")
+            null
+        }
+    }
+
+    @Transient
+    private var privateTagsCache: List<List<String>>? = null
+
+    fun privateTags(privKey: ByteArray): List<List<String>>? {
+        if (privateTagsCache != null) {
+            return privateTagsCache
+        }
+
+        privateTagsCache = try {
+            gson.fromJson(plainContent(privKey), object : TypeToken<List<List<String>>>() {}.type)
+        } catch (e: Throwable) {
+            Log.w("GeneralList", "Error parsing the JSON ${e.message}")
+            null
+        }
+        return privateTagsCache
+    }
+
+    fun privateTaggedUsers(privKey: ByteArray) = privateTags(privKey)?.filter { it.size > 1 && it[0] == "p" }?.map { it[1] }
+    fun privateTaggedEvents(privKey: ByteArray) = privateTags(privKey)?.filter { it.size > 1 && it[0] == "e" }?.map { it[1] }
+    fun privateTaggedAddresses(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "a" }?.mapNotNull {
+        val aTagValue = it.getOrNull(1)
+        val relay = it.getOrNull(2)
+
+        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
+    }
+
+    companion object {
+        fun createPrivateTags(
+            privEvents: List<String>? = null,
+            privUsers: List<String>? = null,
+            privAddresses: List<ATag>? = null,
+
+            privateKey: ByteArray,
+            pubKey: ByteArray
+        ): String {
+            val privTags = mutableListOf<List<String>>()
+            privEvents?.forEach {
+                privTags.add(listOf("e", it))
+            }
+            privUsers?.forEach {
+                privTags.add(listOf("p", it))
+            }
+            privAddresses?.forEach {
+                privTags.add(listOf("a", it.toTag()))
+            }
+            val msg = gson.toJson(privTags)
+
+            return Utils.encrypt(
+                msg,
+                privateKey,
+                pubKey
+            )
+        }
+    }
+}

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

@@ -0,0 +1,52 @@
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.relays.Client
+import nostr.postr.Utils
+import java.util.Date
+
+@Immutable
+class GenericRepostEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    fun boostedPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    fun originalAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+
+    fun containedPost() = try {
+        fromJson(content, Client.lenient)
+    } catch (e: Exception) {
+        null
+    }
+
+    companion object {
+        const val kind = 16
+
+        fun create(boostedPost: EventInterface, privateKey: ByteArray, createdAt: Long = Date().time / 1000): GenericRepostEvent {
+            val content = boostedPost.toJson()
+
+            val replyToPost = listOf("e", boostedPost.id())
+            val replyToAuthor = listOf("p", boostedPost.pubKey())
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            var tags: List<List<String>> = listOf(replyToPost, replyToAuthor)
+
+            if (boostedPost is AddressableEvent) {
+                tags = tags + listOf(listOf("a", boostedPost.address().toTag()))
+            }
+
+            tags = tags + listOf(listOf("k", "${boostedPost.kind()}"))
+
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return GenericRepostEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

@@ -0,0 +1,38 @@
+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 HighlightEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : BaseTextNoteEvent(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    fun inUrl() = taggedUrls().firstOrNull()
+    fun author() = taggedUsers().firstOrNull()
+    fun quote() = content
+
+    companion object {
+        const val kind = 9802
+
+        fun create(
+            msg: String,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): PollNoteEvent {
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = mutableListOf<List<String>>()
+            val id = generateId(pubKey, createdAt, kind, tags, msg)
+            val sig = Utils.sign(id, privateKey)
+            return PollNoteEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
+        }
+    }
+}

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

@@ -0,0 +1,48 @@
+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 LiveActivitiesEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+
+    override fun dTag() = tags.firstOrNull { it.size > 1 && it[0] == "d" }?.get(1) ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
+
+    fun title() = tags.firstOrNull { it.size > 1 && it[0] == "title" }?.get(1)
+    fun summary() = tags.firstOrNull { it.size > 1 && it[0] == "summary" }?.get(1)
+    fun image() = tags.firstOrNull { it.size > 1 && it[0] == "image" }?.get(1)
+    fun streaming() = tags.firstOrNull { it.size > 1 && it[0] == "streaming" }?.get(1)
+    fun starts() = tags.firstOrNull { it.size > 1 && it[0] == "starts" }?.get(1)
+    fun ends() = tags.firstOrNull { it.size > 1 && it[0] == "ends" }?.get(1)
+    fun status() = tags.firstOrNull { it.size > 1 && it[0] == "status" }?.get(1)
+    fun currentParticipants() = tags.firstOrNull { it.size > 1 && it[0] == "current_participants" }?.get(1)
+    fun totalParticipants() = tags.firstOrNull { it.size > 1 && it[0] == "total_participants" }?.get(1)
+
+    fun participants() = tags.filter { it.size > 1 && it[0] == "p" }.map { Participant(it[1], it.getOrNull(2)) }
+
+    companion object {
+        const val kind = 30311
+
+        fun create(
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): LiveActivitiesEvent {
+            val tags = mutableListOf<List<String>>()
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val id = generateId(pubKey, createdAt, kind, tags, "")
+            val sig = Utils.sign(id, privateKey)
+            return LiveActivitiesEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
+        }
+    }
+}

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

@@ -1,10 +1,12 @@
 package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
+import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.service.relays.Client
 
+@Immutable
 class LnZapEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -57,7 +59,7 @@ class LnZapEvent(
         return content
     }
 
-    private fun lnInvoice() = tags.firstOrNull { it.size > 1 && it[0] == "bolt11" }?.get(1)
+    fun lnInvoice() = tags.firstOrNull { it.size > 1 && it[0] == "bolt11" }?.get(1)
 
     private fun description() = tags.firstOrNull { it.size > 1 && it[0] == "description" }?.get(1)
 

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

@@ -1,7 +1,9 @@
 package com.vitorpamplona.amethyst.service.model
 
+import androidx.compose.runtime.Immutable
 import java.math.BigDecimal
 
+@Immutable
 interface LnZapEventInterface : EventInterface {
 
     fun zappedPost(): List<String>

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

@@ -1,12 +1,19 @@
 package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
+import androidx.compose.runtime.Immutable
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
 import com.vitorpamplona.amethyst.model.HexKey
-import com.vitorpamplona.amethyst.model.toByteArray
+import com.vitorpamplona.amethyst.model.hexToByteArray
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
+import java.lang.reflect.Type
 import java.util.Date
 
+@Immutable
 class LnZapPaymentRequestEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -16,13 +23,27 @@ class LnZapPaymentRequestEvent(
     sig: HexKey
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
+    // Once one of an app user decrypts the payment, all users else can see it.
+    @Transient
+    private var lnInvoice: String? = null
+
     fun walletServicePubKey() = tags.firstOrNull() { it.size > 1 && it[0] == "p" }?.get(1)
 
-    fun lnInvoice(privKey: ByteArray): String? {
-        return try {
-            val sharedSecret = Utils.getSharedSecret(privKey, pubKey.toByteArray())
+    fun lnInvoice(privKey: ByteArray, pubkey: ByteArray): String? {
+        if (lnInvoice != null) {
+            return lnInvoice
+        }
 
-            return Utils.decrypt(content, sharedSecret)
+        return try {
+            val sharedSecret = Utils.getSharedSecret(privKey, pubkey)
+
+            val jsonText = Utils.decrypt(content, sharedSecret)
+
+            val payInvoiceMethod = gson.fromJson(jsonText, Request::class.java)
+
+            lnInvoice = (payInvoiceMethod as? PayInvoiceMethod)?.params?.invoice
+
+            return lnInvoice
         } catch (e: Exception) {
             Log.w("BookmarkList", "Error decrypting the message ${e.message}")
             null
@@ -39,12 +60,12 @@ class LnZapPaymentRequestEvent(
             createdAt: Long = Date().time / 1000
         ): LnZapPaymentRequestEvent {
             val pubKey = Utils.pubkeyCreate(privateKey)
-            val serializedRequest = gson.toJson(PayInvoiceMethod(lnInvoice))
+            val serializedRequest = gson.toJson(PayInvoiceMethod.create(lnInvoice))
 
             val content = Utils.encrypt(
                 serializedRequest,
                 privateKey,
-                walletServicePubkey.toByteArray()
+                walletServicePubkey.hexToByteArray()
             )
 
             val tags = mutableListOf<List<String>>()
@@ -59,11 +80,37 @@ class LnZapPaymentRequestEvent(
 
 // REQUEST OBJECTS
 
-abstract class Request(val method: String, val params: Params)
-abstract class Params
+abstract class Request(var method: String? = null)
 
 // PayInvoice Call
+class PayInvoiceParams(var invoice: String? = null)
 
-class PayInvoiceMethod(bolt11: String) : Request("pay_invoice", PayInvoiceParams(bolt11)) {
-    class PayInvoiceParams(val invoice: String) : Params()
+class PayInvoiceMethod(var params: PayInvoiceParams? = null) : Request("pay_invoice") {
+
+    companion object {
+        fun create(bolt11: String): PayInvoiceMethod {
+            return PayInvoiceMethod(PayInvoiceParams(bolt11))
+        }
+    }
+}
+
+class RequestDeserializer :
+    JsonDeserializer<Request?> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext
+    ): Request? {
+        val jsonObject = json.asJsonObject
+        val method = jsonObject.get("method")?.asString
+
+        if (method == "pay_invoice") {
+            return context.deserialize<PayInvoiceMethod>(jsonObject, PayInvoiceMethod::class.java)
+        }
+        return null
+    }
+
+    companion object {
+    }
 }

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

@@ -1,10 +1,17 @@
 package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
+import androidx.compose.runtime.Immutable
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
 import com.google.gson.annotations.SerializedName
 import com.vitorpamplona.amethyst.model.HexKey
 import nostr.postr.Utils
+import java.lang.reflect.Type
 
+@Immutable
 class LnZapPaymentResponseEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -14,10 +21,14 @@ class LnZapPaymentResponseEvent(
     sig: HexKey
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
+    // Once one of an app user decrypts the payment, all users else can see it.
+    @Transient
+    private var response: Response? = null
+
     fun requestAuthor() = tags.firstOrNull() { it.size > 1 && it[0] == "p" }?.get(1)
     fun requestId() = tags.firstOrNull() { it.size > 1 && it[0] == "e" }?.get(1)
 
-    fun decrypt(privKey: ByteArray, pubKey: ByteArray): String? {
+    private fun decrypt(privKey: ByteArray, pubKey: ByteArray): String? {
         return try {
             val sharedSecret = Utils.getSharedSecret(privKey, pubKey)
 
@@ -34,15 +45,21 @@ class LnZapPaymentResponseEvent(
         }
     }
 
-    fun response(privKey: ByteArray, pubKey: ByteArray): Response? = try {
-        if (content.isNotEmpty()) {
-            gson.fromJson(decrypt(privKey, pubKey), Response::class.java)
-        } else {
+    fun response(privKey: ByteArray, pubKey: ByteArray): Response? {
+        if (response != null) response
+
+        return try {
+            if (content.isNotEmpty()) {
+                val decrypted = decrypt(privKey, pubKey)
+                response = gson.fromJson(decrypted, Response::class.java)
+                response
+            } else {
+                null
+            }
+        } catch (e: Exception) {
+            Log.w("LnZapPaymentResponseEvent", "Can't parse content as a payment response: $content", e)
             null
         }
-    } catch (e: Exception) {
-        Log.w("LnZapPaymentResponseEvent", "Can't parse content as a payment response: $content", e)
-        null
     }
 
     companion object {
@@ -58,7 +75,7 @@ abstract class Response(
 
 // PayInvoice Call
 
-class PayInvoiceSuccessResponse(val result: PayInvoiceResultParams) :
+class PayInvoiceSuccessResponse(val result: PayInvoiceResultParams? = null) :
     Response("pay_invoice") {
     class PayInvoiceResultParams(val preimage: String)
 }
@@ -86,3 +103,39 @@ class PayInvoiceErrorResponse(val error: PayInvoiceErrorParams? = null) :
         OTHER // Other error.
     }
 }
+
+class ResponseDeserializer :
+    JsonDeserializer<Response?> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext
+    ): Response? {
+        val jsonObject = json.asJsonObject
+        val resultType = jsonObject.get("result_type")?.asString
+
+        if (resultType == "pay_invoice") {
+            val result = jsonObject.get("result")?.asJsonObject
+            val error = jsonObject.get("error")?.asJsonObject
+            if (result != null) {
+                return context.deserialize<PayInvoiceSuccessResponse>(jsonObject, PayInvoiceSuccessResponse::class.java)
+            }
+            if (error != null) {
+                return context.deserialize<PayInvoiceErrorResponse>(jsonObject, PayInvoiceErrorResponse::class.java)
+            }
+        } else {
+            // tries to guess
+            if (jsonObject.get("result")?.asJsonObject?.get("preimage") != null) {
+                return context.deserialize<PayInvoiceSuccessResponse>(jsonObject, PayInvoiceSuccessResponse::class.java)
+            }
+            if (jsonObject.get("error")?.asJsonObject?.get("code") != null) {
+                return context.deserialize<PayInvoiceErrorResponse>(jsonObject, PayInvoiceErrorResponse::class.java)
+            }
+        }
+        return null
+    }
+
+    companion object {
+    }
+}

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

@@ -1,9 +1,11 @@
 package com.vitorpamplona.amethyst.service.model
 
+import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.*
 import nostr.postr.Bech32
 import nostr.postr.Utils
 import java.nio.charset.Charset
+import java.security.MessageDigest
 import java.security.SecureRandom
 import java.util.*
 import javax.crypto.BadPaddingException
@@ -11,6 +13,7 @@ import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
 
+@Immutable
 class LnZapRequestEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -20,12 +23,37 @@ class LnZapRequestEvent(
     sig: HexKey
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
+    @Transient
+    private var privateZapEvent: Event? = null
+
     fun zappedPost() = tags.filter { it.size > 1 && it[0] == "e" }.map { it[1] }
 
     fun zappedAuthor() = tags.filter { it.size > 1 && it[0] == "p" }.map { it[1] }
 
     fun isPrivateZap() = tags.any { t -> t.size >= 2 && t[0] == "anon" && t[1].isNotBlank() }
 
+    fun getPrivateZapEvent(loggedInUserPrivKey: ByteArray, pubKey: HexKey): Event? {
+        if (privateZapEvent != null) return privateZapEvent
+
+        val anonTag = tags.firstOrNull { t -> t.size >= 2 && t[0] == "anon" }
+        if (anonTag != null) {
+            val encnote = anonTag[1]
+            if (encnote.isNotBlank()) {
+                try {
+                    val note = decryptPrivateZapMessage(encnote, loggedInUserPrivKey, pubKey.hexToByteArray())
+                    val decryptedEvent = fromJson(note)
+                    if (decryptedEvent.kind == 9733) {
+                        privateZapEvent = decryptedEvent
+                        return privateZapEvent
+                    }
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            }
+        }
+        return null
+    }
+
     companion object {
         const val kind = 9734
 
@@ -46,7 +74,7 @@ class LnZapRequestEvent(
                 listOf("p", originalNote.pubKey()),
                 listOf("relays") + relays
             )
-            if (originalNote is LongTextNoteEvent) {
+            if (originalNote is AddressableEvent) {
                 tags = tags + listOf(listOf("a", originalNote.address().toTag()))
             }
             if (pollOption != null && pollOption >= 0) {
@@ -59,7 +87,7 @@ class LnZapRequestEvent(
             } else if (zapType == LnZapEvent.ZapType.PRIVATE) {
                 var encryptionPrivateKey = createEncryptionPrivateKey(privateKey.toHexKey(), originalNote.id(), createdAt)
                 var noteJson = (create(privkey, 9733, listOf(tags[0], tags[1]), message)).toJson()
-                var encryptedContent = encryptPrivateZapMessage(noteJson, encryptionPrivateKey, originalNote.pubKey().toByteArray())
+                var encryptedContent = encryptPrivateZapMessage(noteJson, encryptionPrivateKey, originalNote.pubKey().hexToByteArray())
                 tags = tags + listOf(listOf("anon", encryptedContent))
                 content = "" // make sure public content is empty, as the content is encrypted
                 privkey = encryptionPrivateKey // sign event with generated privkey
@@ -92,7 +120,7 @@ class LnZapRequestEvent(
             } else if (zapType == LnZapEvent.ZapType.PRIVATE) {
                 var encryptionPrivateKey = createEncryptionPrivateKey(privateKey.toHexKey(), userHex, createdAt)
                 var noteJson = (create(privkey, 9733, listOf(tags[0], tags[1]), message)).toJson()
-                var encryptedContent = encryptPrivateZapMessage(noteJson, encryptionPrivateKey, userHex.toByteArray())
+                var encryptedContent = encryptPrivateZapMessage(noteJson, encryptionPrivateKey, userHex.hexToByteArray())
                 tags = tags + listOf(listOf("anon", encryptedContent))
                 content = ""
                 privkey = encryptionPrivateKey
@@ -106,10 +134,10 @@ class LnZapRequestEvent(
         fun createEncryptionPrivateKey(privkey: String, id: String, createdAt: Long): ByteArray {
             var str = privkey + id + createdAt.toString()
             var strbyte = str.toByteArray(Charset.forName("utf-8"))
-            return sha256.digest(strbyte)
+            return MessageDigest.getInstance("SHA-256").digest(strbyte)
         }
 
-        fun encryptPrivateZapMessage(msg: String, privkey: ByteArray, pubkey: ByteArray): String {
+        private fun encryptPrivateZapMessage(msg: String, privkey: ByteArray, pubkey: ByteArray): String {
             var sharedSecret = Utils.getSharedSecret(privkey, pubkey)
             val iv = ByteArray(16)
             SecureRandom().nextBytes(iv)
@@ -128,7 +156,7 @@ class LnZapRequestEvent(
             return encryptedMsgBech32 + "_" + ivBech32
         }
 
-        fun decryptPrivateZapMessage(msg: String, privkey: ByteArray, pubkey: ByteArray): String {
+        private fun decryptPrivateZapMessage(msg: String, privkey: ByteArray, pubkey: ByteArray): String {
             var sharedSecret = Utils.getSharedSecret(privkey, pubkey)
             if (sharedSecret.size != 16 && sharedSecret.size != 32) {
                 throw IllegalArgumentException("Invalid shared secret size")
@@ -150,61 +178,5 @@ class LnZapRequestEvent(
                 throw IllegalArgumentException("Bad padding: ${ex.message}")
             }
         }
-
-        fun checkForPrivateZap(zapRequest: LnZapRequestEvent, loggedInUserPrivKey: ByteArray, pubKey: HexKey): Event? {
-            val anonTag = zapRequest.tags.firstOrNull { t -> t.size >= 2 && t[0] == "anon" }
-            if (anonTag != null) {
-                val encnote = anonTag[1]
-                if (encnote.isNotBlank()) {
-                    try {
-                        val note = decryptPrivateZapMessage(encnote, loggedInUserPrivKey, pubKey.toByteArray())
-                        val decryptedEvent = fromJson(note)
-                        if (decryptedEvent.kind == 9733) {
-                            return decryptedEvent
-                        }
-                    } catch (e: Exception) {
-                        e.printStackTrace()
-                    }
-                }
-            }
-            return null
-        }
     }
 }
-/*
-{
-  "pubkey": "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245",
-  "content": "",
-  "id": "d9cc14d50fcb8c27539aacf776882942c1a11ea4472f8cdec1dea82fab66279d",
-  "created_at": 1674164539,
-  "sig": "77127f636577e9029276be060332ea565deaf89ff215a494ccff16ae3f757065e2bc59b2e8c113dd407917a010b3abd36c8d7ad84c0e3ab7dab3a0b0caa9835d",
-  "kind": 9734,
-  "tags": [
-  [
-    "e",
-    "3624762a1274dd9636e0c552b53086d70bc88c165bc4dc0f9e836a1eaf86c3b8"
-  ],
-  [
-    "p",
-    "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245"
-  ],
-  [
-    "relays",
-    "wss://relay.damus.io",
-    "wss://nostr-relay.wlvs.space",
-    "wss://nostr.fmt.wiz.biz",
-    "wss://relay.nostr.bg",
-    "wss://nostr.oxtr.dev",
-    "wss://nostr.v0l.io",
-    "wss://brb.io",
-    "wss://nostr.bitcoiner.social",
-    "ws://monad.jb55.com:8080",
-    "wss://relay.snort.social"
-  ],
-  [
-    "poll_option", "n"
-  ]
-  ],
-  "ots": <base64-encoded OTS file data> // TODO
-}
-*/

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

@@ -1,10 +1,12 @@
 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 LongTextNoteEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -12,9 +14,9 @@ class LongTextNoteEvent(
     tags: List<List<String>>,
     content: String,
     sig: HexKey
-) : BaseTextNoteEvent(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
-    fun address() = ATag(kind, pubKey, dTag(), null)
+) : BaseTextNoteEvent(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+    override fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
 
     fun topics() = tags.filter { it.firstOrNull() == "t" }.mapNotNull { it.getOrNull(1) }
     fun title() = tags.filter { it.firstOrNull() == "title" }.mapNotNull { it.getOrNull(1) }.firstOrNull()

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

@@ -1,20 +1,17 @@
 package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.google.gson.Gson
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.UserMetadata
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
+import java.io.ByteArrayInputStream
 import java.util.Date
 
-data class ContactMetaData(
-    val name: String,
-    val picture: String,
-    val about: String,
-    val nip05: String?
-)
-
 abstract class IdentityClaim(
     var identity: String,
     var proof: String
@@ -143,9 +140,13 @@ class MetadataEvent(
     sig: HexKey
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
     fun contactMetaData() = try {
-        gson.fromJson(content, ContactMetaData::class.java)
+        metadataParser.readValue(
+            ByteArrayInputStream(content.toByteArray(Charsets.UTF_8)),
+            UserMetadata::class.java
+        )
     } catch (e: Exception) {
-        Log.e("MetadataEvent", "Can't parse $content", e)
+        e.printStackTrace()
+        Log.w("MT", "Content Parse Error ${e.localizedMessage} $content")
         null
     }
 
@@ -162,8 +163,10 @@ class MetadataEvent(
         const val kind = 0
         val gson = Gson()
 
-        fun create(contactMetaData: ContactMetaData, identities: List<IdentityClaim>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): MetadataEvent {
-            return create(gson.toJson(contactMetaData), identities, privateKey, createdAt = createdAt)
+        val metadataParser by lazy {
+            jacksonObjectMapper()
+                .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+                .readerFor(UserMetadata::class.java)
         }
 
         fun create(contactMetaData: String, identities: List<IdentityClaim>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): MetadataEvent {

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

@@ -1,13 +1,15 @@
 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.toByteArray
+import com.vitorpamplona.amethyst.model.hexToByteArray
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
 import java.util.Date
 
+@Immutable
 class MuteListEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -15,13 +17,13 @@ class MuteListEvent(
     tags: List<List<String>>,
     content: String,
     sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
-    fun address() = ATag(kind, pubKey, dTag(), null)
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+    override fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
 
     fun plainContent(privKey: ByteArray): String? {
         return try {
-            val sharedSecret = Utils.getSharedSecret(privKey, pubKey.toByteArray())
+            val sharedSecret = Utils.getSharedSecret(privKey, pubKey.hexToByteArray())
 
             return Utils.decrypt(content, sharedSecret)
         } catch (e: Exception) {

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

@@ -0,0 +1,56 @@
+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/PinListEvent.kt

@@ -0,0 +1,43 @@
+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 PinListEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+
+    override fun dTag() = tags.firstOrNull { it.size > 1 && it[0] == "d" }?.get(1) ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
+
+    fun pins() = tags.filter { it.size > 1 && it[0] == "pin" }.map { it[1] }
+
+    companion object {
+        const val kind = 33888
+
+        fun create(
+            pins: List<String>,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): PinListEvent {
+            val tags = mutableListOf<List<String>>()
+            pins.forEach {
+                tags.add(listOf("pin", it))
+            }
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val id = generateId(pubKey, createdAt, kind, tags, "")
+            val sig = Utils.sign(id, privateKey)
+            return PinListEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
+        }
+    }
+}

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

@@ -1,5 +1,6 @@
 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
@@ -11,6 +12,7 @@ const val VALUE_MINIMUM = "value_minimum"
 const val CONSENSUS_THRESHOLD = "consensus_threshold"
 const val CLOSED_AT = "closed_at"
 
+@Immutable
 class PollNoteEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -49,7 +51,9 @@ class PollNoteEvent(
             valueMinimum: Int?,
             consensusThreshold: Int?,
             closedAt: Int?,
-            zapReceiver: String?
+            zapReceiver: String?,
+            markAsSensitive: Boolean,
+            zapRaiserAmount: Long?
         ): PollNoteEvent {
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
@@ -73,6 +77,12 @@ class PollNoteEvent(
             if (zapReceiver != null) {
                 tags.add(listOf("zap", zapReceiver))
             }
+            if (markAsSensitive) {
+                tags.add(listOf("content-warning", ""))
+            }
+            zapRaiserAmount?.let {
+                tags.add(listOf("zapraiser", "$it"))
+            }
 
             val id = generateId(pubKey, createdAt, kind, tags, msg)
             val sig = Utils.sign(id, privateKey)

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

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
+import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.toHexKey
 import fr.acinq.secp256k1.Hex
@@ -8,6 +9,7 @@ import nostr.postr.Utils
 import nostr.postr.toHex
 import java.util.Date
 
+@Immutable
 class PrivateDmEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -21,7 +23,15 @@ class PrivateDmEvent(
      * nip-04 EncryptedDmEvent but may omit the recipient, too. This value can be queried and used
      * for initial messages.
      */
-    fun recipientPubKey() = tags.firstOrNull { it.size > 1 && it[0] == "p" }?.run { Hex.decode(this[1]).toHexKey() } // makes sure its a valid one
+    private fun recipientPubKey() = tags.firstOrNull { it.size > 1 && it[0] == "p" }
+
+    fun recipientPubKeyBytes() = recipientPubKey()?.runCatching { Hex.decode(this[1]) }?.getOrNull()
+
+    fun verifiedRecipientPubKey() = recipientPubKey()?.runCatching { Hex.decode(this[1]).toHexKey() }?.getOrNull() // makes sure its a valid one
+
+    fun talkingWith(oneSideHex: String): HexKey {
+        return if (pubKey == oneSideHex) verifiedRecipientPubKey() ?: pubKey else pubKey
+    }
 
     /**
      * To be fully compatible with nip-04, we read e-tags that are in violation to nip-18.
@@ -31,6 +41,11 @@ class PrivateDmEvent(
      */
     fun replyTo() = tags.firstOrNull { it.size > 1 && it[0] == "e" }?.get(1)
 
+    fun with(pubkeyHex: String): Boolean {
+        return pubkeyHex == pubKey ||
+            tags.any { it.size > 1 && it[0] == "p" && it[1] == pubkeyHex }
+    }
+
     fun plainContent(privKey: ByteArray, pubKey: ByteArray): String? {
         return try {
             val sharedSecret = Utils.getSharedSecret(privKey, pubKey)
@@ -62,7 +77,9 @@ class PrivateDmEvent(
             privateKey: ByteArray,
             createdAt: Long = Date().time / 1000,
             publishedRecipientPubKey: ByteArray? = null,
-            advertiseNip18: Boolean = true
+            advertiseNip18: Boolean = true,
+            markAsSensitive: Boolean,
+            zapRaiserAmount: Long?
         ): PrivateDmEvent {
             val content = Utils.encrypt(
                 if (advertiseNip18) { nip18Advertisement } else { "" } + msg,
@@ -83,6 +100,12 @@ class PrivateDmEvent(
             zapReceiver?.let {
                 tags.add(listOf("zap", it))
             }
+            if (markAsSensitive) {
+                tags.add(listOf("content-warning", ""))
+            }
+            zapRaiserAmount?.let {
+                tags.add(listOf("zapraiser", "$it"))
+            }
             val id = generateId(pubKey, createdAt, kind, tags, content)
             val sig = Utils.sign(id, privateKey)
             return PrivateDmEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())

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

@@ -1,10 +1,12 @@
 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,
@@ -32,7 +34,7 @@ class ReactionEvent(
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
 
             var tags = listOf(listOf("e", originalNote.id()), listOf("p", originalNote.pubKey()))
-            if (originalNote is LongTextNoteEvent) {
+            if (originalNote is AddressableEvent) {
                 tags = tags + listOf(listOf("a", originalNote.address().toTag()))
             }
 

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

@@ -1,11 +1,13 @@
 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.net.URI
 import java.util.Date
 
+@Immutable
 class RecommendRelayEvent(
     id: HexKey,
     pubKey: HexKey,

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

@@ -1,10 +1,12 @@
 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 RelayAuthEvent(
     id: HexKey,
     pubKey: HexKey,

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

@@ -0,0 +1,44 @@
+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 RelaySetEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+
+    override fun dTag() = tags.firstOrNull { it.size > 1 && it[0] == "d" }?.get(1) ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
+
+    fun relays() = tags.filter { it.size > 1 && it[0] == "r" }.map { it[1] }
+    fun description() = tags.firstOrNull() { it.size > 1 && it[0] == "description" }?.get(1)
+
+    companion object {
+        const val kind = 30022
+
+        fun create(
+            relays: List<String>,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): RelaySetEvent {
+            val tags = mutableListOf<List<String>>()
+            relays.forEach {
+                tags.add(listOf("r", it))
+            }
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val id = generateId(pubKey, createdAt, kind, tags, "")
+            val sig = Utils.sign(id, privateKey)
+            return RelaySetEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
+        }
+    }
+}

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

@@ -1,13 +1,16 @@
 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
 data class ReportedKey(val key: String, val reportType: ReportEvent.ReportType)
 
 // NIP 56 event.
+@Immutable
 class ReportEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -63,7 +66,7 @@ class ReportEvent(
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             var tags: List<List<String>> = listOf(reportPostTag, reportAuthorTag)
 
-            if (reportedPost is LongTextNoteEvent) {
+            if (reportedPost is AddressableEvent) {
                 tags = tags + listOf(listOf("a", reportedPost.address().toTag()))
             }
 

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

@@ -1,11 +1,13 @@
 package com.vitorpamplona.amethyst.service.model
 
+import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.relays.Client
 import nostr.postr.Utils
 import java.util.Date
 
+@Immutable
 class RepostEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -34,9 +36,9 @@ class RepostEvent(
             val replyToAuthor = listOf("p", boostedPost.pubKey())
 
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
-            var tags: List<List<String>> = boostedPost.tags().plus(listOf(replyToPost, replyToAuthor))
+            var tags: List<List<String>> = listOf(replyToPost, replyToAuthor)
 
-            if (boostedPost is LongTextNoteEvent) {
+            if (boostedPost is AddressableEvent) {
                 tags = tags + listOf(listOf("a", boostedPost.address().toTag()))
             }
 

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

@@ -1,5 +1,6 @@
 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
@@ -8,6 +9,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.findHashtags
 import nostr.postr.Utils
 import java.util.Date
 
+@Immutable
 class TextNoteEvent(
     id: HexKey,
     pubKey: HexKey,
@@ -17,6 +19,10 @@ class TextNoteEvent(
     sig: HexKey
 ) : BaseTextNoteEvent(id, pubKey, createdAt, kind, tags, content, sig) {
 
+    fun subject() = tags.firstOrNull() { it.size > 1 && it[0] == "subject" }?.get(1)
+
+    fun root() = tags.firstOrNull() { it.size > 3 && it[3] == "root" }?.get(1)
+
     companion object {
         const val kind = 1
 
@@ -27,22 +33,50 @@ class TextNoteEvent(
             addresses: List<ATag>?,
             extraTags: List<String>?,
             zapReceiver: String?,
+            markAsSensitive: Boolean,
+            zapRaiserAmount: Long?,
+            replyingTo: String?,
+            root: String?,
+            directMentions: Set<HexKey>,
+
             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))
+                if (it == replyingTo) {
+                    tags.add(listOf("e", it, "", "reply"))
+                } else if (it == root) {
+                    tags.add(listOf("e", it, "", "root"))
+                } else if (it in directMentions) {
+                    tags.add(listOf("e", it, "", "mention"))
+                } else {
+                    tags.add(listOf("e", it))
+                }
             }
             mentions?.forEach {
-                tags.add(listOf("p", it))
+                if (it in directMentions) {
+                    tags.add(listOf("p", it, "", "mention"))
+                } else {
+                    tags.add(listOf("p", it))
+                }
             }
             addresses?.forEach {
-                tags.add(listOf("a", it.toTag()))
+                val aTag = it.toTag()
+                if (aTag == replyingTo) {
+                    tags.add(listOf("a", aTag, "", "reply"))
+                } else if (aTag == root) {
+                    tags.add(listOf("a", aTag, "", "root"))
+                } else if (aTag in directMentions) {
+                    tags.add(listOf("a", aTag, "", "mention"))
+                } else {
+                    tags.add(listOf("a", aTag))
+                }
             }
             findHashtags(msg).forEach {
                 tags.add(listOf("t", it))
+                tags.add(listOf("t", it.lowercase()))
             }
             extraTags?.forEach {
                 tags.add(listOf("t", it))
@@ -53,6 +87,12 @@ class TextNoteEvent(
             findURLs(msg).forEach {
                 tags.add(listOf("r", it))
             }
+            if (markAsSensitive) {
+                tags.add(listOf("content-warning", ""))
+            }
+            zapRaiserAmount?.let {
+                tags.add(listOf("zapraiser", "$it"))
+            }
 
             val id = generateId(pubKey, createdAt, kind, tags, msg)
             val sig = Utils.sign(id, privateKey)

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

@@ -2,17 +2,21 @@ package com.vitorpamplona.amethyst.service.model.zaps
 
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.LnZapEventInterface
+import com.vitorpamplona.amethyst.ui.screen.ZapReqResponse
 
 object UserZaps {
-    fun forProfileFeed(zaps: Map<Note, Note?>?): List<Pair<Note, Note>> {
+    fun forProfileFeed(zaps: Map<Note, Note?>?): List<ZapReqResponse> {
         if (zaps == null) return emptyList()
 
         return (
             zaps
-                .filter { it.value != null }
-                .toList()
-                .sortedBy { (it.second?.event as? LnZapEventInterface)?.amount() }
+                .mapNotNull { entry ->
+                    entry.value?.let {
+                        ZapReqResponse(entry.key, it)
+                    }
+                }
+                .sortedBy { (it.zapEvent.event as? LnZapEventInterface)?.amount() }
                 .reversed()
-            ) as List<Pair<Note, Note>>
+            )
     }
 }

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

@@ -1,7 +1,8 @@
 package com.vitorpamplona.amethyst.service.nip19
 
 import android.util.Log
-import com.vitorpamplona.amethyst.model.toByteArray
+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
@@ -13,14 +14,15 @@ object Nip19 {
         USER, NOTE, EVENT, RELAY, ADDRESS
     }
 
-    val nip19regex = Pattern.compile("(nostr:)?@?(nsec1|npub1|nevent1|naddr1|note1|nprofile1|nrelay1)([qpzry9x8gf2tvdw0s3jn54khce6mua7l]+)(.*)", Pattern.CASE_INSENSITIVE)
+    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: Long? = null,
+        val kind: Int? = null,
         val additionalChars: String = ""
     )
 
@@ -109,7 +111,7 @@ object Nip19 {
 
         val kind = tlv.get(Tlv.Type.KIND.id)
             ?.get(0)
-            ?.let { Tlv.toInt32(it) }?.toLong()
+            ?.let { Tlv.toInt32(it) }
 
         return Return(Type.EVENT, hex, relay, author, kind)
     }
@@ -140,15 +142,15 @@ object Nip19 {
 
         val kind = tlv.get(Tlv.Type.KIND.id)
             ?.get(0)
-            ?.let { Tlv.toInt32(it) }?.toLong()
+            ?.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?.toByteArray()
-        val idHex = idHex.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

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

@@ -0,0 +1,109 @@
+package com.vitorpamplona.amethyst.service.notifications
+
+import android.app.NotificationManager
+import android.content.Context
+import androidx.core.content.ContextCompat
+import com.vitorpamplona.amethyst.LocalPreferences
+import com.vitorpamplona.amethyst.R
+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
+
+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)
+                }
+            }
+        }
+    }
+
+    private fun notify(event: PrivateDmEvent) {
+        val note = LocalCache.notes[event.id] ?: return
+
+        LocalPreferences.allSavedAccounts().forEach {
+            val acc = LocalPreferences.loadFromEncryptedStorage(it.npub)
+
+            if (acc != null && acc.userProfile().pubkeyHex == event.verifiedRecipientPubKey()) {
+                val followingKeySet = acc.followingKeySet()
+
+                val messagingWith = acc.userProfile().privateChatrooms.keys.filter {
+                    (
+                        it.pubkeyHex in followingKeySet || acc.userProfile()
+                            .hasSentMessagesTo(it)
+                        ) && !acc.isHidden(it)
+                }.toSet()
+
+                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)
+                }
+            }
+        }
+    }
+
+    private fun notify(event: LnZapEvent) {
+        val noteZapEvent = LocalCache.notes[event.id] ?: return
+
+        val noteZapRequest = event.zapRequest?.id?.let { LocalCache.checkGetOrCreateNote(it) }
+        val noteZapped = event.zappedPost().firstOrNull()?.let { LocalCache.checkGetOrCreateNote(it) }
+
+        LocalPreferences.allSavedAccounts().forEach {
+            val acc = LocalPreferences.loadFromEncryptedStorage(it.npub)
+
+            if (acc != null && acc.userProfile().pubkeyHex == event.zappedAuthor().firstOrNull()) {
+                val amount = showAmount(event.amount)
+                val senderInfo = (noteZapRequest?.event as? LnZapRequestEvent)?.let {
+                    val decryptedContent = acc.decryptZapContentAuthor(noteZapRequest)
+                    if (decryptedContent != null) {
+                        val author = LocalCache.getOrCreateUser(decryptedContent.pubKey)
+                        Pair(author, decryptedContent.content)
+                    } else if (!noteZapRequest.event?.content().isNullOrBlank()) {
+                        Pair(noteZapRequest.author, noteZapRequest.event?.content())
+                    } else {
+                        Pair(noteZapRequest.author, null)
+                    }
+                }
+
+                val zappedContent =
+                    noteZapped?.let { it1 -> acc.decryptContent(it1)?.split("\n")?.get(0) }
+
+                val user = senderInfo?.first?.toBestDisplayName() ?: ""
+                var title = applicationContext.getString(R.string.app_notification_zaps_channel_message, amount)
+                senderInfo?.second?.ifBlank { null }?.let {
+                    title += " ($it)"
+                }
+                var content = applicationContext.getString(R.string.app_notification_zaps_channel_message_from, user)
+                zappedContent?.let {
+                    content += " " + applicationContext.getString(R.string.app_notification_zaps_channel_message_for, zappedContent)
+                }
+                val userPicture = senderInfo?.first?.profilePicture()
+                val noteUri = "nostr:Notifications"
+                notificationManager().sendZapNotification(event.id, content, title, userPicture, noteUri, applicationContext)
+            }
+        }
+    }
+
+    private fun notificationManager(): NotificationManager {
+        return ContextCompat.getSystemService(applicationContext, NotificationManager::class.java) as NotificationManager
+    }
+}

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

@@ -0,0 +1,196 @@
+package com.vitorpamplona.amethyst.service.notifications
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.BitmapDrawable
+import android.net.Uri
+import android.service.notification.StatusBarNotification
+import androidx.core.app.NotificationCompat
+import coil.ImageLoader
+import coil.executeBlocking
+import coil.request.ImageRequest
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.MainActivity
+
+object NotificationUtils {
+    private var dmChannel: NotificationChannel? = null
+    private var zapChannel: NotificationChannel? = null
+
+    private fun getOrCreateDMChannel(applicationContext: Context): NotificationChannel {
+        if (dmChannel != null) return dmChannel!!
+
+        dmChannel = NotificationChannel(
+            applicationContext.getString(R.string.app_notification_dms_channel_id),
+            applicationContext.getString(R.string.app_notification_dms_channel_name),
+            NotificationManager.IMPORTANCE_DEFAULT
+        ).apply {
+            description = applicationContext.getString(R.string.app_notification_dms_channel_description)
+        }
+
+        // Register the channel with the system
+        val notificationManager: NotificationManager =
+            applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+        notificationManager.createNotificationChannel(dmChannel!!)
+
+        return dmChannel!!
+    }
+
+    private fun getOrCreateZapChannel(applicationContext: Context): NotificationChannel {
+        if (zapChannel != null) return zapChannel!!
+
+        zapChannel = NotificationChannel(
+            applicationContext.getString(R.string.app_notification_zaps_channel_id),
+            applicationContext.getString(R.string.app_notification_zaps_channel_name),
+            NotificationManager.IMPORTANCE_DEFAULT
+        ).apply {
+            description = applicationContext.getString(R.string.app_notification_zaps_channel_description)
+        }
+
+        // Register the channel with the system
+        val notificationManager: NotificationManager =
+            applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+        notificationManager.createNotificationChannel(zapChannel!!)
+
+        return zapChannel!!
+    }
+
+    fun NotificationManager.sendZapNotification(
+        id: String,
+        messageBody: String,
+        messageTitle: String,
+        pictureUrl: String?,
+        uri: String,
+        applicationContext: Context
+    ) {
+        val zapChannel = getOrCreateZapChannel(applicationContext)
+        val channelId = applicationContext.getString(R.string.app_notification_zaps_channel_id)
+
+        sendNotification(id, messageBody, messageTitle, pictureUrl, uri, channelId, applicationContext)
+    }
+
+    fun NotificationManager.sendDMNotification(
+        id: String,
+        messageBody: String,
+        messageTitle: String,
+        pictureUrl: String?,
+        uri: String,
+        applicationContext: Context
+    ) {
+        val dmChannel = getOrCreateDMChannel(applicationContext)
+        val channelId = applicationContext.getString(R.string.app_notification_dms_channel_id)
+
+        sendNotification(id, messageBody, messageTitle, pictureUrl, uri, channelId, applicationContext)
+    }
+
+    fun NotificationManager.sendNotification(
+        id: String,
+        messageBody: String,
+        messageTitle: String,
+        pictureUrl: String?,
+        uri: String,
+        channelId: String,
+        applicationContext: Context
+    ) {
+        if (pictureUrl != null) {
+            val request = ImageRequest.Builder(applicationContext)
+                .data(pictureUrl)
+                .build()
+
+            val imageLoader = ImageLoader(applicationContext)
+            val imageResult = imageLoader.executeBlocking(request)
+            sendNotification(
+                id = id,
+                messageBody = messageBody,
+                messageTitle = messageTitle,
+                picture = imageResult.drawable as? BitmapDrawable,
+                uri = uri,
+                channelId,
+                applicationContext = applicationContext
+            )
+        } else {
+            sendNotification(
+                id = id,
+                messageBody = messageBody,
+                messageTitle = messageTitle,
+                picture = null,
+                uri = uri,
+                channelId,
+                applicationContext = applicationContext
+            )
+        }
+    }
+
+    private fun NotificationManager.sendNotification(
+        id: String,
+        messageBody: String,
+        messageTitle: String,
+        picture: BitmapDrawable?,
+        uri: String,
+        channelId: String,
+        applicationContext: Context
+    ) {
+        val notId = id.hashCode()
+
+        // dont notify twice
+        val notifications: Array<StatusBarNotification> = getActiveNotifications()
+        for (notification in notifications) {
+            if (notification.id == notId) {
+                return
+            }
+        }
+
+        val contentIntent = Intent(applicationContext, MainActivity::class.java).apply {
+            data = Uri.parse(uri)
+        }
+
+        val contentPendingIntent = PendingIntent.getActivity(
+            applicationContext,
+            notId,
+            contentIntent,
+            PendingIntent.FLAG_MUTABLE
+        )
+
+        // Build the notification
+        val builderPublic = NotificationCompat.Builder(
+            applicationContext,
+            channelId
+        )
+            .setSmallIcon(R.drawable.amethyst)
+            .setContentTitle(messageTitle)
+            .setContentText(applicationContext.getString(R.string.app_notification_private_message))
+            .setLargeIcon(picture?.bitmap)
+            .setGroup(messageTitle)
+            .setContentIntent(contentPendingIntent)
+            .setPriority(NotificationCompat.PRIORITY_HIGH)
+            .setAutoCancel(true)
+
+        // Build the notification
+        val builder = NotificationCompat.Builder(
+            applicationContext,
+            channelId
+        )
+            .setSmallIcon(R.drawable.amethyst)
+            .setContentTitle(messageTitle)
+            .setContentText(messageBody)
+            .setLargeIcon(picture?.bitmap)
+            .setGroup(messageTitle)
+            .setContentIntent(contentPendingIntent)
+            .setPublicVersion(builderPublic.build())
+            .setPriority(NotificationCompat.PRIORITY_HIGH)
+            .setAutoCancel(true)
+
+        notify(notId, builder.build())
+    }
+
+    /**
+     * Cancels all notifications.
+     */
+    fun NotificationManager.cancelNotifications() {
+        cancelAll()
+    }
+}

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

@@ -0,0 +1,73 @@
+package com.vitorpamplona.amethyst.service.notifications
+
+import android.util.Log
+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 kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+
+class RegisterAccounts(
+    private val accounts: List<AccountInfo>
+) {
+
+    // creates proof that it controls all accounts
+    private fun signEventsToProveControlOfAccounts(
+        accounts: List<AccountInfo>,
+        notificationToken: String
+    ): List<RelayAuthEvent> {
+        return accounts.mapNotNull {
+            val acc = LocalPreferences.loadFromEncryptedStorage(it.npub)
+            if (acc != null) {
+                val relayToUse = acc.activeRelays()?.firstOrNull { it.read }
+                if (relayToUse != null) {
+                    acc.createAuthEvent(relayToUse, notificationToken)
+                } else {
+                    null
+                }
+            } else {
+                null
+            }
+        }
+    }
+
+    private fun postRegistrationEvent(events: List<RelayAuthEvent>) {
+        try {
+            val jsonObject = """{
+                "events": [ ${events.joinToString(", ") { it.toJson() }} ]
+            }
+            """
+
+            val mediaType = "application/json; charset=utf-8".toMediaType()
+            val body = jsonObject.toRequestBody(mediaType)
+
+            val request = Request.Builder()
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                .url("https://push.amethyst.social/register")
+                .post(body)
+                .build()
+
+            val client = HttpClient.getHttpClient()
+
+            client.newCall(request).execute()
+        } 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)
+            )
+        }
+    }
+}