v0.61.4

Relay information dialog

.github/workflows/build.yml

@@ -14,10 +14,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - name: Cache gradle
         uses: actions/cache@v1

.github/workflows/create-release.yml

@@ -12,10 +12,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - name: Cache gradle
         uses: actions/cache@v1
@@ -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

.gitignore

@@ -6,6 +6,7 @@
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 /.idea/androidTestResultsUserPreferences.xml
+/.idea/deploymentTargetDropDown.xml
 .DS_Store
 /build
 /captures
@@ -68,6 +69,7 @@ render.experimental.xml
 .idea/**/caches/
 .idea/**/libraries/
 .idea/**/shelf/
+.idea/**/codeStyles
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 .idea/**/.name

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

.idea/misc.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </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

@@ -4,9 +4,18 @@
 
 Amethyst brings the best social network to your Android phone. Just insert your Nostr private key and start posting. 
 
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+     alt="Get it on F-Droid"
+     height="80">](https://f-droid.org/packages/com.vitorpamplona.amethyst/)
+[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
+     alt="Get it on Google Play"
+     height="80">](https://play.google.com/store/apps/details?id=com.vitorpamplona.amethyst)
+
+Or get the latest APK from the [Releases Section](https://github.com/vitorpamplona/amethyst/releases/latest).
+
 # Current Features
 
-- [x] Event Builders / WebSocket Subscriptions (NIP-01, NIP-15)
+- [x] Event Builders / WebSocket Subscriptions (NIP-01)
 - [x] Home Feed
 - [x] Notifications Feed
 - [x] Global Feed
@@ -23,32 +32,57 @@ Amethyst brings the best social network to your Android phone. Just insert your
 - [x] Relay Sets (home, dms, public chats, global)
 - [x] User/Note Tagging (NIP-08, NIP-10)
 - [x] Lightning Tips
-- [x] Zaps (NIP-57)
+- [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)
 - [x] Online Relay Search (NIP-50)
 - [x] Internationalization
 - [x] Badges (NIP-58)
-- [ ] Local Database 
-- [ ] View Individual Reactions (Like, Boost, Zaps, Reports) per Post
+- [x] Hashtag Following and Custom Hashtags
+- [x] Polls (NIP-69)
+- [x] Verifiable static content in URLs (NIP-94)
+- [x] Login with QR
+- [x] Wallet Connect API (NIP-47)
+- [x] Accessible uploads
+- [x] Bounty support (nostrbounties.com)
+- [x] De-googled F-Droid flavor
+- [x] External Identity Support (NIP-39)
+- [x] Multiple Accounts
+- [x] Markdown Support
+- [x] Relay Authentication (NIP-42)
+- [x] Content stored in relays themselves (NIP-95)
+- [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)
+- [x] Generic Reposts (kind:16)
+- [x] Live Activities & Live Chats (NIP-102)
+- [x] Relay Pages (NIP-11)
+- [ ] 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)
-- [ ] Relay Authentication (NIP-42)
-- [ ] 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
 
@@ -74,7 +108,7 @@ Lastly, the user's account information (priv key/pub key) is stored in the Andro
 ## Setup
 
 Make sure to have the following pre-requisites installed:
-1. Java 11
+1. Java 17
 2. Android Studio
 3. Android 8.0+ Phone or Emulation setup
 
@@ -104,8 +138,15 @@ Build the app:
 ```
 
 ## Installing on device
+
+For the F-Droid build:
 ```bash
-./gradlew installDebug
+./gradlew installFdroidDebug
+```
+
+For the Play build:
+```bash
+./gradlew installPlayDebug
 ```
 
 ## How to Deploy
@@ -149,6 +190,12 @@ Information shared on nostr should be assumed permanent for privacy purposes. Th
 
 [Issues](https://github.com/vitorpamplona/amethyst/issues) and [pull requests](https://github.com/vitorpamplona/amethyst/pulls) are very welcome.
 
+## Contributors
+
+<a align="center" href="https://github.com/vitorpamplona/amethyst/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=vitorpamplona/amethyst" />
+</a>
+
 # MIT License
 
 Copyright (c) 2023 Vitor Pamplona

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 98
-        versionName "0.26.2"
+        versionCode 220
+        versionName "0.61.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary true
         }
+        resConfigs("ar", "cs", "eo", "es", "fa", "fr", "hu", "night", "nl", "pt-rBR", "ru", "sv-rSE", "ta", "tr", "uk", "zh", "sh-rHK", "zh-rTW" )
     }
 
     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"
@@ -38,6 +41,7 @@ android {
 
     productFlavors {
         play {
+            getIsDefault().set(true)
             dimension "channel"
         }
 
@@ -56,12 +60,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
 
     buildFeatures {
@@ -69,7 +73,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "1.4.3"
+        kotlinCompilerExtensionVersion "1.4.7"
     }
 
     packagingOptions {
@@ -77,11 +81,14 @@ android {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
     }
+    lint {
+        disable 'MissingTranslation'
+    }
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.activity:activity-compose:1.7.0-beta01'
+    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"
 
@@ -103,11 +110,13 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
 
+    implementation 'net.engawapg.lib:zoomable:1.4.2'
+
     // Biometrics
     implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"
 
     // Bitcoin secp256k1 bindings to Android
-    implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.7.1'
+    implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.10.0'
 
     // Nostr Base Protocol
     implementation('com.github.vitorpamplona.NostrPostr:nostrpostrlib:master-SNAPSHOT') {
@@ -120,34 +129,34 @@ 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.14.2'
+    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-alpha05'
+    implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha06'
 
     // view videos
-    implementation 'com.google.android.exoplayer:exoplayer:2.18.4'
+    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:2.2.2"
+    implementation "io.coil-kt:coil-compose:$coil_version"
     // view gifs
-    implementation "io.coil-kt:coil-gif:2.2.2"
+    implementation "io.coil-kt:coil-gif:$coil_version"
     // view svgs
-    implementation("io.coil-kt:coil-svg:2.2.2")
+    implementation "io.coil-kt:coil-svg:$coil_version"
+
+    // 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"
 
-    // tabs for user profiles
-    implementation "com.google.accompanist:accompanist-pager:$accompanist_version" // Pager
-    implementation "com.google.accompanist:accompanist-pager-indicators:$accompanist_version"
-
     // Parses URLs from Text:
     implementation "io.github.url-detector:url-detector:0.1.23"
 
@@ -156,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'
@@ -166,12 +180,30 @@ 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.4"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    testImplementation 'io.mockk:mockk:1.13.5'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.0-alpha01'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version"
     debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version"

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

@@ -0,0 +1,113 @@
+package com.vitorpamplona.amethyst
+
+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.Test
+import org.junit.runner.RunWith
+import java.util.Base64
+
+@RunWith(AndroidJUnit4::class)
+class ImageUploadTesting {
+
+    val image = "R0lGODlhPQBEAPeoAJosM//AwO/AwHVYZ/z595kzAP/s7P+goOXMv8+fhw/v739/f+8PD98fH/8mJl+fn/9ZWb8/PzWlwv///6wWGbImAPgTEMImIN9gUFCEm/gDALULDN8PAD6atYdCTX9gUNKlj8wZAKUsAOzZz+UMAOsJAP/Z2ccMDA8PD/95eX5NWvsJCOVNQPtfX/8zM8+QePLl38MGBr8JCP+zs9myn/8GBqwpAP/GxgwJCPny78lzYLgjAJ8vAP9fX/+MjMUcAN8zM/9wcM8ZGcATEL+QePdZWf/29uc/P9cmJu9MTDImIN+/r7+/vz8/P8VNQGNugV8AAF9fX8swMNgTAFlDOICAgPNSUnNWSMQ5MBAQEJE3QPIGAM9AQMqGcG9vb6MhJsEdGM8vLx8fH98AANIWAMuQeL8fABkTEPPQ0OM5OSYdGFl5jo+Pj/+pqcsTE78wMFNGQLYmID4dGPvd3UBAQJmTkP+8vH9QUK+vr8ZWSHpzcJMmILdwcLOGcHRQUHxwcK9PT9DQ0O/v70w5MLypoG8wKOuwsP/g4P/Q0IcwKEswKMl8aJ9fX2xjdOtGRs/Pz+Dg4GImIP8gIH0sKEAwKKmTiKZ8aB/f39Wsl+LFt8dgUE9PT5x5aHBwcP+AgP+WltdgYMyZfyywz78AAAAAAAD///8AAP9mZv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAKgALAAAAAA9AEQAAAj/AFEJHEiwoMGDCBMqXMiwocAbBww4nEhxoYkUpzJGrMixogkfGUNqlNixJEIDB0SqHGmyJSojM1bKZOmyop0gM3Oe2liTISKMOoPy7GnwY9CjIYcSRYm0aVKSLmE6nfq05QycVLPuhDrxBlCtYJUqNAq2bNWEBj6ZXRuyxZyDRtqwnXvkhACDV+euTeJm1Ki7A73qNWtFiF+/gA95Gly2CJLDhwEHMOUAAuOpLYDEgBxZ4GRTlC1fDnpkM+fOqD6DDj1aZpITp0dtGCDhr+fVuCu3zlg49ijaokTZTo27uG7Gjn2P+hI8+PDPERoUB318bWbfAJ5sUNFcuGRTYUqV/3ogfXp1rWlMc6awJjiAAd2fm4ogXjz56aypOoIde4OE5u/F9x199dlXnnGiHZWEYbGpsAEA3QXYnHwEFliKAgswgJ8LPeiUXGwedCAKABACCN+EA1pYIIYaFlcDhytd51sGAJbo3onOpajiihlO92KHGaUXGwWjUBChjSPiWJuOO/LYIm4v1tXfE6J4gCSJEZ7YgRYUNrkji9P55sF/ogxw5ZkSqIDaZBV6aSGYq/lGZplndkckZ98xoICbTcIJGQAZcNmdmUc210hs35nCyJ58fgmIKX5RQGOZowxaZwYA+JaoKQwswGijBV4C6SiTUmpphMspJx9unX4KaimjDv9aaXOEBteBqmuuxgEHoLX6Kqx+yXqqBANsgCtit4FWQAEkrNbpq7HSOmtwag5w57GrmlJBASEU18ADjUYb3ADTinIttsgSB1oJFfA63bduimuqKB1keqwUhoCSK374wbujvOSu4QG6UvxBRydcpKsav++Ca6G8A6Pr1x2kVMyHwsVxUALDq/krnrhPSOzXG1lUTIoffqGR7Goi2MAxbv6O2kEG56I7CSlRsEFKFVyovDJoIRTg7sugNRDGqCJzJgcKE0ywc0ELm6KBCCJo8DIPFeCWNGcyqNFE06ToAfV0HBRgxsvLThHn1oddQMrXj5DyAQgjEHSAJMWZwS3HPxT/QMbabI/iBCliMLEJKX2EEkomBAUCxRi42VDADxyTYDVogV+wSChqmKxEKCDAYFDFj4OmwbY7bDGdBhtrnTQYOigeChUmc1K3QTnAUfEgGFgAWt88hKA6aCRIXhxnQ1yg3BCayK44EWdkUQcBByEQChFXfCB776aQsG0BIlQgQgE8qO26X1h8cEUep8ngRBnOy74E9QgRgEAC8SvOfQkh7FDBDmS43PmGoIiKUUEGkMEC/PJHgxw0xH74yx/3XnaYRJgMB8obxQW6kL9QYEJ0FIFgByfIL7/IQAlvQwEpnAC7DtLNJCKUoO/w45c44GwCXiAFB/OXAATQryUxdN4LfFiwgjCNYg+kYMIEFkCKDs6PKAIJouyGWMS1FSKJOMRB/BoIxYJIUXFUxNwoIkEKPAgCBZSQHQ1A2EWDfDEUVLyADj5AChSIQW6gu10bE/JG2VnCZGfo4R4d0sdQoBAHhPjhIB94v/wRoRKQWGRHgrhGSQJxCS+0pCZbEhAAOw=="
+
+    @Test()
+    fun testImgurUpload() = runBlocking {
+        val bytes = Base64.getDecoder().decode(image)
+        val inputStream = bytes.inputStream()
+
+        ImageUploader.uploadImage(
+            inputStream,
+            bytes.size.toLong(),
+            "image/gif",
+            ImgurServer(),
+            onSuccess = { url, contentType ->
+                println("Uploaded to $url")
+                assertNotNull(url)
+            },
+            onError = {
+                println("Failed to Upload")
+                fail("${it.message}")
+            }
+        )
+
+        delay(5000)
+    }
+
+    @Test()
+    fun testNostrBuildUpload() = runBlocking {
+        val bytes = Base64.getDecoder().decode(image)
+        val inputStream = bytes.inputStream()
+
+        ImageUploader.uploadImage(
+            inputStream,
+            bytes.size.toLong(),
+            "image/gif",
+            NostrBuildServer(),
+            onSuccess = { url, contentType ->
+                println("Uploaded to $url")
+                assertNotNull(url)
+            },
+            onError = {
+                println("Failed to Upload")
+                fail("${it.message}")
+            }
+        )
+
+        delay(1000)
+    }
+
+    @Test()
+    fun testNostrImgUpload() = runBlocking {
+        val bytes = Base64.getDecoder().decode(image)
+        val inputStream = bytes.inputStream()
+
+        ImageUploader.uploadImage(
+            inputStream,
+            bytes.size.toLong(),
+            "image/gif",
+            NostrImgServer(),
+            onSuccess = { url, contentType ->
+                println("Uploaded to $url")
+                assertNotNull(url)
+            },
+            onError = {
+                println("Failed to Upload")
+                fail("${it.message}")
+            }
+        )
+
+        delay(1000)
+    }
+
+    @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

@@ -0,0 +1,138 @@
+package com.vitorpamplona.amethyst
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.vitorpamplona.amethyst.model.toHexKey
+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.LnZapRequestEvent.Companion.createEncryptionPrivateKey
+import fr.acinq.secp256k1.Hex
+import junit.framework.TestCase.assertNotNull
+import junit.framework.TestCase.fail
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class PrivateZapTests {
+
+    @Test
+    fun testPollZap() {
+        val poll = Event.Companion.fromJson(
+            """{
+  "content": "New poll \n\n #zappoll",
+  "created_at": 1682440713,
+  "id": "16291ba452bb0786a4bf5c278d38de73c96b58c056ed75c5ea466b0795197288",
+  "kind": 6969,
+  "pubkey": "f8ff11c7a7d3478355d3b4d174e5a473797a906ea4aa61aa9b6bc0652c1ea17a",
+  "sig": "ac05fa4004c3f7c42913c87b11bf9714bb61a3f0940863a6b9ff0f8105b399add72dbc09bf944c79b9a72ef009ec6905adedbd2c4c8fb3d2f57007bad8fcb279",
+  "tags": [
+    [
+      "poll_option",
+      "0",
+      "Test 1"
+    ],
+    [
+      "poll_option",
+      "1",
+      "Test 2"
+    ],
+    [
+      "value_maximum",
+      "null"
+    ],
+    [
+      "value_minimum",
+      "null"
+    ],
+    [
+      "consensus_threshold",
+      "null"
+    ],
+    [
+      "closed_at",
+      "null"
+    ]
+  ],
+  "seenOn": [
+    "wss://relay.damus.io/"
+  ]
+}
+""",
+            true
+        )
+
+        val loggedIn = Hex.decode("e8e7197ccc53c9ed4cf9b1c8dce085475fa1ffdd71f2c14e44fe23d0bdf77598")
+
+        val privateZapRequest = LnZapRequestEvent.create(
+            poll,
+            setOf("wss://relay.damus.io/"),
+            loggedIn,
+            0,
+            "",
+            LnZapEvent.ZapType.PRIVATE
+        )
+
+        val recepientPK = privateZapRequest.zappedAuthor().firstOrNull()
+        val recepientPost = privateZapRequest.zappedPost().firstOrNull()
+
+        if (recepientPK != null && recepientPost != null) {
+            val privateKey = createEncryptionPrivateKey(loggedIn.toHexKey(), recepientPost, privateZapRequest.createdAt)
+            val decodedPrivateZap =
+                privateZapRequest.getPrivateZapEvent(privateKey, recepientPK)
+
+            println(decodedPrivateZap?.toJson())
+            assertNotNull(decodedPrivateZap)
+        } else {
+            fail("Should not be null")
+        }
+    }
+
+    @Test
+    fun testKind1PrivateZap() {
+        val textNote = Event.Companion.fromJson(
+            """{
+    "content": "Testing copied author. \n\nnostr:npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z",
+    "created_at": 1682369982,
+    "id": "c757e1371d715c711ec9ef9740a3df6475d64b3d0af45ffcbfca08d273baf1c1",
+    "kind": 1,
+    "pubkey": "f8ff11c7a7d3478355d3b4d174e5a473797a906ea4aa61aa9b6bc0652c1ea17a",
+    "sig": "1fb5b6fd980f4c2ef058d5f4f7b166c0e5fb21eff26fe9cacd87a9aa4feb344485841ebcc26a233bf8d6ea0a66acf0db2bfdb11ad1cb04bcea4cfa3e78c3eaf1",
+    "tags": [
+    [
+        "p",
+        "460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c"
+    ]
+    ],
+    "seenOn": [
+    "wss://relay.damus.io/"
+    ]
+}
+""",
+            true
+        )
+
+        val loggedIn = Hex.decode("e8e7197ccc53c9ed4cf9b1c8dce085475fa1ffdd71f2c14e44fe23d0bdf77598")
+
+        val privateZapRequest = LnZapRequestEvent.create(
+            textNote,
+            setOf("wss://relay.damus.io/", "wss://relay.damus2.io/", "wss://relay.damus3.io/"),
+            loggedIn,
+            null,
+            "test",
+            LnZapEvent.ZapType.PRIVATE
+        )
+
+        val recepientPK = privateZapRequest.zappedAuthor().firstOrNull()
+        val recepientPost = privateZapRequest.zappedPost().firstOrNull()
+
+        if (recepientPK != null && recepientPost != null) {
+            val privateKey = createEncryptionPrivateKey(loggedIn.toHexKey(), recepientPost, privateZapRequest.createdAt)
+            val decodedPrivateZap = privateZapRequest.getPrivateZapEvent(privateKey, recepientPK)
+
+            println(decodedPrivateZap?.toJson())
+            assertNotNull(decodedPrivateZap)
+        } else {
+            fail("Should not be null")
+        }
+    }
+}

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

@@ -77,4 +77,13 @@ class TranslationsTest {
             "pt"
         )
     }
+
+    @Test
+    fun testNostrEvents() {
+        assertTranslateContains(
+            "nostr:nevent1qqs0tsw8hjacs4fppgdg7f5yhgwwfkyua4xcs3re9wwkpkk2qeu6mhql22rcy",
+            "sure, nostr:nevent1qqs0tsw8hjacs4fppgdg7f5yhgwwfkyua4xcs3re9wwkpkk2qeu6mhql22rcy",
+            "en"
+        )
+    }
 }

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,26 +1,27 @@
-package com.vitorpamplona.amethyst.ui.components
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.navigation.NavController
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-
-@Composable
-fun TranslateableRichTextViewer(
-    content: String,
-    canPreview: Boolean,
-    modifier: Modifier = Modifier,
-    tags: List<List<String>>?,
-    backgroundColor: Color,
-    accountViewModel: AccountViewModel,
-    navController: NavController
-) = ExpandableRichTextViewer(
-    content,
-    canPreview,
-    modifier,
-    tags,
-    backgroundColor,
-    accountViewModel,
-    navController
-)
+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 com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun TranslatableRichTextViewer(
+    content: String,
+    canPreview: Boolean,
+    modifier: Modifier = Modifier,
+    tags: ImmutableListOfLists<String>,
+    backgroundColor: MutableState<Color>,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) = ExpandableRichTextViewer(
+    content,
+    canPreview,
+    modifier,
+    tags,
+    backgroundColor,
+    accountViewModel,
+    nav
+)

app/src/main/AndroidManifest.xml

@@ -1,14 +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
@@ -16,7 +38,7 @@
         android:name=".Amethyst"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@drawable/amethyst"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:enableOnBackInvokedCallback="true"
         android:supportsRtl="true"
@@ -24,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">
@@ -43,6 +67,20 @@
                 <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" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="nostrwalletconnect" />
+                <data android:scheme="nostr+walletconnect" />
+            </intent-filter>
+
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
@@ -52,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,14 +3,21 @@ 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
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.ui.actions.ServersAvailable
+import com.vitorpamplona.amethyst.ui.note.Nip47URI
 import fr.acinq.secp256k1.Hex
 import nostr.postr.Persona
 import nostr.postr.toHex
@@ -24,12 +31,10 @@ 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,
-    val current: Boolean,
-    val displayName: String?,
-    val profilePicture: String?
+    val hasPrivKey: Boolean = false
 )
 
 private object PrefKeys {
@@ -37,8 +42,6 @@ private object PrefKeys {
     const val SAVED_ACCOUNTS = "all_saved_accounts"
     const val NOSTR_PRIVKEY = "nostr_privkey"
     const val NOSTR_PUBKEY = "nostr_pubkey"
-    const val DISPLAY_NAME = "display_name"
-    const val PROFILE_PICTURE_URL = "profile_picture"
     const val FOLLOWING_CHANNELS = "following_channels"
     const val HIDDEN_USERS = "hidden_users"
     const val RELAYS = "relays"
@@ -46,8 +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_INFO = "hideDeleteRequestInfo"
+    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" }
 }
 
@@ -56,53 +73,73 @@ private val gson = GsonBuilder().create()
 object LocalPreferences {
     private const val comma = ","
 
-    private var currentAccount: String?
-        get() = encryptedPreferences().getString(PrefKeys.CURRENT_ACCOUNT, null)
-        set(npub) {
-            val prefs = encryptedPreferences()
-            prefs.edit().apply {
+    private var _currentAccount: String? = null
+
+    private fun currentAccount(): String? {
+        if (_currentAccount == null) {
+            _currentAccount = encryptedPreferences().getString(PrefKeys.CURRENT_ACCOUNT, null)
+        }
+        return _currentAccount
+    }
+
+    private fun updateCurrentAccount(npub: String) {
+        if (_currentAccount != npub) {
+            _currentAccount = npub
+
+            encryptedPreferences().edit().apply {
                 putString(PrefKeys.CURRENT_ACCOUNT, npub)
             }.apply()
         }
+    }
 
-    private val savedAccounts: List<String>
-        get() = encryptedPreferences()
-            .getString(PrefKeys.SAVED_ACCOUNTS, null)?.split(comma) ?: listOf()
+    private var _savedAccounts: List<String>? = null
+
+    private fun savedAccounts(): List<String> {
+        if (_savedAccounts == null) {
+            _savedAccounts = encryptedPreferences()
+                .getString(PrefKeys.SAVED_ACCOUNTS, null)?.split(comma) ?: listOf()
+        }
+        return _savedAccounts!!
+    }
+
+    private fun updateSavedAccounts(accounts: List<String>) {
+        if (_savedAccounts != accounts) {
+            _savedAccounts = accounts
+
+            encryptedPreferences().edit().apply {
+                putString(PrefKeys.SAVED_ACCOUNTS, accounts.joinToString(comma).ifBlank { null })
+            }.apply()
+        }
+    }
 
     private val prefsDirPath: String
         get() = "${Amethyst.instance.filesDir.parent}/shared_prefs/"
 
     private fun addAccount(npub: String) {
-        val accounts = savedAccounts.toMutableList()
+        val accounts = savedAccounts().toMutableList()
         if (npub !in accounts) {
             accounts.add(npub)
+            updateSavedAccounts(accounts)
         }
-        val prefs = encryptedPreferences()
-        prefs.edit().apply {
-            putString(PrefKeys.SAVED_ACCOUNTS, accounts.joinToString(comma).ifBlank { null })
-        }.apply()
     }
 
     private fun setCurrentAccount(account: Account) {
         val npub = account.userProfile().pubkeyNpub()
-        currentAccount = npub
+        updateCurrentAccount(npub)
         addAccount(npub)
     }
 
     fun switchToAccount(npub: String) {
-        currentAccount = npub
+        updateCurrentAccount(npub)
     }
 
     /**
      * Removes the account from the app level shared preferences
      */
     private fun removeAccount(npub: String) {
-        val accounts = savedAccounts.toMutableList()
+        val accounts = savedAccounts().toMutableList()
         if (accounts.remove(npub)) {
-            val prefs = encryptedPreferences()
-            prefs.edit().apply {
-                putString(PrefKeys.SAVED_ACCOUNTS, accounts.joinToString(comma).ifBlank { null })
-            }.apply()
+            updateSavedAccounts(accounts)
         }
     }
 
@@ -142,11 +179,11 @@ object LocalPreferences {
         removeAccount(npub)
         deleteUserPreferenceFile(npub)
 
-        if (savedAccounts.isEmpty()) {
+        if (savedAccounts().isEmpty()) {
             val appPrefs = encryptedPreferences()
             appPrefs.edit().clear().apply()
-        } else if (currentAccount == npub) {
-            currentAccount = savedAccounts.elementAt(0)
+        } else if (currentAccount() == npub) {
+            updateCurrentAccount(savedAccounts().elementAt(0))
         }
     }
 
@@ -156,17 +193,8 @@ object LocalPreferences {
     }
 
     fun allSavedAccounts(): List<AccountInfo> {
-        return savedAccounts.map { npub ->
-            val prefs = encryptedPreferences(npub)
-            val hasPrivKey = prefs.getString(PrefKeys.NOSTR_PRIVKEY, null) != null
-
-            AccountInfo(
-                npub = npub,
-                hasPrivKey = hasPrivKey,
-                current = npub == currentAccount,
-                displayName = prefs.getString(PrefKeys.DISPLAY_NAME, null),
-                profilePicture = prefs.getString(PrefKeys.PROFILE_PICTURE_URL, null)
-            )
+        return savedAccounts().map { npub ->
+            AccountInfo(npub = npub)
         }
     }
 
@@ -182,15 +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_INFO, account.hideDeleteRequestInfo)
-            putString(PrefKeys.DISPLAY_NAME, account.userProfile().toBestDisplayName())
-            putString(PrefKeys.PROFILE_PICTURE_URL, account.userProfile().profilePicture())
+            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()
@@ -202,12 +253,39 @@ 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, "NOSTR_BUILD"),
+                object : TypeToken<ServersAvailable>() {}.type
+            ) ?: ServersAvailable.NOSTR_BUILD
+
+            val zapPaymentRequestServer = try {
+                getString(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, null)?.let {
+                    gson.fromJson(it, Nip47URI::class.java)
+                }
+            } catch (e: Throwable) {
+                e.printStackTrace()
+                null
+            }
+
             val latestContactList = try {
                 getString(PrefKeys.LATEST_CONTACT_LIST, null)?.let {
                     Event.gson.fromJson(it, Event::class.java)
@@ -230,37 +308,65 @@ object LocalPreferences {
                 mapOf()
             }
 
-            val hideDeleteRequestInfo = getBoolean(PrefKeys.HIDE_DELETE_REQUEST_INFO, false)
+            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)
 
-            return Account(
-                Persona(privKey = privKey?.toByteArray(), pubKey = pubKey.toByteArray()),
-                followingChannels,
-                hiddenUsers,
-                localRelays,
-                dontTranslateFrom,
-                languagePreferences,
-                translateTo,
-                zapAmountChoices,
-                hideDeleteRequestInfo,
-                latestContactList
+            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(
+                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
             )
-        }
-    }
 
-    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)
+            return a
         }
     }
 
     fun migrateSingleUserPrefs() {
-        if (currentAccount != null) return
+        if (currentAccount() != null) return
 
         val pubkey = encryptedPreferences().getString(PrefKeys.NOSTR_PUBKEY, null) ?: return
         val npub = Hex.decode(pubkey).toNpub()
@@ -289,14 +395,14 @@ object LocalPreferences {
                 stringPrefs.forEach { userPrefs.putString(it, appPrefs.getString(it, null)) }
                 stringSetPrefs.forEach { userPrefs.putStringSet(it, appPrefs.getStringSet(it, null)) }
                 userPrefs.putBoolean(
-                    PrefKeys.HIDE_DELETE_REQUEST_INFO,
-                    appPrefs.getBoolean(PrefKeys.HIDE_DELETE_REQUEST_INFO, false)
+                    PrefKeys.HIDE_DELETE_REQUEST_DIALOG,
+                    appPrefs.getBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, false)
                 )
             }.apply()
         }
 
         encryptedPreferences().edit().clear().apply()
         addAccount(npub)
-        currentAccount = npub
+        updateCurrentAccount(npub)
     }
 }

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

@@ -1,68 +0,0 @@
-package com.vitorpamplona.amethyst
-
-import androidx.lifecycle.LiveData
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.util.concurrent.atomic.AtomicBoolean
-
-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.
-    var handlerWaiting = AtomicBoolean()
-
-    fun invalidateData() {
-        if (!hasActiveObservers()) return
-        if (handlerWaiting.getAndSet(true)) return
-
-        val scope = CoroutineScope(Job() + Dispatchers.Main)
-        scope.launch {
-            try {
-                delay(100)
-                refresh()
-            } finally {
-                withContext(NonCancellable) {
-                    handlerWaiting.set(false)
-                }
-            }
-        }
-    }
-
-    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()
     }
@@ -71,6 +104,7 @@ object ServiceManager {
         account?.let {
             LocalCache.pruneOldAndHiddenMessages(it)
             LocalCache.pruneHiddenMessages(it)
+            LocalCache.pruneContactLists(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,7 +19,8 @@ object VideoCache {
 
     lateinit var cacheDataSourceFactory: CacheDataSource.Factory
 
-    fun get(context: Context): CacheDataSource.Factory {
+    @Synchronized
+    fun init(context: Context) {
         if (!this::simpleCache.isInitialized) {
             exoDatabaseProvider = StandaloneDatabaseProvider(context)
 
@@ -31,11 +33,20 @@ 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)
         }
+    }
 
+    fun get(): CacheDataSource.Factory {
         return cacheDataSourceFactory
     }
 }

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

@@ -3,15 +3,13 @@ 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 kotlinx.coroutines.CoroutineScope
+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
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.util.concurrent.atomic.AtomicBoolean
 
 data class Spammer(val pubkeyHex: HexKey, var duplicatedMessages: Set<HexKey>)
 
@@ -20,12 +18,21 @@ class AntiSpamFilter {
     val spamMessages = LruCache<Int, Spammer>(1000)
 
     @Synchronized
-    fun isSpam(event: Event): Boolean {
+    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.
 
@@ -33,7 +40,8 @@ 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", "${event.id} ${recentMessages[hash]} ${spamMessages[hash] != null} ${event.content.replace("\n", " | ")}")
+            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
             if (spamMessages.get(hash) == null) {
@@ -60,28 +68,15 @@ class AntiSpamFilter {
 class AntiSpamLiveData(val cache: AntiSpamFilter) : LiveData<AntiSpamState>(AntiSpamState(cache)) {
 
     // Refreshes observers in batches.
-    var handlerWaiting = AtomicBoolean()
+    private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateData() {
-        if (!hasActiveObservers()) return
-        if (handlerWaiting.getAndSet(true)) return
-
-        val scope = CoroutineScope(Job() + Dispatchers.Main)
-        scope.launch {
-            try {
-                delay(100)
-                refresh()
-            } finally {
-                withContext(NonCancellable) {
-                    handlerWaiting.set(false)
-                }
+        bundler.invalidate() {
+            if (hasActiveObservers()) {
+                postValue(AntiSpamState(cache))
             }
         }
     }
-
-    private fun refresh() {
-        postValue(AntiSpamState(cache))
-    }
 }
 
 class AntiSpamState(val cache: AntiSpamFilter)

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

@@ -1,49 +1,123 @@
 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.ATag
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent
+import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
+import kotlinx.coroutines.Dispatchers
 import java.util.concurrent.ConcurrentHashMap
 
-class Channel(val idHex: String) {
-    var creator: User? = null
+@Stable
+class PublicChatChannel(idHex: String) : Channel(idHex) {
     var info = ChannelCreateEvent.ChannelData(null, null, null)
 
-    var updatedMetadataAt: Long = 0
-
-    val notes = ConcurrentHashMap<HexKey, Note>()
-
-    fun id() = Hex.decode(idHex)
-    fun idNote() = id().toNote()
-    fun idDisplayNote() = idNote().toShortenHex()
-
-    fun toBestDisplayName(): String {
-        return info.name ?: idDisplayNote()
-    }
-
-    fun addNote(note: Note) {
-        notes[note.idHex] = note
-    }
-
     fun updateChannelInfo(creator: User, channelInfo: ChannelCreateEvent.ChannelData, updatedAt: Long) {
         this.creator = creator
         this.info = channelInfo
         this.updatedMetadataAt = updatedAt
 
-        live.refresh()
+        live.invalidateData()
     }
 
-    fun profilePicture(): String? {
+    override fun toBestDisplayName(): String {
+        return info.name ?: super.toBestDisplayName()
+    }
+
+    override fun summary(): String? {
+        return info.about
+    }
+
+    override fun profilePicture(): String? {
         if (info.picture.isNullOrBlank()) info.picture = null
-        return info.picture
+        return info.picture ?: super.profilePicture()
     }
 
-    fun anyNameStartsWith(prefix: String): Boolean {
+    override fun anyNameStartsWith(prefix: String): Boolean {
         return listOfNotNull(info.name, info.about)
-            .filter { it.startsWith(prefix, true) }.isNotEmpty()
+            .filter { it.contains(prefix, true) }.isNotEmpty()
     }
+}
+
+@Stable
+class LiveActivitiesChannel(val address: ATag) : Channel(address.toTag()) {
+    var info: LiveActivitiesEvent? = null
+
+    override fun idNote() = address.toNAddr()
+    override fun idDisplayNote() = idNote().toShortenHex()
+    fun address() = address
+
+    fun updateChannelInfo(creator: User, channelInfo: LiveActivitiesEvent, updatedAt: Long) {
+        this.info = channelInfo
+        super.updateChannelInfo(creator, updatedAt)
+    }
+
+    override fun toBestDisplayName(): String {
+        return info?.title() ?: super.toBestDisplayName()
+    }
+
+    override fun summary(): String? {
+        return info?.summary()
+    }
+
+    override fun profilePicture(): String? {
+        return info?.image()?.ifBlank { null } ?: super.profilePicture()
+    }
+
+    override fun anyNameStartsWith(prefix: String): Boolean {
+        return listOfNotNull(info?.title(), info?.summary())
+            .filter { it.contains(prefix, true) }.isNotEmpty()
+    }
+}
+
+@Stable
+abstract class Channel(val idHex: String) {
+    var creator: User? = null
+
+    var updatedMetadataAt: Long = 0
+
+    val notes = ConcurrentHashMap<HexKey, Note>()
+
+    open fun id() = Hex.decode(idHex)
+    open fun idNote() = id().toNote()
+    open fun idDisplayNote() = idNote().toShortenHex()
+
+    open fun toBestDisplayName(): String {
+        return idDisplayNote()
+    }
+
+    open fun summary(): String? {
+        return null
+    }
+
+    open fun profilePicture(): String? {
+        return creator?.profilePicture()
+    }
+
+    open fun updateChannelInfo(creator: User, updatedAt: Long) {
+        this.creator = creator
+        this.updatedMetadataAt = updatedAt
+
+        live.invalidateData()
+    }
+
+    fun addNote(note: Note) {
+        notes[note.idHex] = note
+    }
+
+    fun removeNote(note: Note) {
+        notes.remove(note.idHex)
+    }
+
+    fun removeNote(noteHex: String) {
+        notes.remove(noteHex)
+    }
+
+    abstract fun anyNameStartsWith(prefix: String): Boolean
 
     // Observers line up here.
     val live: ChannelLiveData = ChannelLiveData(this)
@@ -51,7 +125,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()
@@ -67,18 +141,33 @@ class Channel(val idHex: String) {
 }
 
 class ChannelLiveData(val channel: Channel) : LiveData<ChannelState>(ChannelState(channel)) {
-    fun refresh() {
-        postValue(ChannelState(channel))
+    // Refreshes observers in batches.
+    private val bundler = BundledUpdate(300, Dispatchers.IO)
+
+    fun invalidateData() {
+        bundler.invalidate() {
+            if (hasActiveObservers()) {
+                postValue(ChannelState(channel))
+            }
+        }
     }
 
     override fun onActive() {
         super.onActive()
-        NostrSingleChannelDataSource.add(channel.idHex)
+        if (channel is PublicChatChannel) {
+            NostrSingleChannelDataSource.add(channel.idHex)
+        } else {
+            NostrSingleChannelDataSource.add(channel.idHex)
+        }
     }
 
     override fun onInactive() {
         super.onInactive()
-        NostrSingleChannelDataSource.remove(channel.idHex)
+        if (channel is PublicChatChannel) {
+            NostrSingleChannelDataSource.remove(channel.idHex)
+        } else {
+            NostrSingleChannelDataSource.remove(channel.idHex)
+        }
     }
 }
 

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

@@ -0,0 +1,29 @@
+package com.vitorpamplona.amethyst.model
+import androidx.compose.foundation.layout.padding
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import com.vitorpamplona.amethyst.R
+fun checkForHashtagWithIcon(tag: String): HashtagIcon? {
+    return when (tag.lowercase()) {
+        "bitcoin", "btc", "timechain" -> HashtagIcon(R.drawable.ht_btc, "Bitcoin", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp))
+        "nostr", "nostrich", "nostriches" -> HashtagIcon(R.drawable.ht_nostr, "Nostr", Color.Unspecified, Modifier.padding(1.dp, 2.dp, 0.dp, 0.dp))
+        "lightning", "lightningnetwork" -> HashtagIcon(R.drawable.ht_lightning, "Lightning", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
+        "zap", "zaps", "zapper", "zappers", "zapping", "zapped", "zapathon", "zapraiser", "zaplife", "zapchain" -> HashtagIcon(R.drawable.zap, "Zap", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
+        "amethyst" -> HashtagIcon(R.drawable.amethyst, "Amethyst", Color.Unspecified, Modifier.padding(3.dp, 2.dp, 0.dp, 0.dp))
+        "onyx" -> HashtagIcon(R.drawable.black_heart, "Onyx", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
+        "plebs", "pleb", "plebchain" -> HashtagIcon(R.drawable.plebs, "Pleb", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 1.dp))
+        "coffee", "coffeechain", "cafe" -> HashtagIcon(R.drawable.coffee, "Coffee", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp))
+        "skullofsatoshi" -> HashtagIcon(R.drawable.skull, "SkullofSatoshi", Color.Unspecified, Modifier.padding(2.dp, 1.dp, 0.dp, 0.dp))
+        "grownostr", "gardening", "garden" -> HashtagIcon(R.drawable.grownostr, "GrowNostr", Color.Unspecified, Modifier.padding(0.dp, 1.dp, 0.dp, 1.dp))
+        "footstr" -> HashtagIcon(R.drawable.footstr, "Footstr", Color.Unspecified, Modifier.padding(1.dp, 1.dp, 0.dp, 0.dp))
+        "weed", "weedstr", "420", "cannabis", "marijuana" -> HashtagIcon(R.drawable.weed, "Weed", Color.Unspecified, Modifier.padding(0.dp, 0.dp, 0.dp, 0.dp))
+        else -> null
+    }
+}
+class HashtagIcon(
+    val icon: Int,
+    val description: String,
+    val color: Color,
+    val modifier: Modifier
+)

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)
 }
 
@@ -38,18 +38,35 @@ fun HexKey.toDisplayHexKey(): String {
 }
 
 fun decodePublicKey(key: String): ByteArray {
+    val parsed = Nip19.uriToRoute(key)
+    val pubKeyParsed = parsed?.hex?.hexToByteArray()
+
     return if (key.startsWith("nsec")) {
         Persona(privKey = key.bechToBytes()).pubKey
-    } else if (key.startsWith("npub")) {
-        key.bechToBytes()
-    } else if (key.startsWith("note")) {
-        key.bechToBytes()
-    } else { // if (pattern.matcher(key).matches()) {
-        // } else {
+    } else if (pubKeyParsed != null) {
+        pubKeyParsed
+    } else {
         Hex.decode(key)
     }
 }
 
+fun decodePublicKeyAsHexOrNull(key: String): HexKey? {
+    return try {
+        val parsed = Nip19.uriToRoute(key)
+        val pubKeyParsed = parsed?.hex
+
+        if (key.startsWith("nsec")) {
+            Persona(privKey = key.bechToBytes()).pubKey.toHexKey()
+        } else if (pubKeyParsed != null) {
+            pubKeyParsed
+        } else {
+            Hex.decode(key).toHexKey()
+        }
+    } catch (e: Exception) {
+        null
+    }
+}
+
 data class DirtyKeyInfo(val key: Nip19.Return, val restOfWord: String)
 
 fun parseDirtyWordForKey(mightBeAKey: String): DirtyKeyInfo? {
@@ -84,15 +101,15 @@ fun parseDirtyWordForKey(mightBeAKey: String): DirtyKeyInfo? {
         } else if (key.startsWith("nprofile", true)) {
             val pubkeyRelay = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
 
-            return DirtyKeyInfo(pubkeyRelay, restOfWord)
-        } else if (key.startsWith("nevent", true)) {
+            return DirtyKeyInfo(pubkeyRelay, pubkeyRelay.additionalChars)
+        } else if (key.startsWith("nevent1", true)) {
             val noteRelayId = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
 
-            return DirtyKeyInfo(noteRelayId, restOfWord)
+            return DirtyKeyInfo(noteRelayId, noteRelayId.additionalChars)
         } else if (key.startsWith("naddr1", true)) {
             val address = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
 
-            return DirtyKeyInfo(address, "") // no way to know when they address ends and dirt begins
+            return DirtyKeyInfo(address, address.additionalChars) // no way to know when they address ends and dirt begins
         }
     } catch (e: Exception) {
         e.printStackTrace()

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

@@ -1,35 +1,39 @@
 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
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import java.math.BigDecimal
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.util.Date
-import java.util.concurrent.atomic.AtomicBoolean
 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()
     override fun idDisplayNote() = idNote().toShortenHex()
     override fun address() = address
     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.
@@ -40,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
@@ -48,26 +52,32 @@ 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
 
-    var lastReactionsDownloadTime: Long? = null
+    var lastReactionsDownloadTime: Map<String, EOSETime> = emptyMap()
 
     fun id() = Hex.decode(idHex)
     open fun idNote() = id().toNote()
-    open fun idDisplayNote() = idNote().toShortenHex()
 
-    fun channel(): Channel? {
-        val channelHex =
-            (event as? ChannelMessageEvent)?.channel()
-                ?: (event as? ChannelMetadataEvent)?.channel()
-                ?: (event as? ChannelCreateEvent)?.let { it.id }
-
-        return channelHex?.let { LocalCache.checkGetOrCreateChannel(it) }
+    open fun toNEvent(): String {
+        return Nip19.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relays.firstOrNull())
     }
 
-    open fun address() = (event as? LongTextNoteEvent)?.address()
+    open fun idDisplayNote() = idNote().toShortenHex()
+
+    fun channelHex(): HexKey? {
+        return (event as? ChannelMessageEvent)?.channel()
+            ?: (event as? ChannelMetadataEvent)?.channel()
+            ?: (event as? ChannelCreateEvent)?.id
+            ?: (event as? LiveActivitiesChatMessageEvent)?.activity()?.toTag()
+            ?: (event as? LiveActivitiesEvent)?.address()?.toTag()
+    }
+
+    open fun address(): ATag? = null
 
     open fun createdAt() = event?.createdAt()
 
@@ -89,7 +99,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) + ";"
         }
 
@@ -102,7 +112,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
         }
 
@@ -127,8 +137,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) {
@@ -153,6 +175,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
@@ -160,7 +193,9 @@ 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()
@@ -170,9 +205,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()
         }
     }
@@ -196,17 +248,29 @@ open class Note(val idHex: String) {
         }
     }
 
-    fun isZappedBy(user: User): Boolean {
+    fun isZappedBy(user: User, account: Account): Boolean {
         // Zaps who the requester was the user
-        return zaps.any { it.key.author == user }
+        return zaps.any {
+            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> {
@@ -227,65 +291,98 @@ 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>()
+            .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 {
+        return replies
+            .filter { it.event?.isTaggedHash("bounty-added-reward") ?: false }
+            .any {
+                val pledgeValue = try {
+                    BigDecimal(it.event?.content())
+                } catch (e: Exception) {
+                    null
+                    // do nothing if it can't convert to bigdecimal
+                }
+
+                pledgeValue != null && it.author == user
+            }
+    }
+
+    fun pledgedAmountByOthers(): BigDecimal {
+        return replies
+            .filter { it.event?.isTaggedHash("bounty-added-reward") ?: false }
             .mapNotNull {
-                it.amount
-            }.sumOf { it }
+                try {
+                    BigDecimal(it.event?.content())
+                } catch (e: Exception) {
+                    null
+                    // do nothing if it can't convert to bigdecimal
+                }
+            }
+            .sumOf { it }
     }
 
     fun hasAnyReports(): Boolean {
         val dayAgo = Date().time / 1000 - 24 * 60 * 60
         return reports.isNotEmpty() ||
             (
-                author?.reports?.values?.filter {
+                author?.reports?.values?.any {
                     it.firstOrNull { (it.createdAt() ?: 0) > dayAgo } != null
-                }?.isNotEmpty() ?: false
+                } ?: false
                 )
     }
 
-    fun directlyCiteUsersHex(): Set<HexKey> {
-        val matcher = tagSearch.matcher(event?.content() ?: "")
-        val returningList = mutableSetOf<String>()
-        while (matcher.find()) {
-            try {
-                val tag = matcher.group(1)?.let { event?.tags()?.get(it.toInt()) }
-                if (tag != null && tag[0] == "p") {
-                    returningList.add(tag[1])
-                }
-            } catch (e: Exception) {
-            }
-        }
-        return returningList
-    }
-
-    fun directlyCiteUsers(): Set<User> {
-        val matcher = tagSearch.matcher(event?.content() ?: "")
-        val returningList = mutableSetOf<User>()
-        while (matcher.find()) {
-            try {
-                val tag = matcher.group(1)?.let { event?.tags()?.get(it.toInt()) }
-                if (tag != null && tag[0] == "p") {
-                    LocalCache.checkGetOrCreateUser(tag[1])?.let {
-                        returningList.add(it)
-                    }
-                }
-            } catch (e: Exception) {
-            }
-        }
-        return returningList
-    }
-
-    fun directlyCites(userProfile: User): Boolean {
-        return author == userProfile ||
-            (userProfile in directlyCiteUsers()) ||
-            (event is ReactionEvent && replyTo?.lastOrNull()?.directlyCites(userProfile) == true) ||
-            (event is RepostEvent && replyTo?.lastOrNull()?.directlyCites(userProfile) == true)
-    }
-
     fun isNewThread(): Boolean {
-        return event is RepostEvent || replyTo == null || replyTo?.size == 0
+        return (
+            event is RepostEvent ||
+                event is GenericRepostEvent ||
+                replyTo == null ||
+                replyTo?.size == 0
+            ) &&
+            event !is ChannelMessageEvent &&
+            event !is LiveActivitiesChatMessageEvent
     }
 
     fun hasZapped(loggedIn: User): Boolean {
@@ -297,7 +394,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 {
@@ -309,6 +410,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 {
@@ -349,29 +486,16 @@ class NoteLiveSet(u: Note) {
 
 class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
     // Refreshes observers in batches.
-    var handlerWaiting = AtomicBoolean()
+    private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateData() {
-        if (!hasActiveObservers()) return
-        if (handlerWaiting.getAndSet(true)) return
-
-        val scope = CoroutineScope(Job() + Dispatchers.Main)
-        scope.launch {
-            try {
-                delay(100)
-                refresh()
-            } finally {
-                withContext(NonCancellable) {
-                    handlerWaiting.set(false)
-                }
-            }
+        bundler.invalidate() {
+            // if (hasObservers()) {
+            postValue(NoteState(note))
+            // }
         }
     }
 
-    private fun refresh() {
-        postValue(NoteState(note))
-    }
-
     override fun onActive() {
         super.onActive()
         if (note is AddressableNote) {
@@ -391,4 +515,5 @@ class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
     }
 }
 
+@Immutable
 class NoteState(val note: Note)

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

@@ -0,0 +1,250 @@
+package com.vitorpamplona.amethyst.model
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonArray
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
+import java.lang.reflect.Type
+
+class RelayInformation(
+    val name: String?,
+    val description: String?,
+    val pubkey: String?,
+    val contact: String?,
+    val supported_nips: List<Int>?,
+    val supported_nip_extensions: List<String>?,
+    val software: String?,
+    val version: String?,
+    val limitation: RelayInformationLimitation?,
+    val relay_countries: List<String>?,
+    val language_tags: List<String>?,
+    val tags: List<String>?,
+    val posting_policy: String?,
+    val payments_url: String?,
+    val fees: RelayInformationFees?
+) {
+    companion object {
+        val gson: Gson = GsonBuilder()
+            .disableHtmlEscaping()
+            .registerTypeAdapter(RelayInformation::class.java, RelayInformationSerializer())
+            .registerTypeAdapter(RelayInformationLimitation::class.java, RelayInformationLimitationSerializer())
+            .registerTypeAdapter(RelayInformationFees::class.java, RelayInformationFeesSerializer())
+            .registerTypeAdapter(RelayInformationFee::class.java, RelayInformationFeeSerializer())
+            .create()
+
+        fun fromJson(json: String): RelayInformation = gson.fromJson(json, RelayInformation::class.java)
+    }
+}
+
+class RelayInformationFee(
+    val amount: Int?,
+    val unit: String?,
+    val period: Int?,
+    val kinds: List<Int>?
+) {
+    companion object {
+        val gson: Gson = GsonBuilder()
+            .disableHtmlEscaping()
+            .registerTypeAdapter(RelayInformationFee::class.java, RelayInformationFeeSerializer())
+            .create()
+
+        fun fromJson(json: String): RelayInformationFee = gson.fromJson(json, RelayInformationFee::class.java)
+    }
+}
+
+private class RelayInformationFeeSerializer : JsonSerializer<RelayInformationFee> {
+    override fun serialize(
+        src: RelayInformationFee,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?
+    ): JsonElement {
+        return JsonObject().apply {
+            addProperty("amount", src.amount)
+            addProperty("unit", src.unit)
+            addProperty("period", src.period)
+            add(
+                "kinds",
+                JsonArray().also { kinds ->
+                    src.kinds?.forEach { kind ->
+                        kinds.add(
+                            kind
+                        )
+                    }
+                }
+            )
+        }
+    }
+}
+
+class RelayInformationFees(
+    val admission: List<RelayInformationFee>?,
+    val subscription: List<RelayInformationFee>?,
+    val publication: List<RelayInformationFee>?
+) {
+    companion object {
+        val gson: Gson = GsonBuilder()
+            .disableHtmlEscaping()
+            .registerTypeAdapter(RelayInformationFees::class.java, RelayInformationFeesSerializer())
+            .create()
+
+        fun fromJson(json: String): RelayInformationFees = gson.fromJson(json, RelayInformationFees::class.java)
+    }
+}
+
+private class RelayInformationFeesSerializer : JsonSerializer<RelayInformationFees> {
+    override fun serialize(
+        src: RelayInformationFees,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?
+    ): JsonElement {
+        return JsonObject().apply {
+            add(
+                "admission",
+                JsonArray().also { admissions ->
+                    src.admission?.forEach { admission ->
+                        admissions.add(
+                            admission.toString()
+                        )
+                    }
+                }
+            )
+            add(
+                "publication",
+                JsonArray().also { publications ->
+                    src.publication?.forEach { publication ->
+                        publications.add(
+                            publication.toString()
+                        )
+                    }
+                }
+            )
+            add(
+                "subscription",
+                JsonArray().also { subscriptions ->
+                    src.subscription?.forEach { subscription ->
+                        subscriptions.add(
+                            subscription.toString()
+                        )
+                    }
+                }
+            )
+        }
+    }
+}
+
+class RelayInformationLimitation(
+    val max_message_length: Int?,
+    val max_subscriptions: Int?,
+    val max_filters: Int?,
+    val max_limit: Int?,
+    val max_subid_length: Int?,
+    val min_prefix: Int?,
+    val max_event_tags: Int?,
+    val max_content_length: Int?,
+    val min_pow_difficulty: Int?,
+    val auth_required: Boolean?,
+    val payment_required: Boolean?
+) {
+    companion object {
+        val gson: Gson = GsonBuilder()
+            .disableHtmlEscaping()
+            .registerTypeAdapter(RelayInformationLimitation::class.java, RelayInformationLimitationSerializer())
+            .create()
+
+        fun fromJson(json: String): RelayInformationLimitation = gson.fromJson(json, RelayInformationLimitation::class.java)
+    }
+}
+
+private class RelayInformationLimitationSerializer : JsonSerializer<RelayInformationLimitation> {
+    override fun serialize(
+        src: RelayInformationLimitation,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?
+    ): JsonElement {
+        return JsonObject().apply {
+            addProperty("max_message_length", src.max_message_length)
+            addProperty("max_subscriptions", src.max_subscriptions)
+            addProperty("max_filters", src.max_filters)
+            addProperty("max_limit", src.max_limit)
+            addProperty("max_subid_length", src.max_subid_length)
+            addProperty("min_prefix", src.min_prefix)
+            addProperty("max_event_tags", src.max_event_tags)
+            addProperty("max_content_length", src.max_content_length)
+            addProperty("min_pow_difficulty", src.min_pow_difficulty)
+            addProperty("auth_required", src.auth_required)
+            addProperty("payment_required", src.payment_required)
+        }
+    }
+}
+
+private class RelayInformationSerializer : JsonSerializer<RelayInformation> {
+    override fun serialize(
+        src: RelayInformation,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?
+    ): JsonElement {
+        return JsonObject().apply {
+            addProperty("name", src.name)
+            addProperty("description", src.description)
+            addProperty("pubkey", src.pubkey)
+            addProperty("contact", src.contact)
+            add(
+                "supported_nip_extensions",
+                JsonArray().also { supported_nip_extensions ->
+                    src.supported_nip_extensions?.forEach { nip ->
+                        supported_nip_extensions.add(
+                            nip
+                        )
+                    }
+                }
+            )
+            add(
+                "supported_nips",
+                JsonArray().also { supported_nips ->
+                    src.supported_nips?.forEach { nip ->
+                        supported_nips.add(
+                            nip
+                        )
+                    }
+                }
+            )
+            addProperty("software", src.software)
+            addProperty("version", src.version)
+            add(
+                "relay_countries",
+                JsonArray().also { relay_countries ->
+                    src.relay_countries?.forEach { country ->
+                        relay_countries.add(
+                            country
+                        )
+                    }
+                }
+            )
+            add(
+                "language_tags",
+                JsonArray().also { language_tags ->
+                    src.language_tags?.forEach { language_tag ->
+                        language_tags.add(
+                            language_tag
+                        )
+                    }
+                }
+            )
+            add(
+                "tags",
+                JsonArray().also { tags ->
+                    src.tags?.forEach { tag ->
+                        tags.add(
+                            tag
+                        )
+                    }
+                }
+            )
+            addProperty("posting_policy", src.posting_policy)
+            addProperty("payments_url", src.payments_url)
+        }
+    }
+}

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

@@ -1,14 +1,16 @@
 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,
     val write: Boolean,
     val errorCount: Int = 0,
-    val downloadCount: Int = 0,
-    val uploadCount: Int = 0,
+    val downloadCountInBytes: Int = 0,
+    val uploadCountInBytes: Int = 0,
     val spamCount: Int = 0,
     val feedTypes: Set<FeedType>
 )

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)
@@ -53,6 +60,11 @@ class ThreadAssembler {
                 val threadRoot = searchRoot(note, thread) ?: note
 
                 loadDown(threadRoot, thread)
+                // adds the replies of the note in case the search for Root
+                // did not added them.
+                note.replies.forEach {
+                    loadDown(it, thread)
+                }
 
                 thread.toSet()
             } else {

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

@@ -1,75 +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 com.vitorpamplona.amethyst.ui.components.imageExtension
-import com.vitorpamplona.amethyst.ui.components.isValidURL
-import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
-import com.vitorpamplona.amethyst.ui.components.videoExtension
-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()
-        }
-    }
 
-    fun findUrlsInMessage(message: String): List<String> {
-        return message.split('\n').map { paragraph ->
-            paragraph.split(' ').filter { word: String ->
-                isValidURL(word) || noProtocolUrlValidator.matcher(word).matches()
-            }
-        }.flatten()
-    }
+                override fun onFailed(throwable: Throwable) {
+                    cache[url]?.let {
+                        onReady(it)
+                        return
+                    }
 
-    fun preloadPreviewsFor(note: Note) {
-        note.event?.content()?.let {
-            findUrlsInMessage(it).forEach {
-                val removedParamsFromUrl = it.split("?")[0].lowercase()
-                if (imageExtension.matcher(removedParamsFromUrl).matches()) {
-                    // Preload Images? Isn't this too heavy?
-                } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
-                    // Do nothing for now.
-                } else if (isValidURL(removedParamsFromUrl)) {
-                    previewInfo(it)
-                } else {
-                    previewInfo("https://$it")
+                    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,33 +1,34 @@
 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
 import com.vitorpamplona.amethyst.service.model.MetadataEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
+import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.Relay
+import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import nostr.postr.Bech32
 import nostr.postr.toNpub
 import java.math.BigDecimal
-import java.util.concurrent.atomic.AtomicBoolean
 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
 
     var latestContactList: ContactListEvent? = null
+    var latestBookmarkList: BookmarkListEvent? = null
 
     var notes = setOf<Note>()
         private set
@@ -35,7 +36,7 @@ class User(val pubkeyHex: String) {
     var reports = mapOf<User, Set<Note>>()
         private set
 
-    var latestReportTime: Long = 0
+    var latestEOSEs: Map<String, EOSETime> = emptyMap()
 
     var zaps = mapOf<Note, Note?>()
         private set
@@ -50,6 +51,7 @@ class User(val pubkeyHex: String) {
 
     fun pubkey() = Hex.decode(pubkeyHex)
     fun pubkeyNpub() = pubkey().toNpub()
+
     fun pubkeyDisplayHex() = pubkeyNpub().toShortenHex()
 
     override fun toString(): String = pubkeyHex
@@ -75,6 +77,13 @@ class User(val pubkeyHex: String) {
         return info?.picture
     }
 
+    fun updateBookmark(event: BookmarkListEvent) {
+        if (event.id == latestBookmarkList?.id) return
+
+        latestBookmarkList = event
+        liveSet?.bookmarks?.invalidateData()
+    }
+
     fun updateContactList(event: ContactListEvent) {
         if (event.id == latestContactList?.id) return
 
@@ -87,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()
@@ -121,11 +130,6 @@ class User(val pubkeyHex: String) {
             reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
             liveSet?.reports?.invalidateData()
         }
-
-        val reportTime = note.createdAt() ?: 0
-        if (reportTime > latestReportTime) {
-            latestReportTime = reportTime
-        }
     }
 
     fun removeReport(deleteNote: Note) {
@@ -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)
@@ -189,7 +195,10 @@ 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
@@ -197,6 +206,17 @@ 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
+            liveSet?.messages?.invalidateData()
+        }
+    }
+
     fun addRelayBeingUsed(relay: Relay, eventTime: Long) {
         val here = relaysBeingUsed[relay.url]
         if (here == null) {
@@ -236,35 +256,59 @@ class User(val pubkeyHex: String) {
     }
 
     fun isFollowing(user: User): Boolean {
-        return (latestContactList)?.unverifiedFollowKeySet()?.toSet()?.let {
+        return latestContactList?.isTaggedUser(user.pubkeyHex) ?: false
+    }
+
+    fun isFollowingHashtag(tag: String): Boolean {
+        return latestContactList?.isTaggedHash(tag) ?: false
+    }
+
+    fun isFollowingHashtagCached(tag: String): Boolean {
+        return latestContactList?.verifiedFollowTagSet?.let {
+            return tag.lowercase() in it
+        } ?: false
+    }
+
+    fun isFollowingCached(user: User): Boolean {
+        return latestContactList?.verifiedFollowKeySet?.let {
             return user.pubkeyHex in it
         } ?: 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 {
-        return LocalCache.users.values.count { it.latestContactList?.let { pubkeyHex in it.unverifiedFollowKeySet() } ?: false }
+    suspend fun transientFollowerCount(): Int {
+        return LocalCache.users.values.count { it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
     }
 
     fun cachedFollowingKeySet(): Set<HexKey> {
         return latestContactList?.verifiedFollowKeySet ?: emptySet()
     }
 
+    fun cachedFollowingTagSet(): Set<HexKey> {
+        return latestContactList?.verifiedFollowTagSet ?: emptySet()
+    }
+
     fun cachedFollowCount(): Int? {
         return latestContactList?.verifiedFollowKeySet?.size
     }
 
-    fun cachedFollowerCount(): Int {
-        return LocalCache.users.values.count { it.latestContactList?.let { pubkeyHex in it.unverifiedFollowKeySet() } ?: false }
+    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 {
@@ -296,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)
@@ -303,19 +348,23 @@ class UserLiveSet(u: User) {
     val metadata: UserLiveData = UserLiveData(u)
     val zaps: UserLiveData = UserLiveData(u)
     val badges: UserLiveData = UserLiveData(u)
+    val bookmarks: UserLiveData = UserLiveData(u)
 
     fun isInUse(): Boolean {
         return follows.hasObservers() ||
+            followers.hasObservers() ||
             reports.hasObservers() ||
             messages.hasObservers() ||
             relays.hasObservers() ||
             relayInfo.hasObservers() ||
             metadata.hasObservers() ||
             zaps.hasObservers() ||
-            badges.hasObservers()
+            badges.hasObservers() ||
+            bookmarks.hasObservers()
     }
 }
 
+@Immutable
 data class RelayInfo(
     val url: String,
     var lastEvent: Long,
@@ -324,6 +373,7 @@ data class RelayInfo(
 
 data class Chatroom(var roomMessages: Set<Note>)
 
+@Stable
 class UserMetadata {
     var name: String? = null
     var username: String? = null
@@ -350,37 +400,32 @@ 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? {
+        return (lud16?.trim() ?: lud06?.trim())?.ifBlank { null }
     }
 }
 
 class UserLiveData(val user: User) : LiveData<UserState>(UserState(user)) {
-
     // Refreshes observers in batches.
-    var handlerWaiting = AtomicBoolean()
+    private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateData() {
-        if (handlerWaiting.getAndSet(true)) return
-
-        val scope = CoroutineScope(Job() + Dispatchers.Main)
-        scope.launch {
-            try {
-                delay(100)
-                refresh()
-            } finally {
-                withContext(NonCancellable) {
-                    handlerWaiting.set(false)
-                }
+        bundler.invalidate() {
+            if (hasActiveObservers()) {
+                postValue(UserState(user))
             }
         }
     }
 
-    private fun refresh() {
-        postValue(UserState(user))
-    }
-
     override fun onActive() {
         super.onActive()
         NostrSingleUserDataSource.add(user)
@@ -392,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/BlurHashDecoder.kt

@@ -0,0 +1,203 @@
+package com.vitorpamplona.amethyst.service
+
+import android.graphics.Bitmap
+import android.graphics.Color
+import kotlin.math.cos
+import kotlin.math.pow
+import kotlin.math.withSign
+
+object BlurHashDecoder {
+
+    // cache Math.cos() calculations to improve performance.
+    // The number of calculations can be huge for many bitmaps: width * height * numCompX * numCompY * 2 * nBitmaps
+    // the cache is enabled by default, it is recommended to disable it only when just a few images are displayed
+    private val cacheCosinesX = HashMap<Int, DoubleArray>()
+    private val cacheCosinesY = HashMap<Int, DoubleArray>()
+
+    /**
+     * Clear calculations stored in memory cache.
+     * The cache is not big, but will increase when many image sizes are used,
+     * if the app needs memory it is recommended to clear it.
+     */
+    fun clearCache() {
+        cacheCosinesX.clear()
+        cacheCosinesY.clear()
+    }
+
+    /**
+     * Returns width/height
+     */
+    fun aspectRatio(blurHash: String?): Float? {
+        if (blurHash == null || blurHash.length < 6) {
+            return null
+        }
+        val numCompEnc = decode83(blurHash, 0, 1)
+        val numCompX = (numCompEnc % 9) + 1
+        val numCompY = (numCompEnc / 9) + 1
+        if (blurHash.length != 4 + 2 * numCompX * numCompY) {
+            return null
+        }
+
+        return numCompX.toFloat() / numCompY.toFloat()
+    }
+
+    /**
+     * Decode a blur hash into a new bitmap.
+     *
+     * @param useCache use in memory cache for the calculated math, reused by images with same size.
+     *                 if the cache does not exist yet it will be created and populated with new calculations.
+     *                 By default it is true.
+     */
+    fun decode(blurHash: String?, width: Int, height: Int, punch: Float = 1f, useCache: Boolean = true): Bitmap? {
+        if (blurHash == null || blurHash.length < 6) {
+            return null
+        }
+        val numCompEnc = decode83(blurHash, 0, 1)
+        val numCompX = (numCompEnc % 9) + 1
+        val numCompY = (numCompEnc / 9) + 1
+        if (blurHash.length != 4 + 2 * numCompX * numCompY) {
+            return null
+        }
+        val maxAcEnc = decode83(blurHash, 1, 2)
+        val maxAc = (maxAcEnc + 1) / 166f
+        val colors = Array(numCompX * numCompY) { i ->
+            if (i == 0) {
+                val colorEnc = decode83(blurHash, 2, 6)
+                decodeDc(colorEnc)
+            } else {
+                val from = 4 + i * 2
+                val colorEnc = decode83(blurHash, from, from + 2)
+                decodeAc(colorEnc, maxAc * punch)
+            }
+        }
+        return composeBitmap(width, height, numCompX, numCompY, colors, useCache)
+    }
+
+    private fun decode83(str: String, from: Int = 0, to: Int = str.length): Int {
+        var result = 0
+        for (i in from until to) {
+            val index = charMap[str[i]] ?: -1
+            if (index != -1) {
+                result = result * 83 + index
+            }
+        }
+        return result
+    }
+
+    private fun decodeDc(colorEnc: Int): FloatArray {
+        val r = colorEnc shr 16
+        val g = (colorEnc shr 8) and 255
+        val b = colorEnc and 255
+        return floatArrayOf(srgbToLinear(r), srgbToLinear(g), srgbToLinear(b))
+    }
+
+    private fun srgbToLinear(colorEnc: Int): Float {
+        val v = colorEnc / 255f
+        return if (v <= 0.04045f) {
+            (v / 12.92f)
+        } else {
+            ((v + 0.055f) / 1.055f).pow(2.4f)
+        }
+    }
+
+    private fun decodeAc(value: Int, maxAc: Float): FloatArray {
+        val r = value / (19 * 19)
+        val g = (value / 19) % 19
+        val b = value % 19
+        return floatArrayOf(
+            signedPow2((r - 9) / 9.0f) * maxAc,
+            signedPow2((g - 9) / 9.0f) * maxAc,
+            signedPow2((b - 9) / 9.0f) * maxAc
+        )
+    }
+
+    private fun signedPow2(value: Float) = value.pow(2f).withSign(value)
+
+    private fun composeBitmap(
+        width: Int,
+        height: Int,
+        numCompX: Int,
+        numCompY: Int,
+        colors: Array<FloatArray>,
+        useCache: Boolean
+    ): Bitmap {
+        // use an array for better performance when writing pixel colors
+        val imageArray = IntArray(width * height)
+        val calculateCosX = !useCache || !cacheCosinesX.containsKey(width * numCompX)
+        val cosinesX = getArrayForCosinesX(calculateCosX, width, numCompX)
+        val calculateCosY = !useCache || !cacheCosinesY.containsKey(height * numCompY)
+        val cosinesY = getArrayForCosinesY(calculateCosY, height, numCompY)
+        for (y in 0 until height) {
+            for (x in 0 until width) {
+                var r = 0f
+                var g = 0f
+                var b = 0f
+                for (j in 0 until numCompY) {
+                    for (i in 0 until numCompX) {
+                        val cosX = cosinesX.getCos(calculateCosX, i, numCompX, x, width)
+                        val cosY = cosinesY.getCos(calculateCosY, j, numCompY, y, height)
+                        val basis = (cosX * cosY).toFloat()
+                        val color = colors[j * numCompX + i]
+                        r += color[0] * basis
+                        g += color[1] * basis
+                        b += color[2] * basis
+                    }
+                }
+                imageArray[x + width * y] = Color.rgb(linearToSrgb(r), linearToSrgb(g), linearToSrgb(b))
+            }
+        }
+        return Bitmap.createBitmap(imageArray, width, height, Bitmap.Config.ARGB_8888)
+    }
+
+    private fun getArrayForCosinesY(calculate: Boolean, height: Int, numCompY: Int) = when {
+        calculate -> {
+            DoubleArray(height * numCompY).also {
+                cacheCosinesY[height * numCompY] = it
+            }
+        }
+        else -> {
+            cacheCosinesY[height * numCompY]!!
+        }
+    }
+
+    private fun getArrayForCosinesX(calculate: Boolean, width: Int, numCompX: Int) = when {
+        calculate -> {
+            DoubleArray(width * numCompX).also {
+                cacheCosinesX[width * numCompX] = it
+            }
+        }
+        else -> cacheCosinesX[width * numCompX]!!
+    }
+
+    private fun DoubleArray.getCos(
+        calculate: Boolean,
+        x: Int,
+        numComp: Int,
+        y: Int,
+        size: Int
+    ): Double {
+        if (calculate) {
+            this[x + numComp * y] = cos(Math.PI * y * x / size)
+        }
+        return this[x + numComp * y]
+    }
+
+    private fun linearToSrgb(value: Float): Int {
+        val v = value.coerceIn(0f, 1f)
+        return if (v <= 0.0031308f) {
+            (v * 12.92f * 255f + 0.5f).toInt()
+        } else {
+            ((1.055f * v.pow(1 / 2.4f) - 0.055f) * 255 + 0.5f).toInt()
+        }
+    }
+
+    private val charMap = listOf(
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
+        'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
+        'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
+        'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '#', '$', '%', '*', '+', ',',
+        '-', '.', ':', ';', '=', '?', '@', '[', ']', '^', '_', '{', '|', '}', '~'
+    )
+        .mapIndexed { i, c -> c to i }
+        .toMap()
+}

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

@@ -0,0 +1,66 @@
+package com.vitorpamplona.amethyst.service
+
+import android.content.Context
+import android.net.Uri
+import androidx.core.graphics.drawable.toDrawable
+import coil.ImageLoader
+import coil.decode.DataSource
+import coil.fetch.DrawableResult
+import coil.fetch.FetchResult
+import coil.fetch.Fetcher
+import coil.request.ImageRequest
+import coil.request.Options
+import java.net.URLDecoder
+import java.net.URLEncoder
+import kotlin.math.roundToInt
+
+class BlurHashFetcher(
+    private val options: Options,
+    private val data: Uri
+) : Fetcher {
+
+    override suspend fun fetch(): FetchResult {
+        checkNotInMainThread()
+
+        val encodedHash = data.toString().removePrefix("bluehash:")
+        val hash = URLDecoder.decode(encodedHash, "utf-8")
+
+        val aspectRatio = BlurHashDecoder.aspectRatio(hash) ?: 1.0f
+
+        val preferredWidth = 100
+
+        val bitmap = BlurHashDecoder.decode(
+            hash,
+            preferredWidth,
+            (preferredWidth * (1 / aspectRatio)).roundToInt()
+        )
+
+        if (bitmap == null) {
+            throw Exception("Unable to convert Bluehash $hash")
+        }
+
+        return DrawableResult(
+            drawable = bitmap.toDrawable(options.context.resources),
+            isSampled = false,
+            dataSource = DataSource.MEMORY
+        )
+    }
+
+    object Factory : Fetcher.Factory<Uri> {
+        override fun create(data: Uri, options: Options, imageLoader: ImageLoader): Fetcher {
+            return BlurHashFetcher(options, data)
+        }
+    }
+}
+
+object BlurHashRequester {
+    fun imageRequest(context: Context, message: String): ImageRequest {
+        val encodedMessage = URLEncoder.encode(message, "utf-8")
+
+        return ImageRequest
+            .Builder(context)
+            .data("bluehash:$encodedMessage")
+            .fetcherFactory(BlurHashFetcher.Factory)
+            .build()
+    }
+}

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

@@ -0,0 +1,89 @@
+package com.vitorpamplona.amethyst.service
+
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.util.Log
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.ui.actions.ImageDownloader
+import io.trbl.blurhash.BlurHash
+import java.security.MessageDigest
+import kotlin.math.roundToInt
+
+class FileHeader(
+    val url: String,
+    val mimeType: String?,
+    val hash: String,
+    val size: Int,
+    val dim: String?,
+    val blurHash: String?,
+    val description: String? = null
+) {
+    companion object {
+        suspend fun prepare(fileUrl: String, mimeType: String?, description: String?, onReady: (FileHeader) -> Unit, onError: () -> Unit) {
+            try {
+                val imageData: ByteArray? = ImageDownloader().waitAndGetImage(fileUrl)
+
+                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
+        ) {
+            try {
+                val sha256 = MessageDigest.getInstance("SHA-256")
+
+                val hash = sha256.digest(data).toHexKey()
+                val size = data.size
+
+                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)
+
+                    val intArray = IntArray(mBitmap.width * mBitmap.height)
+                    mBitmap.getPixels(
+                        intArray,
+                        0,
+                        mBitmap.width,
+                        0,
+                        0,
+                        mBitmap.width,
+                        mBitmap.height
+                    )
+
+                    val dim = "${mBitmap.width}x${mBitmap.height}"
+
+                    val aspectRatio = (mBitmap.width).toFloat() / (mBitmap.height).toFloat()
+
+                    if (aspectRatio > 1) {
+                        Pair(BlurHash.encode(intArray, mBitmap.width, mBitmap.height, 9, (9 * (1 / aspectRatio)).roundToInt()), dim)
+                    } else if (aspectRatio < 1) {
+                        Pair(BlurHash.encode(intArray, mBitmap.width, mBitmap.height, (9 * aspectRatio).roundToInt(), 9), dim)
+                    } else {
+                        Pair(BlurHash.encode(intArray, mBitmap.width, mBitmap.height, 4, 4), dim)
+                    }
+                } else {
+                    Pair(null, null)
+                }
+
+                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

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.service
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.vitorpamplona.amethyst.BuildConfig
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -8,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("@")
 
@@ -33,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) {
@@ -43,11 +43,11 @@ class Nip05Verifier {
         withContext(Dispatchers.IO) {
             try {
                 val request = Request.Builder()
-                    .header("User-Agent", "Amethyst")
+                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                     .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) {
@@ -70,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/Nip47.kt

@@ -0,0 +1,34 @@
+package com.vitorpamplona.amethyst.ui.note
+
+import android.net.Uri
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.decodePublicKey
+import com.vitorpamplona.amethyst.model.toHexKey
+
+data class Nip47URI(val pubKeyHex: HexKey, val relayUri: String?, val secret: HexKey?)
+
+// Rename to the corect nip number when ready.
+object Nip47 {
+    fun parse(uri: String): Nip47URI {
+        // nostrwalletconnect://b889ff5b1513b641e2a139f661a661364979c5beee91842f8f0ef42ab558e9d4?relay=wss%3A%2F%2Frelay.damus.io&metadata=%7B%22name%22%3A%22Example%22%7D
+
+        val url = Uri.parse(uri)
+
+        if (url.scheme != "nostrwalletconnect" && url.scheme != "nostr+walletconnect") {
+            throw IllegalArgumentException("Not a Wallet Connect QR Code")
+        }
+
+        val pubkey = url.host ?: throw IllegalArgumentException("Hostname cannot be null")
+
+        val pubkeyHex = try {
+            decodePublicKey(pubkey).toHexKey()
+        } catch (e: Exception) {
+            throw IllegalArgumentException("Hostname is not a valid Nostr Pubkey")
+        }
+
+        val relay = url.getQueryParameter("relay")
+        val secret = url.getQueryParameter("secret")
+
+        return Nip47URI(pubkeyHex, relay, secret)
+    }
+}

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

@@ -1,8 +1,10 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.model.BadgeAwardEvent
 import com.vitorpamplona.amethyst.service.model.BadgeProfilesEvent
+import com.vitorpamplona.amethyst.service.model.BookmarkListEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ContactListEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
@@ -11,16 +13,21 @@ import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
-import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
+import com.vitorpamplona.amethyst.service.relays.Client
+import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 
 object NostrAccountDataSource : NostrDataSource("AccountData") {
     lateinit var account: Account
 
+    val latestEOSEs = EOSEAccount()
+
     fun createAccountContactListFilter(): TypedFilter {
         return TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(ContactListEvent.kind),
                 authors = listOf(account.userProfile().pubkeyHex),
@@ -31,7 +38,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
 
     fun createAccountMetadataFilter(): TypedFilter {
         return TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(MetadataEvent.kind),
                 authors = listOf(account.userProfile().pubkeyHex),
@@ -42,7 +49,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
 
     fun createAccountAcceptedAwardsFilter(): TypedFilter {
         return TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(BadgeProfilesEvent.kind),
                 authors = listOf(account.userProfile().pubkeyHex),
@@ -51,34 +58,62 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
         )
     }
 
+    fun createAccountBookmarkListFilter(): TypedFilter {
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter = JsonFilter(
+                kinds = listOf(BookmarkListEvent.kind, PeopleListEvent.kind),
+                authors = listOf(account.userProfile().pubkeyHex),
+                limit = 100
+            )
+        )
+    }
+
     fun createAccountReportsFilter(): TypedFilter {
         return TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(ReportEvent.kind),
-                authors = listOf(account.userProfile().pubkeyHex)
+                authors = listOf(account.userProfile().pubkeyHex),
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultNotificationFollowList)?.relayList
+            )
+        )
+    }
+
+    fun createAccountLastPostsListFilter(): TypedFilter {
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter = JsonFilter(
+                authors = listOf(account.userProfile().pubkeyHex),
+                limit = 400
             )
         )
     }
 
     fun createNotificationFilter() = TypedFilter(
-        types = FeedType.values().toSet(),
+        types = COMMON_FEED_TYPES,
         filter = JsonFilter(
             kinds = listOf(
                 TextNoteEvent.kind,
+                PollNoteEvent.kind,
                 ReactionEvent.kind,
                 RepostEvent.kind,
+                GenericRepostEvent.kind,
                 ReportEvent.kind,
                 LnZapEvent.kind,
+                LnZapPaymentResponseEvent.kind,
                 ChannelMessageEvent.kind,
                 BadgeAwardEvent.kind
             ),
             tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
-            limit = 200
+            limit = 4000,
+            since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultNotificationFollowList)?.relayList
         )
     )
 
-    val accountChannel = requestNewChannel()
+    val accountChannel = requestNewChannel { time, relayUrl ->
+        latestEOSEs.addOrUpdate(account.userProfile(), account.defaultNotificationFollowList, relayUrl, time)
+    }
 
     override fun updateChannelFilters() {
         // gets everthing about the user logged in
@@ -87,7 +122,24 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
             createAccountContactListFilter(),
             createNotificationFilter(),
             createAccountReportsFilter(),
-            createAccountAcceptedAwardsFilter()
+            createAccountAcceptedAwardsFilter(),
+            createAccountBookmarkListFilter(),
+            createAccountLastPostsListFilter()
         ).ifEmpty { null }
     }
+
+    override fun auth(relay: Relay, challenge: String) {
+        super.auth(relay, challenge)
+
+        if (this::account.isInitialized) {
+            val event = account.createAuthEvent(relay, challenge)
+
+            if (event != null) {
+                Client.send(
+                    event,
+                    relay.url
+                )
+            }
+        }
+    }
 }

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

@@ -1,22 +1,63 @@
 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.model.LiveActivitiesChannel
+import com.vitorpamplona.amethyst.model.PublicChatChannel
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesChatMessageEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 
 object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
+    var account: Account? = null
     var channel: Channel? = null
 
-    fun loadMessagesBetween(channelId: String) {
-        channel = LocalCache.getOrCreateChannel(channelId)
+    fun loadMessagesBetween(account: Account, channel: Channel) {
+        this.account = account
+        this.channel = channel
         resetFilters()
     }
 
+    fun clear() {
+        account = null
+        channel = null
+    }
+
+    fun createMessagesByMeToChannelFilter(): TypedFilter? {
+        val myAccount = account ?: return null
+
+        if (channel is PublicChatChannel) {
+            // Brings on messages by the user from all other relays.
+            // Since we ship with write to public, read from private only
+            // this guarantees that messages from the author do not disappear.
+            return TypedFilter(
+                types = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS, FeedType.GLOBAL, FeedType.SEARCH),
+                filter = JsonFilter(
+                    kinds = listOf(ChannelMessageEvent.kind),
+                    authors = listOf(myAccount.userProfile().pubkeyHex),
+                    limit = 50
+                )
+            )
+        } else if (channel is LiveActivitiesChannel) {
+            // Brings on messages by the user from all other relays.
+            // Since we ship with write to public, read from private only
+            // this guarantees that messages from the author do not disappear.
+            return TypedFilter(
+                types = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS, FeedType.GLOBAL, FeedType.SEARCH),
+                filter = JsonFilter(
+                    kinds = listOf(LiveActivitiesChatMessageEvent.kind),
+                    authors = listOf(myAccount.userProfile().pubkeyHex),
+                    limit = 50
+                )
+            )
+        }
+        return null
+    }
+
     fun createMessagesToChannelFilter(): TypedFilter? {
-        if (channel != null) {
+        if (channel is PublicChatChannel) {
             return TypedFilter(
                 types = setOf(FeedType.PUBLIC_CHATS),
                 filter = JsonFilter(
@@ -25,6 +66,15 @@ object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
                     limit = 200
                 )
             )
+        } else if (channel is LiveActivitiesChannel) {
+            return TypedFilter(
+                types = setOf(FeedType.PUBLIC_CHATS),
+                filter = JsonFilter(
+                    kinds = listOf(LiveActivitiesChatMessageEvent.kind),
+                    tags = mapOf("a" to listOfNotNull(channel?.idHex)),
+                    limit = 200
+                )
+            )
         }
         return null
     }
@@ -32,6 +82,9 @@ object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
     val messagesChannel = requestNewChannel()
 
     override fun updateChannelFilters() {
-        messagesChannel.typedFilters = listOfNotNull(createMessagesToChannelFilter()).ifEmpty { null }
+        messagesChannel.typedFilters = listOfNotNull(
+            createMessagesToChannelFilter(),
+            createMessagesByMeToChannelFilter()
+        ).ifEmpty { null }
     }
 }

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

@@ -5,6 +5,8 @@ import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
+import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
+import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
@@ -12,11 +14,15 @@ import com.vitorpamplona.amethyst.service.relays.TypedFilter
 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))
+            tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
+            since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList
         )
     )
 
@@ -24,7 +30,8 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
         types = setOf(FeedType.PRIVATE_DMS),
         filter = JsonFilter(
             kinds = listOf(PrivateDmEvent.kind),
-            authors = listOf(account.userProfile().pubkeyHex)
+            authors = listOf(account.userProfile().pubkeyHex),
+            since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList
         )
     )
 
@@ -32,22 +39,24 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
         types = setOf(FeedType.PUBLIC_CHATS),
         filter = JsonFilter(
             kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind),
-            authors = listOf(account.userProfile().pubkeyHex)
+            authors = listOf(account.userProfile().pubkeyHex),
+            since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList
         )
     )
 
     fun createMyChannelsFilter() = TypedFilter(
-        types = FeedType.values().toSet(), // Metadata comes from any relay
+        types = COMMON_FEED_TYPES, // Metadata comes from any relay
         filter = JsonFilter(
             kinds = listOf(ChannelCreateEvent.kind),
-            ids = account.followingChannels.toList()
+            ids = account.followingChannels.toList(),
+            since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList
         )
     )
 
     fun createLastChannelInfoFilter(): List<TypedFilter> {
         return account.followingChannels.map {
             TypedFilter(
-                types = FeedType.values().toSet(), // Metadata comes from any relay
+                types = COMMON_FEED_TYPES, // Metadata comes from any relay
                 filter = JsonFilter(
                     kinds = listOf(ChannelMetadataEvent.kind),
                     tags = mapOf("e" to listOf(it)),
@@ -64,13 +73,16 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
                 filter = JsonFilter(
                     kinds = listOf(ChannelMessageEvent.kind),
                     tags = mapOf("e" to listOf(it)),
-                    limit = 100 // Remember to consider spam that is being removed from the UI
+                    since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList,
+                    limit = 25 // Remember to consider spam that is being removed from the UI
                 )
             )
         }
     }
 
-    val chatroomListChannel = requestNewChannel()
+    val chatroomListChannel = requestNewChannel { time, relayUrl ->
+        latestEOSEs.addOrUpdate(account.userProfile(), chatRoomList, relayUrl, time)
+    }
 
     override fun updateChannelFilters() {
         val list = listOf(

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

@@ -2,40 +2,19 @@ package com.vitorpamplona.amethyst.service
 
 import android.util.Log
 import com.vitorpamplona.amethyst.model.LocalCache
-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.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.*
 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
+import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import java.util.Date
 import java.util.UUID
-import java.util.concurrent.atomic.AtomicBoolean
+import kotlin.Error
 
 abstract class NostrDataSource(val debugName: String) {
     private var subscriptions = mapOf<String, 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,42 +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 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 LnZapEvent -> {
-                            event.containedPost()?.let { onEvent(it, subscriptionId, relay) }
-                            LocalCache.consume(event)
-                        }
-                        is LnZapRequestEvent -> 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)
-                        else -> {
-                            Log.w("Event Not Supported", event.toJson())
-                        }
-                    }
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                }
+                LocalCache.verifyAndConsume(event, relay)
             }
         }
 
@@ -115,18 +57,27 @@ abstract class NostrDataSource(val debugName: String) {
 
             if (type == Relay.Type.EOSE && channel != null) {
                 // updates a per subscripton since date
-                subscriptions[channel]?.updateEOSE(Date().time / 1000)
+                subscriptions[channel]?.updateEOSE(Date().time / 1000, relay.url)
             }
         }
 
         override fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) {
         }
+
+        override fun onAuth(relay: Relay, challenge: String) {
+            auth(relay, challenge)
+        }
     }
 
     init {
         Client.subscribe(clientListener)
     }
 
+    fun destroy() {
+        stop()
+        Client.unsubscribe(clientListener)
+    }
+
     open fun start() {
         println("DataSource: ${this.javaClass.simpleName} Start")
         resetFilters()
@@ -140,7 +91,7 @@ abstract class NostrDataSource(val debugName: String) {
         }
     }
 
-    fun requestNewChannel(onEOSE: ((Long) -> Unit)? = null): Subscription {
+    fun requestNewChannel(onEOSE: ((Long, String) -> Unit)? = null): Subscription {
         val newSubscription = Subscription(UUID.randomUUID().toString().substring(0, 4), onEOSE)
         subscriptions = subscriptions + Pair(newSubscription.id, newSubscription)
         return newSubscription
@@ -152,23 +103,15 @@ abstract class NostrDataSource(val debugName: String) {
     }
 
     // Refreshes observers in batches.
-    var handlerWaiting = AtomicBoolean()
+    private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateFilters() {
-        if (handlerWaiting.getAndSet(true)) return
+        bundler.invalidate() {
+            // println("DataSource: ${this.javaClass.simpleName} InvalidateFilters")
 
-        println("DataSource: ${this.javaClass.simpleName} InvalidateFilters")
-
-        val scope = CoroutineScope(Job() + Dispatchers.IO)
-        scope.launch {
-            try {
-                delay(200)
-                resetFiltersSuspend()
-            } finally {
-                withContext(NonCancellable) {
-                    handlerWaiting.set(false)
-                }
-            }
+            // adds the time to perform the refresh into this delay
+            // holding off new updates in case of heavy refresh routines.
+            resetFiltersSuspend()
         }
     }
 
@@ -180,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
@@ -219,4 +164,5 @@ abstract class NostrDataSource(val debugName: String) {
     }
 
     abstract fun updateChannelFilters()
+    open fun auth(relay: Relay, challenge: String) = Unit
 }

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

@@ -1,7 +1,11 @@
 package com.vitorpamplona.amethyst.service
 
+import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.HighlightEvent
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.PinListEvent
+import com.vitorpamplona.amethyst.service.model.PollNoteEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
@@ -11,7 +15,7 @@ object NostrGlobalDataSource : NostrDataSource("GlobalFeed") {
     fun createGlobalFilter() = TypedFilter(
         types = setOf(FeedType.GLOBAL),
         filter = JsonFilter(
-            kinds = listOf(TextNoteEvent.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

@@ -0,0 +1,46 @@
+package com.vitorpamplona.amethyst.service
+
+import androidx.compose.ui.text.capitalize
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.PollNoteEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+
+object NostrHashtagDataSource : NostrDataSource("SingleHashtagFeed") {
+    private var hashtagToWatch: String? = null
+
+    fun createLoadHashtagFilter(): TypedFilter? {
+        val hashToLoad = hashtagToWatch ?: return null
+
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter = JsonFilter(
+                tags = mapOf(
+                    "t" to listOf(
+                        hashToLoad,
+                        hashToLoad.lowercase(),
+                        hashToLoad.uppercase(),
+                        hashToLoad.capitalize()
+                    )
+                ),
+                kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind),
+                limit = 200
+            )
+        )
+    }
+
+    val loadHashtagChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        loadHashtagChannel.typedFilters = listOfNotNull(createLoadHashtagFilter()).ifEmpty { null }
+    }
+
+    fun loadHashtag(tag: String?) {
+        hashtagToWatch = tag
+
+        invalidateFilters()
+    }
+}

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

@@ -2,8 +2,17 @@ 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.LiveActivitiesChatMessageEvent
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.PinListEvent
+import com.vitorpamplona.amethyst.service.model.PollNoteEvent
+import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
@@ -15,6 +24,8 @@ import kotlinx.coroutines.launch
 object NostrHomeDataSource : NostrDataSource("HomeFeed") {
     lateinit var account: Account
 
+    val latestEOSEs = EOSEAccount()
+
     private val cacheListener: (UserState) -> Unit = {
         invalidateFilters()
     }
@@ -40,7 +51,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)
@@ -51,16 +62,50 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
         return TypedFilter(
             types = setOf(FeedType.FOLLOWS),
             filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind),
+                kinds = listOf(
+                    TextNoteEvent.kind,
+                    RepostEvent.kind,
+                    GenericRepostEvent.kind,
+                    LongTextNoteEvent.kind,
+                    PollNoteEvent.kind,
+                    HighlightEvent.kind,
+                    AudioTrackEvent.kind,
+                    PinListEvent.kind,
+                    LiveActivitiesChatMessageEvent.kind,
+                    LiveActivitiesEvent.kind
+                ),
                 authors = followSet,
-                limit = 400
+                limit = 400,
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultHomeFollowList)?.relayList
             )
         )
     }
 
-    val followAccountChannel = requestNewChannel()
+    fun createFollowTagsFilter(): TypedFilter? {
+        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, 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()]?.followList?.get(account.defaultHomeFollowList)?.relayList
+            )
+        )
+    }
+
+    val followAccountChannel = requestNewChannel { time, relayUrl ->
+        latestEOSEs.addOrUpdate(account.userProfile(), account.defaultHomeFollowList, relayUrl, time)
+    }
 
     override fun updateChannelFilters() {
-        followAccountChannel.typedFilters = listOf(createFollowAccountsFilter()).ifEmpty { null }
+        followAccountChannel.typedFilters = listOfNotNull(createFollowAccountsFilter(), createFollowTagsFilter()).ifEmpty { null }
     }
 }

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

@@ -0,0 +1,53 @@
+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 val fromServiceHex: String,
+    private val toUserHex: String,
+    private val replyingToHex: String,
+    private val authSigningKey: ByteArray
+) : NostrDataSource("LnZapPaymentResponseFeed") {
+
+    val feedTypes = setOf(FeedType.WALLET_CONNECT)
+
+    private fun createWalletConnectServiceWatcher(): TypedFilter {
+        // downloads all the reactions to a given event.
+        return TypedFilter(
+            types = feedTypes,
+            filter = JsonFilter(
+                kinds = listOf(LnZapPaymentResponseEvent.kind),
+                authors = listOf(fromServiceHex),
+                tags = mapOf(
+                    "e" to listOf(replyingToHex),
+                    "p" to listOf(toUserHex)
+                ),
+                limit = 1
+            )
+        )
+    }
+
+    val channel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        val wc = createWalletConnectServiceWatcher()
+
+        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,73 +1,61 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.decodePublicKey
-import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
-import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
-import com.vitorpamplona.amethyst.service.model.MetadataEvent
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+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
 
     private fun createAnythingWithIDFilter(): List<TypedFilter>? {
         val mySearchString = searchString
-        if (mySearchString == null) {
+        if (mySearchString.isNullOrBlank()) {
             return null
         }
 
         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
         }
 
-        if (hexToWatch == null) {
-            return null
-        }
-
         // downloads all the reactions to a given event.
-        return listOf(
-            TypedFilter(
-                types = FeedType.values().toSet(),
-                filter = JsonFilter(
-                    ids = listOfNotNull(hexToWatch)
+        return listOfNotNull(
+            hexToWatch?.let {
+                TypedFilter(
+                    types = COMMON_FEED_TYPES,
+                    filter = JsonFilter(
+                        ids = listOfNotNull(hexToWatch)
+                    )
                 )
-            ),
-            TypedFilter(
-                types = FeedType.values().toSet(),
-                filter = JsonFilter(
-                    kinds = listOf(MetadataEvent.kind),
-                    authors = listOfNotNull(hexToWatch)
+            },
+            hexToWatch?.let {
+                TypedFilter(
+                    types = COMMON_FEED_TYPES,
+                    filter = JsonFilter(
+                        kinds = listOf(MetadataEvent.kind),
+                        authors = listOfNotNull(hexToWatch)
+                    )
                 )
-            ),
+            },
             TypedFilter(
-                types = FeedType.values().toSet(),
+                types = setOf(FeedType.SEARCH),
                 filter = JsonFilter(
                     kinds = listOf(MetadataEvent.kind),
                     search = mySearchString,
-                    limit = 20
+                    limit = 100
                 )
             ),
             TypedFilter(
-                types = FeedType.values().toSet(),
+                types = setOf(FeedType.SEARCH),
                 filter = JsonFilter(
-                    kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, ChannelMetadataEvent.kind, ChannelCreateEvent.kind, ChannelMessageEvent.kind),
                     search = mySearchString,
-                    limit = 20
+                    limit = 100
                 )
             )
         )

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

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

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

@@ -2,23 +2,11 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.service.model.BadgeAwardEvent
-import com.vitorpamplona.amethyst.service.model.BadgeDefinitionEvent
-import com.vitorpamplona.amethyst.service.model.BadgeProfilesEvent
-import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
-import com.vitorpamplona.amethyst.service.model.LnZapEvent
-import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
-import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
-import com.vitorpamplona.amethyst.service.model.ReactionEvent
-import com.vitorpamplona.amethyst.service.model.ReportEvent
-import com.vitorpamplona.amethyst.service.model.RepostEvent
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
-import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.model.*
+import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
+import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import java.util.Date
 
 object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
     private var eventsToWatch = setOf<Note>()
@@ -31,21 +19,18 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
             return null
         }
 
-        val now = Date().time / 1000
-
-        return addressesToWatch.filter {
-            val lastTime = it.lastReactionsDownloadTime
-            lastTime == null || lastTime < (now - 10)
-        }.mapNotNull {
+        return addressesToWatch.mapNotNull {
             it.address()?.let { aTag ->
                 TypedFilter(
-                    types = FeedType.values().toSet(),
+                    types = COMMON_FEED_TYPES,
                     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
+                            BadgeAwardEvent.kind, BadgeDefinitionEvent.kind, BadgeProfilesEvent.kind,
+                            PollNoteEvent.kind, AudioTrackEvent.kind, PinListEvent.kind,
+                            PeopleListEvent.kind, BookmarkListEvent.kind
                         ),
                         tags = mapOf("a" to listOf(aTag.toTag())),
                         since = it.lastReactionsDownloadTime
@@ -62,15 +47,10 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
             return null
         }
 
-        val now = Date().time / 1000
-
-        return addressesToWatch.filter {
-            val lastTime = it.lastReactionsDownloadTime
-            lastTime == null || lastTime < (now - 10)
-        }.mapNotNull {
+        return addressesToWatch.mapNotNull {
             it.address()?.let { aTag ->
                 TypedFilter(
-                    types = FeedType.values().toSet(),
+                    types = COMMON_FEED_TYPES,
                     filter = JsonFilter(
                         kinds = listOf(aTag.kind),
                         tags = mapOf("d" to listOf(aTag.dTag)),
@@ -88,23 +68,23 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
             return null
         }
 
-        val now = Date().time / 1000
-
-        return reactionsToWatch.filter {
-            val lastTime = it.lastReactionsDownloadTime
-            lastTime == null || lastTime < (now - 10)
-        }.map {
+        return reactionsToWatch.map {
             TypedFilter(
-                types = FeedType.values().toSet(),
+                types = COMMON_FEED_TYPES,
                 filter = JsonFilter(
                     kinds = listOf(
                         TextNoteEvent.kind,
                         LongTextNoteEvent.kind,
                         ReactionEvent.kind,
                         RepostEvent.kind,
+                        GenericRepostEvent.kind,
                         ReportEvent.kind,
                         LnZapEvent.kind,
-                        LnZapRequestEvent.kind
+                        LnZapRequestEvent.kind,
+                        PollNoteEvent.kind,
+                        HighlightEvent.kind,
+                        AudioTrackEvent.kind,
+                        PinListEvent.kind
                     ),
                     tags = mapOf("e" to listOf(it.idHex)),
                     since = it.lastReactionsDownloadTime
@@ -133,22 +113,24 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
         // downloads linked events to this event.
         return listOf(
             TypedFilter(
-                types = FeedType.values().toSet(),
+                types = COMMON_FEED_TYPES,
                 filter = JsonFilter(
-                    kinds = listOf(
-                        TextNoteEvent.kind, LongTextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, LnZapEvent.kind, LnZapRequestEvent.kind,
-                        ChannelMessageEvent.kind, ChannelCreateEvent.kind, ChannelMetadataEvent.kind, BadgeDefinitionEvent.kind, BadgeAwardEvent.kind, BadgeProfilesEvent.kind
-                    ),
                     ids = interestedEvents.toList()
                 )
             )
         )
     }
 
-    val singleEventChannel = requestNewChannel { time ->
+    val singleEventChannel = requestNewChannel { time, relayUrl ->
         eventsToWatch.forEach {
-            it.lastReactionsDownloadTime = time
+            val eose = it.lastReactionsDownloadTime[relayUrl]
+            if (eose == null) {
+                it.lastReactionsDownloadTime = it.lastReactionsDownloadTime + Pair(relayUrl, EOSETime(time))
+            } else {
+                eose.time = time
+            }
         }
+
         // Many relays operate with limits in the amount of filters.
         // As information comes, the filters will be rotated to get more data.
         invalidateFilters()
@@ -160,26 +142,34 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
         val addresses = createAddressFilter()
         val addressReactions = createTagToAddressFilter()
 
-        singleEventChannel.typedFilters = listOfNotNull(reactions, missing, addresses, addressReactions).flatten().ifEmpty { null }
+        singleEventChannel.typedFilters = listOfNotNull(missing, addresses, reactions, addressReactions).flatten().ifEmpty { null }
     }
 
     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

@@ -3,7 +3,8 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.MetadataEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
-import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
+import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 
@@ -15,7 +16,7 @@ object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
 
         return usersToWatch.filter { it.info?.latestMetadata == null }.map {
             TypedFilter(
-                types = FeedType.values().toSet(),
+                types = COMMON_FEED_TYPES,
                 filter = JsonFilter(
                     kinds = listOf(MetadataEvent.kind),
                     authors = listOf(it.pubkeyHex),
@@ -30,17 +31,26 @@ object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
 
         return usersToWatch.map {
             TypedFilter(
-                types = FeedType.values().toSet(),
+                types = COMMON_FEED_TYPES,
                 filter = JsonFilter(
                     kinds = listOf(ReportEvent.kind),
                     tags = mapOf("p" to listOf(it.pubkeyHex)),
-                    since = it.latestReportTime
+                    since = it.latestEOSEs
                 )
             )
         }
     }
 
-    val userChannel = requestNewChannel() {
+    val userChannel = requestNewChannel() { time, relayUrl ->
+        usersToWatch.forEach {
+            val eose = it.latestEOSEs[relayUrl]
+            if (eose == null) {
+                it.latestEOSEs = it.latestEOSEs + Pair(relayUrl, EOSETime(time))
+            } else {
+                eose.time = time
+            }
+        }
+
         // Many relays operate with limits in the amount of filters.
         // As information comes, the filters will be rotated to get more data.
         invalidateFilters()
@@ -54,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/NostrThreadDataSource.kt

@@ -1,7 +1,7 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.ThreadAssembler
-import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 
@@ -18,14 +18,14 @@ object NostrThreadDataSource : NostrDataSource("SingleThreadFeed") {
             .ifEmpty { null } ?: return null
 
         return TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 ids = eventsToLoad.map { it.substring(0, 8) }
             )
         )
     }
 
-    val loadEventsChannel = requestNewChannel() {
+    val loadEventsChannel = requestNewChannel() { _, _ ->
         // Many relays operate with limits in the amount of filters.
         // As information comes, the filters will be rotated to get more data.
         invalidateFilters()

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

@@ -1,34 +1,21 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.service.model.BadgeAwardEvent
-import com.vitorpamplona.amethyst.service.model.BadgeProfilesEvent
-import com.vitorpamplona.amethyst.service.model.ContactListEvent
-import com.vitorpamplona.amethyst.service.model.LnZapEvent
-import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
-import com.vitorpamplona.amethyst.service.model.MetadataEvent
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
-import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.model.*
+import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 
 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 {
         TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(MetadataEvent.kind),
                 authors = listOf(it.pubkeyHex),
@@ -39,9 +26,18 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
 
     fun createUserPostsFilter() = user?.let {
         TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.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
             )
@@ -50,7 +46,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
 
     fun createUserReceivedZapsFilter() = user?.let {
         TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(LnZapEvent.kind),
                 tags = mapOf("p" to listOf(it.pubkeyHex))
@@ -60,7 +56,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
 
     fun createFollowFilter() = user?.let {
         TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(ContactListEvent.kind),
                 authors = listOf(it.pubkeyHex),
@@ -71,7 +67,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
 
     fun createFollowersFilter() = user?.let {
         TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(ContactListEvent.kind),
                 tags = mapOf("p" to listOf(it.pubkeyHex))
@@ -81,7 +77,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
 
     fun createAcceptedAwardsFilter() = user?.let {
         TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(BadgeProfilesEvent.kind),
                 authors = listOf(it.pubkeyHex),
@@ -90,9 +86,20 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
         )
     }
 
+    fun createBookmarksFilter() = user?.let {
+        TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter = JsonFilter(
+                kinds = listOf(BookmarkListEvent.kind, PeopleListEvent.kind, AppRecommendationEvent.kind),
+                authors = listOf(it.pubkeyHex),
+                limit = 100
+            )
+        )
+    }
+
     fun createReceivedAwardsFilter() = user?.let {
         TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(BadgeAwardEvent.kind),
                 tags = mapOf("p" to listOf(it.pubkeyHex)),
@@ -111,7 +118,8 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
             createFollowersFilter(),
             createUserReceivedZapsFilter(),
             createAcceptedAwardsFilter(),
-            createReceivedAwardsFilter()
+            createReceivedAwardsFilter(),
+            createBookmarksFilter()
         ).ifEmpty { null }
     }
 }

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

@@ -1,6 +1,9 @@
 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
@@ -9,13 +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("@")
@@ -43,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) {
@@ -52,7 +57,7 @@ class LightningAddressResolver {
 
         withContext(Dispatchers.IO) {
             val request: Request = Request.Builder()
-                .header("User-Agent", "Amethyst")
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                 .url(url)
                 .build()
 
@@ -95,7 +100,7 @@ class LightningAddressResolver {
             }
 
             val request: Request = Request.Builder()
-                .header("User-Agent", "Amethyst")
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                 .url(url)
                 .build()
 
@@ -128,12 +133,14 @@ class LightningAddressResolver {
         )
     }
 
-    fun lnAddressInvoice(lnaddress: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    fun lnAddressInvoice(lnaddress: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit, onProgress: (percent: Float) -> Unit) {
         val mapper = jacksonObjectMapper()
 
         fetchLightningAddressJson(
             lnaddress,
             onSuccess = { lnAddressJson ->
+                onProgress(0.4f)
+
                 val lnurlp = try {
                     mapper.readTree(lnAddressJson)
                 } catch (t: Throwable) {
@@ -156,6 +163,8 @@ class LightningAddressResolver {
                         message,
                         if (allowsNostr) nostrRequest else null,
                         onSuccess = {
+                            onProgress(0.6f)
+
                             val lnInvoice = try {
                                 mapper.readTree(it)
                             } catch (t: Throwable) {
@@ -164,7 +173,14 @@ class LightningAddressResolver {
                             }
 
                             lnInvoice?.get("pr")?.asText()?.let { pr ->
-                                onSuccess(pr)
+                                // Forces LN Invoice amount to be the requested amount.
+                                val invoiceAmount = LnInvoiceUtil.getAmountInSats(pr)
+                                if (invoiceAmount.multiply(BigDecimal(1000)).toLong() == BigDecimal(milliSats).toLong()) {
+                                    onProgress(0.7f)
+                                    onSuccess(pr)
+                                } else {
+                                    onError("Incorrect invoice amount (${invoiceAmount.toLong()} sats) from server")
+                                }
                             } ?: onError("Invoice Not Created (element pr not found in the resulting JSON)")
                         },
                         onError = onError

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

@@ -0,0 +1,29 @@
+package com.vitorpamplona.amethyst.service.lnurl
+
+import java.util.regex.Pattern
+
+object LnWithdrawalUtil {
+    private val withdrawalPattern = Pattern.compile(
+        "lnurl.+",
+        Pattern.CASE_INSENSITIVE
+    )
+
+    /**
+     * Finds LN withdrawal in the provided input string and returns it.
+     * For example for input = "aaa bbb lnbc1xxx ccc" it will return "lnbc1xxx"
+     * It will only return the first withdrawal found in the input.
+     *
+     * @return the invoice if it was found. null for null input or if no invoice is found
+     */
+    fun findWithdrawal(input: String?): String? {
+        if (input == null) {
+            return null
+        }
+        val matcher = withdrawalPattern.matcher(input)
+        return if (matcher.find()) {
+            matcher.group()
+        } else {
+            null
+        }
+    }
+}

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,8 +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,
@@ -13,31 +18,96 @@ open class BaseTextNoteEvent(
     sig: HexKey
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
     fun mentions() = taggedUsers()
-    fun replyTos() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    open fun replyTos() = taggedEvents()
 
-    fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
-        val aTagValue = it.getOrNull(1)
-        val relay = it.getOrNull(2)
+    private var citedUsersCache: Set<HexKey>? = null
+    private var citedNotesCache: Set<HexKey>? = null
 
-        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
+    fun citedUsers(): Set<HexKey> {
+        citedUsersCache?.let { return it }
+
+        val matcher = tagSearch.matcher(content)
+        val returningList = mutableSetOf<String>()
+        while (matcher.find()) {
+            try {
+                val tag = matcher.group(1)?.let { tags[it.toInt()] }
+                if (tag != null && tag.size > 1 && tag[0] == "p") {
+                    returningList.add(tag[1])
+                }
+            } catch (e: Exception) {
+            }
+        }
+
+        val matcher2 = nip19regex.matcher(content)
+        while (matcher2.find()) {
+            val uriScheme = matcher2.group(1) // nostr:
+            val type = matcher2.group(2) // npub1
+            val key = matcher2.group(3) // bech32
+            val additionalChars = matcher2.group(4) // additional chars
+
+            try {
+                val parsed = Nip19.parseComponents(uriScheme, type, key, additionalChars)
+
+                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) {
+                Log.w("Unable to parse cited users that matched a NIP19 regex", e)
+            }
+        }
+
+        citedUsersCache = returningList
+        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()) {
             try {
                 val tag = matcher.group(1)?.let { tags[it.toInt()] }
-                if (tag != null && tag[0] == "e") {
+                if (tag != null && tag.size > 1 && tag[0] == "e") {
                     citations.add(tag[1])
                 }
-                if (tag != null && tag[0] == "a") {
+                if (tag != null && tag.size > 1 && tag[0] == "a") {
                     citations.add(tag[1])
                 }
             } catch (e: Exception) {
             }
         }
+
+        val matcher2 = nip19regex.matcher(content)
+        while (matcher2.find()) {
+            val uriScheme = matcher2.group(1) // nostr:
+            val type = matcher2.group(2) // npub1
+            val key = matcher2.group(3) // bech32
+            val additionalChars = matcher2.group(4) // additional chars
+
+            val parsed = Nip19.parseComponents(uriScheme, type, key, additionalChars)
+
+            if (parsed != null) {
+                try {
+                    val tag = tags.firstOrNull { it.size > 1 && it[1] == parsed.hex }
+
+                    if (tag != null && tag[0] == "e") {
+                        citations.add(tag[1])
+                    }
+                    if (tag != null && tag[0] == "a") {
+                        citations.add(tag[1])
+                    }
+                } catch (e: Exception) {
+                }
+            }
+        }
+
+        citedNotesCache = citations
         return citations
     }
 

app/src/main/java/com/vitorpamplona/amethyst/service/model/BookmarkListEvent.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 BookmarkListEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : GeneralListEvent(id, pubKey, createdAt, kind, tags, content, sig) {
+    companion object {
+        const val kind = 30001
+
+        fun create(
+            name: String = "",
+
+            events: List<String>? = null,
+            users: List<String>? = null,
+            addresses: List<ATag>? = null,
+
+            privEvents: List<String>? = null,
+            privUsers: List<String>? = null,
+            privAddresses: List<ATag>? = null,
+
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): BookmarkListEvent {
+            val pubKey = Utils.pubkeyCreate(privateKey)
+            val content = createPrivateTags(privEvents, privUsers, privAddresses, privateKey, pubKey)
+
+            val tags = mutableListOf<List<String>>()
+            tags.add(listOf("d", name))
+
+            events?.forEach {
+                tags.add(listOf("e", it))
+            }
+            users?.forEach {
+                tags.add(listOf("p", it))
+            }
+            addresses?.forEach {
+                tags.add(listOf("a", it.toTag()))
+            }
+
+            val id = generateId(pubKey.toHexKey(), createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return BookmarkListEvent(id.toHexKey(), pubKey.toHexKey(), createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/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,
@@ -12,16 +14,30 @@ class ChannelMessageEvent(
     tags: List<List<String>>,
     content: String,
     sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+) : 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 replyTos() = tags.filter { it.getOrNull(1) != channel() }.mapNotNull { it.getOrNull(1) }
-    fun mentions() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.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, 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(
@@ -33,6 +49,15 @@ class ChannelMessageEvent(
             mentions?.forEach {
                 tags.add(listOf("p", it))
             }
+            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,23 +23,26 @@ 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()
     }
 
+    val verifiedFollowTagSet: Set<String> by lazy {
+        unverifiedFollowTagSet().map { it.lowercase() }.toSet()
+    }
+
     val verifiedFollowKeySetAndMe: Set<HexKey> by lazy {
         verifiedFollowKeySet + pubKey
     }
 
     fun unverifiedFollowKeySet() = tags.filter { it[0] == "p" }.mapNotNull { it.getOrNull(1) }
+    fun unverifiedFollowTagSet() = tags.filter { it[0] == "t" }.mapNotNull { it.getOrNull(1) }
 
     fun follows() = tags.filter { it[0] == "p" }.mapNotNull {
         try {
@@ -48,6 +53,10 @@ class ContactListEvent(
         }
     }
 
+    fun followsTags() = tags.filter { it[0] == "t" }.mapNotNull {
+        it.getOrNull(2)
+    }
+
     fun relays(): Map<String, ReadWrite>? = try {
         if (content.isNotEmpty()) {
             gson.fromJson(content, object : TypeToken<Map<String, ReadWrite>>() {}.type) as Map<String, ReadWrite>
@@ -62,7 +71,7 @@ class ContactListEvent(
     companion object {
         const val kind = 3
 
-        fun create(follows: List<Contact>, relayUse: Map<String, ReadWrite>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ContactListEvent {
+        fun create(follows: List<Contact>, followTags: List<String>, relayUse: Map<String, ReadWrite>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ContactListEvent {
             val content = if (relayUse != null) {
                 gson.toJson(relayUse)
             } else {
@@ -75,7 +84,10 @@ class ContactListEvent(
                 } else {
                     listOf("p", it.pubKeyHex)
                 }
+            } + followTags.map {
+                listOf("t", it)
             }
+
             val id = generateId(pubKey, createdAt, kind, tags, content)
             val sig = Utils.sign(id, privateKey)
             return ContactListEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())

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
@@ -9,9 +11,11 @@ import fr.acinq.secp256k1.Secp256k1
 import nostr.postr.Utils
 import nostr.postr.toHex
 import java.lang.reflect.Type
+import java.math.BigDecimal
 import java.security.MessageDigest
 import java.util.*
 
+@Immutable
 open class Event(
     val id: HexKey,
     @SerializedName("pubkey") val pubKey: HexKey,
@@ -37,9 +41,68 @@ open class Event(
 
     override fun toJson(): String = gson.toJson(this)
 
-    fun taggedUsers() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+    fun hasAnyTaggedUser() = tags.any { it.size > 1 && it[0] == "p" }
 
-    override fun isTaggedUser(idHex: String) = tags.any { it.getOrNull(0) == "p" && it.getOrNull(1) == idHex }
+    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 {
+        val aTagValue = it[1]
+        val relay = it.getOrNull(2)
+
+        ATag.parse(aTagValue, relay)
+    }
+
+    override fun hashtags() = tags.filter { it.size > 1 && it[0] == "t" }.map { it[1] }
+
+    override fun isTaggedUser(idHex: String) = tags.any { it.size > 1 && it[0] == "p" && it[1] == idHex }
+
+    override fun isTaggedHash(hashtag: String) = tags.any { it.size > 1 && it[0] == "t" && it[1].equals(hashtag, true) }
+    override fun isTaggedHashes(hashtags: Set<String>) = tags.any { it.size > 1 && it[0] == "t" && it[1].lowercase() in hashtags }
+    override fun firstIsTaggedHashes(hashtags: Set<String>) = tags.firstOrNull { it.size > 1 && it[0] == "t" && it[1].lowercase() in hashtags }?.getOrNull(1)
+
+    override fun getPoWRank(): Int {
+        var rank = 0
+        for (i in 0..id.length) {
+            if (id[i] == '0') {
+                rank += 4
+            } else if (id[i] in '4'..'7') {
+                rank += 1
+                break
+            } else if (id[i] in '2'..'3') {
+                rank += 2
+                break
+            } else if (id[i] == '1') {
+                rank += 3
+                break
+            } else {
+                break
+            }
+        }
+        return rank
+    }
+
+    override fun getReward(): BigDecimal? {
+        return try {
+            tags.firstOrNull { it.size > 1 && it[0] == "reward" }?.get(1)?.let { BigDecimal(it) }
+        } catch (e: Exception) {
+            null
+        }
+    }
 
     /**
      * Checks if the ID is correct and then if the pubKey's secret key signed the event.
@@ -60,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 {
@@ -78,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> {
@@ -152,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)
@@ -166,10 +231,13 @@ 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)
-
+            BookmarkListEvent.kind -> BookmarkListEvent(id, pubKey, createdAt, tags, content, sig)
             ChannelCreateEvent.kind -> ChannelCreateEvent(id, pubKey, createdAt, tags, content, sig)
             ChannelHideMessageEvent.kind -> ChannelHideMessageEvent(id, pubKey, createdAt, tags, content, sig)
             ChannelMessageEvent.kind -> ChannelMessageEvent(id, pubKey, createdAt, tags, content, sig)
@@ -178,13 +246,26 @@ open class Event(
             ContactListEvent.kind -> ContactListEvent(id, pubKey, createdAt, tags, content, sig)
             DeletionEvent.kind -> DeletionEvent(id, pubKey, createdAt, tags, content, sig)
 
+            FileHeaderEvent.kind -> FileHeaderEvent(id, pubKey, createdAt, tags, content, sig)
+            FileStorageEvent.kind -> FileStorageEvent(id, pubKey, createdAt, tags, content, sig)
+            FileStorageHeaderEvent.kind -> FileStorageHeaderEvent(id, pubKey, createdAt, tags, content, sig)
+            GenericRepostEvent.kind -> GenericRepostEvent(id, pubKey, createdAt, tags, content, sig)
+            HighlightEvent.kind -> HighlightEvent(id, pubKey, createdAt, tags, content, sig)
+            LiveActivitiesEvent.kind -> LiveActivitiesEvent(id, pubKey, createdAt, tags, content, sig)
+            LiveActivitiesChatMessageEvent.kind -> LiveActivitiesChatMessageEvent(id, pubKey, createdAt, tags, content, sig)
             LnZapEvent.kind -> LnZapEvent(id, pubKey, createdAt, tags, content, sig)
+            LnZapPaymentRequestEvent.kind -> LnZapPaymentRequestEvent(id, pubKey, createdAt, tags, content, sig)
+            LnZapPaymentResponseEvent.kind -> LnZapPaymentResponseEvent(id, pubKey, createdAt, tags, content, sig)
             LnZapRequestEvent.kind -> LnZapRequestEvent(id, pubKey, createdAt, tags, content, sig)
             LongTextNoteEvent.kind -> LongTextNoteEvent(id, pubKey, createdAt, tags, content, sig)
             MetadataEvent.kind -> MetadataEvent(id, pubKey, createdAt, tags, content, sig)
+            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)
@@ -200,8 +281,16 @@ open class Event(
                 tags,
                 content
             )
+
+            // GSON decided to hardcode these replacements.
+            // They break Nostr's hash check.
+            // These lines revert their code.
+            // https://github.com/google/gson/issues/2295
             val rawEventJson = gson.toJson(rawEvent)
-            return sha256.digest(rawEventJson.toByteArray())
+                .replace("\\u2028", "\u2028")
+                .replace("\\u2029", "\u2029")
+
+            return MessageDigest.getInstance("SHA-256").digest(rawEventJson.toByteArray())
         }
 
         fun create(privateKey: ByteArray, kind: Int, tags: List<List<String>> = emptyList(), content: String = "", createdAt: Long = Date().time / 1000): Event {
@@ -212,3 +301,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,7 +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
 
@@ -23,5 +26,17 @@ interface EventInterface {
 
     fun hasValidSignature(): Boolean
 
-    fun isTaggedUser(loggedInUser: String): Boolean
+    fun isTaggedUser(idHex: String): Boolean
+
+    fun isTaggedHash(hashtag: String): Boolean
+    fun isTaggedHashes(hashtags: Set<String>): Boolean
+    fun firstIsTaggedHashes(hashtags: Set<String>): String?
+    fun hashtags(): List<String>
+
+    fun getReward(): BigDecimal?
+    fun getPoWRank(): Int
+
+    fun zapAddress(): String?
+    fun isSensitive(): Boolean
+    fun zapraiserAmount(): Long?
 }

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

@@ -0,0 +1,77 @@
+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,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    fun url() = tags.firstOrNull { it.size > 1 && it[0] == URL }?.get(1)
+    fun encryptionKey() = tags.firstOrNull { it.size > 2 && it[0] == ENCRYPTION_KEY }?.let { AESGCM(it[1], it[2]) }
+    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)
+
+    companion object {
+        const val kind = 1063
+
+        private const val URL = "url"
+        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"
+        private const val BLUR_HASH = "blurhash"
+
+        fun create(
+            url: String,
+            mimeType: String? = null,
+            description: String? = null,
+            hash: String? = null,
+            size: String? = null,
+            dimensions: String? = null,
+            blurhash: String? = null,
+            magnetURI: String? = null,
+            torrentInfoHash: String? = null,
+            encryptionKey: AESGCM? = null,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): FileHeaderEvent {
+            val tags = listOfNotNull(
+                listOf(URL, url),
+                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) },
+                encryptionKey?.let { listOf(ENCRYPTION_KEY, it.key, it.nonce) }
+            )
+
+            val content = description ?: ""
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return FileHeaderEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}
+
+data class AESGCM(val key: String, val nonce: String)

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

@@ -0,0 +1,60 @@
+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,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    fun type() = tags.firstOrNull { it.size > 1 && it[0] == TYPE }?.get(1)
+    fun decryptKey() = tags.firstOrNull { it.size > 2 && it[0] == DECRYPT }?.let { AESGCM(it[1], it[2]) }
+
+    fun decode(): ByteArray? {
+        return try {
+            Base64.getDecoder().decode(content)
+        } catch (e: Exception) {
+            Log.e("FileStorageEvent", "Unable to decode base 64 ${e.message} $content")
+            null
+        }
+    }
+
+    companion object {
+        const val kind = 1064
+
+        private const val TYPE = "type"
+        private const val DECRYPT = "decrypt"
+
+        fun encode(bytes: ByteArray): String {
+            return Base64.getEncoder().encodeToString(bytes)
+        }
+
+        fun create(
+            mimeType: String,
+            data: ByteArray,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): FileStorageEvent {
+            val tags = listOfNotNull(
+                listOf(TYPE, mimeType)
+            )
+
+            val content = encode(data)
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return FileStorageEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

@@ -0,0 +1,75 @@
+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,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    fun dataEventId() = tags.firstOrNull { it.size > 1 && it[0] == "e" }?.get(1)
+
+    fun encryptionKey() = tags.firstOrNull { it.size > 2 && it[0] == ENCRYPTION_KEY }?.let { AESGCM(it[1], it[2]) }
+    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)
+
+    companion object {
+        const val kind = 1065
+
+        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"
+        private const val BLUR_HASH = "blurhash"
+
+        fun create(
+            storageEvent: FileStorageEvent,
+            mimeType: String? = null,
+            description: String? = null,
+            hash: String? = null,
+            size: String? = null,
+            dimensions: String? = null,
+            blurhash: String? = null,
+            magnetURI: String? = null,
+            torrentInfoHash: String? = null,
+            encryptionKey: AESGCM? = null,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): FileStorageHeaderEvent {
+            val tags = listOfNotNull(
+                listOf("e", storageEvent.id),
+                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) },
+                encryptionKey?.let { listOf(ENCRYPTION_KEY, it.key, it.nonce) }
+            )
+
+            val content = description ?: ""
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return FileStorageHeaderEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

@@ -0,0 +1,82 @@
+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 LiveActivitiesChatMessageEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : BaseTextNoteEvent(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    private fun innerActivity() = tags.firstOrNull {
+        it.size > 3 && it[0] == "a" && it[3] == "root"
+    } ?: tags.firstOrNull {
+        it.size > 1 && it[0] == "a"
+    }
+
+    private fun activityHex() = innerActivity()?.let {
+        it.getOrNull(1)
+    }
+
+    fun activity() = innerActivity()?.let {
+        if (it.size > 1) {
+            val aTagValue = it[1]
+            val relay = it.getOrNull(2)
+
+            ATag.parse(aTagValue, relay)
+        } else {
+            null
+        }
+    }
+
+    override fun replyTos() = taggedEvents().minus(activityHex() ?: "")
+
+    companion object {
+        const val kind = 1311
+
+        fun create(
+            message: String,
+            activity: ATag,
+            replyTos: List<String>? = null,
+            mentions: List<String>? = null,
+            zapReceiver: String?,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000,
+            markAsSensitive: Boolean,
+            zapRaiserAmount: Long?
+        ): LiveActivitiesChatMessageEvent {
+            val content = message
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = mutableListOf(
+                listOf("a", activity.toTag(), "", "root")
+            )
+            replyTos?.forEach {
+                tags.add(listOf("e", it))
+            }
+            mentions?.forEach {
+                tags.add(listOf("p", it))
+            }
+            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 LiveActivitiesChatMessageEvent(id.toHexKey(), pubKey, createdAt, tags, content, 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,71 +1,76 @@
-package com.vitorpamplona.amethyst.service.model
-
-import android.util.Log
-import com.vitorpamplona.amethyst.model.HexKey
-import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
-import com.vitorpamplona.amethyst.service.relays.Client
-import java.math.BigDecimal
-
-class LnZapEvent(
-    id: HexKey,
-    pubKey: HexKey,
-    createdAt: Long,
-    tags: List<List<String>>,
-    content: String,
-    sig: HexKey
-) : LnZapEventInterface, Event(id, pubKey, createdAt, kind, tags, content, sig) {
-
-    override fun zappedPost() = tags
-        .filter { it.firstOrNull() == "e" }
-        .mapNotNull { it.getOrNull(1) }
-
-    override fun zappedAuthor() = tags
-        .filter { it.firstOrNull() == "p" }
-        .mapNotNull { it.getOrNull(1) }
-
-    override fun taggedAddresses(): List<ATag> = tags
-        .filter { it.firstOrNull() == "a" }
-        .mapNotNull {
-            val aTagValue = it.getOrNull(1)
-            val relay = it.getOrNull(2)
-
-            if (aTagValue != null) ATag.parse(aTagValue, relay) else null
-        }
-
-    override fun amount(): BigDecimal? {
-        return amount
-    }
-
-    // Keeps this as a field because it's a heavier function used everywhere.
-    val amount by lazy {
-        try {
-            lnInvoice()?.let { LnInvoiceUtil.getAmountInSats(it) }
-        } catch (e: Exception) {
-            Log.e("LnZapEvent", "Failed to Parse LnInvoice ${description()}", e)
-            null
-        }
-    }
-
-    override fun containedPost(): Event? = try {
-        description()?.let {
-            fromJson(it, Client.lenient)
-        }
-    } catch (e: Exception) {
-        Log.e("LnZapEvent", "Failed to Parse Contained Post ${description()}", e)
-        null
-    }
-
-    private fun lnInvoice(): String? = tags
-        .filter { it.firstOrNull() == "bolt11" }
-        .mapNotNull { it.getOrNull(1) }
-        .firstOrNull()
-
-    private fun description(): String? = tags
-        .filter { it.firstOrNull() == "description" }
-        .mapNotNull { it.getOrNull(1) }
-        .firstOrNull()
-
-    companion object {
-        const val kind = 9735
-    }
-}
+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,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : LnZapEventInterface, Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    // This event is also kept in LocalCache (same object)
+    @Transient val zapRequest: LnZapRequestEvent?
+
+    override fun containedPost(): LnZapRequestEvent? = try {
+        description()?.ifBlank { null }?.let {
+            fromJson(it, Client.lenient)
+        } as? LnZapRequestEvent
+    } catch (e: Exception) {
+        Log.e("LnZapEvent", "Failed to Parse Contained Post ${description()}", e)
+        null
+    }
+
+    init {
+        zapRequest = containedPost()
+    }
+
+    override fun zappedPost() = tags.filter { it.size > 1 && it[0] == "e" }.map { it[1] }
+
+    override fun zappedAuthor() = tags.filter { it.size > 1 && it[0] == "p" }.map { it[1] }
+
+    override fun zappedPollOption(): Int? = try {
+        zapRequest?.tags?.firstOrNull { it.size > 1 && it[0] == POLL_OPTION }?.get(1)?.toInt()
+    } catch (e: Exception) {
+        Log.e("LnZapEvent", "ZappedPollOption failed to parse", e)
+        null
+    }
+
+    override fun zappedRequestAuthor(): String? = zapRequest?.pubKey()
+
+    override fun amount() = amount
+
+    // Keeps this as a field because it's a heavier function used everywhere.
+    val amount by lazy {
+        try {
+            lnInvoice()?.let { LnInvoiceUtil.getAmountInSats(it) }
+        } catch (e: Exception) {
+            Log.e("LnZapEvent", "Failed to Parse LnInvoice ${description()}", e)
+            null
+        }
+    }
+    override fun content(): String {
+        return content
+    }
+
+    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)
+
+    companion object {
+        const val kind = 9735
+    }
+
+    enum class ZapType() {
+        PUBLIC,
+        PRIVATE,
+        ANONYMOUS,
+        NONZAP
+    }
+}

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

@@ -1,13 +1,19 @@
 package com.vitorpamplona.amethyst.service.model
 
+import androidx.compose.runtime.Immutable
 import java.math.BigDecimal
 
+@Immutable
 interface LnZapEventInterface : EventInterface {
 
     fun zappedPost(): List<String>
 
+    fun zappedPollOption(): Int?
+
     fun zappedAuthor(): List<String>
 
+    fun zappedRequestAuthor(): String?
+
     fun taggedAddresses(): List<ATag>
 
     fun amount(): BigDecimal?

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

@@ -0,0 +1,116 @@
+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.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,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    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, pubkey: ByteArray): String? {
+        if (lnInvoice != null) {
+            return lnInvoice
+        }
+
+        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
+        }
+    }
+
+    companion object {
+        const val kind = 23194
+
+        fun create(
+            lnInvoice: String,
+            walletServicePubkey: String,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): LnZapPaymentRequestEvent {
+            val pubKey = Utils.pubkeyCreate(privateKey)
+            val serializedRequest = gson.toJson(PayInvoiceMethod.create(lnInvoice))
+
+            val content = Utils.encrypt(
+                serializedRequest,
+                privateKey,
+                walletServicePubkey.hexToByteArray()
+            )
+
+            val tags = mutableListOf<List<String>>()
+            tags.add(listOf("p", walletServicePubkey))
+
+            val id = generateId(pubKey.toHexKey(), createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return LnZapPaymentRequestEvent(id.toHexKey(), pubKey.toHexKey(), createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}
+
+// REQUEST OBJECTS
+
+abstract class Request(var method: String? = null)
+
+// PayInvoice Call
+class PayInvoiceParams(var invoice: String? = null)
+
+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

@@ -0,0 +1,141 @@
+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,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    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)
+
+    private fun decrypt(privKey: ByteArray, pubKey: ByteArray): String? {
+        return try {
+            val sharedSecret = Utils.getSharedSecret(privKey, pubKey)
+
+            val retVal = Utils.decrypt(content, sharedSecret)
+
+            if (retVal.startsWith(PrivateDmEvent.nip18Advertisement)) {
+                retVal.substring(16)
+            } else {
+                retVal
+            }
+        } catch (e: Exception) {
+            Log.w("PrivateDM", "Error decrypting the message ${e.message}")
+            null
+        }
+    }
+
+    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
+        }
+    }
+
+    companion object {
+        const val kind = 23195
+    }
+}
+
+// RESPONSE OBJECTS
+abstract class Response(
+    @SerializedName("result_type")
+    val resultType: String
+)
+
+// PayInvoice Call
+
+class PayInvoiceSuccessResponse(val result: PayInvoiceResultParams? = null) :
+    Response("pay_invoice") {
+    class PayInvoiceResultParams(val preimage: String)
+}
+
+class PayInvoiceErrorResponse(val error: PayInvoiceErrorParams? = null) :
+    Response("pay_invoice") {
+    class PayInvoiceErrorParams(val code: ErrorType?, val message: String?)
+
+    enum class ErrorType {
+        @SerializedName(value = "rate_limited", alternate = ["RATE_LIMITED"])
+        RATE_LIMITED, // The client is sending commands too fast. It should retry in a few seconds.
+        @SerializedName(value = "not_implemented", alternate = ["NOT_IMPLEMENTED"])
+        NOT_IMPLEMENTED, // The command is not known or is intentionally not implemented.
+        @SerializedName(value = "insufficient_balance", alternate = ["INSUFFICIENT_BALANCE"])
+        INSUFFICIENT_BALANCE, // The wallet does not have enough funds to cover a fee reserve or the payment amount.
+        @SerializedName(value = "quota_exceeded", alternate = ["QUOTA_EXCEEDED"])
+        QUOTA_EXCEEDED, // The wallet has exceeded its spending quota.
+        @SerializedName(value = "restricted", alternate = ["RESTRICTED"])
+        RESTRICTED, // This public key is not allowed to do this operation.
+        @SerializedName(value = "unauthorized", alternate = ["UNAUTHORIZED"])
+        UNAUTHORIZED, // This public key has no wallet connected.
+        @SerializedName(value = "internal", alternate = ["INTERNAL"])
+        INTERNAL, // An internal error.
+        @SerializedName(value = "other", alternate = ["OTHER"])
+        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,101 +1,182 @@
-package com.vitorpamplona.amethyst.service.model
-
-import com.vitorpamplona.amethyst.model.HexKey
-import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
-import java.util.Date
-
-class LnZapRequestEvent(
-    id: HexKey,
-    pubKey: HexKey,
-    createdAt: Long,
-    tags: List<List<String>>,
-    content: String,
-    sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun zappedPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-    fun zappedAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
-    fun taggedAddresses() = tags.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 {
-        const val kind = 9734
-
-        fun create(
-            originalNote: EventInterface,
-            relays: Set<String>,
-            privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000
-        ): LnZapRequestEvent {
-            val content = ""
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
-            var tags = listOf(
-                listOf("e", originalNote.id()),
-                listOf("p", originalNote.pubKey()),
-                listOf("relays") + relays
-            )
-            if (originalNote is LongTextNoteEvent) {
-                tags = tags + listOf(listOf("a", originalNote.address().toTag()))
-            }
-
-            val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
-            return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
-        }
-
-        fun create(
-            userHex: String,
-            relays: Set<String>,
-            privateKey: ByteArray,
-            createdAt: Long = Date().time / 1000
-        ): LnZapRequestEvent {
-            val content = ""
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
-            val tags = listOf(
-                listOf("p", userHex),
-                listOf("relays") + relays
-            )
-            val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
-            return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
-        }
-    }
-}
-
-/*
-{
-  "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"
-  ]
-  ]
-}
-*/
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.*
+import nostr.postr.Bech32
+import nostr.postr.Utils
+import java.nio.charset.Charset
+import java.security.MessageDigest
+import java.security.SecureRandom
+import java.util.*
+import javax.crypto.BadPaddingException
+import javax.crypto.Cipher
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
+
+@Immutable
+class LnZapRequestEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    @Transient
+    private var privateZapEvent: Event? = null
+
+    fun zappedPost() = tags.filter { it.size > 1 && it[0] == "e" }.map { it[1] }
+
+    fun zappedAuthor() = tags.filter { it.size > 1 && it[0] == "p" }.map { it[1] }
+
+    fun isPrivateZap() = tags.any { t -> t.size >= 2 && t[0] == "anon" && t[1].isNotBlank() }
+
+    fun getPrivateZapEvent(loggedInUserPrivKey: ByteArray, pubKey: HexKey): Event? {
+        if (privateZapEvent != null) return privateZapEvent
+
+        val anonTag = tags.firstOrNull { t -> t.size >= 2 && t[0] == "anon" }
+        if (anonTag != null) {
+            val encnote = anonTag[1]
+            if (encnote.isNotBlank()) {
+                try {
+                    val note = decryptPrivateZapMessage(encnote, loggedInUserPrivKey, pubKey.hexToByteArray())
+                    val decryptedEvent = fromJson(note)
+                    if (decryptedEvent.kind == 9733) {
+                        privateZapEvent = decryptedEvent
+                        return privateZapEvent
+                    }
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            }
+        }
+        return null
+    }
+
+    companion object {
+        const val kind = 9734
+
+        fun create(
+            originalNote: EventInterface,
+            relays: Set<String>,
+            privateKey: ByteArray,
+            pollOption: Int?,
+            message: String,
+            zapType: LnZapEvent.ZapType,
+            createdAt: Long = Date().time / 1000
+        ): LnZapRequestEvent {
+            var content = message
+            var privkey = privateKey
+            var pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            var tags = listOf(
+                listOf("e", originalNote.id()),
+                listOf("p", originalNote.pubKey()),
+                listOf("relays") + relays
+            )
+            if (originalNote is AddressableEvent) {
+                tags = tags + listOf(listOf("a", originalNote.address().toTag()))
+            }
+            if (pollOption != null && pollOption >= 0) {
+                tags = tags + listOf(listOf(POLL_OPTION, pollOption.toString()))
+            }
+            if (zapType == LnZapEvent.ZapType.ANONYMOUS) {
+                tags = tags + listOf(listOf("anon", ""))
+                privkey = Utils.privkeyCreate()
+                pubKey = Utils.pubkeyCreate(privkey).toHexKey()
+            } else if (zapType == LnZapEvent.ZapType.PRIVATE) {
+                var encryptionPrivateKey = createEncryptionPrivateKey(privateKey.toHexKey(), originalNote.id(), createdAt)
+                var noteJson = (create(privkey, 9733, listOf(tags[0], tags[1]), message)).toJson()
+                var encryptedContent = encryptPrivateZapMessage(noteJson, encryptionPrivateKey, originalNote.pubKey().hexToByteArray())
+                tags = tags + listOf(listOf("anon", encryptedContent))
+                content = "" // make sure public content is empty, as the content is encrypted
+                privkey = encryptionPrivateKey // sign event with generated privkey
+                pubKey = Utils.pubkeyCreate(encryptionPrivateKey).toHexKey() // updated event with according pubkey
+            }
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privkey)
+            return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+
+        fun create(
+            userHex: String,
+            relays: Set<String>,
+            privateKey: ByteArray,
+            message: String,
+            zapType: LnZapEvent.ZapType,
+            createdAt: Long = Date().time / 1000
+        ): LnZapRequestEvent {
+            var content = message
+            var privkey = privateKey
+            var pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            var tags = listOf(
+                listOf("p", userHex),
+                listOf("relays") + relays
+            )
+            if (zapType == LnZapEvent.ZapType.ANONYMOUS) {
+                privkey = Utils.privkeyCreate()
+                pubKey = Utils.pubkeyCreate(privkey).toHexKey()
+                tags = tags + listOf(listOf("anon", ""))
+            } else if (zapType == LnZapEvent.ZapType.PRIVATE) {
+                var encryptionPrivateKey = createEncryptionPrivateKey(privateKey.toHexKey(), userHex, createdAt)
+                var noteJson = (create(privkey, 9733, listOf(tags[0], tags[1]), message)).toJson()
+                var encryptedContent = encryptPrivateZapMessage(noteJson, encryptionPrivateKey, userHex.hexToByteArray())
+                tags = tags + listOf(listOf("anon", encryptedContent))
+                content = ""
+                privkey = encryptionPrivateKey
+                pubKey = Utils.pubkeyCreate(encryptionPrivateKey).toHexKey()
+            }
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privkey)
+            return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+
+        fun createEncryptionPrivateKey(privkey: String, id: String, createdAt: Long): ByteArray {
+            var str = privkey + id + createdAt.toString()
+            var strbyte = str.toByteArray(Charset.forName("utf-8"))
+            return MessageDigest.getInstance("SHA-256").digest(strbyte)
+        }
+
+        private fun encryptPrivateZapMessage(msg: String, privkey: ByteArray, pubkey: ByteArray): String {
+            var sharedSecret = Utils.getSharedSecret(privkey, pubkey)
+            val iv = ByteArray(16)
+            SecureRandom().nextBytes(iv)
+
+            val keySpec = SecretKeySpec(sharedSecret, "AES")
+            val ivSpec = IvParameterSpec(iv)
+
+            var utf8message = msg.toByteArray(Charset.forName("utf-8"))
+            val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
+            cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec)
+            val encryptedMsg = cipher.doFinal(utf8message)
+
+            val encryptedMsgBech32 = Bech32.encode("pzap", Bech32.eight2five(encryptedMsg), Bech32.Encoding.Bech32)
+            val ivBech32 = Bech32.encode("iv", Bech32.eight2five(iv), Bech32.Encoding.Bech32)
+
+            return encryptedMsgBech32 + "_" + ivBech32
+        }
+
+        private fun decryptPrivateZapMessage(msg: String, privkey: ByteArray, pubkey: ByteArray): String {
+            var sharedSecret = Utils.getSharedSecret(privkey, pubkey)
+            if (sharedSecret.size != 16 && sharedSecret.size != 32) {
+                throw IllegalArgumentException("Invalid shared secret size")
+            }
+            val parts = msg.split("_")
+            if (parts.size != 2) {
+                throw IllegalArgumentException("Invalid message format")
+            }
+            val iv = parts[1].run { Bech32.decode(this).second }
+            val encryptedMsg = parts.first().run { Bech32.decode(this).second }
+            val encryptedBytes = Bech32.five2eight(encryptedMsg, 0)
+            val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
+            cipher.init(Cipher.DECRYPT_MODE, SecretKeySpec(sharedSecret, "AES"), IvParameterSpec(Bech32.five2eight(iv, 0)))
+
+            try {
+                val decryptedMsgBytes = cipher.doFinal(encryptedBytes)
+                return String(decryptedMsgBytes)
+            } catch (ex: BadPaddingException) {
+                throw IllegalArgumentException("Bad padding: ${ex.message}")
+            }
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/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

@@ -0,0 +1,112 @@
+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 com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.util.Date
+
+@Immutable
+class MuteListEvent(
+    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.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.hexToByteArray())
+
+            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
+    }
+
+    companion object {
+        const val kind = 10000
+
+        fun create(
+            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
+        ): MuteListEvent {
+            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 tags = mutableListOf<List<String>>()
+            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 MuteListEvent(id.toHexKey(), pubKey.toHexKey(), createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

@@ -0,0 +1,115 @@
+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
+
+const val POLL_OPTION = "poll_option"
+const val VALUE_MAXIMUM = "value_maximum"
+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,
+    createdAt: Long,
+    tags: List<List<String>>,
+    // ots: String?, TODO implement OTS: https://github.com/opentimestamps/java-opentimestamps
+    content: String,
+    sig: HexKey
+) : BaseTextNoteEvent(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun pollOptions() =
+        tags.filter { it.size > 2 && it[0] == POLL_OPTION }
+            .associate { it[1].toInt() to it[2] }
+
+    fun getTagInt(property: String): Int? {
+        val number = tags.firstOrNull() { it.size > 1 && it[0] == property }?.get(1)
+
+        return if (number.isNullOrBlank() || number == "null") {
+            null
+        } else {
+            number.toInt()
+        }
+    }
+
+    companion object {
+        const val kind = 6969
+
+        fun create(
+            msg: String,
+            replyTos: List<String>?,
+            mentions: List<String>?,
+            addresses: List<ATag>?,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000,
+            pollOptions: Map<Int, String>,
+            valueMaximum: Int?,
+            valueMinimum: Int?,
+            consensusThreshold: Int?,
+            closedAt: Int?,
+            zapReceiver: String?,
+            markAsSensitive: Boolean,
+            zapRaiserAmount: Long?
+        ): PollNoteEvent {
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = mutableListOf<List<String>>()
+            replyTos?.forEach {
+                tags.add(listOf("e", it))
+            }
+            mentions?.forEach {
+                tags.add(listOf("p", it))
+            }
+            addresses?.forEach {
+                tags.add(listOf("a", it.toTag()))
+            }
+            pollOptions.forEach { poll_op ->
+                tags.add(listOf(POLL_OPTION, poll_op.key.toString(), poll_op.value))
+            }
+            tags.add(listOf(VALUE_MAXIMUM, valueMaximum.toString()))
+            tags.add(listOf(VALUE_MINIMUM, valueMinimum.toString()))
+            tags.add(listOf(CONSENSUS_THRESHOLD, consensusThreshold.toString()))
+            tags.add(listOf(CLOSED_AT, closedAt.toString()))
+
+            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)
+            return PollNoteEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
+        }
+    }
+}
+
+/*
+{
+  "id": <32-bytes lowercase hex-encoded sha256 of the serialized event data>
+  "pubkey": <32-bytes lowercase hex-encoded public key of the event creator>,
+  "created_at": <unix timestamp in seconds>,
+  "kind": 6969,
+  "tags": [
+    ["e", <32-bytes hex of the id of the poll event>, <primary poll host relay URL>],
+    ["p", <32-bytes hex of the key>, <primary poll host relay URL>],
+    ["poll_option", "0", "poll option 0 description string"],
+    ["poll_option", "1", "poll option 1 description string"],
+    ["poll_option", "n", "poll option <n> description string"],
+    ["value_maximum", "maximum satoshi value for inclusion in tally"],
+    ["value_minimum", "minimum satoshi value for inclusion in tally"],
+    ["consensus_threshold", "required percentage to attain consensus <0..100>"],
+    ["closed_at", "unix timestamp in seconds"],
+  ],
+  "ots": <base64-encoded OTS file data>
+  "content": <primary poll description string>,
+  "sig": <64-bytes hex of the signature of the sha256 hash of the serialized event data, which is the same as the "id" field>
+}
+ */

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.firstOrNull() == "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.
@@ -29,7 +39,12 @@ class PrivateDmEvent(
      * Nip-18 messages should refer to other events by inline references in the content like
      * `[](e/c06f795e1234a9a1aecc731d768d4f3ca73e80031734767067c82d67ce82e506).
      */
-    fun replyTo() = tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
+    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 {
@@ -58,10 +73,13 @@ class PrivateDmEvent(
             msg: String,
             replyTos: List<String>? = null,
             mentions: List<String>? = null,
+            zapReceiver: String?,
             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,
@@ -79,6 +97,15 @@ class PrivateDmEvent(
             mentions?.forEach {
                 tags.add(listOf("p", it))
             }
+            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())