0.30.2

Custom Messages for Zaps

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]"
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Video and Screenshots**
+If applicable, add a video and/or screenshots to help explain your problem.
+
+**Device (please complete the following information):**
+ - Phone Brand/Model [e.g. Pixel 7 Pro]: 
+ - Android Version [e.g. 33]: 
+ - App Version [e.g. v0.20.3]: 
+
+**Bounty (in Bitcoin sats) offered for a solution**
+Incentivize developers to work on your issue. Describe clear milestones to claim payment.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[FEATURE]"
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Bounty (in Bitcoin sats) offered for the implementation**
+Incentivize developers to work on your feature. Describe clear milestones to claim payment. 
+
+**Additional context**
+Add any other context, video, or screenshots about the feature request here.

.github/workflows/build.yml

@@ -27,6 +27,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
+      - name: Linter (gradle)
+        run: ./gradlew ktlintCheck
+
       - name: Test (gradle)
         run: ./gradlew test --no-daemon
 

.github/workflows/create-release.yml

@@ -28,10 +28,19 @@ jobs:
       - name: Build AAB
         run: ./gradlew clean bundleRelease --stacktrace
 
-      - name: Sign AAB
+      - name: Sign AAB (Google Play)
         uses: r0adkll/sign-android-release@v1
         with:
-          releaseDirectory: app/build/outputs/bundle/release
+          releaseDirectory: app/build/outputs/bundle/playRelease
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.KEY_ALIAS }}
+          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+      - name: Sign AAB (F-Droid)
+        uses: r0adkll/sign-android-release@v1
+        with:
+          releaseDirectory: app/build/outputs/bundle/fdroidRelease
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.KEY_ALIAS }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
@@ -40,10 +49,19 @@ jobs:
       - name: Build APK
         run: ./gradlew assembleRelease --stacktrace --no-daemon
 
-      - name: Sign APK
+      - name: Sign APK (Google Play)
         uses: r0adkll/sign-android-release@v1
         with:
-          releaseDirectory: app/build/outputs/apk/release
+          releaseDirectory: app/build/outputs/apk/play/release
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.KEY_ALIAS }}
+          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+      - name: Sign APK (F-Droid)
+        uses: r0adkll/sign-android-release@v1
+        with:
+          releaseDirectory: app/build/outputs/apk/fdroid/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.KEY_ALIAS }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
@@ -60,24 +78,96 @@ jobs:
           draft: false
           prerelease: false
 
-      - name: Upload APK Asset
-        id: upload-release-asset-apk
+      # Google Play APK
+      - name: Upload Play APK Universal Asset
+        id: upload-release-asset-play-universal-apk
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} 
-          asset_path: app/build/outputs/apk/release/app-release-unsigned-signed.apk
-          asset_name: app-release-${{ github.ref_name }}.apk
+          asset_path: app/build/outputs/apk/play/release/app-play-universal-release-unsigned-signed.apk
+          asset_name: amethyst-googleplay-universal-${{ github.ref_name }}.apk
           asset_content_type: application/zip
 
-      - name: Upload AAB Asset
-        id: upload-release-asset-aab
+      - name: Upload Play APK x86 Asset
+        id: upload-release-asset-play-x86-apk
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/bundle/release/app-release.aab
-          asset_name: app-release-${{ github.ref_name }}.aab
+          asset_path: app/build/outputs/apk/play/release/app-play-x86-release-unsigned-signed.apk
+          asset_name: amethyst-googleplay-x86-${{ github.ref_name }}.apk
           asset_content_type: application/zip
+
+      - name: Upload Play APK x86_64 Asset
+        id: upload-release-asset-play-x86-64-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/apk/play/release/app-play-x86_64-release-unsigned-signed.apk
+          asset_name: amethyst-googleplay-x86_64-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
+      # F-Droid APK
+      - name: Upload F-Droid APK Universal Asset
+        id: upload-release-asset-fdroid-universal-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-universal-release-unsigned-signed.apk
+          asset_name: amethyst-fdroid-universal-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
+      - name: Upload F-Droid APK x86 Asset
+        id: upload-release-asset-fdroid-x86-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-x86-release-unsigned-signed.apk
+          asset_name: amethyst-fdroid-x86-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
+      - name: Upload F-Droid APK x86_64 Asset
+        id: upload-release-asset-fdroid-x86-64-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-x86_64-release-unsigned-signed.apk
+          asset_name: amethyst-fdroid-x86_64-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
+
+
+      # Google Play AAB
+      - name: Upload Google Play AAB Asset
+        id: upload-release-asset-play-aab
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/bundle/playRelease/app-play-release.aab
+          asset_name: amethyst-googleplay-${{ github.ref_name }}.aab
+          asset_content_type: application/zip
+
+      # FDroid AAB
+      - name: Upload F-Droid AAB Asset
+        id: upload-release-asset-fdroid-aab
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/bundle/fdroidRelease/app-fdroid-release.aab
+          asset_name: amethyst-fdroid-${{ github.ref_name }}.aab
+          asset_content_type: application/zip

.gitignore

@@ -1,5 +1,3 @@
-*.iml
-.gradle
 /local.properties
 /.idea/caches
 /.idea/libraries
@@ -7,12 +5,11 @@
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+/.idea/androidTestResultsUserPreferences.xml
 .DS_Store
 /build
 /captures
-.externalNativeBuild
 .cxx
-local.properties
 
 
 # Built application files
@@ -35,6 +32,7 @@ out/
 # release/
 
 # Gradle files
+.gradle
 .gradle/
 build/
 
@@ -47,25 +45,51 @@ proguard/
 # Log Files
 *.log
 
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
+# Android Studio
+/*/build/
+/*/local.properties
+/*/out
+/*/*/build
+/*/*/production
 captures/
+.navigation/
+*.ipr
+*~
+*.swp
 
 # IntelliJ
 *.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/assetWizardSettings.xml
-.idea/dictionaries
-.idea/libraries
-# Android Studio 3 in .gitignore file.
-.idea/caches
-.idea/modules.xml
-# Comment next line if keeping position of elements in Navigation Editor is relevant for you
-.idea/navEditor.xml
+*.iws
+/out/
+deploymentTargetDropdown.xml
+render.experimental.xml
+
+# User-specific configurations
+.idea/**/caches/
+.idea/**/libraries/
+.idea/**/shelf/
+.idea/**/codeStyles
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/.name
+.idea/**/compiler.xml
+.idea/**/copyright/profiles_settings.xml
+.idea/**/encodings.xml
+.idea/**/misc.xml
+.idea/**/modules.xml
+.idea/**/scopes/scope_settings.xml
+.idea/**/dictionaries
+.idea/**/vcs.xml
+.idea/**/jsLibraryMappings.xml
+.idea/**/datasources.xml
+.idea/**/dataSources.ids
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/assetWizardSettings.xml
+.idea/**/gradle.xml
+.idea/**/jarRepositories.xml
+.idea/**/navEditor.xml
 
 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.

.idea/.name

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

.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>

.idea/inspectionProfiles/Project_Default.xml

@@ -5,6 +5,9 @@
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
+    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />

.idea/kotlinc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.8.10" />
+  </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="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

PRIVACY.md

@@ -0,0 +1,13 @@
+# Amethyst Privacy Policy & Terms of Use
+
+Effective as of Jan 20, 2023.
+
+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. 
+
+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.
+
+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.
+
+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.
+
+If you have any questions about Amethyst or this privacy policy, you can send a message to amethyst@vitorpamplona.com

README.md

@@ -6,18 +6,50 @@ Amethyst brings the best social network to your Android phone. Just insert your
 
 # Current Features
 
-- [x] Account Management
+- [x] Event Builders / WebSocket Subscriptions (NIP-01, NIP-15)
 - [x] Home Feed
 - [x] Notifications Feed
 - [x] Global Feed
-- [x] Reactions (like, boost, reply)
-- [x] Image Preview
-- [x] Url Preview
+- [x] Reactions (likes NIP-25, boost, reply)
+- [x] Image/Video/Url/LnInvoice Previews
 - [x] View Threads
-- [ ] Private Messages
-- [ ] Communities
-- [ ] Profile Edit
-- [ ] Relay Edit
+- [x] Private Messages (NIP-04)
+- [x] User Profiles (edit/follow/unfollow - NIP-02)
+- [x] Public Chats (NIP-28)
+- [x] Bech Encoding support (NIP-19)
+- [x] Notification Dots
+- [x] Reporting and Hide User capability (NIP-56)
+- [x] Automatic Translations
+- [x] Relay Sets (home, dms, public chats, global)
+- [x] User/Note Tagging (NIP-08, NIP-10)
+- [x] Lightning Tips
+- [x] Zaps (NIP-57)
+- [x] URI Support (NIP-21)
+- [x] Event Deletion (NIP-09: like, boost, text notes and reports)
+- [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)
+- [x] Hashtags
+- [ ] Local Database 
+- [ ] View Individual Reactions (Like, Boost, Zaps, Reports) per Post
+- [ ] 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)
+- [ ] Message Sent feedback (NIP-20)
 
 # Development Overview
 
@@ -66,6 +98,12 @@ Build the app:
 ./gradlew connectedAndroidTest
 ```
 
+## Linting
+```bash
+./gradlew ktlintCheck
+./gradlew ktlintFormat
+```
+
 ## Installing on device
 ```bash
 ./gradlew installDebug
@@ -90,6 +128,24 @@ openssl base64 < <my-release-key.keystore> | tr -d '\n' | tee some_signing_key.j
 7. Add your CHANGE LOG to the description of the new release
 8. Download the `aab` file and upload it to the` PlayStore.
 
+# Privacy on Relays & nostr
+Your internet protocol (IP) address is exposed to the relays you connect to. If you want to improve your privacy, consider utilizing a service that masks your IP address (e.g. a VPN) from trackers online. 
+
+The relay also learns which public keys you are requesting, meaning your public key will be tied to your IP address.
+
+Relays have all your data in raw text. They know your IP, your name, your location (guessed from IP), your pub key, all your contacts, and other relays, and can read every action you do (post, like, boost, quote, report, etc) with the exception of Private Zaps and Private DMs.
+
+# DM Privacy #
+While the content of direct messages (DMs) is only visible to you, and your DM nostr counterparty, everyone can see that and when you and your counterparty are DM-ing each other.
+
+# Visibility & Permanence of Your Content on nostr
+## Information Visibility ##
+Content that you share can be shared to other relays. 
+Information that you share is publicly visible to anyone reading from relays that have your information. Your information may also be visible to nostr users who do not share relays with you.
+
+## Information 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. 
+
 # Contributing
 
 [Issues](https://github.com/vitorpamplona/amethyst/issues) and [pull requests](https://github.com/vitorpamplona/amethyst/pulls) are very welcome.
@@ -114,4 +170,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

app/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'org.jlleitschuh.gradle.ktlint' version "11.3.1"
 }
 
 android {
@@ -11,8 +12,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 2
-        versionName "0.2"
+        versionCode 109
+        versionName "0.30.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -22,23 +23,56 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            //minifyEnabled true
+            //proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            resValue "string", "app_name", "@string/app_name_release"
+        }
+        debug {
+            applicationIdSuffix '.debug'
+            versionNameSuffix '-DEBUG'
+            resValue "string", "app_name", "@string/app_name_debug"
         }
     }
+
+    flavorDimensions "channel"
+
+    productFlavors {
+        play {
+            getIsDefault().set(true)
+            dimension "channel"
+        }
+
+        fdroid {
+            dimension "channel"
+        }
+    }
+
+    splits {
+        abi {
+            enable true
+            reset()
+            include "x86", "x86_64"
+            universalApk true
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
+
     kotlinOptions {
         jvmTarget = '11'
     }
+
     buildFeatures {
         compose true
     }
+
     composeOptions {
-        kotlinCompilerExtensionVersion '1.3.2'
+        kotlinCompilerExtensionVersion "1.4.3"
     }
+
     packagingOptions {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
@@ -48,28 +82,35 @@ android {
 
 dependencies {
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
-    implementation 'androidx.activity:activity-compose:1.6.1'
+    implementation 'androidx.activity:activity-compose:1.7.0-beta01'
     implementation "androidx.compose.ui:ui:$compose_ui_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
-    implementation 'androidx.compose.material:material:1.3.1'
+
+    // Needs this to open gallery / image upload
+    implementation "androidx.fragment:fragment-ktx:$fragment_version"
 
     // Navigation
     implementation("androidx.navigation:navigation-compose:$nav_version")
-    implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.6.0-alpha03'
-    implementation 'androidx.compose.runtime:runtime-livedata:1.4.0-alpha03'
 
-    // Input
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1'
+    // Observe Live data as State
+    implementation "androidx.compose.runtime:runtime-livedata:$compose_ui_version"
 
-    // Swipe Refresh
-    implementation 'com.google.accompanist:accompanist-swiperefresh:0.24.13-rc'
+    implementation "androidx.compose.material:material:$compose_ui_version"
+    implementation "androidx.compose.material:material-icons-extended:$compose_ui_version"
 
-    // Load images from the web.
-    implementation "io.coil-kt:coil-compose:2.2.2"
+    // Lifecycle
+    implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
+
+    implementation "net.engawapg.lib:zoomable:1.4.0"
+
+    // Biometrics
+    implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"
 
     // Bitcoin secp256k1 bindings to Android
-    implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.7.0'
+    implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.7.1'
 
     // Nostr Base Protocol
     implementation('com.github.vitorpamplona.NostrPostr:nostrpostrlib:master-SNAPSHOT') {
@@ -78,24 +119,100 @@ dependencies {
         exclude module: 'guava-testlib'
     }
 
-    implementation 'com.squareup.retrofit2:converter-gson:2.8.1'
     // Websockets API
-    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'
 
-    // Json Serialization
-    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.14.1'
-
-    // Rendering clickable text
-    implementation "com.google.accompanist:accompanist-flowlayout:0.28.0"
+    // 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.squareup.retrofit2:converter-gson:2.9.0'
 
     // link preview
     implementation 'tw.com.oneup.www:Baha-UrlPreview:1.0.1'
-    implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha03'
+
+    // Encrypted Key Storage
+    implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha05'
+
+    // view videos
+    implementation 'com.google.android.exoplayer:exoplayer:2.18.4'
+
+    // Load images from the web.
+    implementation "io.coil-kt:coil-compose:2.2.2"
+    // view gifs
+    implementation "io.coil-kt:coil-gif:2.2.2"
+    // view svgs
+    implementation("io.coil-kt:coil-svg:2.2.2")
+
+    // 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"
+
+    // For QR generation
+    implementation 'com.google.zxing:core:3.5.1'
+    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"
+
+    // Local model for language identification
+    playImplementation 'com.google.mlkit:language-id:17.0.4'
+
+    // Google services model the translate text
+    playImplementation 'com.google.mlkit:translate:17.0.1'
+
+    // Automatic memory leak detection
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
 
     testImplementation 'junit:junit:4.13.2'
+    testImplementation "io.mockk:mockk:1.13.4"
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version"
     debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version"
     debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version"
-}
+}
+
+ktlint {
+    disabledRules.set(["no-wildcard-imports"])
+}
+
+// https://gitlab.com/fdroid/wiki/-/wikis/HOWTO:-diff-&-fix-APKs-for-Reproducible-Builds#differing-assetsdexoptbaselineprofm-easy-to-fix
+// NB: Android Studio can't find the imports; this does not affect the
+// actual build since Gradle can find them just fine.
+import com.android.tools.profgen.ArtProfileKt
+import com.android.tools.profgen.ArtProfileSerializer
+import com.android.tools.profgen.DexFile
+
+project.afterEvaluate {
+    tasks.each { task ->
+        if (task.name.startsWith("compile") && task.name.endsWith("ReleaseArtProfile")) {
+            task.doLast {
+                outputs.files.each { file ->
+                    if (file.name.endsWith(".profm")) {
+                        println("Sorting ${file} ...")
+                        def version = ArtProfileSerializer.valueOf("METADATA_0_0_2")
+                        def profile = ArtProfileKt.ArtProfile(file)
+                        def keys = new ArrayList(profile.profileData.keySet())
+                        def sortedData = new LinkedHashMap()
+                        Collections.sort keys, new DexFile.Companion()
+                        keys.each { key -> sortedData[key] = profile.profileData[key] }
+                        new FileOutputStream(file).with {
+                            write(version.magicBytes$profgen)
+                            write(version.versionBytes$profgen)
+                            version.write$profgen(it, sortedData, "")
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

app/proguard-rules.pro

@@ -18,4 +18,20 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+# For the Secp256k1 library
+-keepattributes InnerClasses
+
+-keep class fr.acinq.secp256k1.jni.** { *; }
+# For the NostrPostr library
+-keep class nostr.postr.** { *; }
+-keep class com.vitorpamplona.amethyst.service.model.** { *; }
+# Json parsing
+-keep class com.google.gson.reflect.** { *; }
+-keep class * extends com.google.gson.reflect.TypeToken
+-keep public class * implements java.lang.reflect.Type
+
+-keep class com.vitorpamplona.amethyst.lnurl.** { *; }
+-keep class com.vitorpamplona.amethyst.model.** { *; }
+-keep class com.vitorpamplona.amethyst.service.** { *; }
+-keep class com.vitorpamplona.amethyst.ui.** { *; }

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

@@ -0,0 +1,23 @@
+package com.vitorpamplona.amethyst
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.gson.JsonElement
+import com.vitorpamplona.amethyst.service.model.Event
+import com.vitorpamplona.amethyst.service.relays.Client
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class EventSigCheck {
+
+    val payload1 = "[\"EVENT\",\"40b9\",{\"id\":\"48a72b485d38338627ec9d427583551f9af4f016c739b8ec0d6313540a8b12cf\",\"kind\":1,\"pubkey\":\"3d842afecd5e293f28b6627933704a3fb8ce153aa91d790ab11f6a752d44a42d\",\"created_at\":1677940007,\"content\":\"I got asked about follower count again today. Why does my follower count go down when I delete public relays (in our list) and replace them with filter.nostr.wine? \\n\\nI’ll give you one final explanation to rule them all. First, let’s go over how clients calculate your follower count.\\n\\n1. Your client sends a request to all your connected relays asking for accounts who follow you\\n2. Relays answer back with the events requested\\n3. The client aggregates the event total and displays it\\n\\nEach relay has a set limit on how many stored events it will return per request. For some relays it’s 500, others 1000, some as high as 5000. Let’s say for simplicity that all your public relays use 500 as their limit. If you ask 10 relays for your followers the max possible answer you can get is 5000. That won’t change if you have 20,000 followers or 100,000. You may get back a “different” 5000 each time, but you’ll still cap out at 5000 because that is the most events your client will receive.\u2028\u2028Our limit on filter.nostr.wine is 2000 events. If you replace 10 public relays with only filter.nostr.wine, the MOST followers you will ever get back from our filter relay is 2000. That doesn’t mean you only have 2000 followers or that your reach is reduced in any way.\\n\\nAs long as you are writing to and reading from the same public relays, neither your reach nor any content was lost. That concludes my TED talk. I hope you all have a fantastic day and weekend.\",\"tags\":[],\"sig\":\"dcaf8ab98bb9179017b35bd814092850d1062b26c263dff89fb1ae8c019a324139d1729012d9d05ff0a517f76b1117d869b2cc7d36bea8aa5f4b94c5e2548aa8\"}]"
+
+    @Test
+    fun testUnicode2028and2029ShouldNotBeEscaped() {
+        val msg = Event.gson.fromJson(payload1, JsonElement::class.java).asJsonArray
+        val event = Event.fromJson(msg[2], Client.lenient)
+
+        // Should pass
+        event.checkSignature()
+    }
+}

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

@@ -1,24 +0,0 @@
-package com.vitorpamplona.amethyst
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-  @Test
-  fun useAppContext() {
-    // Context of the app under test.
-    val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-    assertEquals("com.vitorpamplona.amethyst", appContext.packageName)
-  }
-}

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

@@ -0,0 +1,99 @@
+package com.vitorpamplona.amethyst
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.AnnotatedString
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.UserMetadata
+import com.vitorpamplona.amethyst.model.decodePublicKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.ui.actions.buildAnnotatedStringWithUrlHighlighting
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class UrlUserTagTransformationTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.vitorpamplona.amethyst", appContext.packageName.removeSuffix(".debug"))
+    }
+
+    @Test
+    fun transformationText() {
+        val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z").toHexKey())
+        user.info = UserMetadata()
+        user.info?.displayName = "Vitor Pamplona"
+
+        val transformedText = buildAnnotatedStringWithUrlHighlighting(
+            AnnotatedString("New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"),
+            Color.Red
+        )
+
+        assertEquals("New Hey @Vitor Pamplona", transformedText.text.text)
+
+        assertEquals(0, transformedText.offsetMapping.originalToTransformed(0)) // Before N
+        assertEquals(4, transformedText.offsetMapping.originalToTransformed(4)) // Before H
+        assertEquals(8, transformedText.offsetMapping.originalToTransformed(8)) // Before @
+        assertEquals(8, transformedText.offsetMapping.originalToTransformed(9)) // Before n
+        assertEquals(8, transformedText.offsetMapping.originalToTransformed(10)) // Before p
+        assertEquals(9, transformedText.offsetMapping.originalToTransformed(11)) // Before u
+        assertEquals(9, transformedText.offsetMapping.originalToTransformed(12)) // Before b
+        assertEquals(9, transformedText.offsetMapping.originalToTransformed(13)) // Before 1
+
+        assertEquals(23, transformedText.offsetMapping.originalToTransformed(71))
+        assertEquals(23, transformedText.offsetMapping.originalToTransformed(72))
+
+        assertEquals(0, transformedText.offsetMapping.transformedToOriginal(0))
+        assertEquals(4, transformedText.offsetMapping.transformedToOriginal(4))
+        assertEquals(8, transformedText.offsetMapping.transformedToOriginal(8))
+        assertEquals(12, transformedText.offsetMapping.transformedToOriginal(9))
+
+        assertEquals(72, transformedText.offsetMapping.transformedToOriginal(23))
+        assertEquals(73, transformedText.offsetMapping.transformedToOriginal(24))
+    }
+
+    @Test
+    fun transformationTextTwoKeys() {
+        val user = LocalCache.getOrCreateUser(decodePublicKey("npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z").toHexKey())
+        user.info = UserMetadata()
+        user.info?.displayName = "Vitor Pamplona"
+
+        val transformedText = buildAnnotatedStringWithUrlHighlighting(
+            AnnotatedString("New Hey @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z and @npub1gcxzte5zlkncx26j68ez60fzkvtkm9e0vrwdcvsjakxf9mu9qewqlfnj5z"),
+            Color.Red
+        )
+
+        assertEquals("New Hey @Vitor Pamplona and @Vitor Pamplona", transformedText.text.text)
+
+        assertEquals(9, transformedText.offsetMapping.originalToTransformed(11))
+        assertEquals(9, transformedText.offsetMapping.originalToTransformed(12))
+        assertEquals(9, transformedText.offsetMapping.originalToTransformed(13))
+
+        assertEquals(23, transformedText.offsetMapping.originalToTransformed(70)) // Before 5
+        assertEquals(23, transformedText.offsetMapping.originalToTransformed(71)) // Before z
+        assertEquals(23, transformedText.offsetMapping.originalToTransformed(72)) // Before <space>
+        assertEquals(24, transformedText.offsetMapping.originalToTransformed(73)) // Before a
+        assertEquals(25, transformedText.offsetMapping.originalToTransformed(74)) // Before n
+        assertEquals(26, transformedText.offsetMapping.originalToTransformed(75)) // Before d
+        assertEquals(27, transformedText.offsetMapping.originalToTransformed(76)) // Before <space>
+        assertEquals(28, transformedText.offsetMapping.originalToTransformed(77)) // Before @
+        assertEquals(28, transformedText.offsetMapping.originalToTransformed(78)) // Before n
+
+        assertEquals(68, transformedText.offsetMapping.transformedToOriginal(22)) // Before a
+        assertEquals(72, transformedText.offsetMapping.transformedToOriginal(23)) // Before <space>
+        assertEquals(73, transformedText.offsetMapping.transformedToOriginal(24)) // Before a
+        assertEquals(74, transformedText.offsetMapping.transformedToOriginal(25)) // Before n
+        assertEquals(75, transformedText.offsetMapping.transformedToOriginal(26)) // Before d
+        assertEquals(76, transformedText.offsetMapping.transformedToOriginal(27)) // Before <space>
+        assertEquals(77, transformedText.offsetMapping.transformedToOriginal(28)) // Before @
+    }
+}

app/src/androidTest/res/values/strings.xml

@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name_release">Amethyst</string>
+    <string name="app_name_debug">Amethyst Debug</string>
+</resources>

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

@@ -0,0 +1,89 @@
+package com.vitorpamplona.amethyst
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.android.gms.tasks.Tasks
+import com.vitorpamplona.amethyst.service.lang.LanguageTranslatorService
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class TranslationsTest {
+
+    fun translatePT(text: String, translateTo: String): String? {
+        val task = LanguageTranslatorService.autoTranslate(text, emptySet(), translateTo)
+        return Tasks.await(task).result
+    }
+
+    fun assertTranslate(expected: String, input: String, translateTo: String) {
+        assertEquals(null, expected, translatePT(input, translateTo))
+    }
+
+    fun assertTranslateContains(expected: String, input: String, translateTo: String) {
+        val translated = translatePT(input, translateTo)!!
+        assertTrue("'$translated' does not contain '$expected'", translated.contains(expected))
+    }
+
+    @Test
+    fun testTranslation() {
+        assertTranslate("Olá mundo", "Hello World", "pt")
+    }
+
+    @Test
+    fun testTranslationName() {
+        assertTranslate("Olá Vitor, como você está?", "Hello Vitor, how are you doing?", "pt")
+    }
+
+    @Test
+    fun testTranslationTag() {
+        assertTranslate("Você já viu isso, #[0]", "Have you seen this, #[0]", "pt")
+    }
+
+    @Test
+    fun testTranslationUrl() {
+        assertTranslateContains("https://t.me/mygroup", "Have you seen this https://t.me/mygroup", "pt")
+        assertTranslateContains("http://bananas.com", "Have you seen this http://bananas.com", "pt")
+        assertTranslateContains("http://bananas.com/myimage.jpg", "Have you seen this http://bananas.com/myimage.jpg", "pt")
+        assertTranslateContains("http://bananas.com?search=true&image=myimage.jpg", "Have you seen this http://bananas.com?search=true&image=myimage.jpg", "pt")
+        assertTranslate("https://i.imgur.com/EZ3QPsw.jpg", "https://i.imgur.com/EZ3QPsw.jpg", "pt")
+        assertTranslate("https://HaveYouSeenThis.com", "https://HaveYouSeenThis.com", "pt")
+        assertTranslate("https://haveyouseenthis.com", "https://haveyouseenthis.com", "pt")
+        assertTranslate("https://i.imgur.com/asdEZ3QPsw.jpg", "https://i.imgur.com/asdEZ3QPsw.jpg", "pt")
+        assertTranslateContains("https://i.imgur.com/asdEZ3QPswadfj2389rioasdjf9834riofaj9834aKLL.jpg", "Hi there! \n How are you doing? \n https://i.imgur.com/asdEZ3QPswadfj2389rioasdjf9834riofaj9834aKLL.jpg", "pt")
+    }
+
+    @Test
+    fun testChineseWithUrlDetector() {
+        assertTranslate("I entered your home page is very carton, perhaps your attention or other data is too much, and the homepage of others is not so carton. From aMethyst client", "我进入你的主页很卡顿，也许是你的关注人数或者其他数据太多了，其他人主页没有这么卡顿。来自amethyst客户端", "en")
+    }
+
+    @Test
+    fun testTranslationEmail() {
+        assertTranslateContains("vitor@amethyst.social", "Have you seen this vitor@amethyst.social", "pt")
+    }
+
+    @Test
+    fun testTranslationLnInvoice() {
+        assertTranslateContains(
+            "lnbc12u1p3lvjeupp5a5ecgp45k6pa8tu7rnkgzfuwdy3l5ylv3k5tdzrg4cr8rj2f364sdq5g9kxy7fqd9h8vmmfvdjscqzpgxqyz5vqsp5zuzyetf33aphetf0e80w7tztw6dfsjs4lmvya4cyk8umfsx00qts9qyyssqke9hphcr36zvcav8wr502g0mhfhxpy8m9tt36zttg8vldm2qxw039ulccr8nwy3hjg2sw5vk65e99lwuhrhw0nuya2u57qszltvx7egp74jydn",
+            "Have you seen this: lnbc12u1p3lvjeupp5a5ecgp45k6pa8tu7rnkgzfuwdy3l5ylv3k5tdzrg4cr8rj2f364sdq5g9kxy7fqd9h8vmmfvdjscqzpgxqyz5vqsp5zuzyetf33aphetf0e80w7tztw6dfsjs4lmvya4cyk8umfsx00qts9qyyssqke9hphcr36zvcav8wr502g0mhfhxpy8m9tt36zttg8vldm2qxw039ulccr8nwy3hjg2sw5vk65e99lwuhrhw0nuya2u57qszltvx7egp74jydn I think I have to pay",
+            "pt"
+        )
+
+        assertTranslateContains(
+            "lnbc10u1p3l0wg0pp5y5y3vxt3429m28uuq56uqhwxadftn67yaarq06h3y9nqapz72n6sdqqxqyjw5q9q7sqqqqqqqqqqqqqqqqqqqqqqqqq9qsqsp5y2tazp42xde3c0tdsz30zqcekrt0lzrneszdtagy2qn7vs0d3p5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll7jdvcln4lhw5qqqqlgqqqqqeqqjqdau9jzseecmvmh03h88xyf5f980xx45fmn0cej654v5jr79ye36pww90jwdda38damlmgt54v8rn6q9kywtw057rh4v3wwrmn8fajagqnssr7v",
+            "Test lnbc10u1p3l0wg0pp5y5y3vxt3429m28uuq56uqhwxadftn67yaarq06h3y9nqapz72n6sdqqxqyjw5q9q7sqqqqqqqqqqqqqqqqqqqqqqqqq9qsqsp5y2tazp42xde3c0tdsz30zqcekrt0lzrneszdtagy2qn7vs0d3p5qrzjqwryaup9lh50kkranzgcdnn2fgvx390wgj5jd07rwr3vxeje0glcll7jdvcln4lhw5qqqqlgqqqqqeqqjqdau9jzseecmvmh03h88xyf5f980xx45fmn0cej654v5jr79ye36pww90jwdda38damlmgt54v8rn6q9kywtw057rh4v3wwrmn8fajagqnssr7v",
+            "pt"
+        )
+    }
+
+    @Test
+    fun testNostrEvents() {
+        assertTranslateContains(
+            "nostr:nevent1qqs0tsw8hjacs4fppgdg7f5yhgwwfkyua4xcs3re9wwkpkk2qeu6mhql22rcy",
+            "sure, nostr:nevent1qqs0tsw8hjacs4fppgdg7f5yhgwwfkyua4xcs3re9wwkpkk2qeu6mhql22rcy",
+            "en"
+        )
+    }
+}

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

@@ -0,0 +1,26 @@
+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
+)

app/src/main/AndroidManifest.xml

@@ -3,33 +3,55 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.CAMERA" />
+
+    <!-- Used for SDK < 29 -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        tools:ignore="ScopedStorage" />
 
     <application
-        android:allowBackup="true"
+        android:allowBackup="false"
+        android:name=".Amethyst"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@drawable/amethyst_logo"
+        android:icon="@drawable/amethyst"
         android:label="@string/app_name"
-        android:roundIcon="@drawable/amethyst_logo"
         android:enableOnBackInvokedCallback="true"
         android:supportsRtl="true"
         android:theme="@style/Theme.Amethyst"
-        tools:targetApi="31">
+        android:largeHeap="true"
+        android:usesCleartextTraffic="true"
+        android:hardwareAccelerated="true"
+        tools:targetApi="33">
         <activity
             android:name=".ui.MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
+            android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.Amethyst">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
+            <intent-filter android:label="Amethyst">
+                <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </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="nostr" />
+            </intent-filter>
+
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
+
+        <activity
+            android:name="com.journeyapps.barcodescanner.CaptureActivity"
+            android:screenOrientation="fullSensor"
+            tools:replace="screenOrientation" />
     </application>
 
 </manifest>

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

@@ -0,0 +1,15 @@
+package com.vitorpamplona.amethyst
+
+import android.app.Application
+
+class Amethyst : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        instance = this
+    }
+
+    companion object {
+        lateinit var instance: Amethyst
+            private set
+    }
+}

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

@@ -0,0 +1,29 @@
+package com.vitorpamplona.amethyst
+
+import androidx.security.crypto.EncryptedSharedPreferences
+import androidx.security.crypto.MasterKey
+
+object EncryptedStorage {
+    private const val PREFERENCES_NAME = "secret_keeper"
+
+    fun prefsFileName(npub: String? = null): String {
+        return if (npub == null) PREFERENCES_NAME else "${PREFERENCES_NAME}_$npub"
+    }
+
+    fun preferences(npub: String? = null): EncryptedSharedPreferences {
+        val context = Amethyst.instance
+        val masterKey: MasterKey = MasterKey.Builder(context, MasterKey.DEFAULT_MASTER_KEY_ALIAS)
+            .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
+            .build()
+
+        val preferencesName = prefsFileName(npub)
+
+        return EncryptedSharedPreferences.create(
+            context,
+            preferencesName,
+            masterKey,
+            EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+            EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+        ) as EncryptedSharedPreferences
+    }
+}

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

@@ -1,22 +0,0 @@
-package com.vitorpamplona.amethyst
-
-import android.content.Context
-import androidx.security.crypto.EncryptedSharedPreferences
-import androidx.security.crypto.MasterKeys
-
-class KeyStorage {
-
-  fun encryptedPreferences(context: Context): EncryptedSharedPreferences {
-    val secretKey: String = MasterKeys.getOrCreate(MasterKeys.AES256_GCM_SPEC);
-    val preferencesName = "secret_keeper"
-
-    return EncryptedSharedPreferences.create(
-      preferencesName,
-      secretKey,
-      context,
-      EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
-      EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
-    ) as EncryptedSharedPreferences
-  }
-
-}

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

@@ -0,0 +1,319 @@
+package com.vitorpamplona.amethyst
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.SharedPreferences
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.RelaySetupInfo
+import com.vitorpamplona.amethyst.model.toByteArray
+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.ui.note.Nip47URI
+import fr.acinq.secp256k1.Hex
+import nostr.postr.Persona
+import nostr.postr.toHex
+import nostr.postr.toNpub
+import java.io.File
+import java.util.Locale
+
+// Release mode (!BuildConfig.DEBUG) always uses encrypted preferences
+// To use plaintext SharedPreferences for debugging, set this to true
+// It will only apply in Debug builds
+private const val DEBUG_PLAINTEXT_PREFERENCES = false
+private const val DEBUG_PREFERENCES_NAME = "debug_prefs"
+
+data class AccountInfo(
+    val npub: String,
+    val hasPrivKey: Boolean,
+    val current: Boolean,
+    val displayName: String?,
+    val profilePicture: String?
+)
+
+private object PrefKeys {
+    const val CURRENT_ACCOUNT = "currently_logged_in_account"
+    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"
+    const val DONT_TRANSLATE_FROM = "dontTranslateFrom"
+    const val LANGUAGE_PREFS = "languagePreferences"
+    const val TRANSLATE_TO = "translateTo"
+    const val ZAP_AMOUNTS = "zapAmounts"
+    const val ZAP_PAYMENT_REQUEST_SERVER = "zapPaymentServer"
+    const val LATEST_CONTACT_LIST = "latestContactList"
+    const val HIDE_DELETE_REQUEST_DIALOG = "hide_delete_request_dialog"
+    const val HIDE_BLOCK_ALERT_DIALOG = "hide_block_alert_dialog"
+    val LAST_READ: (String) -> String = { route -> "last_read_route_$route" }
+}
+
+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 {
+                putString(PrefKeys.CURRENT_ACCOUNT, npub)
+            }.apply()
+        }
+
+    private val savedAccounts: List<String>
+        get() = encryptedPreferences()
+            .getString(PrefKeys.SAVED_ACCOUNTS, null)?.split(comma) ?: listOf()
+
+    private val prefsDirPath: String
+        get() = "${Amethyst.instance.filesDir.parent}/shared_prefs/"
+
+    private fun addAccount(npub: String) {
+        val accounts = savedAccounts.toMutableList()
+        if (npub !in accounts) {
+            accounts.add(npub)
+        }
+        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
+        addAccount(npub)
+    }
+
+    fun switchToAccount(npub: String) {
+        currentAccount = npub
+    }
+
+    /**
+     * Removes the account from the app level shared preferences
+     */
+    private fun removeAccount(npub: String) {
+        val accounts = savedAccounts.toMutableList()
+        if (accounts.remove(npub)) {
+            val prefs = encryptedPreferences()
+            prefs.edit().apply {
+                putString(PrefKeys.SAVED_ACCOUNTS, accounts.joinToString(comma).ifBlank { null })
+            }.apply()
+        }
+    }
+
+    /**
+     * Deletes the npub-specific shared preference file
+     */
+    private fun deleteUserPreferenceFile(npub: String) {
+        val prefsDir = File(prefsDirPath)
+        prefsDir.list()?.forEach {
+            if (it.contains(npub)) {
+                File(prefsDir, it).delete()
+            }
+        }
+    }
+
+    private fun encryptedPreferences(npub: String? = null): SharedPreferences {
+        return if (BuildConfig.DEBUG && DEBUG_PLAINTEXT_PREFERENCES) {
+            val preferenceFile = if (npub == null) DEBUG_PREFERENCES_NAME else "${DEBUG_PREFERENCES_NAME}_$npub"
+            Amethyst.instance.getSharedPreferences(preferenceFile, Context.MODE_PRIVATE)
+        } else {
+            return EncryptedStorage.preferences(npub)
+        }
+    }
+
+    /**
+     * Clears the preferences for a given npub, deletes the preferences xml file,
+     * and switches the user to the first account in the list if it exists
+     *
+     * We need to use `commit()` to write changes to disk and release the file
+     * lock so that it can be deleted. If we use `apply()` there is a race
+     * condition and the file will probably not be deleted
+     */
+    @SuppressLint("ApplySharedPref")
+    fun updatePrefsForLogout(npub: String) {
+        val userPrefs = encryptedPreferences(npub)
+        userPrefs.edit().clear().commit()
+        removeAccount(npub)
+        deleteUserPreferenceFile(npub)
+
+        if (savedAccounts.isEmpty()) {
+            val appPrefs = encryptedPreferences()
+            appPrefs.edit().clear().apply()
+        } else if (currentAccount == npub) {
+            currentAccount = savedAccounts.elementAt(0)
+        }
+    }
+
+    fun updatePrefsForLogin(account: Account) {
+        setCurrentAccount(account)
+        saveToEncryptedStorage(account)
+    }
+
+    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)
+            )
+        }
+    }
+
+    fun saveToEncryptedStorage(account: Account) {
+        val prefs = encryptedPreferences(account.userProfile().pubkeyNpub())
+        prefs.edit().apply {
+            account.loggedIn.privKey?.let { putString(PrefKeys.NOSTR_PRIVKEY, it.toHex()) }
+            account.loggedIn.pubKey.let { putString(PrefKeys.NOSTR_PUBKEY, it.toHex()) }
+            putStringSet(PrefKeys.FOLLOWING_CHANNELS, account.followingChannels)
+            putStringSet(PrefKeys.HIDDEN_USERS, account.hiddenUsers)
+            putString(PrefKeys.RELAYS, gson.toJson(account.localRelays))
+            putStringSet(PrefKeys.DONT_TRANSLATE_FROM, account.dontTranslateFrom)
+            putString(PrefKeys.LANGUAGE_PREFS, gson.toJson(account.languagePreferences))
+            putString(PrefKeys.TRANSLATE_TO, account.translateTo)
+            putString(PrefKeys.ZAP_AMOUNTS, gson.toJson(account.zapAmountChoices))
+            putString(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, gson.toJson(account.zapPaymentRequest))
+            putString(PrefKeys.LATEST_CONTACT_LIST, Event.gson.toJson(account.backupContactList))
+            putBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, account.hideDeleteRequestDialog)
+            putBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, account.hideBlockAlertDialog)
+            putString(PrefKeys.DISPLAY_NAME, account.userProfile().toBestDisplayName())
+            putString(PrefKeys.PROFILE_PICTURE_URL, account.userProfile().profilePicture())
+        }.apply()
+    }
+
+    fun loadFromEncryptedStorage(): Account? {
+        encryptedPreferences(currentAccount).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()
+            val hiddenUsers = getStringSet(PrefKeys.HIDDEN_USERS, emptySet()) ?: setOf()
+            val localRelays = gson.fromJson(
+                getString(PrefKeys.RELAYS, "[]"),
+                object : TypeToken<Set<RelaySetupInfo>>() {}.type
+            ) ?: setOf<RelaySetupInfo>()
+
+            val dontTranslateFrom = getStringSet(PrefKeys.DONT_TRANSLATE_FROM, null) ?: setOf()
+            val translateTo = getString(PrefKeys.TRANSLATE_TO, null) ?: Locale.getDefault().language
+
+            val zapAmountChoices = gson.fromJson(
+                getString(PrefKeys.ZAP_AMOUNTS, "[]"),
+                object : TypeToken<List<Long>>() {}.type
+            ) ?: listOf(500L, 1000L, 5000L)
+
+            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)
+                        .getRefinedEvent(true) as ContactListEvent
+                }
+            } catch (e: Throwable) {
+                e.printStackTrace()
+                null
+            }
+
+            val languagePreferences = try {
+                getString(PrefKeys.LANGUAGE_PREFS, null)?.let {
+                    gson.fromJson(
+                        it,
+                        object : TypeToken<Map<String, String>>() {}.type
+                    ) as Map<String, String>
+                } ?: mapOf()
+            } catch (e: Throwable) {
+                e.printStackTrace()
+                mapOf()
+            }
+
+            val hideDeleteRequestDialog = getBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, false)
+            val hideBlockAlertDialog = getBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, false)
+
+            return Account(
+                Persona(privKey = privKey?.toByteArray(), pubKey = pubKey.toByteArray()),
+                followingChannels,
+                hiddenUsers,
+                localRelays,
+                dontTranslateFrom,
+                languagePreferences,
+                translateTo,
+                zapAmountChoices,
+                zapPaymentRequestServer,
+                hideDeleteRequestDialog,
+                hideBlockAlertDialog,
+                latestContactList
+            )
+        }
+    }
+
+    fun saveLastRead(route: String, timestampInSecs: Long) {
+        encryptedPreferences(currentAccount).edit().apply {
+            putLong(PrefKeys.LAST_READ(route), timestampInSecs)
+        }.apply()
+    }
+
+    fun loadLastRead(route: String): Long {
+        encryptedPreferences(currentAccount).run {
+            return getLong(PrefKeys.LAST_READ(route), 0)
+        }
+    }
+
+    fun migrateSingleUserPrefs() {
+        if (currentAccount != null) return
+
+        val pubkey = encryptedPreferences().getString(PrefKeys.NOSTR_PUBKEY, null) ?: return
+        val npub = Hex.decode(pubkey).toNpub()
+
+        val stringPrefs = listOf(
+            PrefKeys.NOSTR_PRIVKEY,
+            PrefKeys.NOSTR_PUBKEY,
+            PrefKeys.RELAYS,
+            PrefKeys.LANGUAGE_PREFS,
+            PrefKeys.TRANSLATE_TO,
+            PrefKeys.ZAP_AMOUNTS,
+            PrefKeys.LATEST_CONTACT_LIST
+        )
+
+        val stringSetPrefs = listOf(
+            PrefKeys.FOLLOWING_CHANNELS,
+            PrefKeys.HIDDEN_USERS,
+            PrefKeys.DONT_TRANSLATE_FROM
+        )
+
+        encryptedPreferences().apply {
+            val appPrefs = this
+            encryptedPreferences(npub).edit().apply {
+                val userPrefs = this
+
+                stringPrefs.forEach { userPrefs.putString(it, appPrefs.getString(it, null)) }
+                stringSetPrefs.forEach { userPrefs.putStringSet(it, appPrefs.getStringSet(it, null)) }
+                userPrefs.putBoolean(
+                    PrefKeys.HIDE_DELETE_REQUEST_DIALOG,
+                    appPrefs.getBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, false)
+                )
+            }.apply()
+        }
+
+        encryptedPreferences().edit().clear().apply()
+        addAccount(npub)
+        currentAccount = npub
+    }
+}

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

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

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

@@ -0,0 +1,78 @@
+package com.vitorpamplona.amethyst
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.service.NostrAccountDataSource
+import com.vitorpamplona.amethyst.service.NostrChannelDataSource
+import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
+import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
+import com.vitorpamplona.amethyst.service.NostrHomeDataSource
+import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
+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.relays.Client
+import com.vitorpamplona.amethyst.service.relays.Constants
+
+object ServiceManager {
+    private var account: Account? = null
+
+    fun start(account: Account) {
+        this.account = account
+        start()
+    }
+
+    fun start() {
+        val myAccount = account
+
+        if (myAccount != null) {
+            Client.connect(myAccount.activeRelays() ?: myAccount.convertLocalRelays())
+
+            // start services
+            NostrAccountDataSource.account = myAccount
+            NostrHomeDataSource.account = myAccount
+            NostrChatroomListDataSource.account = myAccount
+
+            // Notification Elements
+            NostrAccountDataSource.start()
+            NostrHomeDataSource.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() {
+        NostrAccountDataSource.stop()
+        NostrHomeDataSource.stop()
+        NostrChannelDataSource.stop()
+        NostrChatroomListDataSource.stop()
+
+        NostrGlobalDataSource.stop()
+        NostrSingleChannelDataSource.stop()
+        NostrSingleEventDataSource.stop()
+        NostrSingleUserDataSource.stop()
+        NostrThreadDataSource.stop()
+        NostrUserProfileDataSource.stop()
+
+        Client.disconnect()
+    }
+
+    fun cleanUp() {
+        LocalCache.cleanObservers()
+
+        account?.let {
+            LocalCache.pruneOldAndHiddenMessages(it)
+            LocalCache.pruneHiddenMessages(it)
+            LocalCache.pruneContactLists(it)
+            // LocalCache.pruneNonFollows(it)
+        }
+    }
+}

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

@@ -0,0 +1,41 @@
+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.upstream.cache.CacheDataSource
+import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor
+import com.google.android.exoplayer2.upstream.cache.SimpleCache
+
+object VideoCache {
+
+    var exoPlayerCacheSize: Long = 90 * 1024 * 1024 // 90MB
+
+    var leastRecentlyUsedCacheEvictor = LeastRecentlyUsedCacheEvictor(exoPlayerCacheSize)
+
+    lateinit var exoDatabaseProvider: StandaloneDatabaseProvider
+    lateinit var simpleCache: SimpleCache
+
+    lateinit var cacheDataSourceFactory: CacheDataSource.Factory
+
+    fun get(context: Context): CacheDataSource.Factory {
+        if (!this::simpleCache.isInitialized) {
+            exoDatabaseProvider = StandaloneDatabaseProvider(context)
+
+            simpleCache = SimpleCache(
+                context.cacheDir,
+                leastRecentlyUsedCacheEvictor,
+                exoDatabaseProvider
+            )
+
+            cacheDataSourceFactory = CacheDataSource.Factory()
+                .setCache(simpleCache)
+                .setUpstreamDataSourceFactory(
+                    DefaultHttpDataSource.Factory().setAllowCrossProtocolRedirects(true)
+                )
+                .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
+        }
+
+        return cacheDataSourceFactory
+    }
+}

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

@@ -1,92 +1,810 @@
 package com.vitorpamplona.amethyst.model
 
+import android.content.res.Resources
+import androidx.core.os.ConfigurationCompat
 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.service.model.BookmarkListEvent
+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.Contact
+import com.vitorpamplona.amethyst.service.model.ContactListEvent
+import com.vitorpamplona.amethyst.service.model.DeletionEvent
+import com.vitorpamplona.amethyst.service.model.IdentityClaim
+import com.vitorpamplona.amethyst.service.model.LnZapPaymentRequestEvent
+import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
+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.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.Constants
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.Relay
+import com.vitorpamplona.amethyst.service.relays.RelayPool
+import com.vitorpamplona.amethyst.ui.components.BundledUpdate
+import com.vitorpamplona.amethyst.ui.note.Nip47URI
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import nostr.postr.Persona
-import nostr.postr.events.TextNoteEvent
-import nostr.postr.toHex
+import java.util.Locale
 
-class Account(val loggedIn: Persona) {
-  var seeReplies: Boolean = true
+val DefaultChannels = setOf(
+    "25e5c82273a271cb1a840d0060391a0bf4965cafeb029d5ab55350b418953fbb", // -> Anigma's Nostr
+    "42224859763652914db53052103f0b744df79dfc4efef7e950fc0802fc3df3c5" // -> Amethyst's Group
+)
 
-  fun userProfile(): User {
-    return LocalCache.getOrCreateUser(loggedIn.pubKey)
-  }
-
-  fun isWriteable(): Boolean {
-    return loggedIn.privKey != null
-  }
-
-  fun reactTo(note: Note) {
-    if (!isWriteable()) return
-
-    note.event?.let {
-      val event = ReactionEvent.create(it, loggedIn.privKey!!)
-      Client.send(event)
-      LocalCache.consume(event)
+fun getLanguagesSpokenByUser(): Set<String> {
+    val languageList = ConfigurationCompat.getLocales(Resources.getSystem().getConfiguration())
+    val codedList = mutableSetOf<String>()
+    for (i in 0 until languageList.size()) {
+        languageList.get(i)?.let { codedList.add(it.language) }
     }
-  }
-
-  fun boost(note: Note) {
-    if (!isWriteable()) return
-
-    note.event?.let {
-      val event = RepostEvent.create(it, loggedIn.privKey!!)
-      Client.send(event)
-      LocalCache.consume(event)
-    }
-  }
-
-  fun sendPost(message: String, replyingTo: Note?) {
-    if (!isWriteable()) return
-
-    val replyToEvent = replyingTo?.event
-    if (replyToEvent is TextNoteEvent) {
-      val repliesTo = replyToEvent.replyTos.plus(replyToEvent.id.toHex())
-      val mentions = replyToEvent.mentions.plus(replyToEvent.pubKey.toHex())
-
-      val signedEvent = TextNoteEvent.create(
-        msg = message,
-        replyTos = repliesTo,
-        mentions = mentions,
-        privateKey = loggedIn.privKey!!
-      )
-      Client.send(signedEvent)
-      LocalCache.consume(signedEvent)
-    } else {
-      val signedEvent = TextNoteEvent.create(
-        msg = message,
-        replyTos = null,
-        mentions = null,
-        privateKey = loggedIn.privKey!!
-      )
-      Client.send(signedEvent)
-      LocalCache.consume(signedEvent)
-    }
-  }
-
-  // Observers line up here.
-  val live: AccountLiveData = AccountLiveData(this)
-
-  private fun refreshObservers() {
-    live.refresh()
-  }
+    return codedList
 }
 
-class AccountLiveData(private val account: Account): LiveData<AccountState>(AccountState(account)) {
-  fun refresh() {
-    postValue(AccountState(account))
-  }
+@OptIn(DelicateCoroutinesApi::class)
+class Account(
+    val loggedIn: Persona,
+    var followingChannels: Set<String> = DefaultChannels,
+    var hiddenUsers: Set<String> = setOf(),
+    var localRelays: Set<RelaySetupInfo> = Constants.defaultRelays.toSet(),
+    var dontTranslateFrom: Set<String> = getLanguagesSpokenByUser(),
+    var languagePreferences: Map<String, String> = mapOf(),
+    var translateTo: String = Locale.getDefault().language,
+    var zapAmountChoices: List<Long> = listOf(500L, 1000L, 5000L),
+    var zapPaymentRequest: Nip47URI? = null,
+    var hideDeleteRequestDialog: Boolean = false,
+    var hideBlockAlertDialog: Boolean = false,
+    var backupContactList: ContactListEvent? = null
+) {
+    var transientHiddenUsers: Set<String> = setOf()
 
-  override fun onActive() {
-    super.onActive()
-  }
+    // Observers line up here.
+    val live: AccountLiveData = AccountLiveData(this)
+    val liveLanguages: AccountLiveData = AccountLiveData(this)
+    val saveable: AccountLiveData = AccountLiveData(this)
 
-  override fun onInactive() {
-    super.onInactive()
-  }
+    fun userProfile(): User {
+        return LocalCache.getOrCreateUser(loggedIn.pubKey.toHexKey())
+    }
+
+    fun followingChannels(): List<Channel> {
+        return followingChannels.map { LocalCache.getOrCreateChannel(it) }
+    }
+
+    fun hiddenUsers(): List<User> {
+        return (hiddenUsers + transientHiddenUsers).map { LocalCache.getOrCreateUser(it) }
+    }
+
+    fun isWriteable(): Boolean {
+        return loggedIn.privKey != null
+    }
+
+    fun sendNewRelayList(relays: Map<String, ContactListEvent.ReadWrite>) {
+        if (!isWriteable()) return
+
+        val contactList = userProfile().latestContactList
+        val follows = contactList?.follows() ?: emptyList()
+        val followsTags = contactList?.unverifiedFollowTagSet() ?: emptyList()
+
+        if (contactList != null && follows.isNotEmpty()) {
+            val event = ContactListEvent.create(
+                follows,
+                followsTags,
+                relays,
+                loggedIn.privKey!!
+            )
+
+            Client.send(event)
+            LocalCache.consume(event)
+        } else {
+            val event = ContactListEvent.create(listOf(), listOf(), relays, loggedIn.privKey!!)
+
+            // Keep this local to avoid erasing a good contact list.
+            // Client.send(event)
+            LocalCache.consume(event)
+        }
+    }
+
+    fun sendNewUserMetadata(toString: String, identities: List<IdentityClaim>) {
+        if (!isWriteable()) return
+
+        loggedIn.privKey?.let {
+            val event = MetadataEvent.create(toString, identities, loggedIn.privKey!!)
+            Client.send(event)
+            LocalCache.consume(event)
+        }
+    }
+
+    fun reactionTo(note: Note): List<Note> {
+        return note.reactedBy(userProfile(), "+")
+    }
+
+    fun hasBoosted(note: Note): Boolean {
+        return boostsTo(note).isNotEmpty()
+    }
+
+    fun boostsTo(note: Note): List<Note> {
+        return note.boostedBy(userProfile())
+    }
+
+    fun hasReacted(note: Note): Boolean {
+        return note.hasReacted(userProfile(), "+")
+    }
+
+    fun reactTo(note: Note) {
+        if (!isWriteable()) return
+
+        if (hasReacted(note)) {
+            // has already liked this note
+            return
+        }
+
+        note.event?.let {
+            val event = ReactionEvent.createLike(it, loggedIn.privKey!!)
+            Client.send(event)
+            LocalCache.consume(event)
+        }
+    }
+
+    fun createZapRequestFor(note: Note, message: String = ""): LnZapRequestEvent? {
+        if (!isWriteable()) return null
+
+        note.event?.let {
+            return LnZapRequestEvent.create(it, userProfile().latestContactList?.relays()?.keys?.ifEmpty { null } ?: localRelays.map { it.url }.toSet(), loggedIn.privKey!!, message)
+        }
+
+        return null
+    }
+
+    fun hasWalletConnectSetup(): Boolean {
+        return zapPaymentRequest != null
+    }
+
+    fun sendZapPaymentRequestFor(lnInvoice: String) {
+        if (!isWriteable()) return
+
+        zapPaymentRequest?.let {
+            val event = LnZapPaymentRequestEvent.create(lnInvoice, it.pubKeyHex, it.secret?.toByteArray() ?: loggedIn.privKey!!)
+
+            Client.send(event, it.relayUri)
+        }
+    }
+
+    fun createZapRequestFor(user: User): LnZapRequestEvent? {
+        return createZapRequestFor(user.pubkeyHex)
+    }
+
+    fun createZapRequestFor(userPubKeyHex: String, message: String = ""): LnZapRequestEvent? {
+        if (!isWriteable()) return null
+
+        return LnZapRequestEvent.create(userPubKeyHex, userProfile().latestContactList?.relays()?.keys?.ifEmpty { null } ?: localRelays.map { it.url }.toSet(), loggedIn.privKey!!, message)
+    }
+
+    fun report(note: Note, type: ReportEvent.ReportType, content: String = "") {
+        if (!isWriteable()) return
+
+        if (note.hasReacted(userProfile(), "⚠️")) {
+            // has already liked this note
+            return
+        }
+
+        note.event?.let {
+            val event = ReactionEvent.createWarning(it, loggedIn.privKey!!)
+            Client.send(event)
+            LocalCache.consume(event)
+        }
+
+        note.event?.let {
+            val event = ReportEvent.create(it, type, loggedIn.privKey!!, content = content)
+            Client.send(event)
+            LocalCache.consume(event, null)
+        }
+    }
+
+    fun report(user: User, type: ReportEvent.ReportType) {
+        if (!isWriteable()) return
+
+        if (user.hasReport(userProfile(), type)) {
+            // has already reported this note
+            return
+        }
+
+        val event = ReportEvent.create(user.pubkeyHex, type, loggedIn.privKey!!)
+        Client.send(event)
+        LocalCache.consume(event, null)
+    }
+
+    fun delete(note: Note) {
+        delete(listOf(note))
+    }
+
+    fun delete(notes: List<Note>) {
+        if (!isWriteable()) return
+
+        val myNotes = notes.filter { it.author == userProfile() }.map { it.idHex }
+
+        if (myNotes.isNotEmpty()) {
+            val event = DeletionEvent.create(myNotes, loggedIn.privKey!!)
+            Client.send(event)
+            LocalCache.consume(event)
+        }
+    }
+
+    fun boost(note: Note) {
+        if (!isWriteable()) return
+
+        if (note.hasBoostedInTheLast5Minutes(userProfile())) {
+            // has already bosted in the past 5mins
+            return
+        }
+
+        note.event?.let {
+            val event = RepostEvent.create(it, loggedIn.privKey!!)
+            Client.send(event)
+            LocalCache.consume(event)
+        }
+    }
+
+    fun broadcast(note: Note) {
+        note.event?.let {
+            Client.send(it)
+        }
+    }
+
+    fun follow(user: User) {
+        if (!isWriteable()) return
+
+        val contactList = userProfile().latestContactList
+        val followingUsers = contactList?.follows() ?: emptyList()
+        val followingTags = contactList?.unverifiedFollowTagSet() ?: emptyList()
+
+        val event = if (contactList != null) {
+            ContactListEvent.create(
+                followingUsers.plus(Contact(user.pubkeyHex, null)),
+                followingTags,
+                contactList.relays(),
+                loggedIn.privKey!!
+            )
+        } else {
+            val relays = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) }
+            ContactListEvent.create(
+                listOf(Contact(user.pubkeyHex, null)),
+                followingTags,
+                relays,
+                loggedIn.privKey!!
+            )
+        }
+
+        Client.send(event)
+        LocalCache.consume(event)
+    }
+
+    fun follow(tag: String) {
+        if (!isWriteable()) return
+
+        val contactList = userProfile().latestContactList
+        val followingUsers = contactList?.follows() ?: emptyList()
+        val followingTags = contactList?.unverifiedFollowTagSet() ?: emptyList()
+
+        val event = if (contactList != null) {
+            ContactListEvent.create(
+                followingUsers,
+                followingTags.plus(tag),
+                contactList.relays(),
+                loggedIn.privKey!!
+            )
+        } else {
+            val relays = Constants.defaultRelays.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) }
+            ContactListEvent.create(
+                followingUsers,
+                followingTags.plus(tag),
+                relays,
+                loggedIn.privKey!!
+            )
+        }
+
+        Client.send(event)
+        LocalCache.consume(event)
+    }
+
+    fun unfollow(user: User) {
+        if (!isWriteable()) return
+
+        val contactList = userProfile().latestContactList
+        val followingUsers = contactList?.follows() ?: emptyList()
+        val followingTags = contactList?.unverifiedFollowTagSet() ?: emptyList()
+
+        if (contactList != null && (followingUsers.isNotEmpty() || followingTags.isNotEmpty())) {
+            val event = ContactListEvent.create(
+                followingUsers.filter { it.pubKeyHex != user.pubkeyHex },
+                followingTags,
+                contactList.relays(),
+                loggedIn.privKey!!
+            )
+
+            Client.send(event)
+            LocalCache.consume(event)
+        }
+    }
+
+    fun unfollow(tag: String) {
+        if (!isWriteable()) return
+
+        val contactList = userProfile().latestContactList
+        val followingUsers = contactList?.follows() ?: emptyList()
+        val followingTags = contactList?.unverifiedFollowTagSet() ?: emptyList()
+
+        if (contactList != null && (followingUsers.isNotEmpty() || followingTags.isNotEmpty())) {
+            val event = ContactListEvent.create(
+                followingUsers,
+                followingTags.filter { !it.equals(tag, ignoreCase = true) },
+                contactList.relays(),
+                loggedIn.privKey!!
+            )
+
+            Client.send(event)
+            LocalCache.consume(event)
+        }
+    }
+
+    fun sendPost(message: String, replyTo: List<Note>?, mentions: List<User>?, tags: List<String>? = null) {
+        if (!isWriteable()) return
+
+        val repliesToHex = replyTo?.filter { it.address() == null }?.map { it.idHex }
+        val mentionsHex = mentions?.map { it.pubkeyHex }
+        val addresses = replyTo?.mapNotNull { it.address() }
+
+        val signedEvent = TextNoteEvent.create(
+            msg = message,
+            replyTos = repliesToHex,
+            mentions = mentionsHex,
+            addresses = addresses,
+            extraTags = tags,
+            privateKey = loggedIn.privKey!!
+        )
+
+        Client.send(signedEvent)
+        LocalCache.consume(signedEvent)
+    }
+
+    fun sendChannelMessage(message: String, toChannel: String, replyingTo: Note? = null, mentions: List<User>?) {
+        if (!isWriteable()) return
+
+        val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
+        val mentionsHex = mentions?.map { it.pubkeyHex }
+
+        val signedEvent = ChannelMessageEvent.create(
+            message = message,
+            channel = toChannel,
+            replyTos = repliesToHex,
+            mentions = mentionsHex,
+            privateKey = loggedIn.privKey!!
+        )
+        Client.send(signedEvent)
+        LocalCache.consume(signedEvent, null)
+    }
+
+    fun sendPrivateMessage(message: String, toUser: String, replyingTo: Note? = null) {
+        if (!isWriteable()) return
+        val user = LocalCache.users[toUser] ?: return
+
+        val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
+        val mentionsHex = emptyList<String>()
+
+        val signedEvent = PrivateDmEvent.create(
+            recipientPubKey = user.pubkey(),
+            publishedRecipientPubKey = user.pubkey(),
+            msg = message,
+            replyTos = repliesToHex,
+            mentions = mentionsHex,
+            privateKey = loggedIn.privKey!!,
+            advertiseNip18 = false
+        )
+        Client.send(signedEvent)
+        LocalCache.consume(signedEvent, null)
+    }
+
+    fun sendCreateNewChannel(name: String, about: String, picture: String) {
+        if (!isWriteable()) return
+
+        val metadata = ChannelCreateEvent.ChannelData(
+            name,
+            about,
+            picture
+        )
+
+        val event = ChannelCreateEvent.create(
+            channelInfo = metadata,
+            privateKey = loggedIn.privKey!!
+        )
+
+        Client.send(event)
+        LocalCache.consume(event)
+
+        joinChannel(event.id)
+    }
+
+    fun addPrivateBookmark(note: Note) {
+        if (!isWriteable()) return
+
+        val bookmarks = userProfile().latestBookmarkList
+
+        val event = BookmarkListEvent.create(
+            "bookmark",
+            bookmarks?.taggedEvents() ?: emptyList(),
+            bookmarks?.taggedUsers() ?: emptyList(),
+            bookmarks?.taggedAddresses() ?: emptyList(),
+
+            bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!)?.plus(note.idHex) ?: listOf(note.idHex),
+            bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
+            bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+
+            loggedIn.privKey!!
+        )
+
+        Client.send(event)
+        LocalCache.consume(event)
+    }
+
+    fun addPublicBookmark(note: Note) {
+        if (!isWriteable()) return
+
+        val bookmarks = userProfile().latestBookmarkList
+
+        val event = BookmarkListEvent.create(
+            "bookmark",
+            bookmarks?.taggedEvents()?.plus(note.idHex) ?: listOf(note.idHex),
+            bookmarks?.taggedUsers() ?: emptyList(),
+            bookmarks?.taggedAddresses() ?: emptyList(),
+
+            bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
+            bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
+            bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+
+            loggedIn.privKey!!
+        )
+
+        Client.send(event)
+        LocalCache.consume(event)
+    }
+
+    fun removePrivateBookmark(note: Note) {
+        if (!isWriteable()) return
+
+        val bookmarks = userProfile().latestBookmarkList
+
+        val event = BookmarkListEvent.create(
+            "bookmark",
+            bookmarks?.taggedEvents() ?: emptyList(),
+            bookmarks?.taggedUsers() ?: emptyList(),
+            bookmarks?.taggedAddresses() ?: emptyList(),
+
+            bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!)?.minus(note.idHex) ?: listOf(),
+            bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
+            bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+
+            loggedIn.privKey!!
+        )
+
+        Client.send(event)
+        LocalCache.consume(event)
+    }
+
+    fun removePublicBookmark(note: Note) {
+        if (!isWriteable()) return
+
+        val bookmarks = userProfile().latestBookmarkList
+
+        val event = BookmarkListEvent.create(
+            "bookmark",
+            bookmarks?.taggedEvents()?.minus(note.idHex),
+            bookmarks?.taggedUsers() ?: emptyList(),
+            bookmarks?.taggedAddresses() ?: emptyList(),
+
+            bookmarks?.privateTaggedEvents(privKey = loggedIn.privKey!!) ?: emptyList(),
+            bookmarks?.privateTaggedUsers(privKey = loggedIn.privKey!!) ?: emptyList(),
+            bookmarks?.privateTaggedAddresses(privKey = loggedIn.privKey!!) ?: emptyList(),
+
+            loggedIn.privKey!!
+        )
+
+        Client.send(event)
+        LocalCache.consume(event)
+    }
+
+    fun isInPrivateBookmarks(note: Note): Boolean {
+        if (!isWriteable()) return false
+
+        if (note is AddressableNote) {
+            return userProfile().latestBookmarkList?.privateTaggedAddresses(loggedIn.privKey!!)
+                ?.contains(note.address) == true
+        } else {
+            return userProfile().latestBookmarkList?.privateTaggedEvents(loggedIn.privKey!!)
+                ?.contains(note.idHex) == true
+        }
+    }
+
+    fun isInPublicBookmarks(note: Note): Boolean {
+        if (!isWriteable()) return false
+
+        if (note is AddressableNote) {
+            return userProfile().latestBookmarkList?.taggedAddresses()?.contains(note.address) == true
+        } else {
+            return userProfile().latestBookmarkList?.taggedEvents()?.contains(note.idHex) == true
+        }
+    }
+
+    fun joinChannel(idHex: String) {
+        followingChannels = followingChannels + idHex
+        live.invalidateData()
+
+        saveable.invalidateData()
+    }
+
+    fun leaveChannel(idHex: String) {
+        followingChannels = followingChannels - idHex
+        live.invalidateData()
+
+        saveable.invalidateData()
+    }
+
+    fun hideUser(pubkeyHex: String) {
+        hiddenUsers = hiddenUsers + pubkeyHex
+        live.invalidateData()
+        saveable.invalidateData()
+    }
+
+    fun showUser(pubkeyHex: String) {
+        hiddenUsers = hiddenUsers - pubkeyHex
+        transientHiddenUsers = transientHiddenUsers - pubkeyHex
+        live.invalidateData()
+        saveable.invalidateData()
+    }
+
+    fun changeZapAmounts(newAmounts: List<Long>) {
+        zapAmountChoices = newAmounts
+        live.invalidateData()
+        saveable.invalidateData()
+    }
+
+    fun changeZapPaymentRequest(newServer: Nip47URI?) {
+        zapPaymentRequest = newServer
+        live.invalidateData()
+        saveable.invalidateData()
+    }
+
+    fun sendChangeChannel(name: String, about: String, picture: String, channel: Channel) {
+        if (!isWriteable()) return
+
+        val metadata = ChannelCreateEvent.ChannelData(
+            name,
+            about,
+            picture
+        )
+
+        val event = ChannelMetadataEvent.create(
+            newChannelInfo = metadata,
+            originalChannelIdHex = channel.idHex,
+            privateKey = loggedIn.privKey!!
+        )
+
+        Client.send(event)
+        LocalCache.consume(event)
+
+        joinChannel(event.id)
+    }
+
+    fun decryptContent(note: Note): String? {
+        val event = note.event
+        return if (event is PrivateDmEvent && loggedIn.privKey != null) {
+            var pubkeyToUse = event.pubKey
+
+            val recepientPK = event.recipientPubKey()
+
+            if (note.author == userProfile() && recepientPK != null) {
+                pubkeyToUse = recepientPK
+            }
+
+            event.plainContent(loggedIn.privKey!!, pubkeyToUse.toByteArray())
+        } else {
+            event?.content()
+        }
+    }
+
+    fun addDontTranslateFrom(languageCode: String) {
+        dontTranslateFrom = dontTranslateFrom.plus(languageCode)
+        liveLanguages.invalidateData()
+
+        saveable.invalidateData()
+    }
+
+    fun updateTranslateTo(languageCode: String) {
+        translateTo = languageCode
+        liveLanguages.invalidateData()
+
+        saveable.invalidateData()
+    }
+
+    fun prefer(source: String, target: String, preference: String) {
+        languagePreferences = languagePreferences + Pair("$source,$target", preference)
+        saveable.invalidateData()
+    }
+
+    fun preferenceBetween(source: String, target: String): String? {
+        return languagePreferences.get("$source,$target")
+    }
+
+    private fun updateContactListTo(newContactList: ContactListEvent?) {
+        if (newContactList?.unverifiedFollowKeySet().isNullOrEmpty()) return
+
+        // Events might be different objects, we have to compare their ids.
+        if (backupContactList?.id != newContactList?.id) {
+            backupContactList = newContactList
+            saveable.invalidateData()
+        }
+    }
+
+    // Takes a User's relay list and adds the types of feeds they are active for.
+    fun activeRelays(): Array<Relay>? {
+        var usersRelayList = userProfile().latestContactList?.relays()?.map {
+            val localFeedTypes = localRelays.firstOrNull() { localRelay -> localRelay.url == it.key }?.feedTypes ?: FeedType.values().toSet()
+            Relay(it.key, it.value.read, it.value.write, localFeedTypes)
+        } ?: return null
+
+        // Ugly, but forces nostr.band as the only search-supporting relay today.
+        // TODO: Remove when search becomes more available.
+        if (usersRelayList.none { it.activeTypes.contains(FeedType.SEARCH) }) {
+            usersRelayList = usersRelayList + Relay(
+                Constants.forcedRelayForSearch.url,
+                Constants.forcedRelayForSearch.read,
+                Constants.forcedRelayForSearch.write,
+                Constants.forcedRelayForSearch.feedTypes
+            )
+        }
+
+        return usersRelayList.toTypedArray()
+    }
+
+    fun convertLocalRelays(): Array<Relay> {
+        return localRelays.map {
+            Relay(it.url, it.read, it.write, it.feedTypes)
+        }.toTypedArray()
+    }
+
+    fun reconnectIfRelaysHaveChanged() {
+        val newRelaySet = activeRelays() ?: convertLocalRelays()
+        if (!Client.isSameRelaySetConfig(newRelaySet)) {
+            Client.disconnect()
+            Client.connect(newRelaySet)
+            RelayPool.requestAndWatch()
+        }
+    }
+
+    fun isHidden(user: User) = user.pubkeyHex in hiddenUsers || user.pubkeyHex in transientHiddenUsers
+
+    fun followingKeySet(): Set<HexKey> {
+        return userProfile().cachedFollowingKeySet() ?: emptySet()
+    }
+
+    fun followingTagSet(): Set<HexKey> {
+        return userProfile().cachedFollowingTagSet() ?: emptySet()
+    }
+
+    fun isAcceptable(user: User): Boolean {
+        return !isHidden(user) && // if user hasn't hided this author
+            user.reportsBy(userProfile()).isEmpty() && // if user has not reported this post
+            user.countReportAuthorsBy(followingKeySet()) < 5
+    }
+
+    fun isAcceptableDirect(note: Note): Boolean {
+        return note.reportsBy(userProfile()).isEmpty() && // if user has not reported this post
+            note.countReportAuthorsBy(followingKeySet()) < 5 // if it has 5 reports by reliable users
+    }
+
+    fun isFollowing(user: User): Boolean {
+        return user.pubkeyHex in followingKeySet()
+    }
+
+    fun isAcceptable(note: Note): Boolean {
+        return note.author?.let { isAcceptable(it) } ?: true && // if user hasn't hided this author
+            isAcceptableDirect(note) &&
+            (
+                note.event !is RepostEvent ||
+                    (note.event is RepostEvent && note.replyTo?.firstOrNull { isAcceptableDirect(it) } != null)
+                ) // is not a reaction about a blocked post
+    }
+
+    fun getRelevantReports(note: Note): Set<Note> {
+        val followsPlusMe = userProfile().latestContactList?.verifiedFollowKeySetAndMe ?: emptySet()
+
+        val innerReports = if (note.event is RepostEvent) {
+            note.replyTo?.map { getRelevantReports(it) }?.flatten() ?: emptyList()
+        } else {
+            emptyList()
+        }
+
+        return (
+            note.reportsBy(followsPlusMe) +
+                (
+                    note.author?.reportsBy(followsPlusMe) ?: emptyList()
+                    ) + innerReports
+            ).toSet()
+    }
+
+    fun saveRelayList(value: List<RelaySetupInfo>) {
+        localRelays = value.toSet()
+        sendNewRelayList(value.associate { it.url to ContactListEvent.ReadWrite(it.read, it.write) })
+
+        saveable.invalidateData()
+    }
+
+    fun setHideDeleteRequestDialog() {
+        hideDeleteRequestDialog = true
+        saveable.invalidateData()
+    }
+
+    fun setHideBlockAlertDialog() {
+        hideBlockAlertDialog = true
+        saveable.invalidateData()
+    }
+
+    init {
+        backupContactList?.let {
+            println("Loading saved contacts ${it.toJson()}")
+            if (userProfile().latestContactList == null) {
+                LocalCache.consume(it)
+            }
+        }
+
+        // Observes relays to restart connections
+        userProfile().live().relays.observeForever {
+            GlobalScope.launch(Dispatchers.IO) {
+                reconnectIfRelaysHaveChanged()
+            }
+        }
+
+        // saves contact list for the next time.
+        userProfile().live().follows.observeForever {
+            updateContactListTo(userProfile().latestContactList)
+        }
+
+        // imports transient blocks due to spam.
+        LocalCache.antiSpam.liveSpam.observeForever {
+            GlobalScope.launch(Dispatchers.IO) {
+                it.cache.spamMessages.snapshot().values.forEach {
+                    if (it.pubkeyHex !in transientHiddenUsers && it.duplicatedMessages.size >= 5) {
+                        val userToBlock = LocalCache.getOrCreateUser(it.pubkeyHex)
+                        if (userToBlock != userProfile() && userToBlock.pubkeyHex !in followingKeySet()) {
+                            transientHiddenUsers = transientHiddenUsers + it.pubkeyHex
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
 
-class AccountState(val account: Account)
+class AccountLiveData(private val account: Account) : LiveData<AccountState>(AccountState(account)) {
+    // Refreshes observers in batches.
+    private val bundler = BundledUpdate(300, Dispatchers.Default) {
+        if (hasActiveObservers()) {
+            refresh()
+        }
+    }
+
+    fun invalidateData() {
+        bundler.invalidate()
+    }
+
+    fun refresh() {
+        postValue(AccountState(account))
+    }
+}
+
+class AccountState(val account: Account)

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

@@ -0,0 +1,72 @@
+package com.vitorpamplona.amethyst.model
+
+import android.util.Log
+import android.util.LruCache
+import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.service.model.Event
+import com.vitorpamplona.amethyst.ui.components.BundledUpdate
+import kotlinx.coroutines.Dispatchers
+
+data class Spammer(val pubkeyHex: HexKey, var duplicatedMessages: Set<HexKey>)
+
+class AntiSpamFilter {
+    val recentMessages = LruCache<Int, String>(1000)
+    val spamMessages = LruCache<Int, Spammer>(1000)
+
+    @Synchronized
+    fun isSpam(event: Event): Boolean {
+        val idHex = event.id
+
+        // if short message, ok
+        if (event.content.length < 50) return false
+
+        // double list strategy:
+        // if duplicated, it goes into spam. 1000 spam messages are saved into the spam list.
+
+        // Considers tags so that same replies to different people don't count.
+        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 down offenders
+            if (spamMessages.get(hash) == null) {
+                spamMessages.put(hash, Spammer(event.pubKey, setOf(recentMessages[hash], event.id)))
+                liveSpam.invalidateData()
+            } else {
+                val spammer = spamMessages.get(hash)
+                spammer.duplicatedMessages = spammer.duplicatedMessages + event.id
+
+                liveSpam.invalidateData()
+            }
+
+            return true
+        }
+
+        recentMessages.put(hash, idHex)
+
+        return false
+    }
+
+    val liveSpam: AntiSpamLiveData = AntiSpamLiveData(this)
+}
+
+class AntiSpamLiveData(val cache: AntiSpamFilter) : LiveData<AntiSpamState>(AntiSpamState(cache)) {
+
+    // Refreshes observers in batches.
+    private val bundler = BundledUpdate(300, Dispatchers.Main) {
+        if (hasActiveObservers()) {
+            refresh()
+        }
+    }
+
+    fun invalidateData() {
+        bundler.invalidate()
+    }
+
+    private fun refresh() {
+        postValue(AntiSpamState(cache))
+    }
+}
+
+class AntiSpamState(val cache: AntiSpamFilter)

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

@@ -0,0 +1,102 @@
+package com.vitorpamplona.amethyst.model
+
+import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+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
+    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 removeNote(note: Note) {
+        notes.remove(note.idHex)
+    }
+
+    fun updateChannelInfo(creator: User, channelInfo: ChannelCreateEvent.ChannelData, updatedAt: Long) {
+        this.creator = creator
+        this.info = channelInfo
+        this.updatedMetadataAt = updatedAt
+
+        live.invalidateData()
+    }
+
+    fun profilePicture(): String? {
+        if (info.picture.isNullOrBlank()) info.picture = null
+        return info.picture
+    }
+
+    fun anyNameStartsWith(prefix: String): Boolean {
+        return listOfNotNull(info.name, info.about)
+            .filter { it.startsWith(prefix, true) }.isNotEmpty()
+    }
+
+    // Observers line up here.
+    val live: ChannelLiveData = ChannelLiveData(this)
+
+    fun pruneOldAndHiddenMessages(account: Account): Set<Note> {
+        val important = notes.values
+            .filter { it.author?.let { it1 -> account.isHidden(it1) } == false }
+            .sortedBy { it.createdAt() }
+            .reversed()
+            .take(1000)
+            .toSet()
+
+        val toBeRemoved = notes.values.filter { it !in important }.toSet()
+
+        toBeRemoved.forEach {
+            notes.remove(it.idHex)
+        }
+
+        return toBeRemoved
+    }
+}
+
+class ChannelLiveData(val channel: Channel) : LiveData<ChannelState>(ChannelState(channel)) {
+    // Refreshes observers in batches.
+    private val bundler = BundledUpdate(300, Dispatchers.Main) {
+        if (hasActiveObservers()) {
+            refresh()
+        }
+    }
+
+    fun invalidateData() {
+        bundler.invalidate()
+    }
+
+    private fun refresh() {
+        postValue(ChannelState(channel))
+    }
+
+    override fun onActive() {
+        super.onActive()
+        NostrSingleChannelDataSource.add(channel.idHex)
+    }
+
+    override fun onInactive() {
+        super.onInactive()
+        NostrSingleChannelDataSource.remove(channel.idHex)
+    }
+}
+
+class ChannelState(val channel: Channel)

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

@@ -0,0 +1,26 @@
+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" -> HashtagIcon(R.drawable.ht_btc, "Bitcoin", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp))
+        "nostr", "nostrich", "nostriches", "nostrichs" -> 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))
+        "plebs", "pleb", "plebchain" -> HashtagIcon(R.drawable.plebs, "Pleb", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 1.dp))
+        "coffee", "coffeechain" -> 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))
+
+        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

@@ -1,36 +1,102 @@
 package com.vitorpamplona.amethyst.model
 
-import com.vitorpamplona.amethyst.ui.note.toDisplayHex
+import com.vitorpamplona.amethyst.service.nip19.Nip19
+import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
-import java.util.regex.Pattern
+import nostr.postr.Bech32
 import nostr.postr.Persona
 import nostr.postr.bechToBytes
 import nostr.postr.toHex
+import nostr.postr.toNpub
 
 /** Makes the distinction between String and Hex **/
 typealias HexKey = String
 
+typealias NPubKey = String
+typealias NoteId = String
+
+fun NPubKey.toDisplayKey(): String {
+    return this.toShortenHex()
+}
+
+fun NoteId.toDisplayId(): String {
+    return this.toShortenHex()
+}
+
+fun ByteArray.toNote() = Bech32.encodeBytes(hrp = "note", this, Bech32.Encoding.Bech32)
+
 fun ByteArray.toHexKey(): HexKey {
-  return toHex()
+    return toHex()
 }
 
 fun HexKey.toByteArray(): ByteArray {
-  return Hex.decode(this)
+    return Hex.decode(this)
 }
 
 fun HexKey.toDisplayHexKey(): String {
-  return this.toDisplayHex()
+    return this.toShortenHex()
 }
 
 fun decodePublicKey(key: String): ByteArray {
-  val pattern = Pattern.compile(".+@.+\\.[a-z]+")
+    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 {
+        Hex.decode(key)
+    }
+}
 
-  return if (key.startsWith("nsec")) {
-    Persona(privKey = key.bechToBytes()).pubKey
-  } else if (key.startsWith("npub")) {
-    key.bechToBytes()
-  } else { //if (pattern.matcher(key).matches()) {
-  //} else {
-    Hex.decode(key)
-  }
-}
+data class DirtyKeyInfo(val key: Nip19.Return, val restOfWord: String)
+
+fun parseDirtyWordForKey(mightBeAKey: String): DirtyKeyInfo? {
+    var key = mightBeAKey
+    if (key.startsWith("nostr:", true)) {
+        key = key.substring("nostr:".length)
+    }
+
+    key = key.removePrefix("@")
+
+    if (key.length < 63) {
+        return null
+    }
+
+    try {
+        val keyB32 = key.substring(0, 63)
+        val restOfWord = key.substring(63)
+
+        if (key.startsWith("nsec1", true)) {
+            // Converts to npub
+            val pubkey = Nip19.uriToRoute(Persona(privKey = keyB32.bechToBytes()).pubKey.toNpub()) ?: return null
+
+            return DirtyKeyInfo(pubkey, restOfWord)
+        } else if (key.startsWith("npub1", true)) {
+            val pubkey = Nip19.uriToRoute(keyB32) ?: return null
+
+            return DirtyKeyInfo(pubkey, restOfWord)
+        } else if (key.startsWith("note1", true)) {
+            val noteId = Nip19.uriToRoute(keyB32) ?: return null
+
+            return DirtyKeyInfo(noteId, restOfWord)
+        } else if (key.startsWith("nprofile", true)) {
+            val pubkeyRelay = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
+
+            return DirtyKeyInfo(pubkeyRelay, restOfWord)
+        } else if (key.startsWith("nevent", true)) {
+            val noteRelayId = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
+
+            return DirtyKeyInfo(noteRelayId, restOfWord)
+        } 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
+        }
+    } catch (e: Exception) {
+        e.printStackTrace()
+    }
+
+    return null
+}

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

@@ -4,221 +4,760 @@ import android.util.Log
 import androidx.lifecycle.LiveData
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.vitorpamplona.amethyst.service.model.ATag
+import com.vitorpamplona.amethyst.service.model.BadgeAwardEvent
+import com.vitorpamplona.amethyst.service.model.BadgeDefinitionEvent
+import com.vitorpamplona.amethyst.service.model.BadgeProfilesEvent
+import com.vitorpamplona.amethyst.service.model.BookmarkListEvent
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.ChannelHideMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMuteUserEvent
+import com.vitorpamplona.amethyst.service.model.ContactListEvent
+import com.vitorpamplona.amethyst.service.model.DeletionEvent
+import com.vitorpamplona.amethyst.service.model.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.Relay
+import com.vitorpamplona.amethyst.ui.components.BundledUpdate
+import fr.acinq.secp256k1.Hex
+import kotlinx.coroutines.*
+import nostr.postr.toNpub
 import java.io.ByteArrayInputStream
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
-import java.util.Collections
 import java.util.concurrent.ConcurrentHashMap
-import nostr.postr.events.ContactListEvent
-import nostr.postr.events.DeletionEvent
-import nostr.postr.events.MetadataEvent
-import nostr.postr.events.PrivateDmEvent
-import nostr.postr.events.RecommendRelayEvent
-import nostr.postr.events.TextNoteEvent
-import nostr.postr.toHex
-
 
 object LocalCache {
-  val metadataParser = jacksonObjectMapper()
-    .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-    .readerFor(UserMetadata::class.java)
+    val metadataParser = jacksonObjectMapper()
+        .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+        .readerFor(UserMetadata::class.java)
 
-  val users = ConcurrentHashMap<HexKey, User>()
-  val notes = ConcurrentHashMap<HexKey, Note>()
+    val antiSpam = AntiSpamFilter()
 
-  @Synchronized
-  fun getOrCreateUser(pubkey: ByteArray): User {
-    val key = pubkey.toHexKey()
-    return users[key] ?: run {
-      val answer = User(pubkey)
-      users.put(key, answer)
-      answer
-    }
-  }
+    val users = ConcurrentHashMap<HexKey, User>()
+    val notes = ConcurrentHashMap<HexKey, Note>()
+    val channels = ConcurrentHashMap<HexKey, Channel>()
+    val addressables = ConcurrentHashMap<String, AddressableNote>()
 
-  @Synchronized
-  fun getOrCreateNote(idHex: String): Note {
-    return notes[idHex] ?: run {
-      val answer = Note(idHex)
-      notes.put(idHex, answer)
-      answer
-    }
-  }
-
-  fun consume(event: MetadataEvent) {
-    //Log.d("MT", "New User ${users.size} ${event.contactMetaData.name}")
-
-    // new event
-    val oldUser = getOrCreateUser(event.pubKey)
-    if (event.createdAt > oldUser.updatedMetadataAt) {
-      val newUser = try {
-        metadataParser.readValue<UserMetadata>(ByteArrayInputStream(event.content.toByteArray(Charsets.UTF_8)), UserMetadata::class.java)
-      } catch (e: Exception) {
-        e.printStackTrace()
-        Log.w("MT", "Content Parse Error ${e.localizedMessage} ${event.content}")
-        return
-      }
-
-      oldUser.updateUserInfo(newUser, event.createdAt)
-    } else {
-      //Log.d("MT","Relay sent a previous Metadata Event ${oldUser.toBestDisplayName()} ${formattedDateTime(event.createdAt)} > ${formattedDateTime(oldUser.updatedAt)}")
-    }
-  }
-
-  fun formattedDateTime(timestamp: Long): String {
-    return Instant.ofEpochSecond(timestamp).atZone(ZoneId.systemDefault())
-      .format(DateTimeFormatter.ofPattern("uuuu MMM d hh:mm a"))
-  }
-
-  fun consume(event: TextNoteEvent) {
-    val note = getOrCreateNote(event.id.toHex())
-
-    // Already processed this event.
-    if (note.event != null) return
-
-    val author = getOrCreateUser(event.pubKey)
-    val mentions = Collections.synchronizedList(event.mentions.map { getOrCreateUser(decodePublicKey(it)) })
-    val replyTo = Collections.synchronizedList(event.replyTos.map { getOrCreateNote(it) }.toMutableList())
-
-    note.loadEvent(event, author, mentions, replyTo)
-
-    //Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content} ${formattedDateTime(event.createdAt)}")
-
-    // Prepares user's profile view.
-    author.notes.add(note)
-
-    // Adds notifications to users.
-    mentions.forEach {
-      it.taggedPosts.add(note)
-    }
-    replyTo.forEach {
-      it.author?.taggedPosts?.add(note)
+    fun checkGetOrCreateUser(key: String): User? {
+        if (isValidHexNpub(key)) {
+            return getOrCreateUser(key)
+        }
+        return null
     }
 
-    // Counts the replies
-    replyTo.forEach {
-      it.addReply(note)
+    @Synchronized
+    fun getOrCreateUser(key: HexKey): User {
+        return users[key] ?: run {
+            val answer = User(key)
+            users.put(key, answer)
+            answer
+        }
     }
 
-    refreshObservers()
-  }
+    fun checkGetOrCreateNote(key: String): Note? {
+        if (ATag.isATag(key)) {
+            return checkGetOrCreateAddressableNote(key)
+        }
+        if (isValidHexNpub(key)) {
+            return getOrCreateNote(key)
+        }
+        return null
+    }
 
-  fun consume(event: RecommendRelayEvent) {
-    //Log.d("RR", event.toJson())
-  }
+    @Synchronized
+    fun getOrCreateNote(idHex: String): Note {
+        return notes[idHex] ?: run {
+            val answer = Note(idHex)
+            notes.put(idHex, answer)
+            answer
+        }
+    }
 
-  fun consume(event: ContactListEvent) {
-    val user = getOrCreateUser(event.pubKey)
-    //Log.d("CL", "${user.toBestDisplayName()} ${event.follows}")
+    fun checkGetOrCreateChannel(key: String): Channel? {
+        if (isValidHexNpub(key)) {
+            return getOrCreateChannel(key)
+        }
+        return null
+    }
 
-    if (event.createdAt > user.updatedFollowsAt) {
-      user.updateFollows(
-        event.follows.map {
-          try {
-            val pubKey = decodePublicKey(it.pubKeyHex)
-            getOrCreateUser(pubKey)
-          } catch (e: Exception) {
-            println("Could not parse Hex key: ${it.pubKeyHex}")
-            println(event.toJson())
-            e.printStackTrace()
+    private fun isValidHexNpub(key: String): Boolean {
+        return try {
+            Hex.decode(key).toNpub()
+            true
+        } catch (e: IllegalArgumentException) {
+            Log.e("LocalCache", "Invalid Key to create user: $key", e)
+            false
+        }
+    }
+
+    @Synchronized
+    fun getOrCreateChannel(key: String): Channel {
+        return channels[key] ?: run {
+            val answer = Channel(key)
+            channels.put(key, answer)
+            answer
+        }
+    }
+
+    fun checkGetOrCreateAddressableNote(key: String): AddressableNote? {
+        return try {
+            val addr = ATag.parse(key, null) // relay doesn't matter for the index.
+            if (addr != null) {
+                getOrCreateAddressableNote(addr)
+            } else {
+                null
+            }
+        } catch (e: IllegalArgumentException) {
+            Log.e("LocalCache", "Invalid Key to create channel: $key", e)
             null
-          }
-        }.filterNotNull(),
-        event.createdAt
-      )
+        }
     }
 
-    refreshObservers()
-  }
-
-  fun consume(event: PrivateDmEvent) {
-    //Log.d("PM", event.toJson())
-  }
-
-  fun consume(event: DeletionEvent) {
-    //Log.d("DEL", event.toJson())
-  }
-
-  fun consume(event: RepostEvent) {
-    val note = getOrCreateNote(event.id.toHex())
-
-    // Already processed this event.
-    if (note.event != null) return
-
-    //Log.d("TN", "New Boost (${notes.size},${users.size}) ${note.author.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
-
-    val author = getOrCreateUser(event.pubKey)
-    val mentions = event.originalAuthor.map { getOrCreateUser(decodePublicKey(it)) }.toList()
-    val repliesTo = event.boostedPost.map { getOrCreateNote(it) }.toMutableList()
-
-    note.loadEvent(event, author, mentions, repliesTo)
-
-    // Prepares user's profile view.
-    author.notes.add(note)
-
-    // Adds notifications to users.
-    mentions.forEach {
-      it.taggedPosts.add(note)
-    }
-    repliesTo.forEach {
-      it.author?.taggedPosts?.add(note)
+    @Synchronized
+    fun getOrCreateAddressableNote(key: ATag): AddressableNote {
+        // we can't use naddr here because naddr might include relay info and
+        // the preferred relay should not be part of the index.
+        return addressables[key.toTag()] ?: run {
+            val answer = AddressableNote(key)
+            answer.author = checkGetOrCreateUser(key.pubKeyHex)
+            addressables.put(key.toTag(), answer)
+            answer
+        }
     }
 
-    // Counts the replies
-    repliesTo.forEach {
-      it.addBoost(note)
+    fun consume(event: MetadataEvent) {
+        // new event
+        val oldUser = getOrCreateUser(event.pubKey)
+        if (oldUser.info == null || event.createdAt > oldUser.info!!.updatedMetadataAt) {
+            val newUser = try {
+                metadataParser.readValue(
+                    ByteArrayInputStream(event.content.toByteArray(Charsets.UTF_8)),
+                    UserMetadata::class.java
+                )
+            } catch (e: Exception) {
+                e.printStackTrace()
+                Log.w("MT", "Content Parse Error ${e.localizedMessage} ${event.content}")
+                return
+            }
+
+            oldUser.updateUserInfo(newUser, event)
+            // Log.d("MT", "New User Metadata ${oldUser.pubkeyDisplayHex} ${oldUser.toBestDisplayName()}")
+        } else {
+            // Log.d("MT","Relay sent a previous Metadata Event ${oldUser.toBestDisplayName()} ${formattedDateTime(event.createdAt)} > ${formattedDateTime(oldUser.updatedAt)}")
+        }
     }
 
-    refreshObservers()
-  }
-
-  fun consume(event: ReactionEvent) {
-    val note = getOrCreateNote(event.id.toHex())
-
-    // Already processed this event.
-    if (note.event != null) return
-
-    val author = getOrCreateUser(event.pubKey)
-    val mentions = event.originalAuthor.map { getOrCreateUser(decodePublicKey(it)) }
-    val repliesTo = event.originalPost.map { getOrCreateNote(it) }.toMutableList()
-
-    note.loadEvent(event, author, mentions, repliesTo)
-
-    //Log.d("RE", "New Reaction ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
-
-    // Adds notifications to users.
-    mentions.forEach {
-      it.taggedPosts.add(note)
-    }
-    repliesTo.forEach {
-      it.author?.taggedPosts?.add(note)
+    fun consume(event: BookmarkListEvent) {
+        val user = getOrCreateUser(event.pubKey)
+        if (user.latestBookmarkList == null || event.createdAt > user.latestBookmarkList!!.createdAt) {
+            if (event.dTag() == "bookmark") {
+                user.updateBookmark(event)
+            }
+            // Log.d("MT", "New User Metadata ${oldUser.pubkeyDisplayHex} ${oldUser.toBestDisplayName()}")
+        } else {
+            // Log.d("MT","Relay sent a previous Metadata Event ${oldUser.toBestDisplayName()} ${formattedDateTime(event.createdAt)} > ${formattedDateTime(oldUser.updatedAt)}")
+        }
     }
 
-    if (event.content == "" || event.content == "+" || event.content == "\uD83E\uDD19") {
-      // Counts the replies
-      repliesTo.forEach {
-        it.addReaction(note)
-      }
+    fun formattedDateTime(timestamp: Long): String {
+        return Instant.ofEpochSecond(timestamp).atZone(ZoneId.systemDefault())
+            .format(DateTimeFormatter.ofPattern("uuuu MMM d hh:mm a"))
     }
-  }
 
-  // Observers line up here.
-  val live: LocalCacheLiveData = LocalCacheLiveData(this)
+    fun consume(event: TextNoteEvent, relay: Relay? = null) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
 
-  private fun refreshObservers() {
-    live.refresh()
-  }
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        if (antiSpam.isSpam(event)) {
+            relay?.let {
+                it.spamCounter++
+            }
+            return
+        }
+
+        val replyTo = event.tagsWithoutCitations().mapNotNull { checkGetOrCreateNote(it) }
+
+        note.loadEvent(event, author, replyTo)
+
+        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()?.take(100)} ${formattedDateTime(event.createdAt)}")
+
+        // Prepares user's profile view.
+        author.addNote(note)
+
+        // Counts the replies
+        replyTo.forEach {
+            it.addReply(note)
+        }
+
+        refreshObservers()
+    }
+
+    fun consume(event: LongTextNoteEvent, relay: Relay?) {
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event?.id() == event.id()) return
+
+        if (antiSpam.isSpam(event)) {
+            relay?.let {
+                it.spamCounter++
+            }
+            return
+        }
+
+        val replyTo = event.tagsWithoutCitations().mapNotNull { checkGetOrCreateNote(it) }
+
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, replyTo)
+
+            author.addNote(note)
+
+            refreshObservers()
+        }
+    }
+
+    fun consume(event: BadgeDefinitionEvent) {
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        // Already processed this event.
+        if (note.event?.id() == event.id()) return
+
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList<Note>())
+
+            refreshObservers()
+        }
+    }
+
+    fun consume(event: BadgeProfilesEvent) {
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        // Already processed this event.
+        if (note.event?.id() == event.id()) return
+
+        val replyTo = event.badgeAwardEvents().mapNotNull { checkGetOrCreateNote(it) } +
+            event.badgeAwardDefinitions().mapNotNull { getOrCreateAddressableNote(it) }
+
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, replyTo)
+
+            author.updateAcceptedBadges(note)
+
+            refreshObservers()
+        }
+    }
+
+    fun consume(event: BadgeAwardEvent) {
+        val note = getOrCreateNote(event.id)
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        // Log.d("TN", "New Boost (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+
+        val author = getOrCreateUser(event.pubKey)
+        val awardDefinition = event.awardDefinition().map { getOrCreateAddressableNote(it) }
+
+        note.loadEvent(event, author, awardDefinition)
+
+        // Replies of an Badge Definition are Award Events
+        awardDefinition.forEach {
+            it.addReply(note)
+        }
+
+        refreshObservers()
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    fun consume(event: RecommendRelayEvent) {
+//        // Log.d("RR", event.toJson())
+    }
+
+    fun consume(event: ContactListEvent) {
+        val user = getOrCreateUser(event.pubKey)
+        val follows = event.unverifiedFollowKeySet()
+
+        if (event.createdAt > (user.latestContactList?.createdAt ?: 0) && !follows.isNullOrEmpty()) {
+            // Saves relay list only if it's a user that is currently been seen
+            user.updateContactList(event)
+
+            // Log.d("CL", "AAA ${user.toBestDisplayName()} ${follows.size}")
+        }
+    }
+
+    fun consume(event: PrivateDmEvent, relay: Relay?) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        val recipient = event.recipientPubKey()?.let { getOrCreateUser(it) }
+
+        // Log.d("PM", "${author.toBestDisplayName()} to ${recipient?.toBestDisplayName()}")
+
+        val repliesTo = event.tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+            .mapNotNull { checkGetOrCreateNote(it) }
+
+        note.loadEvent(event, author, repliesTo)
+
+        if (recipient != null) {
+            author.addMessage(recipient, note)
+            recipient.addMessage(author, note)
+        }
+
+        refreshObservers()
+    }
+
+    fun consume(event: DeletionEvent) {
+        var deletedAtLeastOne = false
+
+        event.deleteEvents().mapNotNull { notes[it] }.forEach { deleteNote ->
+            // must be the same author
+            if (deleteNote.author?.pubkeyHex == event.pubKey) {
+                deleteNote.author?.removeNote(deleteNote)
+
+                // reverts the add
+                val mentions = deleteNote.event?.tags()?.filter { it.firstOrNull() == "p" }
+                    ?.mapNotNull { it.getOrNull(1) }?.mapNotNull { checkGetOrCreateUser(it) }
+
+                mentions?.forEach { user ->
+                    user.removeReport(deleteNote)
+                }
+
+                // Counts the replies
+                deleteNote.replyTo?.forEach { masterNote ->
+                    masterNote.removeReply(deleteNote)
+                    masterNote.removeBoost(deleteNote)
+                    masterNote.removeReaction(deleteNote)
+                    masterNote.removeZap(deleteNote)
+                    masterNote.removeReport(deleteNote)
+                }
+
+                val channel = deleteNote.channel()
+                channel?.removeNote(deleteNote)
+
+                if (deleteNote.event is PrivateDmEvent) {
+                    val author = deleteNote.author
+                    val recipient = (deleteNote.event as? PrivateDmEvent)?.recipientPubKey()?.let { checkGetOrCreateUser(it) }
+
+                    if (recipient != null && author != null) {
+                        author.removeMessage(recipient, deleteNote)
+                        recipient.removeMessage(author, deleteNote)
+                    }
+                }
+
+                notes.remove(deleteNote.idHex)
+
+                deletedAtLeastOne = true
+            }
+        }
+
+        if (deletedAtLeastOne) {
+            live.invalidateData()
+        }
+    }
+
+    fun consume(event: RepostEvent) {
+        val note = getOrCreateNote(event.id)
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        // Log.d("TN", "New Boost (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+
+        val author = getOrCreateUser(event.pubKey)
+        val repliesTo = event.boostedPost().mapNotNull { checkGetOrCreateNote(it) } +
+            event.taggedAddresses().mapNotNull { getOrCreateAddressableNote(it) }
+
+        note.loadEvent(event, author, repliesTo)
+
+        // Prepares user's profile view.
+        author.addNote(note)
+
+        // Counts the replies
+        repliesTo.forEach {
+            it.addBoost(note)
+        }
+
+        refreshObservers()
+    }
+
+    fun consume(event: ReactionEvent) {
+        val note = getOrCreateNote(event.id)
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        val author = getOrCreateUser(event.pubKey)
+        val repliesTo = event.originalPost().mapNotNull { checkGetOrCreateNote(it) } +
+            event.taggedAddresses().mapNotNull { getOrCreateAddressableNote(it) }
+
+        note.loadEvent(event, author, repliesTo)
+
+        // Log.d("RE", "New Reaction ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+
+        if (
+            event.content == "" ||
+            event.content == "+" ||
+            event.content == "\u2764\uFE0F" || // red heart
+            event.content == "\uD83E\uDD19" || // call me hand
+            event.content == "\uD83D\uDC4D" // thumbs up
+        ) {
+            // Counts the replies
+            repliesTo.forEach {
+                it.addReaction(note)
+            }
+        }
+
+        if (event.content == "!" || // nostr_console hide.
+            event.content == "\u26A0\uFE0F" // Warning sign
+        ) {
+            // Counts the replies
+            repliesTo.forEach {
+                it.addReport(note)
+            }
+        }
+    }
+
+    fun consume(event: ReportEvent, relay: Relay?) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        val mentions = event.reportedAuthor().mapNotNull { checkGetOrCreateUser(it.key) }
+        val repliesTo = event.reportedPost().mapNotNull { checkGetOrCreateNote(it.key) } +
+            event.taggedAddresses().map { getOrCreateAddressableNote(it) }
+
+        note.loadEvent(event, author, repliesTo)
+
+        // Log.d("RP", "New Report ${event.content} by ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+        // Adds notifications to users.
+        if (repliesTo.isEmpty()) {
+            mentions.forEach {
+                it.addReport(note)
+            }
+        }
+        repliesTo.forEach {
+            it.addReport(note)
+        }
+    }
+
+    fun consume(event: ChannelCreateEvent) {
+        // Log.d("MT", "New Event ${event.content} ${event.id.toHex()}")
+        val oldChannel = getOrCreateChannel(event.id)
+        val author = getOrCreateUser(event.pubKey)
+        if (event.createdAt <= oldChannel.updatedMetadataAt) {
+            return // older data, does nothing
+        }
+        if (oldChannel.creator == null || oldChannel.creator == author) {
+            oldChannel.updateChannelInfo(author, event.channelInfo(), event.createdAt)
+
+            val note = getOrCreateNote(event.id)
+            oldChannel.addNote(note)
+            note.loadEvent(event, author, emptyList())
+
+            refreshObservers()
+        }
+    }
+
+    fun consume(event: ChannelMetadataEvent) {
+        val channelId = event.channel()
+        // Log.d("MT", "New User ${users.size} ${event.contactMetaData.name}")
+        if (channelId.isNullOrBlank()) return
+
+        // new event
+        val oldChannel = checkGetOrCreateChannel(channelId) ?: return
+        val author = getOrCreateUser(event.pubKey)
+        if (event.createdAt > oldChannel.updatedMetadataAt) {
+            if (oldChannel.creator == null || oldChannel.creator == author) {
+                oldChannel.updateChannelInfo(author, event.channelInfo(), event.createdAt)
+
+                val note = getOrCreateNote(event.id)
+                oldChannel.addNote(note)
+                note.loadEvent(event, author, emptyList())
+
+                refreshObservers()
+            }
+        } else {
+            // Log.d("MT","Relay sent a previous Metadata Event ${oldUser.toBestDisplayName()} ${formattedDateTime(event.createdAt)} > ${formattedDateTime(oldUser.updatedAt)}")
+        }
+    }
+
+    fun consume(event: ChannelMessageEvent, relay: Relay?) {
+        val channelId = event.channel()
+
+        if (channelId.isNullOrBlank()) return
+
+        val channel = checkGetOrCreateChannel(channelId) ?: return
+
+        val note = getOrCreateNote(event.id)
+        channel.addNote(note)
+
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        if (antiSpam.isSpam(event)) {
+            relay?.let {
+                it.spamCounter++
+            }
+            return
+        }
+
+        val replyTo = event.replyTos()
+            .mapNotNull { checkGetOrCreateNote(it) }
+            .filter { it.event !is ChannelCreateEvent }
+
+        note.loadEvent(event, author, replyTo)
+
+        // Log.d("CM", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()} ${formattedDateTime(event.createdAt)}")
+
+        // Counts the replies
+        replyTo.forEach {
+            it.addReply(note)
+        }
+
+        refreshObservers()
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    fun consume(event: ChannelHideMessageEvent) {
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    fun consume(event: ChannelMuteUserEvent) {
+    }
+
+    fun consume(event: LnZapEvent) {
+        val note = getOrCreateNote(event.id)
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        val zapRequest = event.containedPost()?.id?.let { getOrCreateNote(it) }
+
+        val author = getOrCreateUser(event.pubKey)
+        val mentions = event.zappedAuthor().mapNotNull { checkGetOrCreateUser(it) }
+        val repliesTo = event.zappedPost().mapNotNull { checkGetOrCreateNote(it) } +
+            event.taggedAddresses().map { getOrCreateAddressableNote(it) } +
+            (
+                (zapRequest?.event as? LnZapRequestEvent)?.taggedAddresses()
+                    ?.map { getOrCreateAddressableNote(it) } ?: emptySet<Note>()
+                )
+
+        note.loadEvent(event, author, repliesTo)
+
+        if (zapRequest == null) {
+            Log.e("ZP", "Zap Request not found. Unable to process Zap {${event.toJson()}}")
+            return
+        }
+
+        // Log.d("ZP", "New ZapEvent ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+
+        repliesTo.forEach {
+            it.addZap(zapRequest, note)
+        }
+        mentions.forEach {
+            it.addZap(zapRequest, note)
+        }
+    }
+
+    fun consume(event: LnZapRequestEvent) {
+        val note = getOrCreateNote(event.id)
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        val author = getOrCreateUser(event.pubKey)
+        val mentions = event.zappedAuthor().mapNotNull { checkGetOrCreateUser(it) }
+        val repliesTo = event.zappedPost().mapNotNull { checkGetOrCreateNote(it) } +
+            event.taggedAddresses().map { getOrCreateAddressableNote(it) }
+
+        note.loadEvent(event, author, repliesTo)
+
+        // Log.d("ZP", "New Zap Request ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+
+        repliesTo.forEach {
+            it.addZap(note, null)
+        }
+        mentions.forEach {
+            it.addZap(note, null)
+        }
+    }
+
+    fun findUsersStartingWith(username: String): List<User> {
+        return users.values.filter {
+            (it.anyNameStartsWith(username)) ||
+                it.pubkeyHex.startsWith(username, true) ||
+                it.pubkeyNpub().startsWith(username, true)
+        }
+    }
+
+    fun findNotesStartingWith(text: String): List<Note> {
+        return notes.values.filter {
+            (it.event is TextNoteEvent && it.event?.content()?.contains(text, true) ?: false) ||
+                (it.event is ChannelMessageEvent && it.event?.content()?.contains(text, true) ?: false) ||
+                it.idHex.startsWith(text, true) ||
+                it.idNote().startsWith(text, true)
+        } + addressables.values.filter {
+            (it.event as? LongTextNoteEvent)?.content?.contains(text, true) ?: false ||
+                (it.event as? LongTextNoteEvent)?.title()?.contains(text, true) ?: false ||
+                (it.event as? LongTextNoteEvent)?.summary()?.contains(text, true) ?: false ||
+                it.idHex.startsWith(text, true)
+        }
+    }
+
+    fun findChannelsStartingWith(text: String): List<Channel> {
+        return channels.values.filter {
+            it.anyNameStartsWith(text) ||
+                it.idHex.startsWith(text, true) ||
+                it.idNote().startsWith(text, true)
+        }
+    }
+
+    fun cleanObservers() {
+        notes.forEach {
+            it.value.clearLive()
+        }
+
+        users.forEach {
+            it.value.clearLive()
+        }
+    }
+
+    fun pruneOldAndHiddenMessages(account: Account) {
+        channels.forEach { it ->
+            val toBeRemoved = it.value.pruneOldAndHiddenMessages(account)
+
+            toBeRemoved.forEach {
+                notes.remove(it.idHex)
+                // Doesn't need to clean up the replies and mentions.. Too small to matter.
+
+                // reverts the add
+                val mentions =
+                    it.event?.tags()?.filter { it.firstOrNull() == "p" }?.mapNotNull { it.getOrNull(1) }
+                        ?.mapNotNull { checkGetOrCreateUser(it) }
+
+                // Counts the replies
+                it.replyTo?.forEach { _ ->
+                    it.removeReply(it)
+                }
+            }
+
+            println("PRUNE: ${toBeRemoved.size} messages removed from ${it.value.info.name}")
+        }
+    }
+
+    fun pruneHiddenMessages(account: Account) {
+        val toBeRemoved = account.hiddenUsers.map {
+            (users[it]?.notes ?: emptySet())
+        }.flatten()
+
+        account.hiddenUsers.forEach {
+            users[it]?.clearNotes()
+        }
+
+        toBeRemoved.forEach {
+            it.author?.removeNote(it)
+
+            // Counts the replies
+            it.replyTo?.forEach { masterNote ->
+                masterNote.removeReply(it)
+                masterNote.removeBoost(it)
+                masterNote.removeReaction(it)
+                masterNote.removeZap(it)
+                masterNote.removeReport(it)
+            }
+
+            notes.remove(it.idHex)
+        }
+
+        println("PRUNE: ${toBeRemoved.size} messages removed because they were Hidden")
+    }
+
+    fun pruneContactLists(userAccount: Account) {
+        var removingContactList = 0
+        users.values.forEach {
+            if (it != userAccount.userProfile() && (it.liveSet == null || it.liveSet?.isInUse() == false) && it.latestContactList != null) {
+                it.latestContactList = null
+                removingContactList++
+            }
+        }
+
+        println("PRUNE: $removingContactList contact lists")
+    }
+
+    // Observers line up here.
+    val live: LocalCacheLiveData = LocalCacheLiveData(this)
+
+    private fun refreshObservers() {
+        live.invalidateData()
+    }
 }
 
-class LocalCacheLiveData(val cache: LocalCache): LiveData<LocalCacheState>(LocalCacheState(cache)) {
-  fun refresh() {
-    postValue(LocalCacheState(cache))
-  }
+class LocalCacheLiveData(val cache: LocalCache) :
+    LiveData<LocalCacheState>(LocalCacheState(cache)) {
+
+    // Refreshes observers in batches.
+    private val bundler = BundledUpdate(300, Dispatchers.Main) {
+        if (hasActiveObservers()) {
+            refresh()
+        }
+    }
+
+    fun invalidateData() {
+        bundler.invalidate()
+    }
+
+    private fun refresh() {
+        postValue(LocalCacheState(cache))
+    }
 }
 
-class LocalCacheState(val cache: LocalCache) {
-
-}
+class LocalCacheState(val cache: LocalCache)

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

@@ -2,34 +2,75 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
-import com.vitorpamplona.amethyst.ui.note.toDisplayHex
+import com.vitorpamplona.amethyst.service.model.*
+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.Dispatchers
+import java.math.BigDecimal
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
-import java.util.Collections
-import nostr.postr.events.Event
+import java.util.Date
+import java.util.regex.Pattern
 
-class Note(val idHex: String) {
-    val id = Hex.decode(idHex)
-    val idDisplayHex = id.toDisplayHex()
+val tagSearch = Pattern.compile("(?:\\s|\\A)\\#\\[([0-9]+)\\]")
 
-    var event: Event? = null
+class AddressableNote(val address: ATag) : Note(address.toTag()) {
+    override fun idNote() = address.toNAddr()
+    override fun idDisplayNote() = idNote().toShortenHex()
+    override fun address() = address
+    override fun createdAt() = (event as? LongTextNoteEvent)?.publishedAt() ?: event?.createdAt()
+}
+
+open class Note(val idHex: String) {
+    // These fields are only available after the Text Note event is received.
+    // They are immutable after that.
+    var event: EventInterface? = null
     var author: User? = null
-    var mentions: List<User>? = null
-    var replyTo: MutableList<Note>? = null
+    var replyTo: List<Note>? = null
 
-    val replies = Collections.synchronizedSet(mutableSetOf<Note>())
-    val reactions = Collections.synchronizedSet(mutableSetOf<Note>())
-    val boosts = Collections.synchronizedSet(mutableSetOf<Note>())
+    // These fields are updated every time an event related to this note is received.
+    var replies = setOf<Note>()
+        private set
+    var reactions = setOf<Note>()
+        private set
+    var boosts = setOf<Note>()
+        private set
+    var reports = mapOf<User, Set<Note>>()
+        private set
+    var zaps = mapOf<Note, Note?>()
+        private set
 
-    fun loadEvent(event: Event, author: User, mentions: List<User>, replyTo: MutableList<Note>) {
+    var relays = setOf<String>()
+        private set
+
+    var lastReactionsDownloadTime: Map<String, Long> = 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 address(): ATag? = null
+
+    open fun createdAt() = event?.createdAt()
+
+    fun loadEvent(event: Event, author: User, replyTo: List<Note>) {
         this.event = event
         this.author = author
-        this.mentions = mentions
         this.replyTo = replyTo
 
-        refreshObservers()
+        liveSet?.metadata?.invalidateData()
     }
 
     fun formattedDateTime(timestamp: Long): String {
@@ -37,41 +78,121 @@ class Note(val idHex: String) {
             .format(DateTimeFormatter.ofPattern("uuuu-MM-dd-HH:mm:ss"))
     }
 
-    fun replyLevelSignature(): String {
+    /**
+     * This method caches signatures during each execution to avoid recalculation in longer threads
+     */
+    fun replyLevelSignature(cachedSignatures: MutableMap<Note, String> = mutableMapOf()): String {
         val replyTo = replyTo
         if (replyTo == null || replyTo.isEmpty()) {
-            return "/" + formattedDateTime(event?.createdAt ?: 0) + ";"
+            return "/" + formattedDateTime(createdAt() ?: 0) + ";"
         }
 
         return replyTo
-            .map { it.replyLevelSignature() }
-            .maxBy { it.length }.removeSuffix(";") + "/" + formattedDateTime(event?.createdAt ?: 0) + ";"
+            .map {
+                cachedSignatures[it] ?: it.replyLevelSignature(cachedSignatures).apply { cachedSignatures.put(it, this) }
+            }
+            .maxBy { it.length }.removeSuffix(";") + "/" + formattedDateTime(createdAt() ?: 0) + ";"
     }
 
-    fun replyLevel(): Int {
+    fun replyLevel(cachedLevels: MutableMap<Note, Int> = mutableMapOf()): Int {
         val replyTo = replyTo
         if (replyTo == null || replyTo.isEmpty()) {
             return 0
         }
 
         return replyTo.maxOf {
-            it.replyLevel()
+            cachedLevels[it] ?: it.replyLevel(cachedLevels).apply { cachedLevels.put(it, this) }
         } + 1
     }
 
     fun addReply(note: Note) {
-        if (replies.add(note))
-            refreshObservers()
+        if (note !in replies) {
+            replies = replies + note
+            liveSet?.replies?.invalidateData()
+        }
+    }
+
+    fun removeReply(note: Note) {
+        replies = replies - note
+        liveSet?.replies?.invalidateData()
+    }
+    fun removeBoost(note: Note) {
+        boosts = boosts - note
+        liveSet?.boosts?.invalidateData()
+    }
+    fun removeReaction(note: Note) {
+        reactions = reactions - note
+        liveSet?.reactions?.invalidateData()
+    }
+
+    fun removeReport(deleteNote: Note) {
+        val author = deleteNote.author ?: return
+
+        if (author in reports.keys && reports[author]?.contains(deleteNote) == true) {
+            reports[author]?.let {
+                reports = reports + Pair(author, it.minus(deleteNote))
+                liveSet?.reports?.invalidateData()
+            }
+        }
+    }
+
+    fun removeZap(note: Note) {
+        if (zaps[note] != null) {
+            zaps = zaps.minus(note)
+            liveSet?.zaps?.invalidateData()
+        } else if (zaps.containsValue(note)) {
+            val toRemove = zaps.filterValues { it == note }
+            zaps = zaps.minus(toRemove.keys)
+            liveSet?.zaps?.invalidateData()
+        }
     }
 
     fun addBoost(note: Note) {
-        if (boosts.add(note))
-            refreshObservers()
+        if (note !in boosts) {
+            boosts = boosts + note
+            liveSet?.boosts?.invalidateData()
+        }
+    }
+
+    fun addZap(zapRequest: Note, zap: Note?) {
+        if (zapRequest !in zaps.keys) {
+            zaps = zaps + Pair(zapRequest, zap)
+            liveSet?.zaps?.invalidateData()
+        } else if (zapRequest in zaps.keys && zaps[zapRequest] == null) {
+            zaps = zaps + Pair(zapRequest, zap)
+            liveSet?.zaps?.invalidateData()
+        }
     }
 
     fun addReaction(note: Note) {
-        if (reactions.add(note))
-            refreshObservers()
+        if (note !in reactions) {
+            reactions = reactions + note
+            liveSet?.reactions?.invalidateData()
+        }
+    }
+
+    fun addReport(note: Note) {
+        val author = note.author ?: return
+
+        if (author !in reports.keys) {
+            reports = reports + Pair(author, setOf(note))
+            liveSet?.reports?.invalidateData()
+        } else if (reports[author]?.contains(note) == false) {
+            reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
+            liveSet?.reports?.invalidateData()
+        }
+    }
+
+    fun addRelay(relay: Relay) {
+        if (relay.url !in relays) {
+            relays = relays + relay.url
+            liveSet?.relays?.invalidateData()
+        }
+    }
+
+    fun isZappedBy(user: User): Boolean {
+        // Zaps who the requester was the user
+        return zaps.any { it.key.author == user }
     }
 
     fun isReactedBy(user: User): Boolean {
@@ -82,27 +203,205 @@ class Note(val idHex: String) {
         return boosts.any { it.author == user }
     }
 
-    // Observers line up here.
-    val live: NoteLiveData = NoteLiveData(this)
+    fun reportsBy(user: User): Set<Note> {
+        return reports[user] ?: emptySet()
+    }
 
-    private fun refreshObservers() {
-        live.refresh()
+    fun reportAuthorsBy(users: Set<HexKey>): List<User> {
+        return reports.keys.filter { it.pubkeyHex in users }
+    }
+
+    fun countReportAuthorsBy(users: Set<HexKey>): Int {
+        return reports.keys.count { it.pubkeyHex in users }
+    }
+
+    fun reportsBy(users: Set<HexKey>): List<Note> {
+        return reportAuthorsBy(users).mapNotNull {
+            reports[it]
+        }.flatten()
+    }
+
+    fun zappedAmount(): BigDecimal {
+        return zaps.mapNotNull { it.value?.event }
+            .filterIsInstance<LnZapEvent>()
+            .mapNotNull {
+                it.amount
+            }.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 {
+                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?.any {
+                    it.firstOrNull { (it.createdAt() ?: 0) > dayAgo } != null
+                } ?: 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
+    }
+
+    fun hasZapped(loggedIn: User): Boolean {
+        return zaps.any { it.key.author == loggedIn }
+    }
+
+    fun hasReacted(loggedIn: User, content: String): Boolean {
+        return reactedBy(loggedIn, content).isNotEmpty()
+    }
+
+    fun reactedBy(loggedIn: User, content: String): List<Note> {
+        return reactions.filter { it.author == loggedIn && it.event?.content() == content }
+    }
+
+    fun hasBoostedInTheLast5Minutes(loggedIn: User): Boolean {
+        val currentTime = Date().time / 1000
+        return boosts.firstOrNull { it.author == loggedIn && (it.createdAt() ?: 0) > currentTime - (60 * 5) } != null // 5 minute protection
+    }
+
+    fun boostedBy(loggedIn: User): List<Note> {
+        return boosts.filter { it.author == loggedIn }
+    }
+
+    var liveSet: NoteLiveSet? = null
+
+    fun live(): NoteLiveSet {
+        if (liveSet == null) {
+            liveSet = NoteLiveSet(this)
+        }
+        return liveSet!!
+    }
+
+    fun clearLive() {
+        if (liveSet != null && liveSet?.isInUse() == false) {
+            liveSet = null
+        }
     }
 }
 
-class NoteLiveData(val note: Note): LiveData<NoteState>(NoteState(note)) {
-    fun refresh() {
+class NoteLiveSet(u: Note) {
+    // Observers line up here.
+    val metadata: NoteLiveData = NoteLiveData(u)
+
+    val reactions: NoteLiveData = NoteLiveData(u)
+    val boosts: NoteLiveData = NoteLiveData(u)
+    val replies: NoteLiveData = NoteLiveData(u)
+    val reports: NoteLiveData = NoteLiveData(u)
+    val relays: NoteLiveData = NoteLiveData(u)
+    val zaps: NoteLiveData = NoteLiveData(u)
+
+    fun isInUse(): Boolean {
+        return metadata.hasObservers() ||
+            reactions.hasObservers() ||
+            boosts.hasObservers() ||
+            replies.hasObservers() ||
+            reports.hasObservers() ||
+            relays.hasObservers() ||
+            zaps.hasObservers()
+    }
+}
+
+class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
+    // Refreshes observers in batches.
+    private val bundler = BundledUpdate(300, Dispatchers.Main) {
+        if (hasActiveObservers()) {
+            refresh()
+        }
+    }
+
+    fun invalidateData() {
+        bundler.invalidate()
+    }
+
+    private fun refresh() {
         postValue(NoteState(note))
     }
 
     override fun onActive() {
         super.onActive()
-        NostrSingleEventDataSource.add(note.idHex)
+        if (note is AddressableNote) {
+            NostrSingleEventDataSource.addAddress(note)
+        } else {
+            NostrSingleEventDataSource.add(note)
+        }
     }
 
     override fun onInactive() {
         super.onInactive()
-        NostrSingleEventDataSource.remove(note.idHex)
+        if (note is AddressableNote) {
+            NostrSingleEventDataSource.removeAddress(note)
+        } else {
+            NostrSingleEventDataSource.remove(note)
+        }
     }
 }
 

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

@@ -0,0 +1,14 @@
+package com.vitorpamplona.amethyst.model
+
+import com.vitorpamplona.amethyst.service.relays.FeedType
+
+data class RelaySetupInfo(
+    val url: String,
+    val read: Boolean,
+    val write: Boolean,
+    val errorCount: 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

@@ -0,0 +1,77 @@
+package com.vitorpamplona.amethyst.model
+
+import com.vitorpamplona.amethyst.service.model.ATag
+import kotlin.time.ExperimentalTime
+import kotlin.time.measureTimedValue
+
+class ThreadAssembler {
+
+    fun searchRoot(note: Note, testedNotes: MutableSet<Note> = mutableSetOf()): Note? {
+        if (note.replyTo == null || note.replyTo?.isEmpty() == true) return note
+
+        testedNotes.add(note)
+
+        val markedAsRoot = note.event?.tags()?.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1)
+        if (markedAsRoot != null) return LocalCache.checkGetOrCreateNote(markedAsRoot)
+
+        val hasNoReplyTo = note.replyTo?.firstOrNull { it.replyTo?.isEmpty() == true }
+        if (hasNoReplyTo != null) return hasNoReplyTo
+
+        // recursive
+        val roots = note.replyTo?.map {
+            if (it !in testedNotes) {
+                searchRoot(it, testedNotes)
+            } else {
+                null
+            }
+        }?.filterNotNull()
+
+        if (roots != null && roots.isNotEmpty()) {
+            return roots[0]
+        }
+
+        return null
+    }
+
+    @OptIn(ExperimentalTime::class)
+    fun findThreadFor(noteId: String): Set<Note> {
+        val (result, elapsed) = measureTimedValue {
+            val note = if (noteId.contains(":")) {
+                val aTag = ATag.parse(noteId, null)
+                if (aTag != null) {
+                    LocalCache.getOrCreateAddressableNote(aTag)
+                } else {
+                    return emptySet()
+                }
+            } else {
+                LocalCache.getOrCreateNote(noteId)
+            }
+
+            if (note.event != null) {
+                val thread = mutableSetOf<Note>()
+
+                val threadRoot = searchRoot(note, thread) ?: note
+
+                loadDown(threadRoot, thread)
+
+                thread.toSet()
+            } else {
+                setOf(note)
+            }
+        }
+
+        println("Model Refresh: Thread loaded in $elapsed")
+
+        return result
+    }
+
+    fun loadDown(note: Note, thread: MutableSet<Note>) {
+        if (note !in thread) {
+            thread.add(note)
+
+            note.replies.forEach {
+                loadDown(it, thread)
+            }
+        }
+    }
+}

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

@@ -0,0 +1,75 @@
+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
+
+object UrlCachedPreviewer {
+    var cache = mapOf<String, UrlInfoItem>()
+        private set
+    var failures = mapOf<String, Throwable>()
+        private set
+
+    fun previewInfo(url: String, callback: IUrlPreviewCallback? = null) {
+        cache[url]?.let {
+            callback?.onComplete(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)
+                    }
+
+                    override fun onFailed(throwable: Throwable) {
+                        failures = failures + Pair(url, throwable)
+                        callback?.onFailed(throwable)
+                    }
+                }
+            ).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()
+    }
+
+    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")
+                }
+            }
+        }
+    }
+}

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

@@ -2,73 +2,374 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
-import com.vitorpamplona.amethyst.ui.note.toDisplayHex
-import java.util.Collections
+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.Relay
+import com.vitorpamplona.amethyst.ui.components.BundledUpdate
+import com.vitorpamplona.amethyst.ui.note.toShortenHex
+import fr.acinq.secp256k1.Hex
+import kotlinx.coroutines.Dispatchers
+import nostr.postr.Bech32
+import nostr.postr.toNpub
+import java.math.BigDecimal
+import java.util.regex.Pattern
 
-class User(val pubkey: ByteArray) {
-    val pubkeyHex = pubkey.toHexKey()
-    val pubkeyDisplayHex = pubkey.toDisplayHex()
+val lnurlpPattern = Pattern.compile("(?i:http|https):\\/\\/((.+)\\/)*\\.well-known\\/lnurlp\\/(.*)")
 
-    var info = UserMetadata()
+class User(val pubkeyHex: String) {
+    var info: UserMetadata? = null
 
-    var updatedMetadataAt: Long = 0;
-    var updatedFollowsAt: Long = 0;
+    var latestContactList: ContactListEvent? = null
+    var latestBookmarkList: BookmarkListEvent? = null
 
-    val notes = Collections.synchronizedSet(mutableSetOf<Note>())
-    val follows = Collections.synchronizedSet(mutableSetOf<User>())
-    val taggedPosts = Collections.synchronizedSet(mutableSetOf<Note>())
+    var notes = setOf<Note>()
+        private set
 
-    var follower: Number? = null
+    var reports = mapOf<User, Set<Note>>()
+        private set
+
+    var latestEOSEs: Map<String, Long> = emptyMap()
+
+    var zaps = mapOf<Note, Note?>()
+        private set
+
+    var relaysBeingUsed = mapOf<String, RelayInfo>()
+        private set
+
+    var privateChatrooms = mapOf<User, Chatroom>()
+        private set
+
+    var acceptedBadges: AddressableNote? = null
+
+    fun pubkey() = Hex.decode(pubkeyHex)
+    fun pubkeyNpub() = pubkey().toNpub()
+    fun pubkeyDisplayHex() = pubkeyNpub().toShortenHex()
+
+    override fun toString(): String = pubkeyHex
 
     fun toBestDisplayName(): String {
-        return bestDisplayName() ?: bestUsername() ?: pubkeyDisplayHex
+        return bestDisplayName() ?: bestUsername() ?: pubkeyDisplayHex()
     }
 
     fun bestUsername(): String? {
-        return info.name?.ifBlank { null } ?: info.username?.ifBlank { null }
+        return info?.name?.ifBlank { null } ?: info?.username?.ifBlank { null }
     }
 
     fun bestDisplayName(): String? {
-        return info.displayName?.ifBlank { null } ?: info.display_name?.ifBlank { null }
+        return info?.displayName?.ifBlank { null } ?: info?.display_name?.ifBlank { null }
     }
 
-    fun profilePicture(): String {
-        if (info.picture.isNullOrBlank()) info.picture = null
-        return info.picture ?: "https://robohash.org/${pubkeyHex}.png"
+    fun nip05(): String? {
+        return info?.nip05?.ifBlank { null }
     }
 
-    fun updateFollows(newFollows: List<User>, updateAt: Long) {
-        follows.clear()
-        follows.addAll(newFollows)
-        updatedFollowsAt = updateAt
-
-        live.refresh()
+    fun profilePicture(): String? {
+        if (info?.picture.isNullOrBlank()) info?.picture = null
+        return info?.picture
     }
 
-    fun updateUserInfo(newUserInfo: UserMetadata, updateAt: Long) {
+    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
+
+        val oldContactListEvent = latestContactList
+        latestContactList = event
+
+        // Update following of the current user
+        liveSet?.follows?.invalidateData()
+
+        // Update Followers of the past user list
+        // Update Followers of the new contact list
+        (oldContactListEvent)?.unverifiedFollowKeySet()?.forEach {
+            LocalCache.users[it]?.liveSet?.follows?.invalidateData()
+        }
+        (latestContactList)?.unverifiedFollowKeySet()?.forEach {
+            LocalCache.users[it]?.liveSet?.follows?.invalidateData()
+        }
+
+        liveSet?.relays?.invalidateData()
+    }
+
+    fun addNote(note: Note) {
+        if (note !in notes) {
+            notes = notes + note
+            // No need for Listener yet
+        }
+    }
+
+    fun removeNote(note: Note) {
+        notes = notes - note
+    }
+
+    fun clearNotes() {
+        notes = setOf<Note>()
+    }
+
+    fun addReport(note: Note) {
+        val author = note.author ?: return
+
+        if (author !in reports.keys) {
+            reports = reports + Pair(author, setOf(note))
+            liveSet?.reports?.invalidateData()
+        } else if (reports[author]?.contains(note) == false) {
+            reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
+            liveSet?.reports?.invalidateData()
+        }
+    }
+
+    fun removeReport(deleteNote: Note) {
+        val author = deleteNote.author ?: return
+
+        if (author in reports.keys && reports[author]?.contains(deleteNote) == true) {
+            reports[author]?.let {
+                reports = reports + Pair(author, it.minus(deleteNote))
+                liveSet?.reports?.invalidateData()
+            }
+        }
+    }
+
+    fun updateAcceptedBadges(note: AddressableNote) {
+        acceptedBadges = note
+        liveSet?.badges?.invalidateData()
+    }
+
+    fun addZap(zapRequest: Note, zap: Note?) {
+        if (zapRequest !in zaps.keys) {
+            zaps = zaps + Pair(zapRequest, zap)
+            liveSet?.zaps?.invalidateData()
+        } else if (zapRequest in zaps.keys && zaps[zapRequest] == null) {
+            zaps = zaps + Pair(zapRequest, zap)
+            liveSet?.zaps?.invalidateData()
+        }
+    }
+
+    fun zappedAmount(): BigDecimal {
+        return zaps.mapNotNull { it.value?.event }
+            .filterIsInstance<LnZapEvent>()
+            .mapNotNull {
+                it.amount
+            }.sumOf { it }
+    }
+
+    fun reportsBy(user: User): Set<Note> {
+        return reports[user] ?: emptySet()
+    }
+
+    fun reportAuthorsBy(users: Set<HexKey>): List<User> {
+        return reports.keys.filter { it.pubkeyHex in users }
+    }
+
+    fun countReportAuthorsBy(users: Set<HexKey>): Int {
+        return reports.keys.count { it.pubkeyHex in users }
+    }
+
+    fun reportsBy(users: Set<HexKey>): List<Note> {
+        return reportAuthorsBy(users).mapNotNull {
+            reports[it]
+        }.flatten()
+    }
+
+    @Synchronized
+    fun getOrCreatePrivateChatroom(user: User): Chatroom {
+        return privateChatrooms[user] ?: run {
+            val privateChatroom = Chatroom(setOf<Note>())
+            privateChatrooms = privateChatrooms + Pair(user, privateChatroom)
+            privateChatroom
+        }
+    }
+
+    @Synchronized
+    fun addMessage(user: User, msg: Note) {
+        val privateChatroom = getOrCreatePrivateChatroom(user)
+        if (msg !in privateChatroom.roomMessages) {
+            privateChatroom.roomMessages = privateChatroom.roomMessages + msg
+            liveSet?.messages?.invalidateData()
+        }
+    }
+
+    @Synchronized
+    fun removeMessage(user: User, msg: Note) {
+        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) {
+            relaysBeingUsed = relaysBeingUsed + Pair(relay.url, RelayInfo(relay.url, eventTime, 1))
+        } else {
+            if (eventTime > here.lastEvent) {
+                here.lastEvent = eventTime
+            }
+            here.counter++
+        }
+
+        liveSet?.relayInfo?.invalidateData()
+    }
+
+    fun updateUserInfo(newUserInfo: UserMetadata, latestMetadata: MetadataEvent) {
         info = newUserInfo
-        updatedMetadataAt = updateAt
+        info?.latestMetadata = latestMetadata
+        info?.updatedMetadataAt = latestMetadata.createdAt
 
-        live.refresh()
+        if (newUserInfo.lud16.isNullOrBlank() && newUserInfo.lud06?.lowercase()?.startsWith("lnurl") == true) {
+            try {
+                val url = String(Bech32.decodeBytes(newUserInfo.lud06!!, false).second)
+
+                val matcher = lnurlpPattern.matcher(url)
+                while (matcher.find()) {
+                    val domain = matcher.group(2)
+                    val username = matcher.group(3)
+
+                    info?.lud16 = "$username@$domain"
+                }
+            } catch (t: Throwable) {
+                // Doesn't create errors.
+            }
+        }
+
+        liveSet?.metadata?.invalidateData()
     }
 
-    // Observers line up here.
-    val live: UserLiveData = UserLiveData(this)
+    fun isFollowing(user: User): Boolean {
+        return latestContactList?.unverifiedFollowKeySet()?.toSet()?.let {
+            return user.pubkeyHex in it
+        } ?: false
+    }
 
-    private fun refreshObservers() {
-        live.refresh()
+    fun isFollowingHashtag(tag: String): Boolean {
+        return latestContactList?.unverifiedFollowTagSet()?.toSet()?.let {
+            return tag in it
+        } ?: 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 transientFollowCount(): Int? {
+        return latestContactList?.unverifiedFollowKeySet()?.size
+    }
+
+    fun transientFollowerCount(): Int {
+        return LocalCache.users.values.count { it.latestContactList?.let { pubkeyHex in it.unverifiedFollowKeySet() } ?: 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 }
+    }
+
+    fun hasSentMessagesTo(user: User?): Boolean {
+        val messagesToUser = privateChatrooms[user] ?: return false
+
+        return messagesToUser.roomMessages.any { this == it.author }
+    }
+
+    fun hasReport(loggedIn: User, type: ReportEvent.ReportType): Boolean {
+        return reports[loggedIn]?.firstOrNull() {
+            it.event is ReportEvent && (it.event as ReportEvent).reportedAuthor().any { it.reportType == type }
+        } != null
+    }
+
+    fun anyNameStartsWith(username: String): Boolean {
+        return info?.anyNameStartsWith(username) ?: false
+    }
+
+    var liveSet: UserLiveSet? = null
+
+    fun live(): UserLiveSet {
+        if (liveSet == null) {
+            liveSet = UserLiveSet(this)
+        }
+        return liveSet!!
+    }
+
+    fun clearLive() {
+        if (liveSet != null && liveSet?.isInUse() == false) {
+            liveSet = null
+        }
     }
 }
 
+class UserLiveSet(u: User) {
+    // UI Observers line up here.
+    val follows: UserLiveData = UserLiveData(u)
+    val reports: UserLiveData = UserLiveData(u)
+    val messages: UserLiveData = UserLiveData(u)
+    val relays: UserLiveData = UserLiveData(u)
+    val relayInfo: UserLiveData = UserLiveData(u)
+    val metadata: UserLiveData = UserLiveData(u)
+    val zaps: UserLiveData = UserLiveData(u)
+    val badges: UserLiveData = UserLiveData(u)
+    val bookmarks: UserLiveData = UserLiveData(u)
+
+    fun isInUse(): Boolean {
+        return follows.hasObservers() ||
+            reports.hasObservers() ||
+            messages.hasObservers() ||
+            relays.hasObservers() ||
+            relayInfo.hasObservers() ||
+            metadata.hasObservers() ||
+            zaps.hasObservers() ||
+            badges.hasObservers() ||
+            bookmarks.hasObservers()
+    }
+}
+
+data class RelayInfo(
+    val url: String,
+    var lastEvent: Long,
+    var counter: Long
+)
+
+data class Chatroom(var roomMessages: Set<Note>)
+
 class UserMetadata {
     var name: String? = null
     var username: String? = null
     var display_name: String? = null
     var displayName: String? = null
     var picture: String? = null
+    var banner: String? = null
     var website: String? = null
     var about: String? = null
+
     var nip05: String? = null
+    var nip05Verified: Boolean = false
+    var nip05LastVerificationTime: Long? = 0
+
     var domain: String? = null
     var lud06: String? = null
     var lud16: String? = null
@@ -77,21 +378,40 @@ class UserMetadata {
     var iris: String? = null
     var main_relay: String? = null
     var twitter: String? = null
+
+    var updatedMetadataAt: Long = 0
+    var latestMetadata: MetadataEvent? = null
+
+    fun anyNameStartsWith(prefix: String): Boolean {
+        return listOfNotNull(name, username, display_name, displayName, nip05, lud06, lud16)
+            .any { it.startsWith(prefix, true) }
+    }
 }
 
-class UserLiveData(val user: User): LiveData<UserState>(UserState(user)) {
-    fun refresh() {
+class UserLiveData(val user: User) : LiveData<UserState>(UserState(user)) {
+    // Refreshes observers in batches.
+    private val bundler = BundledUpdate(300, Dispatchers.Main) {
+        if (hasActiveObservers()) {
+            refresh()
+        }
+    }
+
+    fun invalidateData() {
+        bundler.invalidate()
+    }
+
+    private fun refresh() {
         postValue(UserState(user))
     }
 
     override fun onActive() {
         super.onActive()
-        NostrSingleUserDataSource.add(user.pubkeyHex)
+        NostrSingleUserDataSource.add(user)
     }
 
     override fun onInactive() {
         super.onInactive()
-        NostrSingleUserDataSource.remove(user.pubkeyHex)
+        NostrSingleUserDataSource.remove(user)
     }
 }
 

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

@@ -1,10 +0,0 @@
-package com.vitorpamplona.amethyst.service
-
-import java.util.UUID
-import nostr.postr.JsonFilter
-
-data class Channel (
-  val id: String = UUID.randomUUID().toString().substring(0,4)
-) {
-  var filter: JsonFilter? = null // Inactive when null
-}

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

@@ -1,24 +0,0 @@
-package com.vitorpamplona.amethyst.service
-
-import com.vitorpamplona.amethyst.service.relays.Relay
-
-object Constants {
-    val defaultRelays = arrayOf(
-      Relay("wss://nostr.bitcoiner.social", read = true, write = true),
-      Relay("wss://relay.nostr.bg", read = true, write = true),
-      //Relay("wss://brb.io", read = true, write = true),
-      Relay("wss://nostr.v0l.io", read = true, write = true),
-      Relay("wss://nostr.rocks", read = true, write = true),
-      Relay("wss://relay.damus.io", read = true, write = true),
-      Relay("wss://nostr.fmt.wiz.biz", read = true, write = true),
-      Relay("wss://nostr.oxtr.dev", read = true, write = true),
-      Relay("wss://nostr-relay.wlvs.space", read = true, write = true),
-      //Relay("wss://nostr-2.zebedee.cloud", read = true, write = true),
-      Relay("wss://nostr-pub.wellorder.net", read = true, write = true),
-      Relay("wss://nostr.mom", read = true, write = true),
-      Relay("wss://nostr.orangepill.dev", read = true, write = true),
-      //Relay("wss://nostr-pub.semisol.dev", read = true, write = true),
-      Relay("wss://nostr.onsats.org", read = true, write = true),
-      Relay("wss://nostr.sandwich.farm", read = true, write = true)
-    )
-}

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

@@ -0,0 +1,99 @@
+package com.vitorpamplona.amethyst.service
+
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.vitorpamplona.amethyst.BuildConfig
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+
+class Nip05Verifier {
+    val client = OkHttpClient.Builder().build()
+
+    fun assembleUrl(nip05address: String): String? {
+        val parts = nip05address.trim().split("@")
+
+        if (parts.size == 2) {
+            return "https://${parts[1]}/.well-known/nostr.json?name=${parts[0]}"
+        }
+
+        return null
+    }
+
+    fun fetchNip05Json(nip05address: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            fetchNip05JsonSuspend(nip05address, onSuccess, onError)
+        }
+    }
+
+    private suspend fun fetchNip05JsonSuspend(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        val url = assembleUrl(nip05)
+
+        if (url == null) {
+            onError("Could not assemble url from Nip05: \"${nip05}\". Check the user's setup")
+            return
+        }
+
+        withContext(Dispatchers.IO) {
+            try {
+                val request = Request.Builder()
+                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                    .url(url)
+                    .build()
+
+                client.newCall(request).enqueue(object : Callback {
+                    override fun onResponse(call: Call, response: Response) {
+                        response.use {
+                            if (it.isSuccessful) {
+                                onSuccess(it.body.string())
+                            } else {
+                                onError("Could not resolve $nip05. Error: ${it.code}. Check if the server up and if the address $nip05 is correct")
+                            }
+                        }
+                    }
+
+                    override fun onFailure(call: Call, e: java.io.IOException) {
+                        onError("Could not resolve $url. Check if the server up and if the address $nip05 is correct")
+                        e.printStackTrace()
+                    }
+                })
+            } catch (e: java.lang.Exception) {
+                onError("Could not resolve '$url': ${e.message}")
+            }
+        }
+    }
+
+    fun verifyNip05(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        val mapper = jacksonObjectMapper()
+
+        fetchNip05Json(
+            nip05,
+            onSuccess = {
+                val nip05url = try {
+                    mapper.readTree(it)
+                } catch (t: Throwable) {
+                    onError("Error Parsing JSON from Lightning Address. Check the user's lightning setup")
+                    null
+                }
+
+                val user = nip05.split("@")[0]
+
+                val hexKey = nip05url?.get("names")?.get(user)?.asText()
+
+                if (hexKey == null) {
+                    onError("Username not found in the NIP05 JSON")
+                } else {
+                    onSuccess(hexKey)
+                }
+            },
+            onError = onError
+        )
+    }
+}

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") {
+            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,74 +1,106 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.UserState
+import com.vitorpamplona.amethyst.service.model.BadgeAwardEvent
+import com.vitorpamplona.amethyst.service.model.BadgeProfilesEvent
+import com.vitorpamplona.amethyst.service.model.BookmarkListEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ContactListEvent
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.service.model.MetadataEvent
+import com.vitorpamplona.amethyst.service.model.ReactionEvent
+import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
-import nostr.postr.JsonFilter
-import nostr.postr.events.TextNoteEvent
-import nostr.postr.toHex
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
 
-object NostrAccountDataSource: NostrDataSource("AccountData") {
-  lateinit var account: Account
+object NostrAccountDataSource : NostrDataSource("AccountData") {
+    lateinit var account: Account
 
-  private val cacheListener: (UserState) -> Unit = {
-    resetFilters()
-  }
-
-  override fun start() {
-    if (this::account.isInitialized)
-      account.userProfile().live.observeForever(cacheListener)
-    super.start()
-  }
-
-  override fun stop() {
-    super.stop()
-    if (this::account.isInitialized)
-      account.userProfile().live.removeObserver(cacheListener)
-  }
-
-  fun createAccountFilter(): JsonFilter {
-    return JsonFilter(
-      authors = listOf(account.userProfile().pubkeyHex),
-      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 4), // 4 days
-    )
-  }
-
-  val accountChannel = requestNewChannel()
-
-  fun <T> equalsIgnoreOrder(list1:List<T>?, list2:List<T>?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return list1.size == list2.size && list1.toSet() == list2.toSet()
-  }
-
-  fun equalAuthors(list1:JsonFilter?, list2:JsonFilter?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return equalsIgnoreOrder(list1.authors, list2.authors)
-  }
-
-  override fun feed(): List<Note> {
-    val user = account.userProfile()
-    val follows = user.follows.map { it.pubkeyHex }.plus(user.pubkeyHex).toSet()
-
-    return LocalCache.notes.values
-      .filter { (it.event is TextNoteEvent || it.event is RepostEvent) && it.author?.pubkeyHex in follows }
-      .sortedBy { it.event!!.createdAt }
-      .reversed()
-  }
-
-  override fun updateChannelFilters() {
-    // gets everthing about the user logged in
-    val newAccountFilter = createAccountFilter()
-
-    if (!equalAuthors(newAccountFilter, accountChannel.filter)) {
-      accountChannel.filter = newAccountFilter
+    fun createAccountContactListFilter(): TypedFilter {
+        return TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(ContactListEvent.kind),
+                authors = listOf(account.userProfile().pubkeyHex),
+                limit = 1
+            )
+        )
     }
-  }
-}
+
+    fun createAccountMetadataFilter(): TypedFilter {
+        return TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(MetadataEvent.kind),
+                authors = listOf(account.userProfile().pubkeyHex),
+                limit = 1
+            )
+        )
+    }
+
+    fun createAccountAcceptedAwardsFilter(): TypedFilter {
+        return TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(BadgeProfilesEvent.kind),
+                authors = listOf(account.userProfile().pubkeyHex),
+                limit = 1
+            )
+        )
+    }
+
+    fun createAccountBookmarkListFilter(): TypedFilter {
+        return TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(BookmarkListEvent.kind),
+                authors = listOf(account.userProfile().pubkeyHex),
+                limit = 1
+            )
+        )
+    }
+
+    fun createAccountReportsFilter(): TypedFilter {
+        return TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(ReportEvent.kind),
+                authors = listOf(account.userProfile().pubkeyHex)
+            )
+        )
+    }
+
+    fun createNotificationFilter() = TypedFilter(
+        types = FeedType.values().toSet(),
+        filter = JsonFilter(
+            kinds = listOf(
+                TextNoteEvent.kind,
+                ReactionEvent.kind,
+                RepostEvent.kind,
+                ReportEvent.kind,
+                LnZapEvent.kind,
+                ChannelMessageEvent.kind,
+                BadgeAwardEvent.kind
+            ),
+            tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
+            limit = 200
+        )
+    )
+
+    val accountChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        // gets everthing about the user logged in
+        accountChannel.typedFilters = listOf(
+            createAccountMetadataFilter(),
+            createAccountContactListFilter(),
+            createNotificationFilter(),
+            createAccountReportsFilter(),
+            createAccountAcceptedAwardsFilter(),
+            createAccountBookmarkListFilter()
+        ).ifEmpty { null }
+    }
+}

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

@@ -0,0 +1,67 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+
+object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
+    var account: Account? = null
+    var channel: Channel? = null
+
+    fun loadMessagesBetween(account: Account, channelId: String) {
+        this.account = account
+        channel = LocalCache.getOrCreateChannel(channelId)
+        resetFilters()
+    }
+
+    fun clear() {
+        account = null
+        channel = null
+    }
+
+    fun createMessagesByMeToChannelFilter(): TypedFilter? {
+        val myAccount = account ?: return null
+
+        if (channel != null) {
+            // 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
+                )
+            )
+        }
+        return null
+    }
+
+    fun createMessagesToChannelFilter(): TypedFilter? {
+        if (channel != null) {
+            return TypedFilter(
+                types = setOf(FeedType.PUBLIC_CHATS),
+                filter = JsonFilter(
+                    kinds = listOf(ChannelMessageEvent.kind),
+                    tags = mapOf("e" to listOfNotNull(channel?.idHex)),
+                    limit = 200
+                )
+            )
+        }
+        return null
+    }
+
+    val messagesChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        messagesChannel.typedFilters = listOfNotNull(
+            createMessagesToChannelFilter(),
+            createMessagesByMeToChannelFilter()
+        ).ifEmpty { null }
+    }
+}

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

@@ -0,0 +1,60 @@
+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
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+
+object NostrChatroomDataSource : NostrDataSource("ChatroomFeed") {
+    lateinit var account: Account
+    var withUser: User? = null
+
+    fun loadMessagesBetween(accountIn: Account, userId: String) {
+        account = accountIn
+        withUser = LocalCache.users[userId]
+        resetFilters()
+    }
+
+    fun createMessagesToMeFilter(): TypedFilter? {
+        val myPeer = withUser
+
+        return if (myPeer != null) {
+            TypedFilter(
+                types = setOf(FeedType.PRIVATE_DMS),
+                filter = JsonFilter(
+                    kinds = listOf(PrivateDmEvent.kind),
+                    authors = listOf(myPeer.pubkeyHex),
+                    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
+                )
+            )
+        } else {
+            null
+        }
+    }
+
+    fun createMessagesFromMeFilter(): TypedFilter? {
+        val myPeer = withUser
+
+        return if (myPeer != null) {
+            TypedFilter(
+                types = setOf(FeedType.PRIVATE_DMS),
+                filter = JsonFilter(
+                    kinds = listOf(PrivateDmEvent.kind),
+                    authors = listOf(account.userProfile().pubkeyHex),
+                    tags = mapOf("p" to listOf(myPeer.pubkeyHex))
+                )
+            )
+        } else {
+            null
+        }
+    }
+
+    val inandoutChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        inandoutChannel.typedFilters = listOfNotNull(createMessagesToMeFilter(), createMessagesFromMeFilter()).ifEmpty { null }
+    }
+}

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

@@ -0,0 +1,88 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+
+object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
+    lateinit var account: Account
+
+    fun createMessagesToMeFilter() = TypedFilter(
+        types = setOf(FeedType.PRIVATE_DMS),
+        filter = JsonFilter(
+            kinds = listOf(PrivateDmEvent.kind),
+            tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
+        )
+    )
+
+    fun createMessagesFromMeFilter() = TypedFilter(
+        types = setOf(FeedType.PRIVATE_DMS),
+        filter = JsonFilter(
+            kinds = listOf(PrivateDmEvent.kind),
+            authors = listOf(account.userProfile().pubkeyHex)
+        )
+    )
+
+    fun createChannelsCreatedbyMeFilter() = TypedFilter(
+        types = setOf(FeedType.PUBLIC_CHATS),
+        filter = JsonFilter(
+            kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind),
+            authors = listOf(account.userProfile().pubkeyHex)
+        )
+    )
+
+    fun createMyChannelsFilter() = TypedFilter(
+        types = FeedType.values().toSet(), // Metadata comes from any relay
+        filter = JsonFilter(
+            kinds = listOf(ChannelCreateEvent.kind),
+            ids = account.followingChannels.toList()
+        )
+    )
+
+    fun createLastChannelInfoFilter(): List<TypedFilter> {
+        return account.followingChannels.map {
+            TypedFilter(
+                types = FeedType.values().toSet(), // Metadata comes from any relay
+                filter = JsonFilter(
+                    kinds = listOf(ChannelMetadataEvent.kind),
+                    tags = mapOf("e" to listOf(it)),
+                    limit = 1
+                )
+            )
+        }
+    }
+
+    fun createLastMessageOfEachChannelFilter(): List<TypedFilter> {
+        return account.followingChannels.map {
+            TypedFilter(
+                types = setOf(FeedType.PUBLIC_CHATS),
+                filter = JsonFilter(
+                    kinds = listOf(ChannelMessageEvent.kind),
+                    tags = mapOf("e" to listOf(it)),
+                    limit = 25 // Remember to consider spam that is being removed from the UI
+                )
+            )
+        }
+    }
+
+    val chatroomListChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        val list = listOf(
+            createMessagesToMeFilter(),
+            createMessagesFromMeFilter(),
+            createMyChannelsFilter()
+        )
+
+        chatroomListChannel.typedFilters = listOfNotNull(
+            list,
+            createLastChannelInfoFilter(),
+            createLastMessageOfEachChannelFilter()
+        ).flatten().ifEmpty { null }
+    }
+}

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

@@ -1,135 +1,213 @@
 package com.vitorpamplona.amethyst.service
 
+import android.util.Log
 import com.vitorpamplona.amethyst.model.LocalCache
-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.BookmarkListEvent
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.ChannelHideMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMuteUserEvent
+import com.vitorpamplona.amethyst.service.model.ContactListEvent
+import com.vitorpamplona.amethyst.service.model.DeletionEvent
+import com.vitorpamplona.amethyst.service.model.Event
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.MetadataEvent
+import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
+import com.vitorpamplona.amethyst.service.model.RecommendRelayEvent
+import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.Relay
-import java.util.Collections
-import nostr.postr.events.ContactListEvent
-import nostr.postr.events.DeletionEvent
-import nostr.postr.events.Event
-import nostr.postr.events.MetadataEvent
-import nostr.postr.events.PrivateDmEvent
-import nostr.postr.events.RecommendRelayEvent
-import nostr.postr.events.TextNoteEvent
+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.launch
+import java.util.Date
+import java.util.UUID
 
 abstract class NostrDataSource(val debugName: String) {
-  private val channels = Collections.synchronizedSet(mutableSetOf<Channel>())
-  private val channelIds =  Collections.synchronizedSet(mutableSetOf<String>())
+    private var subscriptions = mapOf<String, Subscription>()
+    data class Counter(var counter: Int)
 
-  private val clientListener = object : Client.Listener() {
-    override fun onEvent(event: Event, subscriptionId: String, relay: Relay) {
-      if (subscriptionId in channelIds) {
-        when (event) {
-          is MetadataEvent -> LocalCache.consume(event)
-          is TextNoteEvent -> LocalCache.consume(event)
-          is RecommendRelayEvent -> LocalCache.consume(event)
-          is ContactListEvent -> LocalCache.consume(event)
-          is PrivateDmEvent -> LocalCache.consume(event)
-          is DeletionEvent -> LocalCache.consume(event)
-          is RepostEvent -> LocalCache.consume(event)
-          is ReactionEvent -> LocalCache.consume(event)
-          else -> when (event.kind) {
-            RepostEvent.kind -> LocalCache.consume(RepostEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
-            ReactionEvent.kind -> LocalCache.consume(ReactionEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
-          }
+    private var eventCounter = mapOf<String, Counter>()
+
+    fun printCounter() {
+        eventCounter.forEach {
+            Log.d("STATE DUMP", "Received Events ${it.key}: ${it.value.counter}")
         }
-      }
     }
 
-    override fun onError(error: Error, subscriptionId: String, relay: Relay) {
-      //Log.e("ERROR", "Relay ${relay.url}: ${error.message}")
+    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) {
+                    keyValue.counter++
+                } else {
+                    eventCounter = eventCounter + Pair(key, Counter(1))
+                }
+
+                try {
+                    when (event) {
+                        is BadgeAwardEvent -> LocalCache.consume(event)
+                        is BadgeDefinitionEvent -> LocalCache.consume(event)
+                        is BadgeProfilesEvent -> LocalCache.consume(event)
+                        is BookmarkListEvent -> LocalCache.consume(event)
+                        is ChannelCreateEvent -> LocalCache.consume(event)
+                        is ChannelHideMessageEvent -> LocalCache.consume(event)
+                        is ChannelMessageEvent -> LocalCache.consume(event, relay)
+                        is ChannelMetadataEvent -> LocalCache.consume(event)
+                        is ChannelMuteUserEvent -> LocalCache.consume(event)
+                        is ContactListEvent -> LocalCache.consume(event)
+                        is DeletionEvent -> LocalCache.consume(event)
+
+                        is 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()
+                }
+            }
+        }
+
+        override fun onError(error: Error, subscriptionId: String, relay: Relay) {
+            // Log.e("ERROR", "Relay ${relay.url}: ${error.message}")
+        }
+
+        override fun onRelayStateChange(type: Relay.Type, relay: Relay, channel: String?) {
+            // Log.d("RELAY", "Relay ${relay.url} ${when (type) {
+            //  Relay.Type.CONNECT -> "connected."
+            //  Relay.Type.DISCONNECT -> "disconnected."
+            //  Relay.Type.DISCONNECTING -> "disconnecting."
+            //  Relay.Type.EOSE -> "sent all events it had stored."
+            // }}")
+
+            if (type == Relay.Type.EOSE && channel != null) {
+                // updates a per subscripton since date
+                subscriptions[channel]?.updateEOSE(Date().time / 1000, relay.url)
+            }
+        }
+
+        override fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) {
+        }
     }
 
-    override fun onRelayStateChange(type: Relay.Type, relay: Relay) {
-      //Log.d("RELAY", "Relay ${relay.url} ${when (type) {
-      //  Relay.Type.CONNECT -> "connected."
-      //  Relay.Type.DISCONNECT -> "disconnected."
-      //  Relay.Type.DISCONNECTING -> "disconnecting."
-      //  Relay.Type.EOSE -> "sent all events it had stored."
-      //}}")
+    init {
+        Client.subscribe(clientListener)
+    }
 
-      /*
-      if (type == Relay.Type.EOSE) {
-        // One everything is loaded, if new users are found, update filters
+    open fun start() {
+        println("DataSource: ${this.javaClass.simpleName} Start")
         resetFilters()
-      }*/
     }
-  }
 
-  init {
-    Client.subscribe(clientListener)
-  }
-
-  open fun start() {
-    resetFilters()
-  }
-
-  open fun stop() {
-    channels.forEach { channel ->
-      if (channel.filter != null) // if it is active, close
-        Client.close(channel.id)
-    }
-  }
-
-  fun loadTop(): List<Note> {
-    return feed().take(100)
-  }
-
-  fun requestNewChannel(): Channel {
-    val newChannel = Channel()
-    channels.add(newChannel)
-    channelIds.add(newChannel.id)
-    return newChannel
-  }
-
-  fun dismissChannel(channel: Channel) {
-    Client.close(channel.id)
-    channels.remove(channel)
-    channelIds.remove(channel.id)
-  }
-
-  fun resetFilters() {
-    // saves the channels that are currently active
-    val activeChannels = channels.filter { it.filter != null }
-    // saves the current content to only update if it changes
-    val currentFilter = activeChannels.associate { it.id to it.filter!!.toJson() }
-
-    updateChannelFilters()
-
-    // Makes sure to only send an updated filter when it actually changes.
-    channels.forEach { channel ->
-      val channelsNewFilter = channel.filter
-
-      if (channel in activeChannels) {
-        if (channelsNewFilter == null) {
-          // was active and is not active anymore, just close.
-          Client.close(channel.id)
-        } else {
-          // was active and is still active, check if it has changed.
-          if (channelsNewFilter.toJson() != currentFilter[channel.id]) {
+    open fun stop() {
+        println("DataSource: ${this.javaClass.simpleName} Stop")
+        subscriptions.values.forEach { channel ->
             Client.close(channel.id)
-            Client.sendFilter(channel.id, mutableListOf(channelsNewFilter))
-          } else {
-            // hasn't changed, does nothing.
-            Client.sendFilterOnlyIfDisconnected(channel.id, mutableListOf(channelsNewFilter))
-          }
+            channel.typedFilters = null
         }
-      } else {
-        if (channelsNewFilter == null) {
-          // was not active and is still not active, does nothing
-        } else {
-          // was not active and becomes active, sends the filter.
-          if (channelsNewFilter.toJson() != currentFilter[channel.id]) {
-            Client.sendFilter(channel.id, mutableListOf(channelsNewFilter))
-          }
-        }
-      }
     }
-  }
 
-  abstract fun updateChannelFilters()
-  abstract fun feed(): List<Note>
-}
+    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
+    }
+
+    fun dismissChannel(subscription: Subscription) {
+        Client.close(subscription.id)
+        subscriptions = subscriptions.minus(subscription.id)
+    }
+
+    // Refreshes observers in batches.
+    private val bundler = BundledUpdate(250, Dispatchers.IO) {
+        println("DataSource: ${this.javaClass.simpleName} InvalidateFilters")
+
+        // adds the time to perform the refresh into this delay
+        // holding off new updates in case of heavy refresh routines.
+        resetFiltersSuspend()
+    }
+
+    fun invalidateFilters() {
+        bundler.invalidate()
+    }
+
+    fun resetFilters() {
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            resetFiltersSuspend()
+        }
+    }
+
+    fun resetFiltersSuspend() {
+        // saves the channels that are currently active
+        val activeSubscriptions = subscriptions.values.filter { it.typedFilters != null }
+        // saves the current content to only update if it changes
+        val currentFilters = activeSubscriptions.associate { it.id to it.toJson() }
+
+        updateChannelFilters()
+
+        // Makes sure to only send an updated filter when it actually changes.
+        subscriptions.values.forEach { updatedSubscription ->
+            val updatedSubscriotionNewFilters = updatedSubscription.typedFilters
+
+            if (updatedSubscription.id in currentFilters.keys) {
+                if (updatedSubscriotionNewFilters == null) {
+                    // was active and is not active anymore, just close.
+                    Client.close(updatedSubscription.id)
+                } else {
+                    // was active and is still active, check if it has changed.
+                    if (updatedSubscription.toJson() != currentFilters[updatedSubscription.id]) {
+                        Client.close(updatedSubscription.id)
+                        Client.sendFilter(updatedSubscription.id, updatedSubscriotionNewFilters)
+                    } else {
+                        // hasn't changed, does nothing.
+                        Client.sendFilterOnlyIfDisconnected(updatedSubscription.id, updatedSubscriotionNewFilters)
+                    }
+                }
+            } else {
+                if (updatedSubscriotionNewFilters == null) {
+                    // was not active and is still not active, does nothing
+                } else {
+                    // was not active and becomes active, sends the filter.
+                    if (updatedSubscription.toJson() != currentFilters[updatedSubscription.id]) {
+                        Client.sendFilter(updatedSubscription.id, updatedSubscriotionNewFilters)
+                    }
+                }
+            }
+        }
+    }
+
+    abstract fun updateChannelFilters()
+}

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

@@ -1,47 +1,24 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.LocalCache
-import nostr.postr.JsonFilter
-import nostr.postr.events.TextNoteEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
 
-object NostrGlobalDataSource: NostrDataSource("GlobalFeed") {
-  val fifteenMinutes = (60*15) // 15 mins
-
-  fun createGlobalFilter() = JsonFilter(
-      kinds = listOf(TextNoteEvent.kind),
-      since = System.currentTimeMillis() / 1000 - fifteenMinutes
+object NostrGlobalDataSource : NostrDataSource("GlobalFeed") {
+    fun createGlobalFilter() = TypedFilter(
+        types = setOf(FeedType.GLOBAL),
+        filter = JsonFilter(
+            kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind),
+            limit = 200
+        )
     )
 
-  val globalFeedChannel = requestNewChannel()
+    val globalFeedChannel = requestNewChannel()
 
-  fun equalTime(list1:Long?, list2:Long?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return Math.abs(list1 - list2) < (4*fifteenMinutes)
-  }
-
-  fun equalFilters(list1:JsonFilter?, list2:JsonFilter?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return equalTime(list1.since, list2.since)
-  }
-
-  override fun feed() = LocalCache.notes.values
-    .filter {
-      it.event is TextNoteEvent && (it.event as TextNoteEvent).replyTos.isEmpty()
+    override fun updateChannelFilters() {
+        globalFeedChannel.typedFilters = listOf(createGlobalFilter()).ifEmpty { null }
     }
-    .sortedBy { it.event!!.createdAt }
-    .reversed()
-
-  override fun updateChannelFilters() {
-    val newFilter = createGlobalFilter()
-
-    if (!equalFilters(newFilter, globalFeedChannel.filter)) {
-      globalFeedChannel.filter = newFilter
-    }
-  }
-}
+}

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

@@ -0,0 +1,38 @@
+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.TextNoteEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+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 = FeedType.values().toSet(),
+            filter = JsonFilter(
+                tags = mapOf("t" to listOf(hashToLoad, hashToLoad.lowercase(), hashToLoad.uppercase(), hashToLoad.capitalize())),
+                kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.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

@@ -1,80 +1,85 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.UserState
-import com.vitorpamplona.amethyst.service.model.RepostEvent
-import nostr.postr.JsonFilter
-import nostr.postr.events.TextNoteEvent
-import nostr.postr.toHex
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 
-object NostrHomeDataSource: NostrDataSource("HomeFeed") {
-  lateinit var account: Account
+object NostrHomeDataSource : NostrDataSource("HomeFeed") {
+    lateinit var account: Account
 
-  private val cacheListener: (UserState) -> Unit = {
-    resetFilters()
-  }
-
-  override fun start() {
-    if (this::account.isInitialized)
-      account.userProfile().live.observeForever(cacheListener)
-    super.start()
-  }
-
-  override fun stop() {
-    super.stop()
-    if (this::account.isInitialized)
-      account.userProfile().live.removeObserver(cacheListener)
-  }
-
-  fun createFollowAccountsFilter(): JsonFilter? {
-    val follows = account.userProfile().follows?.map {
-      it.pubkey.toHex().substring(0, 6)
+    private val cacheListener: (UserState) -> Unit = {
+        invalidateFilters()
     }
 
-    if (follows == null || follows.isEmpty()) return null
-
-    return JsonFilter(
-      kinds = listOf(TextNoteEvent.kind, RepostEvent.kind),
-      authors = follows,
-      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 1), // 24 hours
-    )
-  }
-
-  val followAccountChannel = requestNewChannel()
-
-  fun <T> equalsIgnoreOrder(list1:List<T>?, list2:List<T>?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return list1.size == list2.size && list1.toSet() == list2.toSet()
-  }
-
-  fun equalAuthors(list1:JsonFilter?, list2:JsonFilter?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return equalsIgnoreOrder(list1.authors, list2.authors)
-  }
-
-  override fun feed(): List<Note> {
-    val user = account.userProfile()
-    val follows = user.follows.map { it.pubkeyHex }.plus(user.pubkeyHex).toSet()
-
-    return LocalCache.notes.values
-      .filter { (it.event is TextNoteEvent || it.event is RepostEvent) && it.author?.pubkeyHex in follows }
-      .sortedBy { it.event!!.createdAt }
-      .reversed()
-  }
-
-  override fun updateChannelFilters() {
-    val newFollowAccountsFilter = createFollowAccountsFilter()
-
-    if (!equalAuthors(newFollowAccountsFilter, followAccountChannel.filter)) {
-      followAccountChannel.filter = newFollowAccountsFilter
+    @OptIn(DelicateCoroutinesApi::class)
+    override fun start() {
+        if (this::account.isInitialized) {
+            GlobalScope.launch(Dispatchers.Main) {
+                account.userProfile().live().follows.observeForever(cacheListener)
+            }
+        }
+        super.start()
     }
-  }
-}
+
+    @OptIn(DelicateCoroutinesApi::class)
+    override fun stop() {
+        super.stop()
+        if (this::account.isInitialized) {
+            GlobalScope.launch(Dispatchers.Main) {
+                account.userProfile().live().follows.removeObserver(cacheListener)
+            }
+        }
+    }
+
+    fun createFollowAccountsFilter(): TypedFilter {
+        val follows = account.followingKeySet()
+
+        val followKeys = follows.map {
+            it.substring(0, 6)
+        }
+
+        val followSet = followKeys.plus(account.userProfile().pubkeyHex.substring(0, 6))
+
+        return TypedFilter(
+            types = setOf(FeedType.FOLLOWS),
+            filter = JsonFilter(
+                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind),
+                authors = followSet,
+                limit = 400
+            )
+        )
+    }
+
+    fun createFollowTagsFilter(): TypedFilter? {
+        val hashToLoad = account.followingTagSet()
+
+        if (hashToLoad.isEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.FOLLOWS),
+            filter = JsonFilter(
+                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind),
+                tags = mapOf(
+                    "t" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 100
+            )
+        )
+    }
+
+    val followAccountChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        followAccountChannel.typedFilters = listOfNotNull(createFollowAccountsFilter(), createFollowTagsFilter()).ifEmpty { null }
+    }
+}

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

@@ -1,48 +0,0 @@
-package com.vitorpamplona.amethyst.service
-
-import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.Note
-import nostr.postr.JsonFilter
-
-object NostrNotificationDataSource: NostrDataSource("GlobalFeed") {
-  lateinit var account: Account
-
-  fun createGlobalFilter() = JsonFilter(
-    since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 2 days
-    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex).filterNotNull())
-  )
-
-  val notificationChannel = requestNewChannel()
-
-  fun <T> equalsIgnoreOrder(list1:List<T>?, list2:List<T>?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return list1.size == list2.size && list1.toSet() == list2.toSet()
-  }
-
-  fun equalFilters(list1:JsonFilter?, list2:JsonFilter?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return equalsIgnoreOrder(list1.tags?.get("p"), list2.tags?.get("p"))
-        && equalsIgnoreOrder(list1.tags?.get("e"), list2.tags?.get("e"))
-  }
-
-  override fun feed(): List<Note> {
-    return account.userProfile().taggedPosts
-      .filter { it.event != null }
-      .sortedBy { it.event!!.createdAt }
-      .reversed()
-  }
-
-  override fun updateChannelFilters() {
-    val newFilter = createGlobalFilter()
-
-    if (!equalFilters(newFilter, notificationChannel.filter)) {
-      notificationChannel.filter = newFilter
-    }
-  }
-}

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

@@ -0,0 +1,90 @@
+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.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
+
+object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
+    private var searchString: String? = null
+
+    private fun createAnythingWithIDFilter(): List<TypedFilter>? {
+        val mySearchString = searchString
+        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
+            }
+        } 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)
+                )
+            ),
+            TypedFilter(
+                types = FeedType.values().toSet(),
+                filter = JsonFilter(
+                    kinds = listOf(MetadataEvent.kind),
+                    authors = listOfNotNull(hexToWatch)
+                )
+            ),
+            TypedFilter(
+                types = FeedType.values().toSet(),
+                filter = JsonFilter(
+                    kinds = listOf(MetadataEvent.kind),
+                    search = mySearchString,
+                    limit = 20
+                )
+            ),
+            TypedFilter(
+                types = FeedType.values().toSet(),
+                filter = JsonFilter(
+                    kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, ChannelMetadataEvent.kind, ChannelCreateEvent.kind, ChannelMessageEvent.kind),
+                    search = mySearchString,
+                    limit = 20
+                )
+            )
+        )
+    }
+
+    val searchChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        searchChannel.typedFilters = createAnythingWithIDFilter()
+    }
+
+    fun search(searchString: String) {
+        this.searchString = searchString
+        invalidateFilters()
+    }
+
+    fun clear() {
+        searchString = null
+    }
+}

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

@@ -0,0 +1,69 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+
+object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
+    private var channelsToWatch = setOf<String>()
+
+    private fun createRepliesAndReactionsFilter(): TypedFilter? {
+        val reactionsToWatch = channelsToWatch.map { it }
+
+        if (reactionsToWatch.isEmpty()) {
+            return null
+        }
+
+        // downloads all the reactions to a given event.
+        return TypedFilter(
+            types = setOf(FeedType.PUBLIC_CHATS),
+            filter = JsonFilter(
+                kinds = listOf(ChannelMetadataEvent.kind),
+                tags = mapOf("e" to reactionsToWatch)
+            )
+        )
+    }
+
+    fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
+        val directEventsToLoad = channelsToWatch
+            .map { LocalCache.getOrCreateChannel(it) }
+            .filter { it.notes.isEmpty() }
+
+        val interestedEvents = (directEventsToLoad).map { it.idHex }.toSet()
+
+        if (interestedEvents.isEmpty()) {
+            return null
+        }
+
+        // downloads linked events to this event.
+        return TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(ChannelCreateEvent.kind),
+                ids = interestedEvents.toList()
+            )
+        )
+    }
+
+    val singleChannelChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        val reactions = createRepliesAndReactionsFilter()
+        val missing = createLoadEventsIfNotLoadedFilter()
+
+        singleChannelChannel.typedFilters = listOfNotNull(reactions, missing).ifEmpty { null }
+    }
+
+    fun add(eventId: String) {
+        channelsToWatch = channelsToWatch.plus(eventId)
+        invalidateFilters()
+    }
+
+    fun remove(eventId: String) {
+        channelsToWatch = channelsToWatch.minus(eventId)
+        invalidateFilters()
+    }
+}

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

@@ -1,70 +1,176 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.Note
-import java.util.Collections
-import nostr.postr.JsonFilter
+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.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+import java.util.Date
 
-object NostrSingleEventDataSource: NostrDataSource("SingleEventFeed") {
-  val eventsToWatch = Collections.synchronizedList(mutableListOf<String>())
+object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
+    private var eventsToWatch = setOf<Note>()
+    private var addressesToWatch = setOf<Note>()
 
-  fun createRepliesAndReactionsFilter(): JsonFilter? {
-    val reactionsToWatch = eventsToWatch.map { it.substring(0, 8) }
+    private fun createTagToAddressFilter(): List<TypedFilter>? {
+        val addressesToWatch = eventsToWatch.filter { it.address() != null } + addressesToWatch
 
-    if (reactionsToWatch.isEmpty()) {
-      return null
+        if (addressesToWatch.isEmpty()) {
+            return null
+        }
+
+        val now = Date().time / 1000
+
+        return addressesToWatch.mapNotNull {
+            it.address()?.let { aTag ->
+                TypedFilter(
+                    types = FeedType.values().toSet(),
+                    filter = JsonFilter(
+                        kinds = listOf(
+                            TextNoteEvent.kind, LongTextNoteEvent.kind,
+                            ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind,
+                            LnZapEvent.kind, LnZapRequestEvent.kind,
+                            BadgeAwardEvent.kind, BadgeDefinitionEvent.kind, BadgeProfilesEvent.kind
+                        ),
+                        tags = mapOf("a" to listOf(aTag.toTag())),
+                        since = it.lastReactionsDownloadTime
+                    )
+                )
+            }
+        }
     }
 
-    return JsonFilter(
-      tags = mapOf("e" to reactionsToWatch)
-    )
-  }
+    private fun createAddressFilter(): List<TypedFilter>? {
+        val addressesToWatch = addressesToWatch.filter { it.event == null }
 
-  fun createLoadEventsIfNotLoadedFilter(): JsonFilter? {
-    val directEventsToLoad = eventsToWatch
-      .mapNotNull { LocalCache.notes[it] }
-      .filter { it.event == null }
+        if (addressesToWatch.isEmpty()) {
+            return null
+        }
 
-    val threadingEventsToLoad = eventsToWatch
-      .mapNotNull { LocalCache.notes[it] }
-      .mapNotNull { it.replyTo }
-      .flatten()
-      .filter { it.event == null }
+        val now = Date().time / 1000
 
-    val interestedEvents =
-      (directEventsToLoad + threadingEventsToLoad)
-      .map { it.idHex.substring(0, 8) }
-
-    if (interestedEvents.isEmpty()) {
-      return null
+        return addressesToWatch.mapNotNull {
+            it.address()?.let { aTag ->
+                TypedFilter(
+                    types = FeedType.values().toSet(),
+                    filter = JsonFilter(
+                        kinds = listOf(aTag.kind),
+                        tags = mapOf("d" to listOf(aTag.dTag)),
+                        authors = listOf(aTag.pubKeyHex.substring(0, 8))
+                    )
+                )
+            }
+        }
     }
 
-    return JsonFilter(
-      ids = interestedEvents
-    )
-  }
+    private fun createRepliesAndReactionsFilter(): List<TypedFilter>? {
+        val reactionsToWatch = eventsToWatch
 
-  val repliesAndReactionsChannel = requestNewChannel()
-  val loadEventsChannel = requestNewChannel()
+        if (reactionsToWatch.isEmpty()) {
+            return null
+        }
 
-  override fun feed(): List<Note> {
-    return eventsToWatch.map {
-      LocalCache.notes[it]
-    }.filterNotNull()
-  }
+        val now = Date().time / 1000
 
-  override fun updateChannelFilters() {
-    repliesAndReactionsChannel.filter = createRepliesAndReactionsFilter()
-    loadEventsChannel.filter = createLoadEventsIfNotLoadedFilter()
-  }
+        return reactionsToWatch.map {
+            TypedFilter(
+                types = FeedType.values().toSet(),
+                filter = JsonFilter(
+                    kinds = listOf(
+                        TextNoteEvent.kind,
+                        LongTextNoteEvent.kind,
+                        ReactionEvent.kind,
+                        RepostEvent.kind,
+                        ReportEvent.kind,
+                        LnZapEvent.kind,
+                        LnZapRequestEvent.kind
+                    ),
+                    tags = mapOf("e" to listOf(it.idHex)),
+                    since = it.lastReactionsDownloadTime
+                )
+            )
+        }
+    }
 
-  fun add(eventId: String) {
-    eventsToWatch.add(eventId)
-    resetFilters()
-  }
+    fun createLoadEventsIfNotLoadedFilter(): List<TypedFilter>? {
+        val directEventsToLoad = eventsToWatch
+            .filter { it.event == null }
 
-  fun remove(eventId: String) {
-    eventsToWatch.remove(eventId)
-    resetFilters()
-  }
-}
+        val threadingEventsToLoad = eventsToWatch
+            .mapNotNull { it.replyTo }
+            .flatten()
+            .filter { it !is AddressableNote && it.event == null }
+
+        val interestedEvents =
+            (directEventsToLoad + threadingEventsToLoad)
+                .map { it.idHex }.toSet()
+
+        if (interestedEvents.isEmpty()) {
+            return null
+        }
+
+        // downloads linked events to this event.
+        return listOf(
+            TypedFilter(
+                types = FeedType.values().toSet(),
+                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, relayUrl ->
+        eventsToWatch.forEach {
+            it.lastReactionsDownloadTime = it.lastReactionsDownloadTime + Pair(relayUrl, time)
+        }
+        // Many relays operate with limits in the amount of filters.
+        // As information comes, the filters will be rotated to get more data.
+        invalidateFilters()
+    }
+
+    override fun updateChannelFilters() {
+        val reactions = createRepliesAndReactionsFilter()
+        val missing = createLoadEventsIfNotLoadedFilter()
+        val addresses = createAddressFilter()
+        val addressReactions = createTagToAddressFilter()
+
+        singleEventChannel.typedFilters = listOfNotNull(reactions, missing, addresses, addressReactions).flatten().ifEmpty { null }
+    }
+
+    fun add(eventId: Note) {
+        eventsToWatch = eventsToWatch.plus(eventId)
+        invalidateFilters()
+    }
+
+    fun remove(eventId: Note) {
+        eventsToWatch = eventsToWatch.minus(eventId)
+        invalidateFilters()
+    }
+
+    fun addAddress(aTag: Note) {
+        addressesToWatch = addressesToWatch.plus(aTag)
+        invalidateFilters()
+    }
+
+    fun removeAddress(aTag: Note) {
+        addressesToWatch = addressesToWatch.minus(aTag)
+        invalidateFilters()
+    }
+}

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

@@ -1,42 +1,68 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
-import java.util.Collections
-import nostr.postr.JsonFilter
-import nostr.postr.events.MetadataEvent
+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.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
 
-object NostrSingleUserDataSource: NostrDataSource("SingleUserFeed") {
-  val usersToWatch = Collections.synchronizedList(mutableListOf<String>())
+object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
+    var usersToWatch = setOf<User>()
 
-  fun createUserFilter(): JsonFilter? {
-    if (usersToWatch.isEmpty()) return null
+    fun createUserFilter(): List<TypedFilter>? {
+        if (usersToWatch.isEmpty()) return null
 
-    return JsonFilter(
-      kinds = listOf(MetadataEvent.kind),
-      authors = usersToWatch.map { it.substring(0, 8) }
-    )
-  }
+        return usersToWatch.filter { it.info?.latestMetadata == null }.map {
+            TypedFilter(
+                types = FeedType.values().toSet(),
+                filter = JsonFilter(
+                    kinds = listOf(MetadataEvent.kind),
+                    authors = listOf(it.pubkeyHex),
+                    limit = 1
+                )
+            )
+        }
+    }
 
-  val userChannel = requestNewChannel()
+    fun createUserReportFilter(): List<TypedFilter>? {
+        if (usersToWatch.isEmpty()) return null
 
-  override fun feed(): List<Note> {
-    return usersToWatch.map {
-      LocalCache.notes[it]
-    }.filterNotNull()
-  }
+        return usersToWatch.map {
+            TypedFilter(
+                types = FeedType.values().toSet(),
+                filter = JsonFilter(
+                    kinds = listOf(ReportEvent.kind),
+                    tags = mapOf("p" to listOf(it.pubkeyHex)),
+                    since = it.latestEOSEs
+                )
+            )
+        }
+    }
 
-  override fun updateChannelFilters() {
-    userChannel.filter = createUserFilter()
-  }
+    val userChannel = requestNewChannel() { time, relayUrl ->
+        usersToWatch.forEach {
+            it.latestEOSEs = it.latestEOSEs + Pair(relayUrl, time)
+        }
+        // Many relays operate with limits in the amount of filters.
+        // As information comes, the filters will be rotated to get more data.
+        invalidateFilters()
+    }
 
-  fun add(userId: String) {
-    usersToWatch.add(userId)
-    resetFilters()
-  }
+    val userChannelOnce = requestNewChannel()
 
-  fun remove(userId: String) {
-    usersToWatch.remove(userId)
-    resetFilters()
-  }
-}
+    override fun updateChannelFilters() {
+        userChannel.typedFilters = listOfNotNull(createUserFilter()).flatten().ifEmpty { null }
+        userChannelOnce.typedFilters = listOfNotNull(createUserReportFilter()).flatten().ifEmpty { null }
+    }
+
+    fun add(user: User) {
+        usersToWatch = usersToWatch.plus(user)
+        invalidateFilters()
+    }
+
+    fun remove(user: User) {
+        usersToWatch = usersToWatch.minus(user)
+        invalidateFilters()
+    }
+}

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

@@ -1,82 +1,43 @@
 package com.vitorpamplona.amethyst.service
 
-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
-import java.util.Collections
-import nostr.postr.JsonFilter
+import com.vitorpamplona.amethyst.model.ThreadAssembler
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
 
-object NostrThreadDataSource: NostrDataSource("SingleThreadFeed") {
-  val eventsToWatch = Collections.synchronizedList(mutableListOf<String>())
+object NostrThreadDataSource : NostrDataSource("SingleThreadFeed") {
+    private var eventToWatch: String? = null
 
-  fun createRepliesAndReactionsFilter(): JsonFilter? {
-    val reactionsToWatch = eventsToWatch.map { it.substring(0, 8) }
+    fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
+        val threadToLoad = eventToWatch ?: return null
 
-    if (reactionsToWatch.isEmpty()) {
-      return null
+        val eventsToLoad = ThreadAssembler().findThreadFor(threadToLoad)
+            .filter { it.event == null }
+            .map { it.idHex }
+            .toSet()
+            .ifEmpty { null } ?: return null
+
+        return TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                ids = eventsToLoad.map { it.substring(0, 8) }
+            )
+        )
     }
 
-    return JsonFilter(
-      tags = mapOf("e" to reactionsToWatch)
-    )
-  }
-
-  fun createLoadEventsIfNotLoadedFilter(): JsonFilter? {
-    val eventsToLoad = eventsToWatch
-      .map { LocalCache.notes[it] }
-      .filterNotNull()
-      .filter { it.event == null }
-      .map { it.idHex.substring(0, 8) }
-
-    if (eventsToLoad.isEmpty()) {
-      return null
+    val loadEventsChannel = requestNewChannel() { eoseTime, relay ->
+        // Many relays operate with limits in the amount of filters.
+        // As information comes, the filters will be rotated to get more data.
+        invalidateFilters()
     }
 
-    return JsonFilter(
-      ids = eventsToLoad
-    )
-  }
-
-  val repliesAndReactionsChannel = requestNewChannel()
-  val loadEventsChannel = requestNewChannel()
-
-  override fun feed(): List<Note> {
-    return eventsToWatch.map {
-      LocalCache.notes[it]
-    }.filterNotNull()
-  }
-
-  override fun updateChannelFilters() {
-    repliesAndReactionsChannel.filter = createRepliesAndReactionsFilter()
-    loadEventsChannel.filter = createLoadEventsIfNotLoadedFilter()
-  }
-
-  fun loadThread(noteId: String) {
-    val note = LocalCache.notes[noteId] ?: return
-
-    val thread = mutableListOf<Note>()
-    val threadSet = mutableSetOf<Note>()
-
-    val threadRoot = note.replyTo?.firstOrNull() ?: note
-
-    loadDown(threadRoot, thread, threadSet)
-
-    // Currently orders by date of each event, descending, at each level of the reply stack
-    val order = compareByDescending<Note> { it.replyLevelSignature() }
-
-    eventsToWatch.clear()
-    eventsToWatch.addAll(thread.sortedWith(order).map { it.idHex })
-
-    resetFilters()
-  }
-
-  fun loadDown(note: Note, thread: MutableList<Note>, threadSet: MutableSet<Note>) {
-    if (note !in threadSet) {
-      thread.add(note)
-      threadSet.add(note)
-
-      note.replies.forEach {
-        loadDown(it, thread, threadSet)
-      }
+    override fun updateChannelFilters() {
+        loadEventsChannel.typedFilters = listOfNotNull(createLoadEventsIfNotLoadedFilter()).ifEmpty { null }
     }
-  }
-}
+
+    fun loadThread(noteId: String?) {
+        eventToWatch = noteId
+
+        invalidateFilters()
+    }
+}

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

@@ -0,0 +1,131 @@
+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.BookmarkListEvent
+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.RepostEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+
+object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
+    var user: User? = null
+
+    fun loadUserProfile(userId: String?) {
+        if (userId != null) {
+            user = LocalCache.getOrCreateUser(userId)
+        } else {
+            user = null
+        }
+
+        resetFilters()
+    }
+
+    fun createUserInfoFilter() = user?.let {
+        TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(MetadataEvent.kind),
+                authors = listOf(it.pubkeyHex),
+                limit = 1
+            )
+        )
+    }
+
+    fun createUserPostsFilter() = user?.let {
+        TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(TextNoteEvent.kind, RepostEvent.kind, LongTextNoteEvent.kind),
+                authors = listOf(it.pubkeyHex),
+                limit = 200
+            )
+        )
+    }
+
+    fun createUserReceivedZapsFilter() = user?.let {
+        TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(LnZapEvent.kind),
+                tags = mapOf("p" to listOf(it.pubkeyHex))
+            )
+        )
+    }
+
+    fun createFollowFilter() = user?.let {
+        TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(ContactListEvent.kind),
+                authors = listOf(it.pubkeyHex),
+                limit = 1
+            )
+        )
+    }
+
+    fun createFollowersFilter() = user?.let {
+        TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(ContactListEvent.kind),
+                tags = mapOf("p" to listOf(it.pubkeyHex))
+            )
+        )
+    }
+
+    fun createAcceptedAwardsFilter() = user?.let {
+        TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(BadgeProfilesEvent.kind),
+                authors = listOf(it.pubkeyHex),
+                limit = 1
+            )
+        )
+    }
+
+    fun createBookmarksFilter() = user?.let {
+        TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(BookmarkListEvent.kind),
+                authors = listOf(it.pubkeyHex),
+                limit = 1
+            )
+        )
+    }
+
+    fun createReceivedAwardsFilter() = user?.let {
+        TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(BadgeAwardEvent.kind),
+                tags = mapOf("p" to listOf(it.pubkeyHex)),
+                limit = 20
+            )
+        )
+    }
+
+    val userInfoChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        userInfoChannel.typedFilters = listOfNotNull(
+            createUserInfoFilter(),
+            createUserPostsFilter(),
+            createFollowFilter(),
+            createFollowersFilter(),
+            createUserReceivedZapsFilter(),
+            createAcceptedAwardsFilter(),
+            createReceivedAwardsFilter(),
+            createBookmarksFilter()
+        ).ifEmpty { null }
+    }
+}

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

@@ -0,0 +1,190 @@
+package com.vitorpamplona.amethyst.service.lnurl
+
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.vitorpamplona.amethyst.BuildConfig
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import 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()
+
+    fun assembleUrl(lnaddress: String): String? {
+        val parts = lnaddress.split("@")
+
+        if (parts.size == 2) {
+            return "https://${parts[1]}/.well-known/lnurlp/${parts[0]}"
+        }
+
+        if (lnaddress.lowercase().startsWith("lnurl")) {
+            return try {
+                String(Bech32.decodeBytes(lnaddress, false).second)
+            } catch (e: Exception) {
+                null
+            }
+        }
+
+        return null
+    }
+
+    fun fetchLightningAddressJson(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            fetchLightningAddressJsonSuspend(lnaddress, onSuccess, onError)
+        }
+    }
+
+    private suspend fun fetchLightningAddressJsonSuspend(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        val url = assembleUrl(lnaddress)
+
+        if (url == null) {
+            onError("Could not assemble LNUrl from Lightning Address \"${lnaddress}\". Check the user's setup")
+            return
+        }
+
+        withContext(Dispatchers.IO) {
+            val request: Request = Request.Builder()
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                .url(url)
+                .build()
+
+            client.newCall(request).enqueue(object : Callback {
+                override fun onResponse(call: Call, response: Response) {
+                    response.use {
+                        if (it.isSuccessful) {
+                            onSuccess(it.body.string())
+                        } else {
+                            onError("Could not resolve $lnaddress. Error: ${it.code}. Check if the server up and if the lightning address $lnaddress is correct")
+                        }
+                    }
+                }
+
+                override fun onFailure(call: Call, e: java.io.IOException) {
+                    onError("Could not resolve $url. Check if the server up and if the lightning address $lnaddress is correct")
+                    e.printStackTrace()
+                }
+            })
+        }
+    }
+
+    fun fetchLightningInvoice(lnCallback: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            fetchLightningInvoiceSuspend(lnCallback, milliSats, message, nostrRequest, onSuccess, onError)
+        }
+    }
+
+    private suspend fun fetchLightningInvoiceSuspend(lnCallback: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        withContext(Dispatchers.IO) {
+            val encodedMessage = URLEncoder.encode(message, "utf-8")
+
+            val urlBinder = if (lnCallback.contains("?")) "&" else "?"
+            var url = "$lnCallback${urlBinder}amount=$milliSats&comment=$encodedMessage"
+
+            if (nostrRequest != null) {
+                val encodedNostrRequest = URLEncoder.encode(nostrRequest, "utf-8")
+                url += "&nostr=$encodedNostrRequest"
+            }
+
+            val request: Request = Request.Builder()
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                .url(url)
+                .build()
+
+            client.newCall(request).enqueue(object : Callback {
+                override fun onResponse(call: Call, response: Response) {
+                    response.use {
+                        if (it.isSuccessful) {
+                            onSuccess(response.body.string())
+                        } else {
+                            onError("Could not fetch invoice from $lnCallback")
+                        }
+                    }
+                }
+
+                override fun onFailure(call: Call, e: java.io.IOException) {
+                    onError("Could not fetch an invoice from $lnCallback. Message ${e.message}")
+                    e.printStackTrace()
+                }
+            })
+        }
+    }
+
+    fun lnAddressToLnUrl(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        fetchLightningAddressJson(
+            lnaddress,
+            onSuccess = {
+                onSuccess(Bech32.encodeBytes("lnurl", it.toByteArray(), Bech32.Encoding.Bech32))
+            },
+            onError = onError
+        )
+    }
+
+    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) {
+                    onError("Error Parsing JSON from Lightning Address. Check the user's lightning setup")
+                    null
+                }
+
+                val callback = lnurlp?.get("callback")?.asText()
+
+                if (callback == null) {
+                    onError("Callback URL not found in the User's lightning address server configuration")
+                }
+
+                val allowsNostr = lnurlp?.get("allowsNostr")?.asBoolean() ?: false
+
+                callback?.let { cb ->
+                    fetchLightningInvoice(
+                        cb,
+                        milliSats,
+                        message,
+                        if (allowsNostr) nostrRequest else null,
+                        onSuccess = {
+                            onProgress(0.6f)
+
+                            val lnInvoice = try {
+                                mapper.readTree(it)
+                            } catch (t: Throwable) {
+                                onError("Error Parsing JSON from Lightning Address's invoice fetch. Check the user's lightning setup")
+                                null
+                            }
+
+                            lnInvoice?.get("pr")?.asText()?.let { pr ->
+                                // Forces LN Invoice amount to be the requested amount.
+                                val invoiceAmount = LnInvoiceUtil.getAmountInSats(pr)
+                                if (invoiceAmount.multiply(BigDecimal(1000)).toLong() == BigDecimal(milliSats).toLong()) {
+                                    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
+                    )
+                }
+            },
+            onError = onError
+        )
+    }
+}

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

@@ -0,0 +1,173 @@
+package com.vitorpamplona.amethyst.service.lnurl
+
+import java.math.BigDecimal
+import java.util.Locale
+import java.util.regex.Pattern
+
+/** based on litecoinj */
+object LnInvoiceUtil {
+    private val invoicePattern = Pattern.compile("lnbc((?<amount>\\d+)(?<multiplier>[munp])?)?1[^1\\s]+", Pattern.CASE_INSENSITIVE)
+
+    /** The Bech32 character set for encoding.  */
+    private const val CHARSET = "qpzry9x8gf2tvdw0s3jn54khce6mua7l"
+
+    /** The Bech32 character set for decoding.  */
+    private val CHARSET_REV = byteArrayOf(
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        15, -1, 10, 17, 21, 20, 26, 30, 7, 5, -1, -1, -1, -1, -1, -1,
+        -1, 29, -1, 24, 13, 25, 9, 8, 23, -1, 18, 22, 31, 27, 19, -1,
+        1, 0, 3, 16, 11, 28, 12, 14, 6, 4, 2, -1, -1, -1, -1, -1,
+        -1, 29, -1, 24, 13, 25, 9, 8, 23, -1, 18, 22, 31, 27, 19, -1,
+        1, 0, 3, 16, 11, 28, 12, 14, 6, 4, 2, -1, -1, -1, -1, -1
+    )
+
+    /** Find the polynomial with value coefficients mod the generator as 30-bit.  */
+    private fun polymod(values: ByteArray): Int {
+        var c = 1
+        for (v_i in values) {
+            val c0 = c ushr 25 and 0xff
+            c = c and 0x1ffffff shl 5 xor (v_i.toInt() and 0xff)
+            if (c0 and 1 != 0) c = c xor 0x3b6a57b2
+            if (c0 and 2 != 0) c = c xor 0x26508e6d
+            if (c0 and 4 != 0) c = c xor 0x1ea119fa
+            if (c0 and 8 != 0) c = c xor 0x3d4233dd
+            if (c0 and 16 != 0) c = c xor 0x2a1462b3
+        }
+        return c
+    }
+
+    /** Expand a HRP for use in checksum computation.  */
+    private fun expandHrp(hrp: String): ByteArray {
+        val hrpLength = hrp.length
+        val ret = ByteArray(hrpLength * 2 + 1)
+        for (i in 0 until hrpLength) {
+            val c = hrp[i].code and 0x7f // Limit to standard 7-bit ASCII
+            ret[i] = (c ushr 5 and 0x07).toByte()
+            ret[i + hrpLength + 1] = (c and 0x1f).toByte()
+        }
+        ret[hrpLength] = 0
+        return ret
+    }
+
+    /** Verify a checksum.  */
+    private fun verifyChecksum(hrp: String, values: ByteArray): Boolean {
+        val hrpExpanded: ByteArray = expandHrp(hrp)
+        val combined = ByteArray(hrpExpanded.size + values.size)
+        System.arraycopy(hrpExpanded, 0, combined, 0, hrpExpanded.size)
+        System.arraycopy(values, 0, combined, hrpExpanded.size, values.size)
+        return polymod(combined) == 1
+    }
+
+    class AddressFormatException(message: String) : Exception(message)
+
+    fun decodeUnlimitedLength(invoice: String): Boolean {
+        var lower = false
+        var upper = false
+        for (i in 0 until invoice.length) {
+            val c = invoice[i]
+            if (c.code < 33 || c.code > 126) throw AddressFormatException("Invalid character: $c, pos: $i")
+            if (c in 'a'..'z') {
+                if (upper) throw AddressFormatException("Invalid character: $c, pos: $i")
+                lower = true
+            }
+            if (c in 'A'..'Z') {
+                if (lower) throw AddressFormatException("Invalid character: $c, pos: $i")
+                upper = true
+            }
+        }
+        val pos = invoice.lastIndexOf('1')
+        if (pos < 1) throw AddressFormatException("Missing human-readable part")
+        val dataPartLength = invoice.length - 1 - pos
+        if (dataPartLength < 6) throw AddressFormatException("Data part too short: $dataPartLength")
+        val values = ByteArray(dataPartLength)
+        for (i in 0 until dataPartLength) {
+            val c = invoice[i + pos + 1]
+            if (CHARSET_REV.get(c.code).toInt() == -1) throw AddressFormatException("Invalid character: " + c + ", pos: " + (i + pos + 1))
+            values[i] = CHARSET_REV.get(c.code)
+        }
+        val hrp = invoice.substring(0, pos).lowercase(Locale.ROOT)
+        if (!verifyChecksum(hrp, values)) throw AddressFormatException("Invalid Checksum")
+        return true
+    }
+
+    /**
+     * Parses invoice amount according to
+     * https://github.com/lightningnetwork/lightning-rfc/blob/master/11-payment-encoding.md#human-readable-part
+     * @return invoice amount in bitcoins, zero if the invoice has no amount
+     * @throws RuntimeException if invoice format is incorrect
+     */
+    fun getAmount(invoice: String): BigDecimal {
+        try {
+            decodeUnlimitedLength(invoice) // checksum must match
+        } catch (e: AddressFormatException) {
+            throw IllegalArgumentException("Cannot decode invoice", e)
+        }
+
+        val matcher = invoicePattern.matcher(invoice)
+        require(matcher.matches()) { "Failed to match HRP pattern" }
+        val amountGroup = matcher.group("amount")
+        val multiplierGroup = matcher.group("multiplier")
+        if (amountGroup == null) {
+            return BigDecimal.ZERO
+        }
+        val amount = BigDecimal(amountGroup)
+        if (multiplierGroup == null) {
+            return amount
+        }
+        require(!(multiplierGroup == "p" && amountGroup[amountGroup.length - 1] != '0')) { "sub-millisatoshi amount" }
+        return amount.multiply(multiplier(multiplierGroup))
+    }
+
+    fun getAmountInSats(invoice: String): BigDecimal {
+        return getAmount(invoice).multiply(BigDecimal(100000000))
+    }
+
+    private fun multiplier(multiplier: String): BigDecimal {
+        return when (multiplier.lowercase()) {
+            "m" -> BigDecimal("0.001")
+            "u" -> BigDecimal("0.000001")
+            "n" -> BigDecimal("0.000000001")
+            "p" -> BigDecimal("0.000000000001")
+            else -> throw IllegalArgumentException("Invalid multiplier: $multiplier")
+        }
+    }
+
+    /**
+     * Finds LN invoice 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 invoice found in the input.
+     *
+     * @return the invoice if it was found. null for null input or if no invoice is found
+     */
+    fun findInvoice(input: String?): String? {
+        if (input == null) {
+            return null
+        }
+        val matcher = invoicePattern.matcher(input)
+        return if (matcher.find()) {
+            matcher.group()
+        } else {
+            null
+        }
+    }
+
+    /**
+     * If the string contains an LN invoice, returns a Pair of the start and end
+     * positions of the invoice in the string. Otherwise, returns (0, 0). This is
+     * used to ensure we don't accidentally cut an invoice in the middle when taking
+     * only a portion of the available text.
+     */
+    fun locateInvoice(input: String?): Pair<Int, Int> {
+        if (input == null) {
+            return Pair(0, 0)
+        }
+        val matcher = invoicePattern.matcher(input)
+        return if (matcher.find()) {
+            Pair(matcher.start(), matcher.end())
+        } else {
+            Pair(0, 0)
+        }
+    }
+}

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

@@ -0,0 +1,81 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.toByteArray
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.nip19.Tlv
+import fr.acinq.secp256k1.Hex
+import nostr.postr.Bech32
+import nostr.postr.bechToBytes
+import nostr.postr.toByteArray
+
+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 dTag = dTag.toByteArray(Charsets.UTF_8)
+        val relay = relay?.toByteArray(Charsets.UTF_8)
+
+        var fullArray = byteArrayOf(Tlv.Type.SPECIAL.id, dTag.size.toByte()) + dTag
+
+        if (relay != null) {
+            fullArray = fullArray + byteArrayOf(Tlv.Type.RELAY.id, relay.size.toByte()) + relay
+        }
+
+        fullArray = fullArray +
+            byteArrayOf(Tlv.Type.AUTHOR.id, author.size.toByte()) + author +
+            byteArrayOf(Tlv.Type.KIND.id, kind.size.toByte()) + kind
+
+        return Bech32.encodeBytes(hrp = "naddr", fullArray, Bech32.Encoding.Bech32)
+    }
+
+    companion object {
+        fun isATag(key: String): Boolean {
+            return key.startsWith("naddr1") || key.contains(":")
+        }
+
+        fun parse(address: String, relay: String?): ATag? {
+            return if (address.startsWith("naddr") || address.startsWith("nostr:naddr")) {
+                parseNAddr(address)
+            } else {
+                parseAtag(address, relay)
+            }
+        }
+
+        fun parseAtag(atag: String, relay: String?): ATag? {
+            return try {
+                val parts = atag.split(":")
+                Hex.decode(parts[1])
+                ATag(parts[0].toInt(), parts[1], parts[2], relay)
+            } catch (t: Throwable) {
+                Log.w("ATag", "Error parsing A Tag: $atag: ${t.message}")
+                null
+            }
+        }
+
+        fun parseNAddr(naddr: String): ATag? {
+            try {
+                val key = naddr.removePrefix("nostr:")
+
+                if (key.startsWith("naddr")) {
+                    val tlv = Tlv.parse(key.bechToBytes())
+                    val d = tlv.get(Tlv.Type.SPECIAL.id)?.get(0)?.toString(Charsets.UTF_8) ?: ""
+                    val relay = tlv.get(Tlv.Type.RELAY.id)?.get(0)?.toString(Charsets.UTF_8)
+                    val author = tlv.get(Tlv.Type.AUTHOR.id)?.get(0)?.toHexKey()
+                    val kind = tlv.get(Tlv.Type.KIND.id)?.get(0)?.let { Tlv.toInt32(it) }
+
+                    if (kind != null && author != null) {
+                        return ATag(kind, author, d, relay)
+                    }
+                }
+            } catch (e: Throwable) {
+                Log.w("ATag", "Issue trying to Decode NIP19 $this: ${e.message}")
+                // e.printStackTrace()
+            }
+
+            return null
+        }
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.HexKey
+
+class BadgeAwardEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    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)
+
+        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
+    }
+
+    companion object {
+        const val kind = 8
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.HexKey
+
+class BadgeDefinitionEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
+    fun address() = ATag(kind, pubKey, dTag(), null)
+
+    fun 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()
+
+    companion object {
+        const val kind = 30009
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.HexKey
+
+class BadgeProfilesEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun badgeAwardEvents() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    fun badgeAwardDefinitions() = 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
+    }
+
+    fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
+    fun address() = ATag(kind, pubKey, dTag(), null)
+
+    companion object {
+        const val kind = 30008
+    }
+}

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

@@ -0,0 +1,50 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.tagSearch
+
+open class BaseTextNoteEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    kind: Int,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun mentions() = taggedUsers()
+    fun replyTos() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+
+    fun findCitations(): Set<String> {
+        var citations = mutableSetOf<String>()
+        // 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") {
+                    citations.add(tag[1])
+                }
+                if (tag != null && tag[0] == "a") {
+                    citations.add(tag[1])
+                }
+            } catch (e: Exception) {
+            }
+        }
+        return citations
+    }
+
+    fun tagsWithoutCitations(): List<String> {
+        val repliesTo = replyTos()
+        val tagAddresses = taggedAddresses().map { it.toTag() }
+        if (repliesTo.isEmpty() && tagAddresses.isEmpty()) return emptyList()
+
+        val citations = findCitations()
+
+        return if (citations.isEmpty()) {
+            repliesTo + tagAddresses
+        } else {
+            repliesTo.filter { it !in citations }
+        }
+    }
+}

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

@@ -0,0 +1,117 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.google.gson.reflect.TypeToken
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toByteArray
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.util.Date
+
+class BookmarkListEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
+    fun address() = ATag(kind, pubKey, dTag(), null)
+
+    fun category() = dTag()
+    fun bookmarkedPosts() = tags.filter { it[0] == "e" }.mapNotNull { it.getOrNull(1) }
+
+    fun plainContent(privKey: ByteArray): String? {
+        return try {
+            val sharedSecret = Utils.getSharedSecret(privKey, pubKey.toByteArray())
+
+            return Utils.decrypt(content, sharedSecret)
+        } catch (e: Exception) {
+            Log.w("BookmarkList", "Error decrypting the message ${e.message}")
+            null
+        }
+    }
+
+    @Transient
+    private var privateTagsCache: List<List<String>>? = null
+
+    fun privateTags(privKey: ByteArray): List<List<String>>? {
+        if (privateTagsCache != null) {
+            return privateTagsCache
+        }
+
+        privateTagsCache = try {
+            gson.fromJson(plainContent(privKey), object : TypeToken<List<List<String>>>() {}.type)
+        } catch (e: Throwable) {
+            Log.w("BookmarkList", "Error parsing the JSON ${e.message}")
+            null
+        }
+        return privateTagsCache
+    }
+
+    fun privateTaggedUsers(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "p" }?.mapNotNull { it.getOrNull(1) }
+    fun privateTaggedEvents(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "e" }?.mapNotNull { it.getOrNull(1) }
+    fun privateTaggedAddresses(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "a" }?.mapNotNull {
+        val aTagValue = it.getOrNull(1)
+        val relay = it.getOrNull(2)
+
+        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
+    }
+
+    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 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>>()
+            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

@@ -0,0 +1,48 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.util.Date
+
+class ChannelCreateEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun channelInfo(): ChannelData = try {
+        MetadataEvent.gson.fromJson(content, ChannelData::class.java)
+    } catch (e: Exception) {
+        Log.e("ChannelMetadataEvent", "Can't parse channel info $content", e)
+        ChannelData(null, null, null)
+    }
+
+    companion object {
+        const val kind = 40
+
+        fun create(channelInfo: ChannelData?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelCreateEvent {
+            val content = try {
+                if (channelInfo != null) {
+                    gson.toJson(channelInfo)
+                } else {
+                    ""
+                }
+            } catch (t: Throwable) {
+                Log.e("ChannelCreateEvent", "Couldn't parse channel information", t)
+                ""
+            }
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = emptyList<List<String>>()
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return ChannelCreateEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+
+    data class ChannelData(var name: String?, var about: String?, var picture: String?)
+}

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

@@ -0,0 +1,33 @@
+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 ChannelHideMessageEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun eventsToHide() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+
+    companion object {
+        const val kind = 43
+
+        fun create(reason: String, messagesToHide: List<String>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelHideMessageEvent {
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags =
+                messagesToHide?.map {
+                    listOf("e", it)
+                } ?: emptyList()
+
+            val id = generateId(pubKey, createdAt, kind, tags, reason)
+            val sig = Utils.sign(id, privateKey)
+            return ChannelHideMessageEvent(id.toHexKey(), pubKey, createdAt, tags, reason, sig.toHexKey())
+        }
+    }
+}

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

@@ -0,0 +1,42 @@
+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 ChannelMessageEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(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) }
+
+    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 {
+            val content = message
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = mutableListOf(
+                listOf("e", channel, "", "root")
+            )
+            replyTos?.forEach {
+                tags.add(listOf("e", it))
+            }
+            mentions?.forEach {
+                tags.add(listOf("p", it))
+            }
+
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return ChannelMessageEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

@@ -0,0 +1,44 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.util.Date
+
+class ChannelMetadataEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun channel() = tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
+    fun channelInfo() =
+        try {
+            MetadataEvent.gson.fromJson(content, ChannelCreateEvent.ChannelData::class.java)
+        } catch (e: Exception) {
+            Log.e("ChannelMetadataEvent", "Can't parse channel info $content", e)
+            ChannelCreateEvent.ChannelData(null, null, null)
+        }
+
+    companion object {
+        const val kind = 41
+
+        fun create(newChannelInfo: ChannelCreateEvent.ChannelData?, originalChannelIdHex: String, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMetadataEvent {
+            val content =
+                if (newChannelInfo != null) {
+                    gson.toJson(newChannelInfo)
+                } else {
+                    ""
+                }
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = listOf(listOf("e", originalChannelIdHex, "", "root"))
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return ChannelMetadataEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

@@ -0,0 +1,35 @@
+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 ChannelMuteUserEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    fun usersToMute() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+
+    companion object {
+        const val kind = 44
+
+        fun create(reason: String, usersToMute: List<String>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMuteUserEvent {
+            val content = reason
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags =
+                usersToMute?.map {
+                    listOf("p", it)
+                } ?: emptyList()
+
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return ChannelMuteUserEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

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

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

@@ -0,0 +1,30 @@
+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 DeletionEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun deleteEvents() = tags.map { it[1] }
+
+    companion object {
+        const val kind = 5
+
+        fun create(deleteEvents: List<String>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): DeletionEvent {
+            val content = ""
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = deleteEvents.map { listOf("e", it) }
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return DeletionEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

@@ -0,0 +1,267 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.google.gson.*
+import com.google.gson.annotations.SerializedName
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import fr.acinq.secp256k1.Hex
+import fr.acinq.secp256k1.Secp256k1
+import nostr.postr.Utils
+import nostr.postr.toHex
+import java.lang.reflect.Type
+import java.math.BigDecimal
+import java.security.MessageDigest
+import java.util.*
+
+open class Event(
+    val id: HexKey,
+    @SerializedName("pubkey") val pubKey: HexKey,
+    @SerializedName("created_at") val createdAt: Long,
+    val kind: Int,
+    val tags: List<List<String>>,
+    val content: String,
+    val sig: HexKey
+) : EventInterface {
+    override fun id(): HexKey = id
+
+    override fun pubKey(): HexKey = pubKey
+
+    override fun createdAt(): Long = createdAt
+
+    override fun kind(): Int = kind
+
+    override fun tags(): List<List<String>> = tags
+
+    override fun content(): String = content
+
+    override fun sig(): HexKey = sig
+
+    override fun toJson(): String = gson.toJson(this)
+
+    fun taggedUsers() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+    fun taggedEvents() = tags.filter { it.firstOrNull() == "e" }.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
+    }
+
+    override fun hashtags() = tags.filter { it.firstOrNull() == "t" }.mapNotNull { it.getOrNull(1) }
+
+    override fun isTaggedUser(idHex: String) = tags.any { it.getOrNull(0) == "p" && it.getOrNull(1) == idHex }
+
+    override fun isTaggedHash(hashtag: String) = tags.any { it.getOrNull(0) == "t" && it.getOrNull(1).equals(hashtag, true) }
+    override fun isTaggedHashes(hashtags: Set<String>) = tags.any { it.getOrNull(0) == "t" && it.getOrNull(1)?.lowercase() in hashtags }
+    override fun firstIsTaggedHashes(hashtags: Set<String>) = tags.firstOrNull { it.getOrNull(0) == "t" && it.getOrNull(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.filter { it.firstOrNull() == "reward" }.mapNotNull { BigDecimal(it.getOrNull(1)) }.firstOrNull()
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    /**
+     * Checks if the ID is correct and then if the pubKey's secret key signed the event.
+     */
+    override fun checkSignature() {
+        if (!id.contentEquals(generateId())) {
+            throw Exception(
+                """|Unexpected ID.
+                   |  Event: ${toJson()}
+                   |  Actual ID: $id
+                   |  Generated: ${generateId()}
+                """.trimIndent()
+            )
+        }
+        if (!secp256k1.verifySchnorr(Hex.decode(sig), Hex.decode(id), Hex.decode(pubKey))) {
+            throw Exception("""Bad signature!""")
+        }
+    }
+
+    override fun hasValidSignature(): Boolean {
+        if (!id.contentEquals(generateId())) {
+            return false
+        }
+
+        return secp256k1.verifySchnorr(Hex.decode(sig), Hex.decode(id), Hex.decode(pubKey))
+    }
+
+    private fun generateId(): String {
+        val rawEvent = listOf(0, pubKey, createdAt, kind, tags, content)
+
+        // GSON decided to hardcode these replacements.
+        // They break Nostr's hash check.
+        // These lines revert their code.
+        // https://github.com/google/gson/issues/2295
+        val rawEventJson = gson.toJson(rawEvent)
+            .replace("\\u2028", "\u2028")
+            .replace("\\u2029", "\u2029")
+
+        return sha256.digest(rawEventJson.toByteArray()).toHexKey()
+    }
+
+    private class EventDeserializer : JsonDeserializer<Event> {
+        override fun deserialize(
+            json: JsonElement,
+            typeOfT: Type?,
+            context: JsonDeserializationContext?
+        ): Event {
+            val jsonObject = json.asJsonObject
+            return Event(
+                id = jsonObject.get("id").asString,
+                pubKey = jsonObject.get("pubkey").asString,
+                createdAt = jsonObject.get("created_at").asLong,
+                kind = jsonObject.get("kind").asInt,
+                tags = jsonObject.get("tags").asJsonArray.map {
+                    it.asJsonArray.mapNotNull { s -> if (s.isJsonNull) null else s.asString }
+                },
+                content = jsonObject.get("content").asString,
+                sig = jsonObject.get("sig").asString
+            )
+        }
+    }
+
+    private class EventSerializer : JsonSerializer<Event> {
+        override fun serialize(
+            src: Event,
+            typeOfSrc: Type?,
+            context: JsonSerializationContext?
+        ): JsonElement {
+            return JsonObject().apply {
+                addProperty("id", src.id)
+                addProperty("pubkey", src.pubKey)
+                addProperty("created_at", src.createdAt)
+                addProperty("kind", src.kind)
+                add(
+                    "tags",
+                    JsonArray().also { jsonTags ->
+                        src.tags.forEach { tag ->
+                            jsonTags.add(
+                                JsonArray().also { jsonTagElement ->
+                                    tag.forEach { tagElement ->
+                                        jsonTagElement.add(tagElement)
+                                    }
+                                }
+                            )
+                        }
+                    }
+                )
+                addProperty("content", src.content)
+                addProperty("sig", src.sig)
+            }
+        }
+    }
+
+    private class ByteArrayDeserializer : JsonDeserializer<ByteArray> {
+        override fun deserialize(
+            json: JsonElement,
+            typeOfT: Type?,
+            context: JsonDeserializationContext?
+        ): ByteArray = Hex.decode(json.asString)
+    }
+
+    private class ByteArraySerializer : JsonSerializer<ByteArray> {
+        override fun serialize(
+            src: ByteArray,
+            typeOfSrc: Type?,
+            context: JsonSerializationContext?
+        ) = JsonPrimitive(src.toHex())
+    }
+
+    companion object {
+        private val secp256k1 = Secp256k1.get()
+
+        val 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())
+            .create()
+
+        fun fromJson(json: String, lenient: Boolean = false): Event = gson.fromJson(json, Event::class.java).getRefinedEvent(lenient)
+
+        fun fromJson(json: JsonElement, lenient: Boolean = false): Event = gson.fromJson(json, Event::class.java).getRefinedEvent(lenient)
+
+        fun Event.getRefinedEvent(lenient: Boolean = false): Event = when (kind) {
+            BadgeAwardEvent.kind -> BadgeAwardEvent(id, pubKey, createdAt, tags, content, sig)
+            BadgeDefinitionEvent.kind -> BadgeDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
+            BadgeProfilesEvent.kind -> BadgeProfilesEvent(id, pubKey, createdAt, tags, content, sig)
+            BookmarkListEvent.kind -> BookmarkListEvent(id, pubKey, createdAt, tags, content, sig)
+            ChannelCreateEvent.kind -> ChannelCreateEvent(id, pubKey, createdAt, tags, content, sig)
+            ChannelHideMessageEvent.kind -> ChannelHideMessageEvent(id, pubKey, createdAt, tags, content, sig)
+            ChannelMessageEvent.kind -> ChannelMessageEvent(id, pubKey, createdAt, tags, content, sig)
+            ChannelMetadataEvent.kind -> ChannelMetadataEvent(id, pubKey, createdAt, tags, content, sig)
+            ChannelMuteUserEvent.kind -> ChannelMuteUserEvent(id, pubKey, createdAt, tags, content, sig)
+            ContactListEvent.kind -> ContactListEvent(id, pubKey, createdAt, tags, content, sig)
+            DeletionEvent.kind -> DeletionEvent(id, pubKey, createdAt, tags, content, sig)
+
+            LnZapEvent.kind -> LnZapEvent(id, pubKey, createdAt, tags, content, sig)
+            LnZapPaymentRequestEvent.kind -> LnZapPaymentRequestEvent(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)
+            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)
+            ReportEvent.kind -> ReportEvent(id, pubKey, createdAt, tags, content, sig)
+            RepostEvent.kind -> RepostEvent(id, pubKey, createdAt, tags, content, sig)
+            TextNoteEvent.kind -> TextNoteEvent(id, pubKey, createdAt, tags, content, sig)
+            else -> this
+        }
+
+        fun generateId(pubKey: HexKey, createdAt: Long, kind: Int, tags: List<List<String>>, content: String): ByteArray {
+            val rawEvent = listOf(
+                0,
+                pubKey,
+                createdAt,
+                kind,
+                tags,
+                content
+            )
+
+            // GSON decided to hardcode these replacements.
+            // They break Nostr's hash check.
+            // These lines revert their code.
+            // https://github.com/google/gson/issues/2295
+            val rawEventJson = gson.toJson(rawEvent)
+                .replace("\\u2028", "\u2028")
+                .replace("\\u2029", "\u2029")
+
+            return sha256.digest(rawEventJson.toByteArray())
+        }
+
+        fun create(privateKey: ByteArray, kind: Int, tags: List<List<String>> = emptyList(), content: String = "", createdAt: Long = Date().time / 1000): Event {
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val id = Companion.generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey).toHexKey()
+            return Event(id.toHexKey(), pubKey, createdAt, kind, tags, content, sig)
+        }
+    }
+}

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

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

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

@@ -0,0 +1,62 @@
+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 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
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.vitorpamplona.amethyst.service.model
+
+import java.math.BigDecimal
+
+interface LnZapEventInterface : EventInterface {
+
+    fun zappedPost(): List<String>
+
+    fun zappedAuthor(): List<String>
+
+    fun taggedAddresses(): List<ATag>
+
+    fun amount(): BigDecimal?
+
+    fun containedPost(): Event?
+}

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

@@ -0,0 +1,55 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toByteArray
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.util.Date
+
+class LnZapPaymentRequestEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    fun lnInvoice(privKey: ByteArray): String? {
+        return try {
+            val sharedSecret = Utils.getSharedSecret(privKey, pubKey.toByteArray())
+
+            return Utils.decrypt(content, sharedSecret)
+        } catch (e: Exception) {
+            Log.w("BookmarkList", "Error decrypting the message ${e.message}")
+            null
+        }
+    }
+
+    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 content = Utils.encrypt(
+                lnInvoice,
+                privateKey,
+                walletServicePubkey.toByteArray()
+            )
+
+            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())
+        }
+    }
+}

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

@@ -0,0 +1,97 @@
+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) }
+
+    companion object {
+        const val kind = 9734
+
+        fun create(
+            originalNote: EventInterface,
+            relays: Set<String>,
+            privateKey: ByteArray,
+            message: String,
+            createdAt: Long = Date().time / 1000
+        ): LnZapRequestEvent {
+            val content = message
+            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,
+            message: String,
+            createdAt: Long = Date().time / 1000
+        ): LnZapRequestEvent {
+            val content = message
+            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"
+  ]
+  ]
+}
+*/

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

@@ -0,0 +1,47 @@
+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 LongTextNoteEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    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)
+
+    fun topics() = tags.filter { it.firstOrNull() == "t" }.mapNotNull { it.getOrNull(1) }
+    fun title() = tags.filter { it.firstOrNull() == "title" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+    fun image() = tags.filter { it.firstOrNull() == "image" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+    fun summary() = tags.filter { it.firstOrNull() == "summary" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+
+    fun publishedAt() = try {
+        tags.filter { it.firstOrNull() == "published_at" }.mapNotNull { it.getOrNull(1) }.firstOrNull()?.toLong()
+    } catch (_: Exception) {
+        null
+    }
+
+    companion object {
+        const val kind = 30023
+
+        fun create(msg: String, replyTos: List<String>?, mentions: List<String>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): LongTextNoteEvent {
+            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))
+            }
+            val id = generateId(pubKey, createdAt, kind, tags, msg)
+            val sig = Utils.sign(id, privateKey)
+            return LongTextNoteEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
+        }
+    }
+}

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

@@ -0,0 +1,182 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.google.gson.Gson
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+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
+) {
+    abstract fun toProofUrl(): String
+    abstract fun toIcon(): Int
+    abstract fun toDescriptor(): Int
+    abstract fun platform(): String
+
+    fun platformIdentity() = "${platform()}:$identity"
+
+    companion object {
+        fun create(platformIdentity: String, proof: String): IdentityClaim? {
+            val (platform, identity) = platformIdentity.split(':')
+
+            return when (platform.lowercase()) {
+                GitHubIdentity.platform -> GitHubIdentity(identity, proof)
+                TwitterIdentity.platform -> TwitterIdentity(identity, proof)
+                TelegramIdentity.platform -> TelegramIdentity(identity, proof)
+                MastodonIdentity.platform -> MastodonIdentity(identity, proof)
+                else -> throw IllegalArgumentException("Platform $platform not supported")
+            }
+        }
+    }
+}
+
+class GitHubIdentity(
+    identity: String,
+    proof: String
+) : IdentityClaim(identity, proof) {
+    override fun toProofUrl() = "https://gist.github.com/$identity/$proof"
+
+    override fun platform() = platform
+    override fun toIcon() = R.drawable.github
+    override fun toDescriptor() = R.string.github
+
+    companion object {
+        val platform = "github"
+
+        fun parseProofUrl(proofUrl: String): GitHubIdentity? {
+            return try {
+                if (proofUrl.isBlank()) return null
+                val path = proofUrl.removePrefix("https://gist.github.com/").split("?")[0].split("/")
+
+                GitHubIdentity(path[0], path[1])
+            } catch (e: Exception) {
+                null
+            }
+        }
+    }
+}
+
+class TwitterIdentity(
+    identity: String,
+    proof: String
+) : IdentityClaim(identity, proof) {
+    override fun toProofUrl() = "https://twitter.com/$identity/status/$proof"
+
+    override fun platform() = platform
+    override fun toIcon() = R.drawable.twitter
+    override fun toDescriptor() = R.string.twitter
+
+    companion object {
+        val platform = "twitter"
+
+        fun parseProofUrl(proofUrl: String): TwitterIdentity? {
+            return try {
+                if (proofUrl.isBlank()) return null
+                val path = proofUrl.removePrefix("https://twitter.com/").split("?")[0].split("/")
+
+                TwitterIdentity(path[0], path[2])
+            } catch (e: Exception) {
+                null
+            }
+        }
+    }
+}
+
+class TelegramIdentity(
+    identity: String,
+    proof: String
+) : IdentityClaim(identity, proof) {
+    override fun toProofUrl() = "https://t.me/$proof"
+
+    override fun platform() = platform
+    override fun toIcon() = R.drawable.telegram
+    override fun toDescriptor() = R.string.telegram
+
+    companion object {
+        val platform = "telegram"
+    }
+}
+
+class MastodonIdentity(
+    identity: String,
+    proof: String
+) : IdentityClaim(identity, proof) {
+    override fun toProofUrl() = "https://$identity/$proof"
+
+    override fun platform() = platform
+    override fun toIcon() = R.drawable.mastodon
+    override fun toDescriptor() = R.string.mastodon
+
+    companion object {
+        val platform = "mastodon"
+
+        fun parseProofUrl(proofUrl: String): MastodonIdentity? {
+            return try {
+                if (proofUrl.isBlank()) return null
+                val path = proofUrl.removePrefix("https://").split("?")[0].split("/")
+
+                return MastodonIdentity("${path[0]}/${path[1]}", path[2])
+            } catch (e: Exception) {
+                null
+            }
+        }
+    }
+}
+
+class MetadataEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun contactMetaData() = try {
+        gson.fromJson(content, ContactMetaData::class.java)
+    } catch (e: Exception) {
+        Log.e("MetadataEvent", "Can't parse $content", e)
+        null
+    }
+
+    fun identityClaims() = tags.filter { it.firstOrNull() == "i" }.mapNotNull {
+        try {
+            IdentityClaim.create(it.get(1), it.get(2))
+        } catch (e: Exception) {
+            Log.e("MetadataEvent", "Can't parse identity [${it.joinToString { "," }}]", e)
+            null
+        }
+    }
+
+    companion object {
+        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)
+        }
+
+        fun create(contactMetaData: String, identities: List<IdentityClaim>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): MetadataEvent {
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = mutableListOf<List<String>>()
+
+            identities.forEach {
+                tags.add(listOf("i", it.platformIdentity(), it.proof))
+            }
+
+            val id = generateId(pubKey, createdAt, kind, tags, contactMetaData)
+            val sig = Utils.sign(id, privateKey)
+            return MetadataEvent(id.toHexKey(), pubKey, createdAt, tags, contactMetaData, sig.toHexKey())
+        }
+    }
+}

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

@@ -0,0 +1,110 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.google.gson.reflect.TypeToken
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toByteArray
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.util.Date
+
+class MuteListEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
+    fun address() = ATag(kind, pubKey, dTag(), null)
+
+    fun plainContent(privKey: ByteArray): String? {
+        return try {
+            val sharedSecret = Utils.getSharedSecret(privKey, pubKey.toByteArray())
+
+            return Utils.decrypt(content, sharedSecret)
+        } catch (e: Exception) {
+            Log.w("BookmarkList", "Error decrypting the message ${e.message}")
+            null
+        }
+    }
+
+    @Transient
+    private var privateTagsCache: List<List<String>>? = null
+
+    fun privateTags(privKey: ByteArray): List<List<String>>? {
+        if (privateTagsCache != null) {
+            return privateTagsCache
+        }
+
+        privateTagsCache = try {
+            gson.fromJson(plainContent(privKey), object : TypeToken<List<List<String>>>() {}.type)
+        } catch (e: Throwable) {
+            Log.w("BookmarkList", "Error parsing the JSON ${e.message}")
+            null
+        }
+        return privateTagsCache
+    }
+
+    fun privateTaggedUsers(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "p" }?.mapNotNull { it.getOrNull(1) }
+    fun privateTaggedEvents(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "e" }?.mapNotNull { it.getOrNull(1) }
+    fun privateTaggedAddresses(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "a" }?.mapNotNull {
+        val aTagValue = it.getOrNull(1)
+        val relay = it.getOrNull(2)
+
+        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
+    }
+
+    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/PrivateDmEvent.kt

@@ -0,0 +1,87 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import fr.acinq.secp256k1.Hex
+import nostr.postr.Utils
+import nostr.postr.toHex
+import java.util.Date
+
+class PrivateDmEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    /**
+     * This may or may not be the actual recipient's pub key. The event is intended to look like a
+     * 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
+
+    /**
+     * To be fully compatible with nip-04, we read e-tags that are in violation to nip-18.
+     *
+     * 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 plainContent(privKey: ByteArray, pubKey: ByteArray): String? {
+        return try {
+            val sharedSecret = Utils.getSharedSecret(privKey, pubKey)
+
+            val retVal = Utils.decrypt(content, sharedSecret)
+
+            if (retVal.startsWith(nip18Advertisement)) {
+                retVal.substring(16)
+            } else {
+                retVal
+            }
+        } catch (e: Exception) {
+            Log.w("PrivateDM", "Error decrypting the message ${e.message}")
+            null
+        }
+    }
+
+    companion object {
+        const val kind = 4
+
+        const val nip18Advertisement = "[//]: # (nip18)\n"
+
+        fun create(
+            recipientPubKey: ByteArray,
+            msg: String,
+            replyTos: List<String>? = null,
+            mentions: List<String>? = null,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000,
+            publishedRecipientPubKey: ByteArray? = null,
+            advertiseNip18: Boolean = true
+        ): PrivateDmEvent {
+            val content = Utils.encrypt(
+                if (advertiseNip18) { nip18Advertisement } else { "" } + msg,
+                privateKey,
+                recipientPubKey
+            )
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = mutableListOf<List<String>>()
+            publishedRecipientPubKey?.let {
+                tags.add(listOf("p", publishedRecipientPubKey.toHex()))
+            }
+            replyTos?.forEach {
+                tags.add(listOf("e", it))
+            }
+            mentions?.forEach {
+                tags.add(listOf("p", it))
+            }
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return PrivateDmEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

@@ -1,37 +1,44 @@
 package com.vitorpamplona.amethyst.service.model
 
-import java.util.Date
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
-import nostr.postr.events.Event
-import nostr.postr.toHex
+import java.util.Date
 
-class ReactionEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
-  createdAt: Long,
-  tags: List<List<String>>,
-  content: String,
-  sig: ByteArray
-): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+class ReactionEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
-  @Transient val originalPost: List<String>
-  @Transient val originalAuthor: List<String>
+    fun originalPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    fun originalAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
 
-  init {
-    originalPost = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-    originalAuthor = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
-  }
+    companion object {
+        const val kind = 7
 
-  companion object {
-    const val kind = 7
+        fun createWarning(originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
+            return create("\u26A0\uFE0F", originalNote, privateKey, createdAt)
+        }
 
-    fun create(originalNote: Event, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
-      val content = "+"
-      val pubKey = Utils.pubkeyCreate(privateKey)
-      val tags = listOf( listOf("e", originalNote.id.toHex()), listOf("p", originalNote.pubKey.toHex()))
-      val id = generateId(pubKey, createdAt, kind, tags, content)
-      val sig = Utils.sign(id, privateKey)
-      return ReactionEvent(id, pubKey, createdAt, tags, content, sig)
+        fun createLike(originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
+            return create("+", originalNote, privateKey, createdAt)
+        }
+
+        fun create(content: String, originalNote: EventInterface, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReactionEvent {
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+
+            var tags = listOf(listOf("e", originalNote.id()), listOf("p", originalNote.pubKey()))
+            if (originalNote is LongTextNoteEvent) {
+                tags = tags + listOf(listOf("a", originalNote.address().toTag()))
+            }
+
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return ReactionEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
     }
-  }
-}
+}

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

@@ -0,0 +1,37 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.net.URI
+import java.util.Date
+
+class RecommendRelayEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey,
+    val lenient: Boolean = false
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    fun relay() = if (lenient) {
+        URI.create(content.trim())
+    } else {
+        URI.create(content)
+    }
+
+    companion object {
+        const val kind = 2
+
+        fun create(relay: URI, privateKey: ByteArray, createdAt: Long = Date().time / 1000): RecommendRelayEvent {
+            val content = relay.toString()
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = listOf<List<String>>()
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return RecommendRelayEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

@@ -0,0 +1,96 @@
+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
+
+data class ReportedKey(val key: String, val reportType: ReportEvent.ReportType)
+
+// NIP 56 event.
+class ReportEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    private fun defaultReportType(): ReportType {
+        // Works with old and new structures for report.
+        var reportType = tags.filter { it.firstOrNull() == "report" }.mapNotNull { it.getOrNull(1) }.map { ReportType.valueOf(it.uppercase()) }.firstOrNull()
+        if (reportType == null) {
+            reportType = tags.mapNotNull { it.getOrNull(2) }.map { ReportType.valueOf(it.uppercase()) }.firstOrNull()
+        }
+        if (reportType == null) {
+            reportType = ReportType.SPAM
+        }
+        return reportType
+    }
+
+    fun reportedPost() = tags
+        .filter { it.firstOrNull() == "e" && it.getOrNull(1) != null }
+        .map {
+            ReportedKey(
+                it[1],
+                it.getOrNull(2)?.uppercase()?.let { it1 -> ReportType.valueOf(it1) } ?: defaultReportType()
+            )
+        }
+
+    fun reportedAuthor() = tags
+        .filter { it.firstOrNull() == "p" && it.getOrNull(1) != null }
+        .map {
+            ReportedKey(
+                it[1],
+                it.getOrNull(2)?.uppercase()?.let { it1 -> ReportType.valueOf(it1) } ?: defaultReportType()
+            )
+        }
+
+    companion object {
+        const val kind = 1984
+
+        fun create(
+            reportedPost: EventInterface,
+            type: ReportType,
+            privateKey: ByteArray,
+            content: String = "",
+            createdAt: Long = Date().time / 1000
+        ): ReportEvent {
+            val reportPostTag = listOf("e", reportedPost.id(), type.name.lowercase())
+            val reportAuthorTag = listOf("p", reportedPost.pubKey(), type.name.lowercase())
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            var tags: List<List<String>> = listOf(reportPostTag, reportAuthorTag)
+
+            if (reportedPost is LongTextNoteEvent) {
+                tags = tags + listOf(listOf("a", reportedPost.address().toTag()))
+            }
+
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return ReportEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+
+        fun create(reportedUser: String, type: ReportType, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReportEvent {
+            val content = ""
+
+            val reportAuthorTag = listOf("p", reportedUser, type.name.lowercase())
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags: List<List<String>> = listOf(reportAuthorTag)
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return ReportEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+
+    enum class ReportType() {
+        EXPLICIT, // Not used anymore.
+        ILLEGAL,
+        SPAM,
+        IMPERSONATION,
+        NUDITY,
+        PROFANITY
+    }
+}

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

@@ -1,41 +1,48 @@
 package com.vitorpamplona.amethyst.service.model
 
-import java.util.Date
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.relays.Client
 import nostr.postr.Utils
-import nostr.postr.events.Event
-import nostr.postr.toHex
+import java.util.Date
 
-class RepostEvent (
-  id: ByteArray,
-  pubKey: ByteArray,
-  createdAt: Long,
-  tags: List<List<String>>,
-  content: String,
-  sig: ByteArray
-): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+class RepostEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
-  @Transient val boostedPost: List<String>
-  @Transient val originalAuthor: List<String>
+    fun boostedPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    fun originalAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
 
-  init {
-    boostedPost = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-    originalAuthor = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
-  }
-
-  companion object {
-    const val kind = 6
-
-    fun create(boostedPost: Event, privateKey: ByteArray, createdAt: Long = Date().time / 1000): RepostEvent {
-      val content = ""
-
-      val replyToPost = listOf("e", boostedPost.id.toHex())
-      val replyToAuthor = listOf("p", boostedPost.pubKey.toHex())
-
-      val pubKey = Utils.pubkeyCreate(privateKey)
-      val tags:List<List<String>> = boostedPost.tags.plus(listOf(replyToPost, replyToAuthor))
-      val id = generateId(pubKey, createdAt, kind, tags, content)
-      val sig = Utils.sign(id, privateKey)
-      return RepostEvent(id, pubKey, createdAt, tags, content, sig)
+    fun containedPost() = try {
+        fromJson(content, Client.lenient)
+    } catch (e: Exception) {
+        null
     }
-  }
-}
+
+    companion object {
+        const val kind = 6
+
+        fun create(boostedPost: EventInterface, privateKey: ByteArray, createdAt: Long = Date().time / 1000): RepostEvent {
+            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>> = boostedPost.tags().plus(listOf(replyToPost, replyToAuthor))
+
+            if (boostedPost is LongTextNoteEvent) {
+                tags = tags + listOf(listOf("a", boostedPost.address().toTag()))
+            }
+
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return RepostEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

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

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

@@ -0,0 +1,18 @@
+package com.vitorpamplona.amethyst.service.model.zaps
+
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.LnZapEventInterface
+
+object UserZaps {
+    fun forProfileFeed(zaps: Map<Note, Note?>?): List<Pair<Note, Note>> {
+        if (zaps == null) return emptyList()
+
+        return (
+            zaps
+                .filter { it.value != null }
+                .toList()
+                .sortedBy { (it.second?.event as? LnZapEventInterface)?.amount() }
+                .reversed()
+            ) as List<Pair<Note, Note>>
+    }
+}

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

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

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

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

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

@@ -1,18 +1,19 @@
 package com.vitorpamplona.amethyst.service.relays
 
-import com.vitorpamplona.amethyst.service.Constants
-import java.util.Collections
+import com.vitorpamplona.amethyst.service.model.Event
+import com.vitorpamplona.amethyst.service.model.EventInterface
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import java.util.UUID
-import java.util.concurrent.ConcurrentHashMap
-import nostr.postr.JsonFilter
-import nostr.postr.events.Event
 
 /**
  * The Nostr Client manages multiple personae the user may switch between. Events are received and
  * published through multiple relays.
  * Events are stored with their respective persona.
  */
-object Client: RelayPool.Listener {
+object Client : RelayPool.Listener {
     /**
      * Lenient mode:
      *
@@ -23,48 +24,69 @@ object Client: RelayPool.Listener {
      *        something.
      **/
     var lenient: Boolean = false
-    private val listeners = Collections.synchronizedSet(HashSet<Listener>())
-    internal var relays = Constants.defaultRelays
-    internal val subscriptions = ConcurrentHashMap<String, MutableList<JsonFilter>>()
+    private var listeners = setOf<Listener>()
+    private var relays = Constants.convertDefaultRelays()
+    private var subscriptions = mapOf<String, List<TypedFilter>>()
 
-    fun connect(
-        relays: Array<Relay> = Constants.defaultRelays
-    ) {
+    @Synchronized
+    fun connect(relays: Array<Relay>) {
         RelayPool.register(this)
+        RelayPool.unloadRelays()
         RelayPool.loadRelays(relays.toList())
         this.relays = relays
     }
 
-    fun requestAndWatch(
-        subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
-        filters: MutableList<JsonFilter> = mutableListOf(JsonFilter())
-    ) {
-        subscriptions[subscriptionId] = filters
-        RelayPool.requestAndWatch()
+    fun isSameRelaySetConfig(newRelayConfig: Array<Relay>): Boolean {
+        if (relays.size != newRelayConfig.size) return false
+
+        relays.forEach { oldRelayInfo ->
+            val newRelayInfo = newRelayConfig.find { it.url == oldRelayInfo.url } ?: return false
+
+            if (!oldRelayInfo.isSameRelayConfig(newRelayInfo)) return false
+        }
+
+        return true
     }
 
     fun sendFilter(
         subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
-        filters: MutableList<JsonFilter> = mutableListOf(JsonFilter())
+        filters: List<TypedFilter> = listOf()
     ) {
-        subscriptions[subscriptionId] = filters
+        subscriptions = subscriptions + Pair(subscriptionId, filters)
         RelayPool.sendFilter(subscriptionId)
     }
 
     fun sendFilterOnlyIfDisconnected(
         subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
-        filters: MutableList<JsonFilter> = mutableListOf(JsonFilter())
+        filters: List<TypedFilter> = listOf()
     ) {
-        subscriptions[subscriptionId] = filters
-        RelayPool.sendFilterOnlyIfDisconnected(subscriptionId)
+        subscriptions = subscriptions + Pair(subscriptionId, filters)
+        RelayPool.sendFilterOnlyIfDisconnected()
     }
 
-    fun send(signedEvent: Event) {
-        RelayPool.send(signedEvent)
+    fun send(signedEvent: EventInterface, relay: String? = null) {
+        if (relay == null) {
+            RelayPool.send(signedEvent)
+        } else {
+            val useConnectedRelay = relays.filter { it.url == relay }
+
+            if (useConnectedRelay.isNotEmpty()) {
+                useConnectedRelay.forEach {
+                    it.send(signedEvent)
+                }
+            } else {
+                /** temporary connection */
+                Relay(relay, false, true, emptySet()).requestAndWatch() {
+                    it.send(signedEvent)
+                    it.disconnect()
+                }
+            }
+        }
     }
 
-    fun close(subscriptionId: String){
+    fun close(subscriptionId: String) {
         RelayPool.close(subscriptionId)
+        subscriptions = subscriptions.minus(subscriptionId)
     }
 
     fun disconnect() {
@@ -73,26 +95,57 @@ object Client: RelayPool.Listener {
         RelayPool.unloadRelays()
     }
 
+    @OptIn(DelicateCoroutinesApi::class)
     override fun onEvent(event: Event, subscriptionId: String, relay: Relay) {
-        listeners.forEach { it.onEvent(event, subscriptionId, relay) }
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onEvent(event, subscriptionId, relay) }
+        }
     }
 
+    @OptIn(DelicateCoroutinesApi::class)
     override fun onError(error: Error, subscriptionId: String, relay: Relay) {
-        listeners.forEach { it.onError(error, subscriptionId, relay) }
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onError(error, subscriptionId, relay) }
+        }
     }
 
-    override fun onRelayStateChange(type: Relay.Type, relay: Relay) {
-        listeners.forEach { it.onRelayStateChange(type, relay) }
+    @OptIn(DelicateCoroutinesApi::class)
+    override fun onRelayStateChange(type: Relay.Type, relay: Relay, channel: String?) {
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onRelayStateChange(type, relay, channel) }
+        }
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    override fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) {
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onSendResponse(eventId, success, message, relay) }
+        }
     }
 
     fun subscribe(listener: Listener) {
-        listeners.add(listener)
+        listeners = listeners.plus(listener)
     }
 
-    fun unsubscribe(listener: Listener): Boolean {
-        return listeners.remove(listener)
+    fun unsubscribe(listener: Listener) {
+        listeners = listeners.minus(listener)
     }
 
+    fun allSubscriptions(): List<String> {
+        return subscriptions.keys.toList()
+    }
+
+    fun getSubscriptionFilters(subId: String): List<TypedFilter> {
+        return subscriptions[subId] ?: emptyList()
+    }
 
     abstract class Listener {
         /**
@@ -108,6 +161,11 @@ object Client: RelayPool.Listener {
         /**
          * Connected to or disconnected from a relay
          */
-        open fun onRelayStateChange(type: Relay.Type, relay: Relay) = Unit
+        open fun onRelayStateChange(type: Relay.Type, relay: Relay, channel: String?) = Unit
+
+        /**
+         * When an relay saves or rejects a new event.
+         */
+        open fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) = Unit
     }
-}
+}

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

@@ -0,0 +1,54 @@
+package com.vitorpamplona.amethyst.service.relays
+
+import com.vitorpamplona.amethyst.model.RelaySetupInfo
+
+object Constants {
+    val activeTypes = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS)
+    val activeTypesGlobalChats = setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.PRIVATE_DMS, FeedType.GLOBAL)
+    val activeTypesSearch = setOf(FeedType.SEARCH)
+
+    fun convertDefaultRelays(): Array<Relay> {
+        return defaultRelays.map {
+            Relay(it.url, it.read, it.write, it.feedTypes)
+        }.toTypedArray()
+    }
+
+    val defaultRelays = arrayOf(
+        // Free relays
+        RelaySetupInfo("wss://nostr.bitcoiner.social", read = true, write = true, feedTypes = activeTypes),
+        RelaySetupInfo("wss://relay.nostr.bg", read = true, write = true, feedTypes = activeTypes),
+        RelaySetupInfo("wss://relay.snort.social", read = true, write = true, feedTypes = activeTypes),
+        RelaySetupInfo("wss://relay.damus.io", read = true, write = true, feedTypes = activeTypes),
+        RelaySetupInfo("wss://nostr.oxtr.dev", read = true, write = true, feedTypes = activeTypes),
+        RelaySetupInfo("wss://nostr-pub.wellorder.net", read = true, write = true, feedTypes = activeTypes),
+        RelaySetupInfo("wss://nostr.mom", read = true, write = true, feedTypes = activeTypes),
+        RelaySetupInfo("wss://no.str.cr", read = true, write = true, feedTypes = activeTypes),
+        RelaySetupInfo("wss://nos.lol", read = true, write = true, feedTypes = activeTypes),
+
+        // Less Reliable
+        // NewRelayListViewModel.Relay("wss://nostr.orangepill.dev", read = true, write = true, feedTypes = activeTypes),
+        // NewRelayListViewModel.Relay("wss://nostr.onsats.org", read = true, write = true, feedTypes = activeTypes),
+        // NewRelayListViewModel.Relay("wss://nostr.sandwich.farm", read = true, write = true, feedTypes = activeTypes),
+        // NewRelayListViewModel.Relay("wss://relay.nostr.ch", read = true, write = true, feedTypes = activeTypes),
+        // NewRelayListViewModel.Relay("wss://nostr.zebedee.cloud", read = true, write = true, feedTypes = activeTypes),
+        // NewRelayListViewModel.Relay("wss://nostr.rocks", read = true, write = true, feedTypes = activeTypes),
+        // NewRelayListViewModel.Relay("wss://nostr.fmt.wiz.biz", read = true, write = true, feedTypes = activeTypes),
+        // NewRelayListViewModel.Relay("wss://brb.io", read = true, write = true, feedTypes = activeTypes),
+
+        // Paid relays
+        RelaySetupInfo("wss://relay.nostr.com.au", read = true, write = false, feedTypes = activeTypesGlobalChats),
+        RelaySetupInfo("wss://eden.nostr.land", read = true, write = false, feedTypes = activeTypesGlobalChats),
+        RelaySetupInfo("wss://nostr.milou.lol", read = true, write = false, feedTypes = activeTypesGlobalChats),
+        RelaySetupInfo("wss://puravida.nostr.land", read = true, write = false, feedTypes = activeTypesGlobalChats),
+        RelaySetupInfo("wss://nostr.wine", read = true, write = false, feedTypes = activeTypesGlobalChats),
+        RelaySetupInfo("wss://nostr.inosta.cc", read = true, write = false, feedTypes = activeTypesGlobalChats),
+        RelaySetupInfo("wss://atlas.nostr.land", read = true, write = false, feedTypes = activeTypesGlobalChats),
+        RelaySetupInfo("wss://relay.orangepill.dev", read = true, write = false, feedTypes = activeTypesGlobalChats),
+        RelaySetupInfo("wss://relay.nostrati.com", read = true, write = false, feedTypes = activeTypesGlobalChats),
+
+        // Supporting NIP-50
+        RelaySetupInfo("wss://relay.nostr.band", read = true, write = false, feedTypes = activeTypesSearch)
+    )
+
+    val forcedRelayForSearch = RelaySetupInfo("wss://relay.nostr.band", read = true, write = false, feedTypes = activeTypesSearch)
+}

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

@@ -0,0 +1,66 @@
+package com.vitorpamplona.amethyst.service.relays
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import java.util.*
+
+class JsonFilter(
+    val ids: List<String>? = null,
+    val authors: List<String>? = null,
+    val kinds: List<Int>? = null,
+    val tags: Map<String, List<String>>? = null,
+    val since: Map<String, Long>? = null,
+    val until: Long? = null,
+    val limit: Int? = null,
+    val search: String? = null
+) {
+    fun toJson(forRelay: String? = null): String {
+        val jsonObject = JsonObject()
+        ids?.run {
+            jsonObject.add("ids", JsonArray().apply { ids.forEach { add(it) } })
+        }
+        authors?.run {
+            jsonObject.add("authors", JsonArray().apply { authors.forEach { add(it) } })
+        }
+        kinds?.run {
+            jsonObject.add("kinds", JsonArray().apply { kinds.forEach { add(it) } })
+        }
+        tags?.run {
+            entries.forEach { kv ->
+                jsonObject.add("#${kv.key}", JsonArray().apply { kv.value.forEach { add(it) } })
+            }
+        }
+        since?.run {
+            if (!isEmpty()) {
+                if (forRelay != null) {
+                    val relaySince = get(forRelay)
+                    if (relaySince != null) {
+                        jsonObject.addProperty("since", relaySince)
+                    }
+                } else {
+                    val jsonObjectSince = JsonObject()
+                    entries.forEach { sincePairs ->
+                        jsonObjectSince.addProperty(sincePairs.key, "${sincePairs.value}")
+                    }
+                    jsonObject.add("since", jsonObjectSince)
+                }
+            }
+        }
+        until?.run {
+            jsonObject.addProperty("until", until)
+        }
+        limit?.run {
+            jsonObject.addProperty("limit", limit)
+        }
+        search?.run {
+            jsonObject.addProperty("search", search)
+        }
+        return gson.toJson(jsonObject)
+    }
+
+    companion object {
+        val gson: Gson = GsonBuilder().create()
+    }
+}

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

@@ -1,148 +1,242 @@
 package com.vitorpamplona.amethyst.service.relays
 
+import android.util.Log
 import com.google.gson.JsonElement
-import java.util.Collections
-import nostr.postr.JsonFilter
-import nostr.postr.events.Event
+import com.vitorpamplona.amethyst.BuildConfig
+import com.vitorpamplona.amethyst.service.model.Event
+import com.vitorpamplona.amethyst.service.model.EventInterface
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import okhttp3.WebSocket
 import okhttp3.WebSocketListener
+import java.util.Date
+
+enum class FeedType {
+    FOLLOWS, PUBLIC_CHATS, PRIVATE_DMS, GLOBAL, SEARCH
+}
 
 class Relay(
-    val url: String,
+    var url: String,
     var read: Boolean = true,
-    var write: Boolean = true
+    var write: Boolean = true,
+    var activeTypes: Set<FeedType> = FeedType.values().toSet()
 ) {
-    private val httpClient = OkHttpClient()
-    private val listeners = Collections.synchronizedSet(HashSet<Listener>())
+    private val httpClient = OkHttpClient.Builder()
+        .followRedirects(true)
+        .followSslRedirects(true)
+        .build()
+
+    private var listeners = setOf<Listener>()
     private var socket: WebSocket? = null
+    private var isReady: Boolean = false
+
+    var eventDownloadCounterInBytes = 0
+    var eventUploadCounterInBytes = 0
+
+    var spamCounter = 0
+    var errorCounter = 0
+    var ping: Long? = null
+
+    var closingTime = 0L
 
     fun register(listener: Listener) {
-        listeners.add(listener)
+        listeners = listeners.plus(listener)
+    }
+
+    fun unregister(listener: Listener) {
+        listeners = listeners.minus(listener)
     }
 
     fun isConnected(): Boolean {
         return socket != null
     }
 
-    fun unregister(listener: Listener) = listeners.remove(listener)
-
-    fun requestAndWatch(reconnectTs: Long? = null) {
-        val request = Request.Builder().url(url).build()
-        val listener = object : WebSocketListener() {
-
-            override fun onOpen(webSocket: WebSocket, response: Response) {
-                // Sends everything.
-                Client.subscriptions.forEach {
-                    sendFilter(requestId = it.key, reconnectTs = reconnectTs)
-                }
-                listeners.forEach { it.onRelayStateChange(this@Relay, Type.CONNECT) }
-            }
-
-            override fun onMessage(webSocket: WebSocket, text: String) {
-                try {
-                    val msg = Event.gson.fromJson(text, JsonElement::class.java).asJsonArray
-                    val type = msg[0].asString
-                    val channel = msg[1].asString
-                    when (type) {
-                        "EVENT" -> {
-                            val event = Event.fromJson(msg[2], Client.lenient)
-                            listeners.forEach { it.onEvent(this@Relay, channel, event) }
-                        }
-                        "EOSE" -> listeners.forEach {
-                            it.onRelayStateChange(this@Relay, Type.EOSE)
-                        }
-                        "NOTICE" -> listeners.forEach {
-                            // "channel" being the second string in the string array ...
-                            it.onError(this@Relay, channel, Error("Relay sent notice: $channel"))
-                        }
-                        "OK" -> listeners.forEach {
-                            // "channel" being the second string in the string array ...
-                            // Event was saved correctly?
-                        }
-                        else -> listeners.forEach {
-                            it.onError(
-                                this@Relay,
-                                channel,
-                                Error("Unknown type $type on channel $channel. Msg was $text")
-                            )
-                        }
-                    }
-                } catch (t: Throwable) {
-                    t.printStackTrace()
-                    text.chunked(2000) { chunked ->
-                        listeners.forEach { it.onError(this@Relay, "", Error("Problem with $chunked")) }
-                    }
-                }
-            }
-
-            override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
-                listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECTING) }
-            }
-
-            override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
-                socket = null
-                listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECT) }
-            }
-
-            override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
-                t.printStackTrace()
-                listeners.forEach {
-                    it.onError(this@Relay, "", Error("WebSocket Failure. Response: ${response}. Exception: ${t.message}", t))
-                }
+    @Synchronized
+    fun requestAndWatch() {
+        requestAndWatch {
+            // Sends everything.
+            Client.allSubscriptions().forEach {
+                sendFilter(requestId = it)
             }
         }
-        socket = httpClient.newWebSocket(request, listener)
+    }
+
+    @Synchronized
+    fun requestAndWatch(onConnected: (Relay) -> Unit) {
+        if (socket != null) return
+
+        try {
+            val request = Request.Builder()
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                .url(url.trim())
+                .build()
+            val listener = object : WebSocketListener() {
+
+                override fun onOpen(webSocket: WebSocket, response: Response) {
+                    isReady = true
+                    ping = response.receivedResponseAtMillis - response.sentRequestAtMillis
+                    // Log.w("Relay", "Relay OnOpen, Loading All subscriptions $url")
+                    onConnected(this@Relay)
+
+                    listeners.forEach { it.onRelayStateChange(this@Relay, Type.CONNECT, null) }
+                }
+
+                override fun onMessage(webSocket: WebSocket, text: String) {
+                    eventDownloadCounterInBytes += text.bytesUsedInMemory()
+
+                    try {
+                        val msg = Event.gson.fromJson(text, JsonElement::class.java).asJsonArray
+                        val type = msg[0].asString
+                        val channel = msg[1].asString
+                        when (type) {
+                            "EVENT" -> {
+                                // Log.w("Relay", "Relay onEVENT $url, $channel")
+                                listeners.forEach { it.onEvent(this@Relay, channel, Event.fromJson(msg[2], Client.lenient)) }
+                            }
+                            "EOSE" -> listeners.forEach {
+                                // Log.w("Relay", "Relay onEOSE $url, $channel")
+                                it.onRelayStateChange(this@Relay, Type.EOSE, channel)
+                            }
+                            "NOTICE" -> listeners.forEach {
+                                // Log.w("Relay", "Relay onNotice $url, $channel")
+                                it.onError(this@Relay, channel, Error("Relay sent notice: " + channel))
+                            }
+                            "OK" -> listeners.forEach {
+                                // Log.w("Relay", "Relay onOK $url, $channel")
+                                it.onSendResponse(this@Relay, msg[1].asString, msg[2].asBoolean, msg[3].asString)
+                            }
+                            else -> listeners.forEach {
+                                // Log.w("Relay", "Relay something else $url, $channel")
+                                it.onError(
+                                    this@Relay,
+                                    channel,
+                                    Error("Unknown type $type on channel $channel. Msg was $text")
+                                )
+                            }
+                        }
+                    } catch (t: Throwable) {
+                        t.printStackTrace()
+                        text.chunked(2000) { chunked ->
+                            listeners.forEach { it.onError(this@Relay, "", Error("Problem with $chunked")) }
+                        }
+                    }
+                }
+
+                override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
+                    listeners.forEach {
+                        it.onRelayStateChange(
+                            this@Relay,
+                            Type.DISCONNECTING,
+                            null
+                        )
+                    }
+                }
+
+                override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
+                    socket = null
+                    isReady = false
+                    closingTime = Date().time / 1000
+                    listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECT, null) }
+                }
+
+                override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+                    errorCounter++
+
+                    socket?.close(1000, "Normal close")
+                    // Failures disconnect the relay.
+                    socket = null
+                    isReady = false
+                    closingTime = Date().time / 1000
+
+                    Log.w("Relay", "Relay onFailure $url, ${response?.message} $response")
+                    t.printStackTrace()
+                    listeners.forEach {
+                        it.onError(this@Relay, "", Error("WebSocket Failure. Response: $response. Exception: ${t.message}", t))
+                    }
+                }
+            }
+
+            socket = httpClient.newWebSocket(request, listener)
+        } catch (e: Exception) {
+            errorCounter++
+            isReady = false
+            closingTime = Date().time / 1000
+            Log.e("Relay", "Relay Invalid $url")
+            e.printStackTrace()
+        }
     }
 
     fun disconnect() {
-        //httpClient.dispatcher.executorService.shutdown()
+        // httpClient.dispatcher.executorService.shutdown()
+        closingTime = Date().time / 1000
         socket?.close(1000, "Normal close")
+        socket = null
+        isReady = false
     }
 
-    fun sendFilter(requestId: String, reconnectTs: Long? = null) {
-        if (socket == null) {
-            requestAndWatch(reconnectTs)
-        } else {
-            val filters = if (reconnectTs != null) {
-                Client.subscriptions[requestId]?.let {
-                    it.map { filter ->
-                        JsonFilter(filter.ids, filter.authors, filter.kinds, filter.tags, since = reconnectTs)
+    fun sendFilter(requestId: String) {
+        if (read) {
+            if (isConnected()) {
+                if (isReady) {
+                    val filters = Client.getSubscriptionFilters(requestId).filter { activeTypes.intersect(it.types).isNotEmpty() }
+                    if (filters.isNotEmpty()) {
+                        val request =
+                            """["REQ","$requestId",${filters.take(10).joinToString(",") { it.filter.toJson(url) }}]"""
+                        // println("FILTERSSENT $url $request")
+                        socket?.send(request)
+                        eventUploadCounterInBytes += request.bytesUsedInMemory()
                     }
-                } ?: error("No filter(s) found.")
+                }
             } else {
-                Client.subscriptions[requestId] ?: error("No filter(s) found.")
+                // waits 60 seconds to reconnect after disconnected.
+                if (Date().time / 1000 > closingTime + 60) {
+                    // sends all filters after connection is successful.
+                    requestAndWatch()
+                }
             }
-            val request = """["REQ","$requestId",${filters.joinToString(",") { it.toJson() }}]"""
-            //println("FILTERSSENT " + """["REQ","$requestId",${filters.joinToString(",") { it.toJson() }}]""")
-            socket!!.send(request)
         }
     }
 
-    fun sendFilterOnlyIfDisconnected(requestId: String, reconnectTs: Long? = null) {
+    fun sendFilterOnlyIfDisconnected() {
         if (socket == null) {
-            requestAndWatch(reconnectTs)
+            // waits 60 seconds to reconnect after disconnected.
+            if (Date().time / 1000 > closingTime + 60) {
+                // println("sendfilter Only if Disconnected ${url} ")
+                requestAndWatch()
+            }
         }
     }
 
-    fun send(signedEvent: Event) {
-        if (write)
-            socket?.send("""["EVENT",${signedEvent.toJson()}]""")
+    fun send(signedEvent: EventInterface) {
+        if (write) {
+            val event = """["EVENT",${signedEvent.toJson()}]"""
+            socket?.send(event)
+            eventUploadCounterInBytes += event.bytesUsedInMemory()
+        }
     }
 
-    fun close(subscriptionId: String){
+    fun close(subscriptionId: String) {
         socket?.send("""["CLOSE","$subscriptionId"]""")
     }
 
+    fun isSameRelayConfig(other: Relay): Boolean {
+        return url == other.url &&
+            write == other.write &&
+            read == other.read &&
+            activeTypes == other.activeTypes
+    }
+
     enum class Type {
         // Websocket connected
         CONNECT,
+
         // Websocket disconnecting
         DISCONNECTING,
+
         // Websocket disconnected
         DISCONNECT,
+
         // End Of Stored Events
         EOSE
     }
@@ -155,11 +249,17 @@ class Relay(
 
         fun onError(relay: Relay, subscriptionId: String, error: Error)
 
+        fun onSendResponse(relay: Relay, eventId: String, success: Boolean, message: String)
+
         /**
          * Connected to or disconnected from a relay
          *
          * @param type is 0 for disconnect and 1 for connect
          */
-        fun onRelayStateChange(relay: Relay, type: Type)
+        fun onRelayStateChange(relay: Relay, type: Type, channel: String?)
     }
 }
+
+fun String.bytesUsedInMemory(): Int {
+    return (8 * ((((this.length) * 2) + 45) / 8))
+}

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

@@ -1,32 +1,46 @@
 package com.vitorpamplona.amethyst.service.relays
 
 import androidx.lifecycle.LiveData
-import com.vitorpamplona.amethyst.service.Constants
-import java.util.Collections
-import nostr.postr.events.Event
+import com.vitorpamplona.amethyst.service.model.Event
+import com.vitorpamplona.amethyst.service.model.EventInterface
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 
 /**
  * RelayPool manages the connection to multiple Relays and lets consumers deal with simple events.
  */
-object RelayPool: Relay.Listener {
-    private val relays = Collections.synchronizedList(ArrayList<Relay>())
-    private val listeners = Collections.synchronizedSet(HashSet<Listener>())
+object RelayPool : Relay.Listener {
 
-    fun report(): String {
-        val connected = relays.filter { it.isConnected() }
-        return "${connected.size}/${relays.size}"
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
+
+    private var relays = listOf<Relay>()
+    private var listeners = setOf<Listener>()
+
+    fun availableRelays(): Int {
+        return relays.size
     }
 
-    fun loadRelays(relayList: List<Relay>? = null){
-        if (!relayList.isNullOrEmpty()){
+    fun connectedRelays(): Int {
+        return relays.filter { it.isConnected() }.size
+    }
+
+    fun getRelay(url: String): Relay? {
+        return relays.firstOrNull() { it.url == url }
+    }
+
+    fun loadRelays(relayList: List<Relay>) {
+        if (!relayList.isNullOrEmpty()) {
             relayList.forEach { addRelay(it) }
         } else {
-            Constants.defaultRelays.forEach { addRelay(it) }
+            Constants.convertDefaultRelays().forEach { addRelay(it) }
         }
     }
 
     fun unloadRelays() {
-        relays.toList().forEach { removeRelay(it) }
+        relays.forEach { it.unregister(this) }
+        relays = listOf()
     }
 
     fun requestAndWatch() {
@@ -37,15 +51,15 @@ object RelayPool: Relay.Listener {
         relays.forEach { it.sendFilter(subscriptionId) }
     }
 
-    fun sendFilterOnlyIfDisconnected(subscriptionId: String) {
-        relays.forEach { it.sendFilterOnlyIfDisconnected(subscriptionId) }
+    fun sendFilterOnlyIfDisconnected() {
+        relays.forEach { it.sendFilterOnlyIfDisconnected() }
     }
 
-    fun send(signedEvent: Event) {
+    fun send(signedEvent: EventInterface) {
         relays.forEach { it.send(signedEvent) }
     }
 
-    fun close(subscriptionId: String){
+    fun close(subscriptionId: String) {
         relays.forEach { it.close(subscriptionId) }
     }
 
@@ -58,19 +72,17 @@ object RelayPool: Relay.Listener {
         relays += relay
     }
 
-    fun removeRelay(relay: Relay): Boolean {
+    fun removeRelay(relay: Relay) {
         relay.unregister(this)
-        return relays.remove(relay)
+        relays = relays.minus(relay)
     }
 
-    fun getRelays(): List<Relay> = relays
-
     fun register(listener: Listener) {
-        listeners.add(listener)
+        listeners = listeners.plus(listener)
     }
 
-    fun unregister(listener: Listener): Boolean {
-        return listeners.remove(listener)
+    fun unregister(listener: Listener) {
+        listeners = listeners.minus(listener)
     }
 
     interface Listener {
@@ -78,10 +90,11 @@ object RelayPool: Relay.Listener {
 
         fun onError(error: Error, subscriptionId: String, relay: Relay)
 
-        fun onRelayStateChange(type: Relay.Type, relay: Relay)
+        fun onRelayStateChange(type: Relay.Type, relay: Relay, channel: String?)
+
+        fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay)
     }
 
-    @Synchronized
     override fun onEvent(relay: Relay, subscriptionId: String, event: Event) {
         listeners.forEach { it.onEvent(event, subscriptionId, relay) }
     }
@@ -91,23 +104,29 @@ object RelayPool: Relay.Listener {
         refreshObservers()
     }
 
-    override fun onRelayStateChange(relay: Relay, type: Relay.Type) {
-        listeners.forEach { it.onRelayStateChange(type, relay) }
+    override fun onRelayStateChange(relay: Relay, type: Relay.Type, channel: String?) {
+        listeners.forEach { it.onRelayStateChange(type, relay, channel) }
         refreshObservers()
     }
 
+    override fun onSendResponse(relay: Relay, eventId: String, success: Boolean, message: String) {
+        listeners.forEach { it.onSendResponse(eventId, success, message, relay) }
+    }
+
     // Observers line up here.
     val live: RelayPoolLiveData = RelayPoolLiveData(this)
 
     private fun refreshObservers() {
-        live.refresh()
+        scope.launch {
+            live.refresh()
+        }
     }
 }
 
-class RelayPoolLiveData(val relays: RelayPool): LiveData<RelayPoolState>(RelayPoolState(relays)) {
+class RelayPoolLiveData(val relays: RelayPool) : LiveData<RelayPoolState>(RelayPoolState(relays)) {
     fun refresh() {
         postValue(RelayPoolState(relays))
     }
 }
 
-class RelayPoolState(val relays: RelayPool)
+class RelayPoolState(val relays: RelayPool)

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

@@ -0,0 +1,30 @@
+package com.vitorpamplona.amethyst.service.relays
+
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import java.util.UUID
+
+data class Subscription(
+    val id: String = UUID.randomUUID().toString().substring(0, 4),
+    val onEOSE: ((Long, String) -> Unit)? = null
+) {
+    var typedFilters: List<TypedFilter>? = null // Inactive when null
+
+    fun updateEOSE(time: Long, relay: String) {
+        onEOSE?.let { it(time, relay) }
+    }
+
+    fun toJson(): String {
+        return GsonBuilder().create().toJson(toJsonObject())
+    }
+
+    fun toJsonObject(): JsonObject {
+        val jsonObject = JsonObject()
+        jsonObject.addProperty("id", id)
+        typedFilters?.run {
+            jsonObject.add("typedFilters", JsonArray().apply { typedFilters?.forEach { add(it.toJsonObject()) } })
+        }
+        return jsonObject
+    }
+}

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

@@ -0,0 +1,60 @@
+package com.vitorpamplona.amethyst.service.relays
+
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+
+class TypedFilter(
+    val types: Set<FeedType>,
+    val filter: JsonFilter
+) {
+
+    fun toJson(): String {
+        return GsonBuilder().create().toJson(toJsonObject())
+    }
+
+    fun toJsonObject(): JsonObject {
+        val jsonObject = JsonObject()
+        jsonObject.add("types", typesToJson(types))
+        jsonObject.add("filter", filterToJson(filter))
+        return jsonObject
+    }
+
+    fun typesToJson(types: Set<FeedType>): JsonArray {
+        return JsonArray().apply { types.forEach { add(it.name.lowercase()) } }
+    }
+
+    fun filterToJson(filter: JsonFilter): JsonObject {
+        val jsonObject = JsonObject()
+        filter.ids?.run {
+            jsonObject.add("ids", JsonArray().apply { filter.ids.forEach { add(it) } })
+        }
+        filter.authors?.run {
+            jsonObject.add("authors", JsonArray().apply { filter.authors.forEach { add(it) } })
+        }
+        filter.kinds?.run {
+            jsonObject.add("kinds", JsonArray().apply { filter.kinds.forEach { add(it) } })
+        }
+        filter.tags?.run {
+            entries.forEach { kv ->
+                jsonObject.add("#${kv.key}", JsonArray().apply { kv.value.forEach { add(it) } })
+            }
+        }
+        /*
+        Does not include since in the json comparison
+        filter.since?.run {
+            val jsonObjectSince = JsonObject()
+            entries.forEach { sincePairs ->
+                jsonObjectSince.addProperty(sincePairs.key, "${sincePairs.value}")
+            }
+            jsonObject.add("since", jsonObjectSince)
+        }*/
+        filter.until?.run {
+            jsonObject.addProperty("until", filter.until)
+        }
+        filter.limit?.run {
+            jsonObject.addProperty("limit", filter.limit)
+        }
+        return jsonObject
+    }
+}