0.40.2

- Keeps position in the Video feed between screen
- Animates to the top when posting
- Adds NIP-95 in-disk caching
- Fixes the Crossfade for BlurHash on NIP94 and NIP95 events

.github/workflows/build.yml

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

.github/workflows/create-release.yml

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

PRIVACY.md

@@ -1,12 +1,12 @@
 # Amethyst Privacy Policy & Terms of Use
 
-Effective as of Jan 20, 2023.
+Effective as of Jan 20, 2023 for the distributed applications in the Play Store and the F-Droid Catalogue 
 
 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.
+You cannot use the Amethyst app for Android to submit Objectionable Content to relays. Objectionable Content includes, but is not limited to: (i) sexually explicit materials; (ii) obscene, defamatory, libelous, slanderous, violent and/or unlawful content or profanity; (iii) content that infringes upon the rights of any third party, including copyright, trademark, privacy, publicity or other personal or proprietary right, or that is deceptive or fraudulent; (iv) content that promotes the use or sale of illegal or regulated substances, tobacco products, ammunition and/or firearms; and (v) illegal content related to gambling.
 
 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.
 

README.md

@@ -32,7 +32,7 @@ Or get the latest APK from the [Releases Section](https://github.com/vitorpamplo
 - [x] Relay Sets (home, dms, public chats, global)
 - [x] User/Note Tagging (NIP-08, NIP-10)
 - [x] Lightning Tips
-- [x] Zaps (NIP-57)
+- [x] Zaps (private, public, anon, non-zap) (NIP-57)
 - [x] URI Support (NIP-21)
 - [x] Event Deletion (NIP-09: like, boost, text notes and reports)
 - [x] Identity Verification (NIP-05)
@@ -41,13 +41,24 @@ Or get the latest APK from the [Releases Section](https://github.com/vitorpamplo
 - [x] Online Relay Search (NIP-50)
 - [x] Internationalization
 - [x] Badges (NIP-58)
-- [x] Hashtags
+- [x] Hashtag Following and Custom Hashtags
+- [x] Polls (NIP-69)
+- [x] Verifiable static content in URLs (NIP-94)
+- [x] Login with QR
+- [x] Wallet Connect API (NIP-47)
+- [x] Accessible uploads
+- [x] Bounty support (nostrbounties.com)
+- [x] De-googled F-Droid flavor
+- [x] External Identity Support (NIP-39)
+- [x] Multiple Accounts
+- [x] Markdown Support
+- [x] Relay Authentication (NIP-42)
+- [x] Content stored in relays themselves (NIP-95)
 - [ ] 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)
@@ -59,7 +70,7 @@ Or get the latest APK from the [Releases Section](https://github.com/vitorpamplo
 - [ ] Delegated Event Signing (NIP-26)
 - [ ] Account Creation / Backup Guidance (NIP-06)
 - [ ] Message Sent feedback (NIP-20)
-- [ ] Polls (NIP-69)
+
 
 # Development Overview
 
@@ -85,7 +96,7 @@ Lastly, the user's account information (priv key/pub key) is stored in the Andro
 ## Setup
 
 Make sure to have the following pre-requisites installed:
-1. Java 11
+1. Java 17
 2. Android Studio
 3. Android 8.0+ Phone or Emulation setup
 
@@ -167,6 +178,12 @@ Information shared on nostr should be assumed permanent for privacy purposes. Th
 
 [Issues](https://github.com/vitorpamplona/amethyst/issues) and [pull requests](https://github.com/vitorpamplona/amethyst/pulls) are very welcome.
 
+## Contributors
+
+<a align="center" href="https://github.com/vitorpamplona/amethyst/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=vitorpamplona/amethyst" />
+</a>
+
 # MIT License
 
 Copyright (c) 2023 Vitor Pamplona

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 117
-        versionName "0.32.2"
+        versionCode 136
+        versionName "0.40.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -57,12 +57,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
 
     buildFeatures {
@@ -78,11 +78,15 @@ android {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
     }
+    lint {
+        disable 'MissingTranslation'
+    }
+
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.activity:activity-compose:1.7.0-beta01'
+    implementation 'androidx.core:core-ktx:1.10.0'
+    implementation 'androidx.activity:activity-compose:1.7.0'
     implementation "androidx.compose.ui:ui:$compose_ui_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
 
@@ -104,13 +108,13 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
 
-    implementation "net.engawapg.lib:zoomable:1.4.0"
+    implementation 'net.engawapg.lib:zoomable:1.4.2'
 
     // Biometrics
     implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"
 
     // Bitcoin secp256k1 bindings to Android
-    implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.8.0'
+    implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.9.0'
 
     // Nostr Base Protocol
     implementation('com.github.vitorpamplona.NostrPostr:nostrpostrlib:master-SNAPSHOT') {
@@ -123,17 +127,17 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'
 
     // Json Serialization TODO: We might need to converge between gson and Jackson (we are usin both)
-    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.14.2'
+    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.15.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 
     // link preview
     implementation 'tw.com.oneup.www:Baha-UrlPreview:1.0.1'
 
     // Encrypted Key Storage
-    implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha05'
+    implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha06'
 
     // view videos
-    implementation 'com.google.android.exoplayer:exoplayer:2.18.5'
+    implementation 'com.google.android.exoplayer:exoplayer:2.18.6'
 
     // Load images from the web.
     implementation "io.coil-kt:coil-compose:$coil_version"
@@ -142,15 +146,14 @@ dependencies {
     // view svgs
     implementation "io.coil-kt:coil-svg:$coil_version"
 
+    // create blurhash
+    implementation group: 'io.trbl', name: 'blurhash', version: '1.0.0'
+
     // Rendering clickable text
     implementation "com.google.accompanist:accompanist-flowlayout:$accompanist_version"
     // Permission to upload pictures:
     implementation "com.google.accompanist:accompanist-permissions:$accompanist_version"
 
-    // tabs for user profiles
-    implementation "com.google.accompanist:accompanist-pager:$accompanist_version" // Pager
-    implementation "com.google.accompanist:accompanist-pager-indicators:$accompanist_version"
-
     // Parses URLs from Text:
     implementation "io.github.url-detector:url-detector:0.1.23"
 
@@ -173,8 +176,8 @@ dependencies {
     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'
+    testImplementation 'io.mockk:mockk:1.13.5'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.0-alpha01'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version"
     debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version"

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

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

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

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

app/src/main/AndroidManifest.xml

@@ -2,8 +2,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
+
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.CAMERA" />
 
@@ -16,7 +19,7 @@
         android:name=".Amethyst"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@drawable/amethyst"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:enableOnBackInvokedCallback="true"
         android:supportsRtl="true"
@@ -48,6 +51,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="nostrwalletconnect" />
+                <data android:scheme="nostr+walletconnect" />
             </intent-filter>
 
             <meta-data

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

@@ -11,6 +11,8 @@ 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.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.ui.actions.ServersAvailable
 import com.vitorpamplona.amethyst.ui.note.Nip47URI
 import fr.acinq.secp256k1.Hex
 import nostr.postr.Persona
@@ -42,6 +44,8 @@ private object PrefKeys {
     const val LANGUAGE_PREFS = "languagePreferences"
     const val TRANSLATE_TO = "translateTo"
     const val ZAP_AMOUNTS = "zapAmounts"
+    const val DEFAULT_ZAPTYPE = "defaultZapType"
+    const val DEFAULT_FILE_SERVER = "defaultFileServer"
     const val ZAP_PAYMENT_REQUEST_SERVER = "zapPaymentServer"
     const val LATEST_CONTACT_LIST = "latestContactList"
     const val HIDE_DELETE_REQUEST_DIALOG = "hide_delete_request_dialog"
@@ -191,6 +195,8 @@ object LocalPreferences {
             putString(PrefKeys.LANGUAGE_PREFS, gson.toJson(account.languagePreferences))
             putString(PrefKeys.TRANSLATE_TO, account.translateTo)
             putString(PrefKeys.ZAP_AMOUNTS, gson.toJson(account.zapAmountChoices))
+            putString(PrefKeys.DEFAULT_ZAPTYPE, gson.toJson(account.defaultZapType))
+            putString(PrefKeys.DEFAULT_FILE_SERVER, gson.toJson(account.defaultFileServer))
             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)
@@ -217,6 +223,16 @@ object LocalPreferences {
                 object : TypeToken<List<Long>>() {}.type
             ) ?: listOf(500L, 1000L, 5000L)
 
+            val defaultZapType = gson.fromJson(
+                getString(PrefKeys.DEFAULT_ZAPTYPE, "PUBLIC"),
+                object : TypeToken<LnZapEvent.ZapType>() {}.type
+            ) ?: LnZapEvent.ZapType.PUBLIC
+
+            val defaultFileServer = gson.fromJson(
+                getString(PrefKeys.DEFAULT_FILE_SERVER, "IMGUR"),
+                object : TypeToken<ServersAvailable>() {}.type
+            ) ?: ServersAvailable.IMGUR
+
             val zapPaymentRequestServer = try {
                 getString(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, null)?.let {
                     gson.fromJson(it, Nip47URI::class.java)
@@ -260,6 +276,8 @@ object LocalPreferences {
                 languagePreferences,
                 translateTo,
                 zapAmountChoices,
+                defaultZapType,
+                defaultFileServer,
                 zapPaymentRequestServer,
                 hideDeleteRequestDialog,
                 hideBlockAlertDialog,

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

@@ -18,7 +18,7 @@ object VideoCache {
 
     lateinit var cacheDataSourceFactory: CacheDataSource.Factory
 
-    fun get(context: Context): CacheDataSource.Factory {
+    fun init(context: Context) {
         if (!this::simpleCache.isInitialized) {
             exoDatabaseProvider = StandaloneDatabaseProvider(context)
 
@@ -35,7 +35,9 @@ object VideoCache {
                 )
                 .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
         }
+    }
 
+    fun get(): CacheDataSource.Factory {
         return cacheDataSourceFactory
     }
 }

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

@@ -1,14 +1,18 @@
 package com.vitorpamplona.amethyst.model
 
 import android.content.res.Resources
+import android.util.Log
 import androidx.core.os.ConfigurationCompat
 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.service.FileHeader
+import com.vitorpamplona.amethyst.service.NostrLnZapPaymentResponseDataSource
 import com.vitorpamplona.amethyst.service.model.*
 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.actions.ServersAvailable
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.Nip47URI
 import kotlinx.coroutines.DelicateCoroutinesApi
@@ -16,6 +20,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import nostr.postr.Persona
+import nostr.postr.Utils
+import java.math.BigDecimal
 import java.util.Locale
 
 val DefaultChannels = setOf(
@@ -42,6 +48,8 @@ class Account(
     var languagePreferences: Map<String, String> = mapOf(),
     var translateTo: String = Locale.getDefault().language,
     var zapAmountChoices: List<Long> = listOf(500L, 1000L, 5000L),
+    var defaultZapType: LnZapEvent.ZapType = LnZapEvent.ZapType.PRIVATE,
+    var defaultFileServer: ServersAvailable = ServersAvailable.IMGUR,
     var zapPaymentRequest: Nip47URI? = null,
     var hideDeleteRequestDialog: Boolean = false,
     var hideBlockAlertDialog: Boolean = false,
@@ -54,8 +62,14 @@ class Account(
     val liveLanguages: AccountLiveData = AccountLiveData(this)
     val saveable: AccountLiveData = AccountLiveData(this)
 
+    var userProfileCache: User? = null
+
     fun userProfile(): User {
-        return LocalCache.getOrCreateUser(loggedIn.pubKey.toHexKey())
+        return userProfileCache ?: run {
+            val myUser: User = LocalCache.getOrCreateUser(loggedIn.pubKey.toHexKey())
+            userProfileCache = myUser
+            myUser
+        }
     }
 
     fun followingChannels(): List<Channel> {
@@ -137,7 +151,7 @@ class Account(
         }
     }
 
-    fun createZapRequestFor(note: Note, pollOption: Int?, message: String = ""): LnZapRequestEvent? {
+    fun createZapRequestFor(note: Note, pollOption: Int?, message: String = "", zapType: LnZapEvent.ZapType): LnZapRequestEvent? {
         if (!isWriteable()) return null
 
         note.event?.let { event ->
@@ -147,7 +161,8 @@ class Account(
                     ?: localRelays.map { it.url }.toSet(),
                 loggedIn.privKey!!,
                 pollOption,
-                message
+                message,
+                zapType
             )
         }
         return null
@@ -157,13 +172,51 @@ class Account(
         return zapPaymentRequest != null
     }
 
-    fun sendZapPaymentRequestFor(lnInvoice: String) {
+    fun isNIP47Author(pubkeyHex: String?): Boolean {
+        val privKey = zapPaymentRequest?.secret?.toByteArray() ?: loggedIn.privKey!!
+        val pubKey = Utils.pubkeyCreate(privKey).toHexKey()
+        return (pubKey == pubkeyHex)
+    }
+
+    fun decryptZapPaymentResponseEvent(zapResponseEvent: LnZapPaymentResponseEvent): Response? {
+        val myNip47 = zapPaymentRequest ?: return null
+        return zapResponseEvent.response(
+            myNip47.secret?.toByteArray() ?: loggedIn.privKey!!,
+            myNip47.pubKeyHex.toByteArray()
+        )
+    }
+
+    fun calculateIfNoteWasZappedByAccount(zappedNote: Note): Boolean {
+        return zappedNote.isZappedBy(userProfile(), this) == true
+    }
+
+    fun calculateZappedAmount(zappedNote: Note?): BigDecimal {
+        return zappedNote?.zappedAmount(
+            zapPaymentRequest?.secret?.toByteArray() ?: loggedIn.privKey!!,
+            zapPaymentRequest?.pubKeyHex?.toByteArray()
+        ) ?: BigDecimal.ZERO
+    }
+
+    fun sendZapPaymentRequestFor(bolt11: String, zappedNote: Note?, onResponse: (Response?) -> Unit) {
         if (!isWriteable()) return
 
-        zapPaymentRequest?.let {
-            val event = LnZapPaymentRequestEvent.create(lnInvoice, it.pubKeyHex, it.secret?.toByteArray() ?: loggedIn.privKey!!)
+        zapPaymentRequest?.let { nip47 ->
+            val event = LnZapPaymentRequestEvent.create(bolt11, nip47.pubKeyHex, nip47.secret?.toByteArray() ?: loggedIn.privKey!!)
 
-            Client.send(event, it.relayUri)
+            val wcListener = NostrLnZapPaymentResponseDataSource(nip47.pubKeyHex, event.pubKey, event.id)
+            wcListener.start()
+
+            LocalCache.consume(event, zappedNote) {
+                // After the response is received.
+                val privKey = nip47.secret?.toByteArray()
+                if (privKey != null) {
+                    onResponse(it.response(privKey, nip47.pubKeyHex.toByteArray()))
+                }
+            }
+
+            Client.send(event, nip47.relayUri, wcListener.feedTypes) {
+                wcListener.destroy()
+            }
         }
     }
 
@@ -171,14 +224,15 @@ class Account(
         return createZapRequestFor(user)
     }
 
-    fun createZapRequestFor(userPubKeyHex: String, message: String = ""): LnZapRequestEvent? {
+    fun createZapRequestFor(userPubKeyHex: String, message: String = "", zapType: LnZapEvent.ZapType): LnZapRequestEvent? {
         if (!isWriteable()) return null
 
         return LnZapRequestEvent.create(
             userPubKeyHex,
             userProfile().latestContactList?.relays()?.keys?.ifEmpty { null } ?: localRelays.map { it.url }.toSet(),
             loggedIn.privKey!!,
-            message
+            message,
+            zapType
         )
     }
 
@@ -349,7 +403,60 @@ class Account(
         }
     }
 
-    fun sendPost(message: String, replyTo: List<Note>?, mentions: List<User>?, tags: List<String>? = null) {
+    fun createNip95(data: ByteArray, headerInfo: FileHeader): Pair<FileStorageEvent, FileStorageHeaderEvent>? {
+        if (!isWriteable()) return null
+
+        val data = FileStorageEvent.create(
+            mimeType = headerInfo.mimeType ?: "",
+            data = data,
+            privateKey = loggedIn.privKey!!
+        )
+
+        val signedEvent = FileStorageHeaderEvent.create(
+            data,
+            mimeType = headerInfo.mimeType,
+            hash = headerInfo.hash,
+            size = headerInfo.size.toString(),
+            blurhash = headerInfo.blurHash,
+            description = headerInfo.description,
+            privateKey = loggedIn.privKey!!
+        )
+
+        return Pair(data, signedEvent)
+    }
+
+    fun sendNip95(data: FileStorageEvent, signedEvent: FileStorageHeaderEvent): Note? {
+        if (!isWriteable()) return null
+
+        Client.send(data)
+        LocalCache.consume(data, null)
+
+        Client.send(signedEvent)
+        LocalCache.consume(signedEvent, null)
+
+        return LocalCache.notes[signedEvent.id]
+    }
+
+    fun sendHeader(headerInfo: FileHeader): Note? {
+        if (!isWriteable()) return null
+
+        val signedEvent = FileHeaderEvent.create(
+            url = headerInfo.url,
+            mimeType = headerInfo.mimeType,
+            hash = headerInfo.hash,
+            size = headerInfo.size.toString(),
+            blurhash = headerInfo.blurHash,
+            description = headerInfo.description,
+            privateKey = loggedIn.privKey!!
+        )
+
+        Client.send(signedEvent)
+        LocalCache.consume(signedEvent, null)
+
+        return LocalCache.notes[signedEvent.id]
+    }
+
+    fun sendPost(message: String, replyTo: List<Note>?, mentions: List<User>?, tags: List<String>? = null, zapReceiver: String? = null) {
         if (!isWriteable()) return
 
         val repliesToHex = replyTo?.filter { it.address() == null }?.map { it.idHex }
@@ -362,6 +469,7 @@ class Account(
             mentions = mentionsHex,
             addresses = addresses,
             extraTags = tags,
+            zapReceiver = zapReceiver,
             privateKey = loggedIn.privKey!!
         )
 
@@ -377,7 +485,8 @@ class Account(
         valueMaximum: Int?,
         valueMinimum: Int?,
         consensusThreshold: Int?,
-        closedAt: Int?
+        closedAt: Int?,
+        zapReceiver: String? = null
     ) {
         if (!isWriteable()) return
 
@@ -395,14 +504,15 @@ class Account(
             valueMaximum = valueMaximum,
             valueMinimum = valueMinimum,
             consensusThreshold = consensusThreshold,
-            closedAt = closedAt
+            closedAt = closedAt,
+            zapReceiver = zapReceiver
         )
         // println("Sending new PollNoteEvent: %s".format(signedEvent.toJson()))
         Client.send(signedEvent)
         LocalCache.consume(signedEvent)
     }
 
-    fun sendChannelMessage(message: String, toChannel: String, replyTo: List<Note>?, mentions: List<User>?) {
+    fun sendChannelMessage(message: String, toChannel: String, replyTo: List<Note>?, mentions: List<User>?, zapReceiver: String? = null) {
         if (!isWriteable()) return
 
         // val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
@@ -414,13 +524,14 @@ class Account(
             channel = toChannel,
             replyTos = repliesToHex,
             mentions = mentionsHex,
+            zapReceiver = zapReceiver,
             privateKey = loggedIn.privKey!!
         )
         Client.send(signedEvent)
         LocalCache.consume(signedEvent, null)
     }
 
-    fun sendPrivateMessage(message: String, toUser: String, replyingTo: Note? = null, mentions: List<User>?) {
+    fun sendPrivateMessage(message: String, toUser: String, replyingTo: Note? = null, mentions: List<User>?, zapReceiver: String? = null) {
         if (!isWriteable()) return
         val user = LocalCache.users[toUser] ?: return
 
@@ -433,6 +544,7 @@ class Account(
             msg = message,
             replyTos = repliesToHex,
             mentions = mentionsHex,
+            zapReceiver = zapReceiver,
             privateKey = loggedIn.privKey!!,
             advertiseNip18 = false
         )
@@ -526,6 +638,12 @@ class Account(
         LocalCache.consume(event)
     }
 
+    fun createAuthEvent(relay: Relay, challenge: String): RelayAuthEvent? {
+        if (!isWriteable()) return null
+
+        return RelayAuthEvent.create(relay.url, challenge, loggedIn.privKey!!)
+    }
+
     fun removePublicBookmark(note: Note) {
         if (!isWriteable()) return
 
@@ -597,6 +715,18 @@ class Account(
         saveable.invalidateData()
     }
 
+    fun changeDefaultZapType(zapType: LnZapEvent.ZapType) {
+        defaultZapType = zapType
+        live.invalidateData()
+        saveable.invalidateData()
+    }
+
+    fun changeDefaultFileServer(server: ServersAvailable) {
+        defaultFileServer = server
+        live.invalidateData()
+        saveable.invalidateData()
+    }
+
     fun changeZapAmounts(newAmounts: List<Long>) {
         zapAmountChoices = newAmounts
         live.invalidateData()
@@ -642,11 +772,61 @@ class Account(
             }
 
             event.plainContent(loggedIn.privKey!!, pubkeyToUse.toByteArray())
+        } else if (event is LnZapRequestEvent && loggedIn.privKey != null) {
+            decryptZapContentAuthor(note)?.content()
         } else {
             event?.content()
         }
     }
 
+    fun decryptZapContentAuthor(note: Note): Event? {
+        val event = note.event
+        val loggedInPrivateKey = loggedIn.privKey
+
+        return if (event is LnZapRequestEvent && loggedInPrivateKey != null && event.isPrivateZap()) {
+            val recipientPK = event.zappedAuthor().firstOrNull()
+            val recipientPost = event.zappedPost().firstOrNull()
+
+            if (recipientPK == userProfile().pubkeyHex) {
+                // if the receiver is logged in, these are the params.
+                val privateKeyToUse = loggedInPrivateKey
+                val pubkeyToUse = event.pubKey
+
+                LnZapRequestEvent.checkForPrivateZap(event, privateKeyToUse, pubkeyToUse)
+            } else {
+                // if the sender is logged in, these are the params
+                val altPubkeyToUse = recipientPK
+                val altPrivateKeyToUse = if (recipientPost != null) {
+                    LnZapRequestEvent.createEncryptionPrivateKey(
+                        loggedInPrivateKey.toHexKey(),
+                        recipientPost,
+                        event.createdAt
+                    )
+                } else if (recipientPK != null) {
+                    LnZapRequestEvent.createEncryptionPrivateKey(
+                        loggedInPrivateKey.toHexKey(),
+                        recipientPK,
+                        event.createdAt
+                    )
+                } else {
+                    null
+                }
+
+                if (altPrivateKeyToUse != null && altPubkeyToUse != null) {
+                    val result = LnZapRequestEvent.checkForPrivateZap(event, altPrivateKeyToUse, altPubkeyToUse)
+                    if (result == null) {
+                        Log.w("Private ZAP Decrypt", "Fail to decrypt Zap from ${note.author?.toBestDisplayName()} ${note.idNote()}")
+                    }
+                    result
+                } else {
+                    null
+                }
+            }
+        } else {
+            null
+        }
+    }
+
     fun addDontTranslateFrom(languageCode: String) {
         dontTranslateFrom = dontTranslateFrom.plus(languageCode)
         liveLanguages.invalidateData()
@@ -716,14 +896,15 @@ class Account(
         }
     }
 
-    fun isHidden(user: User) = user.pubkeyHex in hiddenUsers || user.pubkeyHex in transientHiddenUsers
+    fun isHidden(user: User) = isHidden(user.pubkeyHex)
+    fun isHidden(userHex: String) = userHex in hiddenUsers || userHex in transientHiddenUsers
 
     fun followingKeySet(): Set<HexKey> {
-        return userProfile().cachedFollowingKeySet() ?: emptySet()
+        return userProfile().cachedFollowingKeySet()
     }
 
     fun followingTagSet(): Set<HexKey> {
-        return userProfile().cachedFollowingTagSet() ?: emptySet()
+        return userProfile().cachedFollowingTagSet()
     }
 
     fun isAcceptable(user: User): Boolean {

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

@@ -6,15 +6,16 @@ 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))
+        "bitcoin", "btc", "timechain" -> HashtagIcon(R.drawable.ht_btc, "Bitcoin", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp))
+        "nostr", "nostrich", "nostriches" -> HashtagIcon(R.drawable.ht_nostr, "Nostr", Color.Unspecified, Modifier.padding(1.dp, 2.dp, 0.dp, 0.dp))
         "lightning", "lightningnetwork" -> HashtagIcon(R.drawable.ht_lightning, "Lightning", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
         "zap", "zaps", "zapper", "zappers", "zapping", "zapped", "zapathon", "zapraiser", "zaplife", "zapchain" -> HashtagIcon(R.drawable.zap, "Zap", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
         "amethyst" -> HashtagIcon(R.drawable.amethyst, "Amethyst", Color.Unspecified, Modifier.padding(3.dp, 2.dp, 0.dp, 0.dp))
         "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))
+        "coffee", "coffeechain", "cafe" -> HashtagIcon(R.drawable.coffee, "Coffee", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp))
         "skullofsatoshi" -> HashtagIcon(R.drawable.skull, "SkullofSatoshi", Color.Unspecified, Modifier.padding(2.dp, 1.dp, 0.dp, 0.dp))
-
+        "grownostr", "#permaculture", "#gardening", "#garden" -> HashtagIcon(R.drawable.grownostr, "GrowNostr", Color.Unspecified, Modifier.padding(0.dp, 1.dp, 0.dp, 1.dp))
+        "footstr" -> HashtagIcon(R.drawable.footstr, "Footstr", Color.Unspecified, Modifier.padding(1.dp, 1.dp, 0.dp, 0.dp))
         else -> null
     }
 }

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

@@ -84,15 +84,15 @@ fun parseDirtyWordForKey(mightBeAKey: String): DirtyKeyInfo? {
         } else if (key.startsWith("nprofile", true)) {
             val pubkeyRelay = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
 
-            return DirtyKeyInfo(pubkeyRelay, restOfWord)
-        } else if (key.startsWith("nevent", true)) {
+            return DirtyKeyInfo(pubkeyRelay, pubkeyRelay.additionalChars)
+        } else if (key.startsWith("nevent1", true)) {
             val noteRelayId = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
 
-            return DirtyKeyInfo(noteRelayId, restOfWord)
+            return DirtyKeyInfo(noteRelayId, noteRelayId.additionalChars)
         } else if (key.startsWith("naddr1", true)) {
             val address = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
 
-            return DirtyKeyInfo(address, "") // no way to know when they address ends and dirt begins
+            return DirtyKeyInfo(address, address.additionalChars) // no way to know when they address ends and dirt begins
         }
     } catch (e: Exception) {
         e.printStackTrace()

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

@@ -1,16 +1,21 @@
 package com.vitorpamplona.amethyst.model
 
 import android.util.Log
+import androidx.core.net.toUri
 import androidx.lifecycle.LiveData
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.vitorpamplona.amethyst.Amethyst
 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.components.BundledInsert
 import fr.acinq.secp256k1.Hex
 import kotlinx.coroutines.*
 import nostr.postr.toNpub
 import java.io.ByteArrayInputStream
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
@@ -30,6 +35,9 @@ object LocalCache {
     val channels = ConcurrentHashMap<HexKey, Channel>()
     val addressables = ConcurrentHashMap<String, AddressableNote>(100)
 
+    val awaitingPaymentRequests =
+        ConcurrentHashMap<HexKey, Pair<Note?, (LnZapPaymentResponseEvent) -> Unit>>(10)
+
     fun checkGetOrCreateUser(key: String): User? {
         if (isValidHexNpub(key)) {
             return getOrCreateUser(key)
@@ -189,7 +197,7 @@ object LocalCache {
             it.addReply(note)
         }
 
-        refreshObservers()
+        refreshObservers(note)
     }
 
     fun consume(event: LongTextNoteEvent, relay: Relay?) {
@@ -218,7 +226,7 @@ object LocalCache {
 
             author.addNote(note)
 
-            refreshObservers()
+            refreshObservers(note)
         }
     }
 
@@ -255,7 +263,7 @@ object LocalCache {
             it.addReply(note)
         }
 
-        refreshObservers()
+        refreshObservers(note)
     }
 
     fun consume(event: BadgeDefinitionEvent) {
@@ -268,7 +276,7 @@ object LocalCache {
         if (event.createdAt > (note.createdAt() ?: 0)) {
             note.loadEvent(event, author, emptyList<Note>())
 
-            refreshObservers()
+            refreshObservers(note)
         }
     }
 
@@ -286,8 +294,6 @@ object LocalCache {
             note.loadEvent(event, author, replyTo)
 
             author.updateAcceptedBadges(note)
-
-            refreshObservers()
         }
     }
 
@@ -309,7 +315,7 @@ object LocalCache {
             it.addReply(note)
         }
 
-        refreshObservers()
+        refreshObservers(note)
     }
 
     @Suppress("UNUSED_PARAMETER")
@@ -353,7 +359,7 @@ object LocalCache {
             recipient.addMessage(author, note)
         }
 
-        refreshObservers()
+        refreshObservers(note)
     }
 
     fun consume(event: DeletionEvent) {
@@ -378,6 +384,7 @@ object LocalCache {
                     masterNote.removeBoost(deleteNote)
                     masterNote.removeReaction(deleteNote)
                     masterNote.removeZap(deleteNote)
+                    masterNote.removeZapPayment(deleteNote)
                     masterNote.removeReport(deleteNote)
                 }
 
@@ -401,7 +408,7 @@ object LocalCache {
         }
 
         if (deletedAtLeastOne) {
-            live.invalidateData()
+            // refreshObservers()
         }
     }
 
@@ -427,7 +434,7 @@ object LocalCache {
             it.addBoost(note)
         }
 
-        refreshObservers()
+        refreshObservers(note)
     }
 
     fun consume(event: ReactionEvent) {
@@ -465,6 +472,8 @@ object LocalCache {
                 it.addReport(note)
             }
         }
+
+        refreshObservers(note)
     }
 
     fun consume(event: ReportEvent, relay: Relay?) {
@@ -495,6 +504,8 @@ object LocalCache {
         repliesTo.forEach {
             it.addReport(note)
         }
+
+        refreshObservers(note)
     }
 
     fun consume(event: ChannelCreateEvent) {
@@ -511,7 +522,7 @@ object LocalCache {
             oldChannel.addNote(note)
             note.loadEvent(event, author, emptyList())
 
-            refreshObservers()
+            refreshObservers(note)
         }
     }
 
@@ -531,7 +542,7 @@ object LocalCache {
                 oldChannel.addNote(note)
                 note.loadEvent(event, author, emptyList())
 
-                refreshObservers()
+                refreshObservers(note)
             }
         } else {
             // Log.d("MT","Relay sent a previous Metadata Event ${oldUser.toBestDisplayName()} ${formattedDateTime(event.createdAt)} > ${formattedDateTime(oldUser.updatedAt)}")
@@ -578,7 +589,7 @@ object LocalCache {
             it.addReply(note)
         }
 
-        refreshObservers()
+        refreshObservers(note)
     }
 
     @Suppress("UNUSED_PARAMETER")
@@ -591,11 +602,10 @@ object LocalCache {
 
     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 zapRequest = event.zapRequest?.id?.let { getOrCreateNote(it) }
 
         val author = getOrCreateUser(event.pubKey)
         val mentions = event.zappedAuthor().mapNotNull { checkGetOrCreateUser(it) }
@@ -620,6 +630,8 @@ object LocalCache {
         mentions.forEach {
             it.addZap(zapRequest, note)
         }
+
+        refreshObservers(note)
     }
 
     fun consume(event: LnZapRequestEvent) {
@@ -643,6 +655,138 @@ object LocalCache {
         mentions.forEach {
             it.addZap(note, null)
         }
+
+        refreshObservers(note)
+    }
+
+    fun consume(event: FileHeaderEvent, relay: Relay?) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        refreshObservers(note)
+    }
+
+    fun consume(event: FileStorageHeaderEvent, relay: Relay?) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        refreshObservers(note)
+    }
+
+    fun consume(event: HighlightEvent, relay: Relay?) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        // Adds to user profile
+        author.addNote(note)
+
+        refreshObservers(note)
+    }
+
+    fun consume(event: FileStorageEvent, relay: Relay?) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        if (relay != null) {
+            author.addRelayBeingUsed(relay, event.createdAt)
+            note.addRelay(relay)
+        }
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        try {
+            val cachePath = File(Amethyst.instance.applicationContext.externalCacheDir, "NIP95")
+            cachePath.mkdirs()
+            val stream = FileOutputStream(File(cachePath, event.id))
+            stream.write(event.decode())
+            stream.close()
+            Log.e("EventLogger", "Saved to disk as ${File(cachePath, event.id).toUri()}")
+        } catch (e: IOException) {
+            Log.e("FileSotrageEvent", "FileStorageEvent save to disk error: " + event.id, e)
+        }
+
+        // this is an invalid event. But we don't need to keep the data in memory.
+        val eventNoData = FileStorageEvent(event.id, event.pubKey, event.createdAt, event.tags, "", event.sig)
+
+        note.loadEvent(eventNoData, author, emptyList())
+
+        refreshObservers(note)
+    }
+
+    fun consume(event: LnZapPaymentRequestEvent) {
+        // Does nothing without a response callback.
+    }
+
+    fun consume(event: LnZapPaymentRequestEvent, zappedNote: Note?, onResponse: (LnZapPaymentResponseEvent) -> Unit) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        zappedNote?.addZapPayment(note, null)
+
+        awaitingPaymentRequests.put(event.id, Pair(zappedNote, onResponse))
+
+        refreshObservers(note)
+    }
+
+    fun consume(event: LnZapPaymentResponseEvent) {
+        val requestId = event.requestId()
+        val pair = awaitingPaymentRequests[requestId] ?: return
+
+        val (zappedNote, responseCallback) = pair
+
+        val requestNote = requestId?.let { checkGetOrCreateNote(requestId) }
+
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        requestNote?.let { request ->
+            zappedNote?.addZapPayment(request, note)
+        }
+
+        if (responseCallback != null) {
+            responseCallback(event)
+        }
     }
 
     fun findUsersStartingWith(username: String): List<User> {
@@ -694,11 +838,6 @@ object LocalCache {
                 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)
@@ -749,30 +888,23 @@ object LocalCache {
     }
 
     // Observers line up here.
-    val live: LocalCacheLiveData = LocalCacheLiveData(this)
+    val live: LocalCacheLiveData = LocalCacheLiveData()
 
-    private fun refreshObservers() {
-        live.invalidateData()
+    private fun refreshObservers(newNote: Note) {
+        live.invalidateData(newNote)
     }
 }
 
-class LocalCacheLiveData(val cache: LocalCache) :
-    LiveData<LocalCacheState>(LocalCacheState(cache)) {
+class LocalCacheLiveData : LiveData<Set<Note>>(setOf<Note>()) {
 
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.Main) {
-        if (hasActiveObservers()) {
-            refresh()
+    private val bundler = BundledInsert<Note>(300, Dispatchers.Main)
+
+    fun invalidateData(newNote: Note) {
+        bundler.invalidateList(newNote) { bundledNewNotes ->
+            if (hasActiveObservers()) {
+                postValue(bundledNewNotes)
+            }
         }
     }
-
-    fun invalidateData() {
-        bundler.invalidate()
-    }
-
-    private fun refresh() {
-        postValue(LocalCacheState(cache))
-    }
 }
-
-class LocalCacheState(val cache: LocalCache)

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

@@ -2,7 +2,9 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
+import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.service.model.*
+import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
@@ -20,6 +22,7 @@ val tagSearch = Pattern.compile("(?:\\s|\\A)\\#\\[([0-9]+)\\]")
 
 class AddressableNote(val address: ATag) : Note(address.toTag()) {
     override fun idNote() = address.toNAddr()
+    override fun toNEvent() = address.toNAddr()
     override fun idDisplayNote() = idNote().toShortenHex()
     override fun address() = address
     override fun createdAt() = (event as? LongTextNoteEvent)?.publishedAt() ?: event?.createdAt()
@@ -43,6 +46,8 @@ open class Note(val idHex: String) {
         private set
     var zaps = mapOf<Note, Note?>()
         private set
+    var zapPayments = mapOf<Note, Note?>()
+        private set
 
     var relays = setOf<String>()
         private set
@@ -51,15 +56,21 @@ open class Note(val idHex: String) {
 
     fun id() = Hex.decode(idHex)
     open fun idNote() = id().toNote()
+
+    open fun toNEvent(): String {
+        return Nip19.createNEvent(idHex, author?.pubkeyHex, event?.kind(), relays.firstOrNull())
+    }
+
     open fun idDisplayNote() = idNote().toShortenHex()
 
-    fun channel(): Channel? {
-        val channelHex =
-            (event as? ChannelMessageEvent)?.channel()
-                ?: (event as? ChannelMetadataEvent)?.channel()
-                ?: (event as? ChannelCreateEvent)?.let { it.id }
+    fun channelHex(): HexKey? {
+        return (event as? ChannelMessageEvent)?.channel()
+            ?: (event as? ChannelMetadataEvent)?.channel()
+            ?: (event as? ChannelCreateEvent)?.id
+    }
 
-        return channelHex?.let { LocalCache.checkGetOrCreateChannel(it) }
+    fun channel(): Channel? {
+        return channelHex()?.let { LocalCache.checkGetOrCreateChannel(it) }
     }
 
     open fun address(): ATag? = null
@@ -148,6 +159,17 @@ open class Note(val idHex: String) {
         }
     }
 
+    fun removeZapPayment(note: Note) {
+        if (zapPayments[note] != null) {
+            zapPayments = zapPayments.minus(note)
+            liveSet?.zaps?.invalidateData()
+        } else if (zapPayments.containsValue(note)) {
+            val toRemove = zapPayments.filterValues { it == note }
+            zapPayments = zapPayments.minus(toRemove.keys)
+            liveSet?.zaps?.invalidateData()
+        }
+    }
+
     fun addBoost(note: Note) {
         if (note !in boosts) {
             boosts = boosts + note
@@ -166,6 +188,17 @@ open class Note(val idHex: String) {
         }
     }
 
+    @Synchronized
+    fun addZapPayment(zapPaymentRequest: Note, zapPayment: Note?) {
+        if (zapPaymentRequest !in zapPayments.keys) {
+            zapPayments = zapPayments + Pair(zapPaymentRequest, zapPayment)
+            liveSet?.zaps?.invalidateData()
+        } else if (zapPaymentRequest in zapPayments.keys && zapPayments[zapPaymentRequest] == null) {
+            zapPayments = zapPayments + Pair(zapPaymentRequest, zapPayment)
+            liveSet?.zaps?.invalidateData()
+        }
+    }
+
     fun addReaction(note: Note) {
         if (note !in reactions) {
             reactions = reactions + note
@@ -192,17 +225,27 @@ open class Note(val idHex: String) {
         }
     }
 
-    fun isZappedBy(user: User): Boolean {
+    fun isZappedBy(user: User, account: Account): Boolean {
         // Zaps who the requester was the user
-        return zaps.any { it.key.author == user }
+        return zaps.any {
+            it.key.author === user || account.decryptZapContentAuthor(it.key)?.pubKey == user.pubkeyHex
+        } || zapPayments.any {
+            val zapResponseEvent = it.value?.event as? LnZapPaymentResponseEvent
+            val response = if (zapResponseEvent != null) {
+                account.decryptZapPaymentResponseEvent(zapResponseEvent)
+            } else {
+                null
+            }
+            response is PayInvoiceSuccessResponse && account.isNIP47Author(zapResponseEvent?.requestAuthor())
+        }
     }
 
     fun isReactedBy(user: User): Boolean {
-        return reactions.any { it.author == user }
+        return reactions.any { it.author === user }
     }
 
     fun isBoostedBy(user: User): Boolean {
-        return boosts.any { it.author == user }
+        return boosts.any { it.author === user }
     }
 
     fun reportsBy(user: User): Set<Note> {
@@ -223,12 +266,44 @@ open class Note(val idHex: String) {
         }.flatten()
     }
 
-    fun zappedAmount(): BigDecimal {
-        return zaps.mapNotNull { it.value?.event }
+    fun zappedAmount(privKey: ByteArray?, walletServicePubkey: ByteArray?): BigDecimal {
+        // Regular Zap Receipts
+        val completedZaps = zaps.asSequence()
+            .mapNotNull { it.value?.event }
             .filterIsInstance<LnZapEvent>()
-            .mapNotNull {
-                it.amount
-            }.sumOf { it }
+            .filter { it.amount != null }
+            .associate {
+                it.lnInvoice() to it.amount
+            }
+            .toMap()
+
+        val completedPayments = if (privKey != null && walletServicePubkey != null) {
+            // Payments confirmed by the User's Wallet
+            zapPayments
+                .asSequence()
+                .filter {
+                    val response = (it.value?.event as? LnZapPaymentResponseEvent)?.response(privKey, walletServicePubkey)
+                    response is PayInvoiceSuccessResponse
+                }
+                .associate {
+                    val lnInvoice = (it.key.event as? LnZapPaymentRequestEvent)?.lnInvoice(privKey)
+                    val amount = try {
+                        if (lnInvoice == null) {
+                            null
+                        } else {
+                            LnInvoiceUtil.getAmountInSats(lnInvoice)
+                        }
+                    } catch (e: java.lang.Exception) {
+                        null
+                    }
+                    lnInvoice to amount
+                }
+                .toMap()
+        } else {
+            emptyMap()
+        }
+
+        return (completedZaps + completedPayments).values.filterNotNull().sumOf { it }
     }
 
     fun hasPledgeBy(user: User): Boolean {
@@ -270,45 +345,6 @@ open class Note(val idHex: String) {
                 )
     }
 
-    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
     }

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

@@ -47,6 +47,7 @@ class User(val pubkeyHex: String) {
 
     fun pubkey() = Hex.decode(pubkeyHex)
     fun pubkeyNpub() = pubkey().toNpub()
+
     fun pubkeyDisplayHex() = pubkeyNpub().toShortenHex()
 
     override fun toString(): String = pubkeyHex
@@ -295,7 +296,7 @@ class User(val pubkeyHex: String) {
     fun hasSentMessagesTo(user: User?): Boolean {
         val messagesToUser = privateChatrooms[user] ?: return false
 
-        return messagesToUser.roomMessages.any { this == it.author }
+        return messagesToUser.roomMessages.any { this === it.author }
     }
 
     fun hasReport(loggedIn: User, type: ReportEvent.ReportType): Boolean {

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

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

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

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

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

@@ -0,0 +1,82 @@
+package com.vitorpamplona.amethyst.service
+
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.util.Log
+import com.vitorpamplona.amethyst.model.toHexKey
+import io.trbl.blurhash.BlurHash
+import java.net.URL
+import java.security.MessageDigest
+import kotlin.math.roundToInt
+
+class FileHeader(
+    val url: String,
+    val mimeType: String?,
+    val hash: String,
+    val size: Int,
+    val blurHash: String?,
+    val description: String? = null
+) {
+    companion object {
+        fun prepare(fileUrl: String, mimeType: String?, description: String?, onReady: (FileHeader) -> Unit, onError: () -> Unit) {
+            try {
+                val imageData = URL(fileUrl).readBytes()
+
+                prepare(imageData, fileUrl, mimeType, description, onReady, onError)
+            } catch (e: Exception) {
+                Log.e("ImageDownload", "Couldn't download image from server: ${e.message}")
+                onError()
+            }
+        }
+
+        fun prepare(
+            data: ByteArray,
+            fileUrl: String,
+            mimeType: String?,
+            description: String?,
+            onReady: (FileHeader) -> Unit,
+            onError: () -> Unit
+        ) {
+            try {
+                val sha256 = MessageDigest.getInstance("SHA-256")
+
+                val hash = sha256.digest(data).toHexKey()
+                val size = data.size
+
+                val blurHash = if (mimeType?.startsWith("image/") == true) {
+                    val opt = BitmapFactory.Options()
+                    opt.inPreferredConfig = Bitmap.Config.ARGB_8888
+                    val mBitmap = BitmapFactory.decodeByteArray(data, 0, data.size, opt)
+
+                    val intArray = IntArray(mBitmap.width * mBitmap.height)
+                    mBitmap.getPixels(
+                        intArray,
+                        0,
+                        mBitmap.width,
+                        0,
+                        0,
+                        mBitmap.width,
+                        mBitmap.height
+                    )
+
+                    val aspectRatio = (mBitmap.width).toFloat() / (mBitmap.height).toFloat()
+
+                    if (aspectRatio > 1) {
+                        BlurHash.encode(intArray, mBitmap.width, mBitmap.height, 9, (9 * (1 / aspectRatio)).roundToInt())
+                    } else if (aspectRatio < 1) {
+                        BlurHash.encode(intArray, mBitmap.width, mBitmap.height, (9 * aspectRatio).roundToInt(), 9)
+                    } else {
+                        BlurHash.encode(intArray, mBitmap.width, mBitmap.height, 4, 4)
+                    }
+                } else {
+                    null
+                }
+
+                onReady(FileHeader(fileUrl, mimeType, hash, size, blurHash, description))
+            } catch (e: Exception) {
+                Log.e("ImageDownload", "Couldn't convert image in to File Header: ${e.message}")
+                onError()
+            }
+        }
+    }
+}

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

@@ -14,7 +14,7 @@ object Nip47 {
 
         val url = Uri.parse(uri)
 
-        if (url.scheme != "nostrwalletconnect") {
+        if (url.scheme != "nostrwalletconnect" && url.scheme != "nostr+walletconnect") {
             throw IllegalArgumentException("Not a Wallet Connect QR Code")
         }
 

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

@@ -13,9 +13,11 @@ 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.COMMON_FEED_TYPES
+import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
-import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 
 object NostrAccountDataSource : NostrDataSource("AccountData") {
@@ -25,7 +27,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
 
     fun createAccountContactListFilter(): TypedFilter {
         return TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(ContactListEvent.kind),
                 authors = listOf(account.userProfile().pubkeyHex),
@@ -36,7 +38,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
 
     fun createAccountMetadataFilter(): TypedFilter {
         return TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(MetadataEvent.kind),
                 authors = listOf(account.userProfile().pubkeyHex),
@@ -47,7 +49,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
 
     fun createAccountAcceptedAwardsFilter(): TypedFilter {
         return TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(BadgeProfilesEvent.kind),
                 authors = listOf(account.userProfile().pubkeyHex),
@@ -58,7 +60,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
 
     fun createAccountBookmarkListFilter(): TypedFilter {
         return TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(BookmarkListEvent.kind),
                 authors = listOf(account.userProfile().pubkeyHex),
@@ -69,7 +71,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
 
     fun createAccountReportsFilter(): TypedFilter {
         return TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(ReportEvent.kind),
                 authors = listOf(account.userProfile().pubkeyHex),
@@ -79,7 +81,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
     }
 
     fun createNotificationFilter() = TypedFilter(
-        types = FeedType.values().toSet(),
+        types = COMMON_FEED_TYPES,
         filter = JsonFilter(
             kinds = listOf(
                 TextNoteEvent.kind,
@@ -88,6 +90,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                 RepostEvent.kind,
                 ReportEvent.kind,
                 LnZapEvent.kind,
+                LnZapPaymentResponseEvent.kind,
                 ChannelMessageEvent.kind,
                 BadgeAwardEvent.kind
             ),
@@ -112,4 +115,19 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
             createAccountBookmarkListFilter()
         ).ifEmpty { null }
     }
+
+    override fun auth(relay: Relay, challenge: String) {
+        super.auth(relay, challenge)
+
+        if (this::account.isInitialized) {
+            val event = account.createAuthEvent(relay, challenge)
+
+            if (event != null) {
+                Client.send(
+                    event,
+                    relay.url
+                )
+            }
+        }
+    }
 }

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

@@ -5,6 +5,7 @@ import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
+import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
@@ -43,7 +44,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
     )
 
     fun createMyChannelsFilter() = TypedFilter(
-        types = FeedType.values().toSet(), // Metadata comes from any relay
+        types = COMMON_FEED_TYPES, // Metadata comes from any relay
         filter = JsonFilter(
             kinds = listOf(ChannelCreateEvent.kind),
             ids = account.followingChannels.toList(),
@@ -54,7 +55,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
     fun createLastChannelInfoFilter(): List<TypedFilter> {
         return account.followingChannels.map {
             TypedFilter(
-                types = FeedType.values().toSet(), // Metadata comes from any relay
+                types = COMMON_FEED_TYPES, // Metadata comes from any relay
                 filter = JsonFilter(
                     kinds = listOf(ChannelMetadataEvent.kind),
                     tags = mapOf("e" to listOf(it)),

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

@@ -35,6 +35,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import java.util.Date
 import java.util.UUID
+import kotlin.Error
 
 abstract class NostrDataSource(val debugName: String) {
     private var subscriptions = mapOf<String, Subscription>()
@@ -75,11 +76,17 @@ abstract class NostrDataSource(val debugName: String) {
                         is ContactListEvent -> LocalCache.consume(event)
                         is DeletionEvent -> LocalCache.consume(event)
 
+                        is FileHeaderEvent -> LocalCache.consume(event, relay)
+                        is FileStorageEvent -> LocalCache.consume(event, relay)
+                        is FileStorageHeaderEvent -> LocalCache.consume(event, relay)
+                        is HighlightEvent -> LocalCache.consume(event, relay)
                         is LnZapEvent -> {
-                            event.containedPost()?.let { onEvent(it, subscriptionId, relay) }
+                            event.zapRequest?.let { onEvent(it, subscriptionId, relay) }
                             LocalCache.consume(event)
                         }
                         is LnZapRequestEvent -> LocalCache.consume(event)
+                        is LnZapPaymentRequestEvent -> LocalCache.consume(event)
+                        is LnZapPaymentResponseEvent -> LocalCache.consume(event)
                         is LongTextNoteEvent -> LocalCache.consume(event, relay)
                         is MetadataEvent -> LocalCache.consume(event)
                         is PrivateDmEvent -> LocalCache.consume(event, relay)
@@ -122,12 +129,21 @@ abstract class NostrDataSource(val debugName: String) {
 
         override fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) {
         }
+
+        override fun onAuth(relay: Relay, challenge: String) {
+            auth(relay, challenge)
+        }
     }
 
     init {
         Client.subscribe(clientListener)
     }
 
+    fun destroy() {
+        stop()
+        Client.unsubscribe(clientListener)
+    }
+
     open fun start() {
         println("DataSource: ${this.javaClass.simpleName} Start")
         resetFilters()
@@ -154,7 +170,7 @@ abstract class NostrDataSource(val debugName: String) {
 
     // Refreshes observers in batches.
     private val bundler = BundledUpdate(250, Dispatchers.IO) {
-        println("DataSource: ${this.javaClass.simpleName} InvalidateFilters")
+        // 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.
@@ -212,4 +228,5 @@ abstract class NostrDataSource(val debugName: String) {
     }
 
     abstract fun updateChannelFilters()
+    open fun auth(relay: Relay, challenge: String) = Unit
 }

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

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.HighlightEvent
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.PollNoteEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
@@ -12,7 +13,7 @@ object NostrGlobalDataSource : NostrDataSource("GlobalFeed") {
     fun createGlobalFilter() = TypedFilter(
         types = setOf(FeedType.GLOBAL),
         filter = JsonFilter(
-            kinds = listOf(TextNoteEvent.kind, PollNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind),
+            kinds = listOf(TextNoteEvent.kind, PollNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind, HighlightEvent.kind),
             limit = 200
         )
     )

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

@@ -4,7 +4,7 @@ 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.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 
@@ -15,9 +15,16 @@ object NostrHashtagDataSource : NostrDataSource("SingleHashtagFeed") {
         val hashToLoad = hashtagToWatch ?: return null
 
         return TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
-                tags = mapOf("t" to listOf(hashToLoad, hashToLoad.lowercase(), hashToLoad.uppercase(), hashToLoad.capitalize())),
+                tags = mapOf(
+                    "t" to listOf(
+                        hashToLoad,
+                        hashToLoad.lowercase(),
+                        hashToLoad.uppercase(),
+                        hashToLoad.capitalize()
+                    )
+                ),
                 kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind),
                 limit = 200
             )

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.UserState
+import com.vitorpamplona.amethyst.service.model.HighlightEvent
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.PollNoteEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
@@ -55,7 +56,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
         return TypedFilter(
             types = setOf(FeedType.FOLLOWS),
             filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind),
+                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind, HighlightEvent.kind),
                 authors = followSet,
                 limit = 400,
                 since = latestEOSEs.users[account.userProfile()]?.relayList
@@ -71,7 +72,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
         return TypedFilter(
             types = setOf(FeedType.FOLLOWS),
             filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind),
+                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, HighlightEvent.kind),
                 tags = mapOf(
                     "t" to hashToLoad.map {
                         listOf(it, it.lowercase(), it.uppercase(), it.capitalize())

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

@@ -0,0 +1,39 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.service.model.LnZapPaymentResponseEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+
+class NostrLnZapPaymentResponseDataSource(
+    private var fromServiceHex: String,
+    private var toUserHex: String,
+    private var replyingToHex: String
+) : NostrDataSource("LnZapPaymentResponseFeed") {
+
+    val feedTypes = setOf(FeedType.WALLET_CONNECT)
+
+    private fun createWalletConnectServiceWatcher(): TypedFilter {
+        // downloads all the reactions to a given event.
+        return TypedFilter(
+            types = feedTypes,
+            filter = JsonFilter(
+                kinds = listOf(LnZapPaymentResponseEvent.kind),
+                authors = listOf(fromServiceHex),
+                tags = mapOf(
+                    "e" to listOf(replyingToHex),
+                    "p" to listOf(toUserHex)
+                ),
+                limit = 1
+            )
+        )
+    }
+
+    val channel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        val wc = createWalletConnectServiceWatcher()
+
+        channel.typedFilters = listOfNotNull(wc).ifEmpty { null }
+    }
+}

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

@@ -2,7 +2,7 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.decodePublicKey
 import com.vitorpamplona.amethyst.service.model.*
-import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.bechToBytes
@@ -34,7 +34,7 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
         return listOfNotNull(
             hexToWatch?.let {
                 TypedFilter(
-                    types = FeedType.values().toSet(),
+                    types = COMMON_FEED_TYPES,
                     filter = JsonFilter(
                         ids = listOfNotNull(hexToWatch)
                     )
@@ -42,7 +42,7 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
             },
             hexToWatch?.let {
                 TypedFilter(
-                    types = FeedType.values().toSet(),
+                    types = COMMON_FEED_TYPES,
                     filter = JsonFilter(
                         kinds = listOf(MetadataEvent.kind),
                         authors = listOfNotNull(hexToWatch)
@@ -50,7 +50,7 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
                 )
             },
             TypedFilter(
-                types = FeedType.values().toSet(),
+                types = COMMON_FEED_TYPES,
                 filter = JsonFilter(
                     kinds = listOf(MetadataEvent.kind),
                     search = mySearchString,
@@ -58,9 +58,9 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
                 )
             ),
             TypedFilter(
-                types = FeedType.values().toSet(),
+                types = COMMON_FEED_TYPES,
                 filter = JsonFilter(
-                    kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind, ChannelMetadataEvent.kind, ChannelCreateEvent.kind, ChannelMessageEvent.kind),
+                    kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind, ChannelMetadataEvent.kind, ChannelCreateEvent.kind, ChannelMessageEvent.kind, HighlightEvent.kind),
                     search = mySearchString,
                     limit = 20
                 )

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

@@ -3,6 +3,7 @@ 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.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
@@ -40,7 +41,7 @@ object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
 
         // downloads linked events to this event.
         return TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(ChannelCreateEvent.kind),
                 ids = interestedEvents.toList()

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

@@ -3,11 +3,10 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.*
+import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.EOSETime
-import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import java.util.Date
 
 object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
     private var eventsToWatch = setOf<Note>()
@@ -20,12 +19,10 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
             return null
         }
 
-        val now = Date().time / 1000
-
         return addressesToWatch.mapNotNull {
             it.address()?.let { aTag ->
                 TypedFilter(
-                    types = FeedType.values().toSet(),
+                    types = COMMON_FEED_TYPES,
                     filter = JsonFilter(
                         kinds = listOf(
                             TextNoteEvent.kind, LongTextNoteEvent.kind,
@@ -49,12 +46,10 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
             return null
         }
 
-        val now = Date().time / 1000
-
         return addressesToWatch.mapNotNull {
             it.address()?.let { aTag ->
                 TypedFilter(
-                    types = FeedType.values().toSet(),
+                    types = COMMON_FEED_TYPES,
                     filter = JsonFilter(
                         kinds = listOf(aTag.kind),
                         tags = mapOf("d" to listOf(aTag.dTag)),
@@ -74,7 +69,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
 
         return reactionsToWatch.map {
             TypedFilter(
-                types = FeedType.values().toSet(),
+                types = COMMON_FEED_TYPES,
                 filter = JsonFilter(
                     kinds = listOf(
                         TextNoteEvent.kind,
@@ -84,7 +79,8 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                         ReportEvent.kind,
                         LnZapEvent.kind,
                         LnZapRequestEvent.kind,
-                        PollNoteEvent.kind
+                        PollNoteEvent.kind,
+                        HighlightEvent.kind
                     ),
                     tags = mapOf("e" to listOf(it.idHex)),
                     since = it.lastReactionsDownloadTime
@@ -113,12 +109,17 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
         // downloads linked events to this event.
         return listOf(
             TypedFilter(
-                types = FeedType.values().toSet(),
+                types = COMMON_FEED_TYPES,
                 filter = JsonFilter(
                     kinds = listOf(
-                        TextNoteEvent.kind, LongTextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, LnZapEvent.kind, LnZapRequestEvent.kind,
-                        ChannelMessageEvent.kind, ChannelCreateEvent.kind, ChannelMetadataEvent.kind, BadgeDefinitionEvent.kind, BadgeAwardEvent.kind, BadgeProfilesEvent.kind,
-                        PollNoteEvent.kind
+                        TextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind,
+                        ReactionEvent.kind, RepostEvent.kind,
+                        LnZapEvent.kind, LnZapRequestEvent.kind,
+                        ChannelMessageEvent.kind, ChannelCreateEvent.kind, ChannelMetadataEvent.kind,
+                        BadgeDefinitionEvent.kind, BadgeAwardEvent.kind, BadgeProfilesEvent.kind,
+                        PrivateDmEvent.kind,
+                        FileHeaderEvent.kind, FileStorageEvent.kind, FileStorageHeaderEvent.kind,
+                        HighlightEvent.kind
                     ),
                     ids = interestedEvents.toList()
                 )

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

@@ -3,8 +3,8 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.MetadataEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
+import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.EOSETime
-import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 
@@ -16,7 +16,7 @@ object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
 
         return usersToWatch.filter { it.info?.latestMetadata == null }.map {
             TypedFilter(
-                types = FeedType.values().toSet(),
+                types = COMMON_FEED_TYPES,
                 filter = JsonFilter(
                     kinds = listOf(MetadataEvent.kind),
                     authors = listOf(it.pubkeyHex),
@@ -31,7 +31,7 @@ object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
 
         return usersToWatch.map {
             TypedFilter(
-                types = FeedType.values().toSet(),
+                types = COMMON_FEED_TYPES,
                 filter = JsonFilter(
                     kinds = listOf(ReportEvent.kind),
                     tags = mapOf("p" to listOf(it.pubkeyHex)),

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

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

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

@@ -3,7 +3,7 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.*
-import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 
@@ -22,7 +22,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
 
     fun createUserInfoFilter() = user?.let {
         TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(MetadataEvent.kind),
                 authors = listOf(it.pubkeyHex),
@@ -33,9 +33,9 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
 
     fun createUserPostsFilter() = user?.let {
         TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, RepostEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind),
+                kinds = listOf(TextNoteEvent.kind, RepostEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind, HighlightEvent.kind),
                 authors = listOf(it.pubkeyHex),
                 limit = 200
             )
@@ -44,7 +44,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
 
     fun createUserReceivedZapsFilter() = user?.let {
         TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(LnZapEvent.kind),
                 tags = mapOf("p" to listOf(it.pubkeyHex))
@@ -54,7 +54,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
 
     fun createFollowFilter() = user?.let {
         TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(ContactListEvent.kind),
                 authors = listOf(it.pubkeyHex),
@@ -65,7 +65,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
 
     fun createFollowersFilter() = user?.let {
         TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(ContactListEvent.kind),
                 tags = mapOf("p" to listOf(it.pubkeyHex))
@@ -75,7 +75,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
 
     fun createAcceptedAwardsFilter() = user?.let {
         TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(BadgeProfilesEvent.kind),
                 authors = listOf(it.pubkeyHex),
@@ -86,7 +86,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
 
     fun createBookmarksFilter() = user?.let {
         TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(BookmarkListEvent.kind),
                 authors = listOf(it.pubkeyHex),
@@ -97,7 +97,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
 
     fun createReceivedAwardsFilter() = user?.let {
         TypedFilter(
-            types = FeedType.values().toSet(),
+            types = COMMON_FEED_TYPES,
             filter = JsonFilter(
                 kinds = listOf(BadgeAwardEvent.kind),
                 tags = mapOf("p" to listOf(it.pubkeyHex)),

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

@@ -0,0 +1,23 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.service.model.FileHeaderEvent
+import com.vitorpamplona.amethyst.service.model.FileStorageHeaderEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+
+object NostrVideoDataSource : NostrDataSource("VideoFeed") {
+    fun createGlobalFilter() = TypedFilter(
+        types = setOf(FeedType.GLOBAL),
+        filter = JsonFilter(
+            kinds = listOf(FileHeaderEvent.kind, FileStorageHeaderEvent.kind),
+            limit = 200
+        )
+    )
+
+    val videoFeedChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        videoFeedChannel.typedFilters = listOf(createGlobalFilter()).ifEmpty { null }
+    }
+}

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

@@ -2,6 +2,8 @@ package com.vitorpamplona.amethyst.service.model
 
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.tagSearch
+import com.vitorpamplona.amethyst.service.nip19.Nip19
+import com.vitorpamplona.amethyst.service.nip19.Nip19.nip19regex
 
 open class BaseTextNoteEvent(
     id: HexKey,
@@ -15,6 +17,48 @@ open class BaseTextNoteEvent(
     fun mentions() = taggedUsers()
     open fun replyTos() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
 
+    private var citedUsersCache: Set<HexKey>? = null
+
+    fun citedUsers(): Set<HexKey> {
+        citedUsersCache?.let { return it }
+
+        val matcher = tagSearch.matcher(content)
+        val returningList = mutableSetOf<String>()
+        while (matcher.find()) {
+            try {
+                val tag = matcher.group(1)?.let { tags[it.toInt()] }
+                if (tag != null && tag.size > 1 && tag[0] == "p") {
+                    returningList.add(tag[1])
+                }
+            } catch (e: Exception) {
+            }
+        }
+
+        val matcher2 = nip19regex.matcher(content)
+        while (matcher2.find()) {
+            val uriScheme = matcher2.group(1) // nostr:
+            val type = matcher2.group(2) // npub1
+            val key = matcher2.group(3) // bech32
+            val additionalChars = matcher2.group(4) // additional chars
+
+            val parsed = Nip19.parseComponents(uriScheme, type, key, additionalChars)
+
+            if (parsed != null) {
+                try {
+                    val tag = tags.firstOrNull { it.size > 1 && it[1] == parsed.hex }
+
+                    if (tag != null && tag[0] == "p") {
+                        returningList.add(tag[1])
+                    }
+                } catch (e: Exception) {
+                }
+            }
+        }
+
+        citedUsersCache = returningList
+        return returningList
+    }
+
     fun findCitations(): Set<String> {
         var citations = mutableSetOf<String>()
         // Removes citations from replies:
@@ -22,15 +66,40 @@ open class BaseTextNoteEvent(
         while (matcher.find()) {
             try {
                 val tag = matcher.group(1)?.let { tags[it.toInt()] }
-                if (tag != null && tag[0] == "e") {
+                if (tag != null && tag.size > 1 && tag[0] == "e") {
                     citations.add(tag[1])
                 }
-                if (tag != null && tag[0] == "a") {
+                if (tag != null && tag.size > 1 && tag[0] == "a") {
                     citations.add(tag[1])
                 }
             } catch (e: Exception) {
             }
         }
+
+        val matcher2 = nip19regex.matcher(content)
+        while (matcher2.find()) {
+            val uriScheme = matcher2.group(1) // nostr:
+            val type = matcher2.group(2) // npub1
+            val key = matcher2.group(3) // bech32
+            val additionalChars = matcher2.group(4) // additional chars
+
+            val parsed = Nip19.parseComponents(uriScheme, type, key, additionalChars)
+
+            if (parsed != null) {
+                try {
+                    val tag = tags.firstOrNull { it.size > 1 && it[1] == parsed.hex }
+
+                    if (tag != null && tag[0] == "e") {
+                        citations.add(tag[1])
+                    }
+                    if (tag != null && tag[0] == "a") {
+                        citations.add(tag[1])
+                    }
+                } catch (e: Exception) {
+                }
+            }
+        }
+
         return citations
     }
 

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

@@ -20,7 +20,7 @@ class ChannelMessageEvent(
     companion object {
         const val kind = 42
 
-        fun create(message: String, channel: String, replyTos: List<String>? = null, mentions: List<String>? = null, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMessageEvent {
+        fun create(message: String, channel: String, replyTos: List<String>? = null, mentions: List<String>? = null, zapReceiver: String?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMessageEvent {
             val content = message
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf(
@@ -32,6 +32,9 @@ class ChannelMessageEvent(
             mentions?.forEach {
                 tags.add(listOf("p", it))
             }
+            zapReceiver?.let {
+                tags.add(listOf("zap", it))
+            }
 
             val id = generateId(pubKey, createdAt, kind, tags, content)
             val sig = Utils.sign(id, privateKey)

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

@@ -38,23 +38,27 @@ open class Event(
 
     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 taggedUsers() = tags.filter { it.size > 1 && it[0] == "p" }.map { it[1] }
+    fun taggedEvents() = tags.filter { it.size > 1 && it[0] == "e" }.map { it[1] }
 
-    fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
-        val aTagValue = it.getOrNull(1)
+    fun taggedUrls() = tags.filter { it.size > 1 && it[0] == "r" }.map { it[1] }
+
+    override fun zapAddress() = tags.firstOrNull { it.size > 1 && it[0] == "zap" }?.get(1)
+
+    fun taggedAddresses() = tags.filter { it.size > 1 && it[0] == "a" }.mapNotNull {
+        val aTagValue = it[1]
         val relay = it.getOrNull(2)
 
-        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
+        ATag.parse(aTagValue, relay)
     }
 
-    override fun hashtags() = tags.filter { it.firstOrNull() == "t" }.mapNotNull { it.getOrNull(1) }
+    override fun hashtags() = tags.filter { it.size > 1 && it[0] == "t" }.map { it[1] }
 
-    override fun isTaggedUser(idHex: String) = tags.any { it.getOrNull(0) == "p" && it.getOrNull(1) == idHex }
+    override fun isTaggedUser(idHex: String) = tags.any { it.size > 1 && it[0] == "p" && it[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 isTaggedHash(hashtag: String) = tags.any { it.size > 1 && it[0] == "t" && it[1].equals(hashtag, true) }
+    override fun isTaggedHashes(hashtags: Set<String>) = tags.any { it.size > 1 && it[0] == "t" && it[1].lowercase() in hashtags }
+    override fun firstIsTaggedHashes(hashtags: Set<String>) = tags.firstOrNull { it.size > 1 && it[0] == "t" && it[1].lowercase() in hashtags }?.getOrNull(1)
 
     override fun getPoWRank(): Int {
         var rank = 0
@@ -79,7 +83,7 @@ open class Event(
 
     override fun getReward(): BigDecimal? {
         return try {
-            tags.filter { it.firstOrNull() == "reward" }.mapNotNull { BigDecimal(it.getOrNull(1)) }.firstOrNull()
+            tags.filter { it.firstOrNull() == "reward" }.mapNotNull { it.getOrNull(1)?.let { BigDecimal(it) } }.firstOrNull()
         } catch (e: Exception) {
             null
         }
@@ -203,6 +207,7 @@ open class Event(
             .registerTypeAdapter(Event::class.java, EventDeserializer())
             .registerTypeAdapter(ByteArray::class.java, ByteArraySerializer())
             .registerTypeAdapter(ByteArray::class.java, ByteArrayDeserializer())
+            .registerTypeAdapter(Response::class.java, ResponseDeserializer())
             .create()
 
         fun fromJson(json: String, lenient: Boolean = false): Event = gson.fromJson(json, Event::class.java).getRefinedEvent(lenient)
@@ -222,8 +227,13 @@ open class Event(
             ContactListEvent.kind -> ContactListEvent(id, pubKey, createdAt, tags, content, sig)
             DeletionEvent.kind -> DeletionEvent(id, pubKey, createdAt, tags, content, sig)
 
+            FileHeaderEvent.kind -> FileHeaderEvent(id, pubKey, createdAt, tags, content, sig)
+            FileStorageEvent.kind -> FileStorageEvent(id, pubKey, createdAt, tags, content, sig)
+            FileStorageHeaderEvent.kind -> FileStorageHeaderEvent(id, pubKey, createdAt, tags, content, sig)
+            HighlightEvent.kind -> HighlightEvent(id, pubKey, createdAt, tags, content, sig)
             LnZapEvent.kind -> LnZapEvent(id, pubKey, createdAt, tags, content, sig)
             LnZapPaymentRequestEvent.kind -> LnZapPaymentRequestEvent(id, pubKey, createdAt, tags, content, sig)
+            LnZapPaymentResponseEvent.kind -> LnZapPaymentResponseEvent(id, pubKey, createdAt, tags, content, sig)
             LnZapRequestEvent.kind -> LnZapRequestEvent(id, pubKey, createdAt, tags, content, sig)
             LongTextNoteEvent.kind -> LongTextNoteEvent(id, pubKey, createdAt, tags, content, sig)
             MetadataEvent.kind -> MetadataEvent(id, pubKey, createdAt, tags, content, sig)

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

@@ -24,13 +24,15 @@ interface EventInterface {
 
     fun hasValidSignature(): Boolean
 
-    fun isTaggedUser(loggedInUser: String): Boolean
+    fun isTaggedUser(idHex: String): Boolean
 
     fun isTaggedHash(hashtag: String): Boolean
-    fun isTaggedHashes(hashtag: Set<String>): Boolean
-    fun firstIsTaggedHashes(hashtag: Set<String>): String?
+    fun isTaggedHashes(hashtags: Set<String>): Boolean
+    fun firstIsTaggedHashes(hashtags: Set<String>): String?
     fun hashtags(): List<String>
 
     fun getReward(): BigDecimal?
     fun getPoWRank(): Int
+
+    fun zapAddress(): String?
 }

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

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

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

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

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

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

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

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

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

@@ -4,7 +4,6 @@ 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,
@@ -14,25 +13,37 @@ class LnZapEvent(
     content: String,
     sig: HexKey
 ) : LnZapEventInterface, Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    // This event is also kept in LocalCache (same object)
+    @Transient val zapRequest: LnZapRequestEvent?
 
-    override fun zappedPost() = tags
-        .filter { it.firstOrNull() == "e" }
-        .mapNotNull { it.getOrNull(1) }
-
-    override fun zappedPollOption(): Int? = containedPost()?.tags
-        ?.filter { it.firstOrNull() == POLL_OPTION }
-        ?.getOrNull(0)?.getOrNull(1)?.toInt()
-
-    override fun zappedAuthor() = tags
-        .filter { it.firstOrNull() == "p" }
-        .mapNotNull { it.getOrNull(1) }
-
-    override fun zappedRequestAuthor(): String? = containedPost()?.pubKey()
-
-    override fun amount(): BigDecimal? {
-        return amount
+    override fun containedPost(): LnZapRequestEvent? = try {
+        description()?.ifBlank { null }?.let {
+            fromJson(it, Client.lenient)
+        } as? LnZapRequestEvent
+    } catch (e: Exception) {
+        Log.e("LnZapEvent", "Failed to Parse Contained Post ${description()}", e)
+        null
     }
 
+    init {
+        zapRequest = containedPost()
+    }
+
+    override fun zappedPost() = tags.filter { it.size > 1 && it[0] == "e" }.map { it[1] }
+
+    override fun zappedAuthor() = tags.filter { it.size > 1 && it[0] == "p" }.map { it[1] }
+
+    override fun zappedPollOption(): Int? = try {
+        zapRequest?.tags?.firstOrNull { it.size > 1 && it[0] == POLL_OPTION }?.get(1)?.toInt()
+    } catch (e: Exception) {
+        Log.e("LnZapEvent", "ZappedPollOption failed to parse", e)
+        null
+    }
+
+    override fun zappedRequestAuthor(): String? = zapRequest?.pubKey()
+
+    override fun amount() = amount
+
     // Keeps this as a field because it's a heavier function used everywhere.
     val amount by lazy {
         try {
@@ -42,31 +53,22 @@ class LnZapEvent(
             null
         }
     }
-    override fun message(): String {
-        return message
-    }
-    val message = content
-
-    override fun containedPost(): Event? = try {
-        description()?.ifBlank { null }?.let {
-            fromJson(it, Client.lenient)
-        }
-    } catch (e: Exception) {
-        Log.e("LnZapEvent", "Failed to Parse Contained Post ${description()}", e)
-        null
+    override fun content(): String {
+        return content
     }
 
-    private fun lnInvoice(): String? = tags
-        .filter { it.firstOrNull() == "bolt11" }
-        .mapNotNull { it.getOrNull(1) }
-        .firstOrNull()
+    fun lnInvoice() = tags.firstOrNull { it.size > 1 && it[0] == "bolt11" }?.get(1)
 
-    private fun description(): String? = tags
-        .filter { it.firstOrNull() == "description" }
-        .mapNotNull { it.getOrNull(1) }
-        .firstOrNull()
+    private fun description() = tags.firstOrNull { it.size > 1 && it[0] == "description" }?.get(1)
 
     companion object {
         const val kind = 9735
     }
+
+    enum class ZapType() {
+        PUBLIC,
+        PRIVATE,
+        ANONYMOUS,
+        NONZAP
+    }
 }

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

@@ -17,6 +17,4 @@ interface LnZapEventInterface : EventInterface {
     fun amount(): BigDecimal?
 
     fun containedPost(): Event?
-
-    fun message(): String
 }

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

@@ -16,6 +16,8 @@ class LnZapPaymentRequestEvent(
     sig: HexKey
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
+    fun walletServicePubKey() = tags.firstOrNull() { it.size > 1 && it[0] == "p" }?.get(1)
+
     fun lnInvoice(privKey: ByteArray): String? {
         return try {
             val sharedSecret = Utils.getSharedSecret(privKey, pubKey.toByteArray())
@@ -37,9 +39,10 @@ class LnZapPaymentRequestEvent(
             createdAt: Long = Date().time / 1000
         ): LnZapPaymentRequestEvent {
             val pubKey = Utils.pubkeyCreate(privateKey)
+            val serializedRequest = gson.toJson(PayInvoiceMethod(lnInvoice))
 
             val content = Utils.encrypt(
-                lnInvoice,
+                serializedRequest,
                 privateKey,
                 walletServicePubkey.toByteArray()
             )
@@ -53,3 +56,14 @@ class LnZapPaymentRequestEvent(
         }
     }
 }
+
+// REQUEST OBJECTS
+
+abstract class Request(val method: String, val params: Params)
+abstract class Params
+
+// PayInvoice Call
+
+class PayInvoiceMethod(bolt11: String) : Request("pay_invoice", PayInvoiceParams(bolt11)) {
+    class PayInvoiceParams(val invoice: String) : Params()
+}

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

@@ -0,0 +1,130 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.google.gson.annotations.SerializedName
+import com.vitorpamplona.amethyst.model.HexKey
+import nostr.postr.Utils
+import java.lang.reflect.Type
+
+class LnZapPaymentResponseEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    fun requestAuthor() = tags.firstOrNull() { it.size > 1 && it[0] == "p" }?.get(1)
+    fun requestId() = tags.firstOrNull() { it.size > 1 && it[0] == "e" }?.get(1)
+
+    fun decrypt(privKey: ByteArray, pubKey: ByteArray): String? {
+        return try {
+            val sharedSecret = Utils.getSharedSecret(privKey, pubKey)
+
+            val retVal = Utils.decrypt(content, sharedSecret)
+
+            if (retVal.startsWith(PrivateDmEvent.nip18Advertisement)) {
+                retVal.substring(16)
+            } else {
+                retVal
+            }
+        } catch (e: Exception) {
+            Log.w("PrivateDM", "Error decrypting the message ${e.message}")
+            null
+        }
+    }
+
+    fun response(privKey: ByteArray, pubKey: ByteArray): Response? = try {
+        if (content.isNotEmpty()) {
+            val decrypted = decrypt(privKey, pubKey)
+            gson.fromJson(decrypted, Response::class.java)
+        } else {
+            null
+        }
+    } catch (e: Exception) {
+        Log.w("LnZapPaymentResponseEvent", "Can't parse content as a payment response: $content", e)
+        null
+    }
+
+    companion object {
+        const val kind = 23195
+    }
+}
+
+// RESPONSE OBJECTS
+abstract class Response(
+    @SerializedName("result_type")
+    val resultType: String
+)
+
+// PayInvoice Call
+
+class PayInvoiceSuccessResponse(val result: PayInvoiceResultParams? = null) :
+    Response("pay_invoice") {
+    class PayInvoiceResultParams(val preimage: String)
+}
+
+class PayInvoiceErrorResponse(val error: PayInvoiceErrorParams? = null) :
+    Response("pay_invoice") {
+    class PayInvoiceErrorParams(val code: ErrorType?, val message: String?)
+
+    enum class ErrorType {
+        @SerializedName(value = "rate_limited", alternate = ["RATE_LIMITED"])
+        RATE_LIMITED, // The client is sending commands too fast. It should retry in a few seconds.
+        @SerializedName(value = "not_implemented", alternate = ["NOT_IMPLEMENTED"])
+        NOT_IMPLEMENTED, // The command is not known or is intentionally not implemented.
+        @SerializedName(value = "insufficient_balance", alternate = ["INSUFFICIENT_BALANCE"])
+        INSUFFICIENT_BALANCE, // The wallet does not have enough funds to cover a fee reserve or the payment amount.
+        @SerializedName(value = "quota_exceeded", alternate = ["QUOTA_EXCEEDED"])
+        QUOTA_EXCEEDED, // The wallet has exceeded its spending quota.
+        @SerializedName(value = "restricted", alternate = ["RESTRICTED"])
+        RESTRICTED, // This public key is not allowed to do this operation.
+        @SerializedName(value = "unauthorized", alternate = ["UNAUTHORIZED"])
+        UNAUTHORIZED, // This public key has no wallet connected.
+        @SerializedName(value = "internal", alternate = ["INTERNAL"])
+        INTERNAL, // An internal error.
+        @SerializedName(value = "other", alternate = ["OTHER"])
+        OTHER // Other error.
+    }
+}
+
+class ResponseDeserializer :
+    JsonDeserializer<Response?> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext
+    ): Response? {
+        val jsonObject = json.asJsonObject
+        val resultType = jsonObject.get("result_type")?.asString
+
+        if (resultType == "pay_invoice") {
+            val result = jsonObject.get("result")?.asJsonObject
+            val error = jsonObject.get("error")?.asJsonObject
+            if (result != null) {
+                return context.deserialize<PayInvoiceSuccessResponse>(jsonObject, PayInvoiceSuccessResponse::class.java)
+            }
+            if (error != null) {
+                return context.deserialize<PayInvoiceErrorResponse>(jsonObject, PayInvoiceErrorResponse::class.java)
+            }
+        } else {
+            // tries to guess
+            if (jsonObject.get("result")?.asJsonObject?.get("preimage") != null) {
+                return context.deserialize<PayInvoiceSuccessResponse>(jsonObject, PayInvoiceSuccessResponse::class.java)
+            }
+            if (jsonObject.get("error")?.asJsonObject?.get("code") != null) {
+                return context.deserialize<PayInvoiceErrorResponse>(jsonObject, PayInvoiceErrorResponse::class.java)
+            }
+        }
+        return null
+    }
+
+    companion object {
+    }
+}

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

@@ -1,9 +1,15 @@
 package com.vitorpamplona.amethyst.service.model
 
-import com.vitorpamplona.amethyst.model.HexKey
-import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.model.*
+import nostr.postr.Bech32
 import nostr.postr.Utils
-import java.util.Date
+import java.nio.charset.Charset
+import java.security.SecureRandom
+import java.util.*
+import javax.crypto.BadPaddingException
+import javax.crypto.Cipher
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
 
 class LnZapRequestEvent(
     id: HexKey,
@@ -13,8 +19,12 @@ class LnZapRequestEvent(
     content: String,
     sig: HexKey
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun zappedPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-    fun zappedAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+
+    fun zappedPost() = tags.filter { it.size > 1 && it[0] == "e" }.map { it[1] }
+
+    fun zappedAuthor() = tags.filter { it.size > 1 && it[0] == "p" }.map { it[1] }
+
+    fun isPrivateZap() = tags.any { t -> t.size >= 2 && t[0] == "anon" && t[1].isNotBlank() }
 
     companion object {
         const val kind = 9734
@@ -25,10 +35,12 @@ class LnZapRequestEvent(
             privateKey: ByteArray,
             pollOption: Int?,
             message: String,
+            zapType: LnZapEvent.ZapType,
             createdAt: Long = Date().time / 1000
         ): LnZapRequestEvent {
-            val content = message
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            var content = message
+            var privkey = privateKey
+            var pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             var tags = listOf(
                 listOf("e", originalNote.id()),
                 listOf("p", originalNote.pubKey()),
@@ -40,9 +52,21 @@ class LnZapRequestEvent(
             if (pollOption != null && pollOption >= 0) {
                 tags = tags + listOf(listOf(POLL_OPTION, pollOption.toString()))
             }
-
+            if (zapType == LnZapEvent.ZapType.ANONYMOUS) {
+                tags = tags + listOf(listOf("anon", ""))
+                privkey = Utils.privkeyCreate()
+                pubKey = Utils.pubkeyCreate(privkey).toHexKey()
+            } else if (zapType == LnZapEvent.ZapType.PRIVATE) {
+                var encryptionPrivateKey = createEncryptionPrivateKey(privateKey.toHexKey(), originalNote.id(), createdAt)
+                var noteJson = (create(privkey, 9733, listOf(tags[0], tags[1]), message)).toJson()
+                var encryptedContent = encryptPrivateZapMessage(noteJson, encryptionPrivateKey, originalNote.pubKey().toByteArray())
+                tags = tags + listOf(listOf("anon", encryptedContent))
+                content = "" // make sure public content is empty, as the content is encrypted
+                privkey = encryptionPrivateKey // sign event with generated privkey
+                pubKey = Utils.pubkeyCreate(encryptionPrivateKey).toHexKey() // updated event with according pubkey
+            }
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = Utils.sign(id, privkey)
             return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
 
@@ -51,22 +75,102 @@ class LnZapRequestEvent(
             relays: Set<String>,
             privateKey: ByteArray,
             message: String,
+            zapType: LnZapEvent.ZapType,
             createdAt: Long = Date().time / 1000
         ): LnZapRequestEvent {
-            val content = message
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
-            val tags = listOf(
+            var content = message
+            var privkey = privateKey
+            var pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            var tags = listOf(
                 listOf("p", userHex),
                 listOf("relays") + relays
             )
-
+            if (zapType == LnZapEvent.ZapType.ANONYMOUS) {
+                privkey = Utils.privkeyCreate()
+                pubKey = Utils.pubkeyCreate(privkey).toHexKey()
+                tags = tags + listOf(listOf("anon", ""))
+            } else if (zapType == LnZapEvent.ZapType.PRIVATE) {
+                var encryptionPrivateKey = createEncryptionPrivateKey(privateKey.toHexKey(), userHex, createdAt)
+                var noteJson = (create(privkey, 9733, listOf(tags[0], tags[1]), message)).toJson()
+                var encryptedContent = encryptPrivateZapMessage(noteJson, encryptionPrivateKey, userHex.toByteArray())
+                tags = tags + listOf(listOf("anon", encryptedContent))
+                content = ""
+                privkey = encryptionPrivateKey
+                pubKey = Utils.pubkeyCreate(encryptionPrivateKey).toHexKey()
+            }
             val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
+            val sig = Utils.sign(id, privkey)
             return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
         }
+
+        fun createEncryptionPrivateKey(privkey: String, id: String, createdAt: Long): ByteArray {
+            var str = privkey + id + createdAt.toString()
+            var strbyte = str.toByteArray(Charset.forName("utf-8"))
+            return sha256.digest(strbyte)
+        }
+
+        fun encryptPrivateZapMessage(msg: String, privkey: ByteArray, pubkey: ByteArray): String {
+            var sharedSecret = Utils.getSharedSecret(privkey, pubkey)
+            val iv = ByteArray(16)
+            SecureRandom().nextBytes(iv)
+
+            val keySpec = SecretKeySpec(sharedSecret, "AES")
+            val ivSpec = IvParameterSpec(iv)
+
+            var utf8message = msg.toByteArray(Charset.forName("utf-8"))
+            val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
+            cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec)
+            val encryptedMsg = cipher.doFinal(utf8message)
+
+            val encryptedMsgBech32 = Bech32.encode("pzap", Bech32.eight2five(encryptedMsg), Bech32.Encoding.Bech32)
+            val ivBech32 = Bech32.encode("iv", Bech32.eight2five(iv), Bech32.Encoding.Bech32)
+
+            return encryptedMsgBech32 + "_" + ivBech32
+        }
+
+        fun decryptPrivateZapMessage(msg: String, privkey: ByteArray, pubkey: ByteArray): String {
+            var sharedSecret = Utils.getSharedSecret(privkey, pubkey)
+            if (sharedSecret.size != 16 && sharedSecret.size != 32) {
+                throw IllegalArgumentException("Invalid shared secret size")
+            }
+            val parts = msg.split("_")
+            if (parts.size != 2) {
+                throw IllegalArgumentException("Invalid message format")
+            }
+            val iv = parts[1].run { Bech32.decode(this).second }
+            val encryptedMsg = parts.first().run { Bech32.decode(this).second }
+            val encryptedBytes = Bech32.five2eight(encryptedMsg, 0)
+            val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
+            cipher.init(Cipher.DECRYPT_MODE, SecretKeySpec(sharedSecret, "AES"), IvParameterSpec(Bech32.five2eight(iv, 0)))
+
+            try {
+                val decryptedMsgBytes = cipher.doFinal(encryptedBytes)
+                return String(decryptedMsgBytes)
+            } catch (ex: BadPaddingException) {
+                throw IllegalArgumentException("Bad padding: ${ex.message}")
+            }
+        }
+
+        fun checkForPrivateZap(zapRequest: LnZapRequestEvent, loggedInUserPrivKey: ByteArray, pubKey: HexKey): Event? {
+            val anonTag = zapRequest.tags.firstOrNull { t -> t.size >= 2 && t[0] == "anon" }
+            if (anonTag != null) {
+                val encnote = anonTag[1]
+                if (encnote.isNotBlank()) {
+                    try {
+                        val note = decryptPrivateZapMessage(encnote, loggedInUserPrivKey, pubKey.toByteArray())
+                        val decryptedEvent = fromJson(note)
+                        if (decryptedEvent.kind == 9733) {
+                            return decryptedEvent
+                        }
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
+                }
+            }
+            return null
+        }
     }
 }
-
 /*
 {
   "pubkey": "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245",

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

@@ -20,24 +20,17 @@ class PollNoteEvent(
     content: String,
     sig: HexKey
 ) : BaseTextNoteEvent(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun pollOptions(): Map<Int, String> {
-        val map = mutableMapOf<Int, String>()
-        tags.filter { it.first() == POLL_OPTION }
-            .forEach { map[it[1].toInt()] = it[2] }
-        return map
-    }
+    fun pollOptions() =
+        tags.filter { it.size > 2 && it[0] == POLL_OPTION }
+            .associate { it[1].toInt() to it[2] }
 
     fun getTagInt(property: String): Int? {
-        val tagList = tags.filter {
-            it.firstOrNull() == property
-        }
-        val tag = tagList.getOrNull(0)
-        val s = tag?.getOrNull(1)
+        val number = tags.firstOrNull() { it.size > 1 && it[0] == property }?.get(1)
 
-        return if (s.isNullOrBlank() || s == "null") {
+        return if (number.isNullOrBlank() || number == "null") {
             null
         } else {
-            s.toInt()
+            number.toInt()
         }
     }
 
@@ -55,7 +48,8 @@ class PollNoteEvent(
             valueMaximum: Int?,
             valueMinimum: Int?,
             consensusThreshold: Int?,
-            closedAt: Int?
+            closedAt: Int?,
+            zapReceiver: String?
         ): PollNoteEvent {
             val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             val tags = mutableListOf<List<String>>()
@@ -75,6 +69,11 @@ class PollNoteEvent(
             tags.add(listOf(VALUE_MINIMUM, valueMinimum.toString()))
             tags.add(listOf(CONSENSUS_THRESHOLD, consensusThreshold.toString()))
             tags.add(listOf(CLOSED_AT, closedAt.toString()))
+
+            if (zapReceiver != null) {
+                tags.add(listOf("zap", zapReceiver))
+            }
+
             val id = generateId(pubKey, createdAt, kind, tags, msg)
             val sig = Utils.sign(id, privateKey)
             return PollNoteEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())

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

@@ -21,7 +21,7 @@ class PrivateDmEvent(
      * nip-04 EncryptedDmEvent but may omit the recipient, too. This value can be queried and used
      * for initial messages.
      */
-    fun recipientPubKey() = tags.firstOrNull { it.firstOrNull() == "p" }?.run { Hex.decode(this[1]).toHexKey() } // makes sure its a valid one
+    fun recipientPubKey() = tags.firstOrNull { it.size > 1 && it[0] == "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.
@@ -29,7 +29,7 @@ class PrivateDmEvent(
      * Nip-18 messages should refer to other events by inline references in the content like
      * `[](e/c06f795e1234a9a1aecc731d768d4f3ca73e80031734767067c82d67ce82e506).
      */
-    fun replyTo() = tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
+    fun replyTo() = tags.firstOrNull { it.size > 1 && it[0] == "e" }?.get(1)
 
     fun plainContent(privKey: ByteArray, pubKey: ByteArray): String? {
         return try {
@@ -58,6 +58,7 @@ class PrivateDmEvent(
             msg: String,
             replyTos: List<String>? = null,
             mentions: List<String>? = null,
+            zapReceiver: String?,
             privateKey: ByteArray,
             createdAt: Long = Date().time / 1000,
             publishedRecipientPubKey: ByteArray? = null,
@@ -79,6 +80,9 @@ class PrivateDmEvent(
             mentions?.forEach {
                 tags.add(listOf("p", it))
             }
+            zapReceiver?.let {
+                tags.add(listOf("zap", 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

@@ -14,8 +14,8 @@ class ReactionEvent(
     sig: HexKey
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
-    fun originalPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-    fun originalAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+    fun originalPost() = tags.filter { it.size > 1 && it[0] == "e" }.map { it[1] }
+    fun originalAuthor() = tags.filter { it.size > 1 && it[0] == "p" }.map { it[1] }
 
     companion object {
         const val kind = 7

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

@@ -0,0 +1,34 @@
+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 RelayAuthEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun relay() = tags.firstOrNull() { it.size > 1 && it[0] == "relay" }?.get(1)
+    fun challenge() = tags.firstOrNull() { it.size > 1 && it[0] == "challenge" }?.get(1)
+
+    companion object {
+        const val kind = 22242
+
+        fun create(relay: String, challenge: String, privateKey: ByteArray, createdAt: Long = Date().time / 1000): RelayAuthEvent {
+            val content = ""
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = listOf(
+                listOf("relay", relay),
+                listOf("challenge", challenge)
+            )
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return RelayAuthEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}

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

@@ -30,7 +30,7 @@ class ReportEvent(
     }
 
     fun reportedPost() = tags
-        .filter { it.firstOrNull() == "e" && it.getOrNull(1) != null }
+        .filter { it.size > 1 && it[0] == "e" }
         .map {
             ReportedKey(
                 it[1],
@@ -39,7 +39,7 @@ class ReportEvent(
         }
 
     fun reportedAuthor() = tags
-        .filter { it.firstOrNull() == "p" && it.getOrNull(1) != null }
+        .filter { it.size > 1 && it[0] == "p" }
         .map {
             ReportedKey(
                 it[1],

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

@@ -26,6 +26,7 @@ class TextNoteEvent(
             mentions: List<String>?,
             addresses: List<ATag>?,
             extraTags: List<String>?,
+            zapReceiver: String?,
             privateKey: ByteArray,
             createdAt: Long = Date().time / 1000
         ): TextNoteEvent {
@@ -46,9 +47,13 @@ class TextNoteEvent(
             extraTags?.forEach {
                 tags.add(listOf("t", it))
             }
+            zapReceiver?.let {
+                tags.add(listOf("zap", 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())

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

@@ -1,8 +1,11 @@
 package com.vitorpamplona.amethyst.service.nip19
 
 import android.util.Log
+import com.vitorpamplona.amethyst.model.toByteArray
 import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Bech32
 import nostr.postr.bechToBytes
+import nostr.postr.toByteArray
 import java.util.regex.Pattern
 
 object Nip19 {
@@ -12,7 +15,14 @@ object Nip19 {
 
     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 = "")
+    data class Return(
+        val type: Type,
+        val hex: String,
+        val relay: String? = null,
+        val author: String? = null,
+        val kind: Long? = null,
+        val additionalChars: String = ""
+    )
 
     fun uriToRoute(uri: String?): Return? {
         if (uri == null) return null
@@ -26,8 +36,23 @@ object Nip19 {
             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 additionalChars = matcher.group(4) // additional chars
 
+            return parseComponents(uriScheme, type, key, additionalChars)
+        } catch (e: Throwable) {
+            Log.e("NIP19 Parser", "Issue trying to Decode NIP19 $uri: ${e.message}", e)
+        }
+
+        return null
+    }
+
+    fun parseComponents(
+        uriScheme: String?,
+        type: String,
+        key: String?,
+        additionalChars: String?
+    ): Return? {
+        return try {
             val bytes = (type + key).bechToBytes()
             val parsed = when (type.lowercase()) {
                 "npub1" -> npub(bytes)
@@ -38,12 +63,11 @@ object Nip19 {
                 "naddr1" -> naddr(bytes)
                 else -> null
             }
-            return parsed?.copy(additionalChars = additionalChars)
+            parsed?.copy(additionalChars = additionalChars ?: "")
         } catch (e: Throwable) {
-            Log.e("NIP19 Parser", "Issue trying to Decode NIP19 $uri: ${e.message}", e)
+            Log.e("NIP19 Parser", "Issue trying to Decode NIP19 $key: ${e.message}", e)
+            null
         }
-
-        return null
     }
 
     private fun npub(bytes: ByteArray): Return {
@@ -79,7 +103,15 @@ object Nip19 {
             ?.get(0)
             ?.toString(Charsets.UTF_8)
 
-        return Return(Type.EVENT, hex, relay)
+        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) }?.toLong()
+
+        return Return(Type.EVENT, hex, relay, author, kind)
     }
 
     private fun nrelay(bytes: ByteArray): Return? {
@@ -108,8 +140,31 @@ object Nip19 {
 
         val kind = tlv.get(Tlv.Type.KIND.id)
             ?.get(0)
-            ?.let { Tlv.toInt32(it) }
+            ?.let { Tlv.toInt32(it) }?.toLong()
 
-        return Return(Type.ADDRESS, "$kind:$author:$d", relay)
+        return Return(Type.ADDRESS, "$kind:$author:$d", relay, author, kind)
+    }
+
+    public fun createNEvent(idHex: String, author: String?, kind: Int?, relay: String?): String {
+        val kind = kind?.toByteArray()
+        val author = author?.toByteArray()
+        val idHex = idHex.toByteArray()
+        val relay = relay?.toByteArray(Charsets.UTF_8)
+
+        var fullArray = byteArrayOf(Tlv.Type.SPECIAL.id, idHex.size.toByte()) + idHex
+
+        if (relay != null) {
+            fullArray = fullArray + byteArrayOf(Tlv.Type.RELAY.id, relay.size.toByte()) + relay
+        }
+
+        if (author != null) {
+            fullArray = fullArray + byteArrayOf(Tlv.Type.AUTHOR.id, author.size.toByte()) + author
+        }
+
+        if (kind != null) {
+            fullArray = fullArray + byteArrayOf(Tlv.Type.KIND.id, kind.size.toByte()) + kind
+        }
+
+        return Bech32.encodeBytes(hrp = "nevent", fullArray, Bech32.Encoding.Bech32)
     }
 }

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

@@ -5,6 +5,7 @@ import com.vitorpamplona.amethyst.service.model.EventInterface
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import java.util.UUID
 
@@ -64,21 +65,49 @@ object Client : RelayPool.Listener {
         RelayPool.sendFilterOnlyIfDisconnected()
     }
 
-    fun send(signedEvent: EventInterface, relay: String? = null) {
+    fun send(signedEvent: EventInterface, relay: String? = null, feedTypes: Set<FeedType>? = null, onDone: (() -> Unit)? = null) {
         if (relay == null) {
             RelayPool.send(signedEvent)
         } else {
-            val useConnectedRelay = relays.filter { it.url == relay }
+            val useConnectedRelayIfPresent = relays.filter { it.url == relay }
 
-            if (useConnectedRelay.isNotEmpty()) {
-                useConnectedRelay.forEach {
+            if (useConnectedRelayIfPresent.isNotEmpty()) {
+                useConnectedRelayIfPresent.forEach {
                     it.send(signedEvent)
                 }
             } else {
                 /** temporary connection */
-                Relay(relay, false, true, emptySet()).requestAndWatch() {
-                    it.send(signedEvent)
-                    it.disconnect()
+                newSporadicRelay(
+                    relay,
+                    feedTypes,
+                    onConnected = { relay ->
+                        relay.send(signedEvent)
+                    },
+                    onDone = onDone
+                )
+            }
+        }
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    fun newSporadicRelay(url: String, feedTypes: Set<FeedType>?, onConnected: (Relay) -> Unit, onDone: (() -> Unit)?) {
+        val relay = Relay(url, true, true, feedTypes ?: emptySet())
+        RelayPool.addRelay(relay)
+
+        relay.requestAndWatch {
+            allSubscriptions().forEach {
+                relay.sendFilter(requestId = it)
+            }
+
+            onConnected(relay)
+
+            GlobalScope.launch(Dispatchers.IO) {
+                delay(10000) // waits for a reply
+                relay.disconnect()
+                RelayPool.removeRelay(relay)
+
+                if (onDone != null) {
+                    onDone()
                 }
             }
         }
@@ -131,6 +160,14 @@ object Client : RelayPool.Listener {
         }
     }
 
+    override fun onAuth(relay: Relay, challenge: String) {
+        // Releases the Web thread for the new payload.
+        // May need to add a processing queue if processing new events become too costly.
+        GlobalScope.launch(Dispatchers.Default) {
+            listeners.forEach { it.onAuth(relay, challenge) }
+        }
+    }
+
     fun subscribe(listener: Listener) {
         listeners = listeners.plus(listener)
     }
@@ -167,5 +204,7 @@ object Client : RelayPool.Listener {
          * When an relay saves or rejects a new event.
          */
         open fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) = Unit
+
+        open fun onAuth(relay: Relay, challenge: String) = Unit
     }
 }

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

@@ -5,6 +5,7 @@ import com.google.gson.JsonElement
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.service.model.Event
 import com.vitorpamplona.amethyst.service.model.EventInterface
+import com.vitorpamplona.amethyst.service.model.RelayAuthEvent
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -13,9 +14,11 @@ import okhttp3.WebSocketListener
 import java.util.Date
 
 enum class FeedType {
-    FOLLOWS, PUBLIC_CHATS, PRIVATE_DMS, GLOBAL, SEARCH
+    FOLLOWS, PUBLIC_CHATS, PRIVATE_DMS, GLOBAL, SEARCH, WALLET_CONNECT
 }
 
+val COMMON_FEED_TYPES = setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.PRIVATE_DMS, FeedType.GLOBAL)
+
 class Relay(
     var url: String,
     var read: Boolean = true,
@@ -95,9 +98,11 @@ class Relay(
 
                         when (type) {
                             "EVENT" -> {
+                                val event = Event.fromJson(msg[2], Client.lenient)
+
                                 // Log.w("Relay", "Relay onEVENT $url, $channel")
                                 listeners.forEach {
-                                    it.onEvent(this@Relay, channel, Event.fromJson(msg[2], Client.lenient))
+                                    it.onEvent(this@Relay, channel, event)
                                     if (afterEOSE) {
                                         it.onRelayStateChange(this@Relay, Type.EOSE, channel)
                                     }
@@ -109,13 +114,17 @@ class Relay(
                                 it.onRelayStateChange(this@Relay, Type.EOSE, channel)
                             }
                             "NOTICE" -> listeners.forEach {
-                                // Log.w("Relay", "Relay onNotice $url, $channel")
+                                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")
+                                Log.w("Relay", "Relay on OK $url, ${msg[1].asString}, ${msg[2].asBoolean}, ${msg[3].asString}")
                                 it.onSendResponse(this@Relay, msg[1].asString, msg[2].asBoolean, msg[3].asString)
                             }
+                            "AUTH" -> listeners.forEach {
+                                // Log.w("Relay", "Relay$url, ${msg[1].asString}")
+                                it.onAuth(this@Relay, msg[1].asString)
+                            }
                             else -> listeners.forEach {
                                 // Log.w("Relay", "Relay something else $url, $channel")
                                 it.onError(
@@ -196,7 +205,7 @@ class Relay(
                     val filters = Client.getSubscriptionFilters(requestId).filter { activeTypes.intersect(it.types).isNotEmpty() }
                     if (filters.isNotEmpty()) {
                         val request =
-                            """["REQ","$requestId",${filters.take(40).joinToString(",") { it.filter.toJson(url) }}]"""
+                            """["REQ","$requestId",${filters.take(10).joinToString(",") { it.filter.toJson(url) }}]"""
                         // println("FILTERSSENT $url $request")
                         socket?.send(request)
                         eventUploadCounterInBytes += request.bytesUsedInMemory()
@@ -224,11 +233,19 @@ class Relay(
     }
 
     fun send(signedEvent: EventInterface) {
-        if (write) {
-            val event = """["EVENT",${signedEvent.toJson()}]"""
+        if (signedEvent is RelayAuthEvent) {
+            val event = """["AUTH",${signedEvent.toJson()}]"""
             socket?.send(event)
             eventUploadCounterInBytes += event.bytesUsedInMemory()
         }
+
+        if (write) {
+            if (signedEvent !is RelayAuthEvent) {
+                val event = """["EVENT",${signedEvent.toJson()}]"""
+                socket?.send(event)
+                eventUploadCounterInBytes += event.bytesUsedInMemory()
+            }
+        }
     }
 
     fun close(subscriptionId: String) {
@@ -266,6 +283,8 @@ class Relay(
 
         fun onSendResponse(relay: Relay, eventId: String, success: Boolean, message: String)
 
+        fun onAuth(relay: Relay, challenge: String)
+
         /**
          * Connected to or disconnected from a relay
          *

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

@@ -93,6 +93,8 @@ object RelayPool : Relay.Listener {
         fun onRelayStateChange(type: Relay.Type, relay: Relay, channel: String?)
 
         fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay)
+
+        fun onAuth(relay: Relay, challenge: String)
     }
 
     override fun onEvent(relay: Relay, subscriptionId: String, event: Event) {
@@ -113,6 +115,10 @@ object RelayPool : Relay.Listener {
         listeners.forEach { it.onSendResponse(eventId, success, message, relay) }
     }
 
+    override fun onAuth(relay: Relay, challenge: String) {
+        listeners.forEach { it.onAuth(relay, challenge) }
+    }
+
     // Observers line up here.
     val live: RelayPoolLiveData = RelayPoolLiveData(this)
 

app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt

@@ -19,8 +19,10 @@ import coil.decode.ImageDecoderDecoder
 import coil.decode.SvgDecoder
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
+import com.vitorpamplona.amethyst.VideoCache
 import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.Client
+import com.vitorpamplona.amethyst.ui.components.muted
 import com.vitorpamplona.amethyst.ui.navigation.Route
 import com.vitorpamplona.amethyst.ui.note.Nip47
 import com.vitorpamplona.amethyst.ui.screen.AccountScreen
@@ -54,6 +56,9 @@ class MainActivity : FragmentActivity() {
             null
         }
 
+        // Initializes video cache.
+        VideoCache.init(this.applicationContext)
+
         Coil.setImageLoader {
             ImageLoader.Builder(this).components {
                 if (SDK_INT >= 28) {
@@ -88,6 +93,8 @@ class MainActivity : FragmentActivity() {
     @OptIn(DelicateCoroutinesApi::class)
     override fun onResume() {
         super.onResume()
+        // starts muted every time
+        muted.value = true
 
         // Only starts after login
         GlobalScope.launch(Dispatchers.IO) {

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageSaver.kt

@@ -7,13 +7,17 @@ import android.media.MediaScannerConnection
 import android.os.Build
 import android.os.Environment
 import android.provider.MediaStore
+import android.webkit.MimeTypeMap
 import androidx.annotation.RequiresApi
 import com.vitorpamplona.amethyst.BuildConfig
 import okhttp3.*
 import okio.BufferedSource
 import okio.IOException
+import okio.buffer
 import okio.sink
+import okio.source
 import java.io.File
+import java.util.UUID
 
 object ImageSaver {
     /**
@@ -74,6 +78,38 @@ object ImageSaver {
         })
     }
 
+    fun saveImage(
+        localFile: File,
+        mimeType: String?,
+        context: Context,
+        onSuccess: () -> Any?,
+        onError: (Throwable) -> Any?
+    ) {
+        try {
+            val extension = mimeType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
+            val buffer = localFile.inputStream().source().buffer()
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                saveContentQ(
+                    displayName = UUID.randomUUID().toString(),
+                    contentType = mimeType ?: "",
+                    contentSource = buffer,
+                    contentResolver = context.contentResolver
+                )
+            } else {
+                saveContentDefault(
+                    fileName = UUID.randomUUID().toString() + ".$extension",
+                    contentSource = buffer,
+                    context = context
+                )
+            }
+            onSuccess()
+        } catch (e: Exception) {
+            e.printStackTrace()
+            onError(e)
+        }
+    }
+
     @RequiresApi(Build.VERSION_CODES.Q)
     private fun saveContentQ(
         displayName: String,

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.actions
 
 import android.content.ContentResolver
 import android.net.Uri
+import android.webkit.MimeTypeMap
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
 import okhttp3.*
@@ -9,19 +10,49 @@ import okhttp3.MediaType.Companion.toMediaType
 import okio.BufferedSink
 import okio.source
 import java.io.IOException
-import java.util.*
+import java.io.InputStream
+
+val charPool: List<Char> = ('a'..'z') + ('A'..'Z') + ('0'..'9')
+
+fun randomChars() = List(16) { charPool.random() }.joinToString("")
 
 object ImageUploader {
+
     fun uploadImage(
         uri: Uri,
+        server: ServersAvailable,
         contentResolver: ContentResolver,
-        onSuccess: (String) -> Unit,
+        onSuccess: (String, String?) -> Unit,
         onError: (Throwable) -> Unit
     ) {
         val contentType = contentResolver.getType(uri)
-        val category = contentType?.toMediaType()?.toString()?.split("/")?.get(0) ?: "image"
+        val imageInputStream = contentResolver.openInputStream(uri)
 
-        val url = if (category == "image") "https://api.imgur.com/3/image" else "https://api.imgur.com/3/upload"
+        checkNotNull(imageInputStream) {
+            "Can't open the image input stream"
+        }
+
+        val myServer = if (server == ServersAvailable.IMGUR) {
+            ImgurServer()
+        } else if (server == ServersAvailable.NOSTRIMG) {
+            NostrImgServer()
+        } else {
+            ImgurServer()
+        }
+
+        uploadImage(imageInputStream, contentType, myServer, onSuccess, onError)
+    }
+
+    fun uploadImage(
+        inputStream: InputStream,
+        contentType: String?,
+        server: FileServer,
+        onSuccess: (String, String?) -> Unit,
+        onError: (Throwable) -> Unit
+    ) {
+        val category = contentType?.toMediaType()?.toString()?.split("/")?.get(0) ?: "image"
+        val fileName = randomChars()
+        val extension = contentType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
 
         val client = OkHttpClient.Builder().build()
 
@@ -29,42 +60,42 @@ object ImageUploader {
             .setType(MultipartBody.FORM)
             .addFormDataPart(
                 category,
-                "${UUID.randomUUID()}",
+                "$fileName.$extension",
                 object : RequestBody() {
                     override fun contentType(): MediaType? =
                         contentType?.toMediaType()
 
                     override fun writeTo(sink: BufferedSink) {
-                        val imageInputStream = contentResolver.openInputStream(uri)
-                        checkNotNull(imageInputStream) {
-                            "Can't open the image input stream"
-                        }
-
-                        imageInputStream.source().use(sink::writeAll)
+                        inputStream.source().use(sink::writeAll)
                     }
                 }
             )
             .build()
 
-        val request: Request = Request.Builder()
-            .header("Authorization", "Client-ID e6aea87296f3f96")
+        val requestBuilder = Request.Builder()
+
+        server.clientID()?.let {
+            requestBuilder.header("Authorization", it)
+        }
+
+        requestBuilder
             .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-            .url(url)
+            .url(server.postUrl(contentType))
             .post(requestBody)
-            .build()
+
+        val request = requestBuilder.build()
 
         client.newCall(request).enqueue(object : Callback {
             override fun onResponse(call: Call, response: Response) {
                 try {
                     check(response.isSuccessful)
                     response.body.use { body ->
-                        val tree = jacksonObjectMapper().readTree(body.string())
-                        val url = tree?.get("data")?.get("link")?.asText()
+                        val url = server.parseUrlFromSucess(body.string())
                         checkNotNull(url) {
                             "There must be an uploaded image URL in the response"
                         }
 
-                        onSuccess(url)
+                        onSuccess(url, contentType)
                     }
                 } catch (e: Exception) {
                     e.printStackTrace()
@@ -79,3 +110,49 @@ object ImageUploader {
         })
     }
 }
+
+abstract class FileServer {
+    abstract fun postUrl(contentType: String?): String
+    abstract fun parseUrlFromSucess(body: String): String?
+
+    open fun clientID(): String? = null
+}
+
+class NostrImgServer : FileServer() {
+    override fun postUrl(contentType: String?) = "https://nostrimg.com/api/upload"
+
+    override fun parseUrlFromSucess(body: String): String? {
+        val tree = jacksonObjectMapper().readTree(body)
+        val url = tree?.get("data")?.get("link")?.asText()
+        return url
+    }
+
+    override fun clientID() = null
+}
+
+class ImgurServer : FileServer() {
+    override fun postUrl(contentType: String?): String {
+        val category = contentType?.toMediaType()?.toString()?.split("/")?.get(0) ?: "image"
+        return if (category == "image") "https://api.imgur.com/3/image" else "https://api.imgur.com/3/upload"
+    }
+
+    override fun parseUrlFromSucess(body: String): String? {
+        val tree = jacksonObjectMapper().readTree(body)
+        val url = tree?.get("data")?.get("link")?.asText()
+        return url
+    }
+
+    override fun clientID() = "Client-ID e6aea87296f3f96"
+}
+
+class NostrBuildServer : FileServer() {
+    override fun postUrl(contentType: String?) = "https://nostr.build/api/upload/amethyst.php"
+
+    override fun parseUrlFromSucess(body: String): String? {
+        val tree = jacksonObjectMapper().readTree(body)
+        val url = tree?.get("data")?.get("link")?.asText()
+        return url
+    }
+
+    override fun clientID() = null
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt

@@ -0,0 +1,210 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import android.content.Context
+import android.net.Uri
+import android.util.Log
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.vitorpamplona.amethyst.model.*
+import com.vitorpamplona.amethyst.service.FileHeader
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.launch
+import java.net.URL
+
+open class NewMediaModel : ViewModel() {
+    var account: Account? = null
+
+    var isUploadingImage by mutableStateOf(false)
+    val imageUploadingError = MutableSharedFlow<String?>()
+    var mediaType by mutableStateOf<String?>(null)
+
+    var selectedServer by mutableStateOf<ServersAvailable?>(null)
+    var description by mutableStateOf("")
+
+    // Images and Videos
+    var galleryUri by mutableStateOf<Uri?>(null)
+
+    var uploadingPercentage = mutableStateOf(0.0f)
+    var uploadingDescription = mutableStateOf<String?>(null)
+
+    var onceUploaded: () -> Unit = {}
+
+    open fun load(account: Account, uri: Uri, contentType: String?) {
+        this.account = account
+        this.galleryUri = uri
+        this.mediaType = contentType
+        this.selectedServer = defaultServer()
+
+        if (selectedServer == ServersAvailable.IMGUR) {
+            selectedServer = ServersAvailable.IMGUR_NIP_94
+        } else if (selectedServer == ServersAvailable.NOSTRIMG) {
+            selectedServer = ServersAvailable.NOSTRIMG_NIP_94
+        }
+    }
+
+    fun upload(context: Context) {
+        isUploadingImage = true
+
+        val contentResolver = context.contentResolver
+        val uri = galleryUri ?: return
+        val serverToUse = selectedServer ?: return
+
+        if (selectedServer == ServersAvailable.NIP95) {
+            uploadingPercentage.value = 0.1f
+            uploadingDescription.value = "Loading"
+            val contentType = contentResolver.getType(uri)
+            contentResolver.openInputStream(uri)?.use {
+                createNIP95Record(it.readBytes(), contentType, description)
+            }
+                ?: viewModelScope.launch {
+                    imageUploadingError.emit("Failed to upload the image / video")
+                    isUploadingImage = false
+                    uploadingPercentage.value = 0.00f
+                    uploadingDescription.value = null
+                }
+        } else {
+            uploadingPercentage.value = 0.1f
+            uploadingDescription.value = "Uploading"
+            ImageUploader.uploadImage(
+                uri = uri,
+                server = serverToUse,
+                contentResolver = contentResolver,
+                onSuccess = { imageUrl, mimeType ->
+                    createNIP94Record(imageUrl, mimeType, description)
+                },
+                onError = {
+                    isUploadingImage = false
+                    uploadingPercentage.value = 0.00f
+                    uploadingDescription.value = null
+                    viewModelScope.launch {
+                        imageUploadingError.emit("Failed to upload the image / video")
+                    }
+                }
+            )
+        }
+    }
+
+    open fun cancel() {
+        galleryUri = null
+        isUploadingImage = false
+        mediaType = null
+        uploadingDescription.value = null
+        uploadingPercentage.value = 0.0f
+
+        description = ""
+        selectedServer = account?.defaultFileServer
+    }
+
+    fun canPost(): Boolean {
+        return !isUploadingImage && galleryUri != null && selectedServer != null
+    }
+
+    fun createNIP94Record(imageUrl: String, mimeType: String?, description: String) {
+        uploadingPercentage.value = 0.40f
+        viewModelScope.launch(Dispatchers.IO) {
+            uploadingDescription.value = "Server Processing"
+            // Images don't seem to be ready immediately after upload
+
+            if (mimeType?.startsWith("image/") == true) {
+                delay(2000)
+            } else {
+                delay(15000)
+            }
+
+            uploadingDescription.value = "Downloading"
+            uploadingPercentage.value = 0.60f
+
+            try {
+                val imageData = URL(imageUrl).readBytes()
+
+                uploadingPercentage.value = 0.80f
+                uploadingDescription.value = "Hashing"
+
+                FileHeader.prepare(
+                    imageData,
+                    imageUrl,
+                    mimeType,
+                    description,
+                    onReady = {
+                        uploadingPercentage.value = 0.90f
+                        uploadingDescription.value = "Sending"
+                        val note = account?.sendHeader(it)
+                        uploadingPercentage.value = 1.00f
+                        isUploadingImage = false
+                        onceUploaded()
+                        cancel()
+                    },
+                    onError = {
+                        cancel()
+                        uploadingPercentage.value = 0.00f
+                        uploadingDescription.value = null
+                        isUploadingImage = false
+                        viewModelScope.launch {
+                            imageUploadingError.emit("Failed to upload the image / video")
+                        }
+                    }
+                )
+            } catch (e: Exception) {
+                Log.e("ImageDownload", "Couldn't download image from server: ${e.message}")
+                cancel()
+                uploadingPercentage.value = 0.00f
+                uploadingDescription.value = null
+                isUploadingImage = false
+                viewModelScope.launch {
+                    imageUploadingError.emit("Failed to upload the image / video")
+                }
+            }
+        }
+    }
+
+    fun createNIP95Record(bytes: ByteArray, mimeType: String?, description: String) {
+        uploadingPercentage.value = 0.20f
+        uploadingDescription.value = "Hashing"
+
+        viewModelScope.launch(Dispatchers.IO) {
+            FileHeader.prepare(
+                bytes,
+                "",
+                mimeType,
+                description,
+                onReady = {
+                    uploadingDescription.value = "Signing"
+                    uploadingPercentage.value = 0.30f
+                    val nip95 = account?.createNip95(bytes, headerInfo = it)
+
+                    if (nip95 != null) {
+                        uploadingDescription.value = "Sending"
+                        uploadingPercentage.value = 0.60f
+                        account?.sendNip95(nip95.first, nip95.second)
+                    }
+
+                    uploadingPercentage.value = 1.00f
+                    isUploadingImage = false
+                    onceUploaded()
+                    cancel()
+                },
+                onError = {
+                    uploadingDescription.value = null
+                    uploadingPercentage.value = 0.00f
+                    isUploadingImage = false
+                    cancel()
+                    viewModelScope.launch {
+                        imageUploadingError.emit("Failed to upload the image / video")
+                    }
+                }
+            )
+        }
+    }
+
+    fun isImage() = mediaType?.startsWith("image")
+    fun isVideo() = mediaType?.startsWith("video")
+    fun defaultServer() = account?.defaultFileServer
+    fun onceUploaded(onceUploaded: () -> Unit) {
+        this.onceUploaded = onceUploaded
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt

@@ -0,0 +1,222 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import android.graphics.Bitmap
+import android.net.Uri
+import android.os.Build
+import android.util.Size
+import android.widget.Toast
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.navigation.NavController
+import coil.compose.AsyncImage
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.components.*
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+@Composable
+fun NewMediaView(uri: Uri, onClose: () -> Unit, postViewModel: NewMediaModel, accountViewModel: AccountViewModel, navController: NavController) {
+    val account = accountViewModel.accountLiveData.value?.account ?: return
+    val resolver = LocalContext.current.contentResolver
+    val context = LocalContext.current
+
+    val scroolState = rememberScrollState()
+
+    val mediaType = resolver.getType(uri) ?: ""
+    postViewModel.load(account, uri, mediaType)
+
+    LaunchedEffect(Unit) {
+        postViewModel.imageUploadingError.collect { error ->
+            Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
+        }
+    }
+
+    Dialog(
+        onDismissRequest = { onClose() },
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            dismissOnClickOutside = false,
+            decorFitsSystemWindows = false
+        )
+    ) {
+        Surface(
+            modifier = Modifier
+                .fillMaxWidth()
+        ) {
+            Column(
+                modifier = Modifier.padding(start = 10.dp, end = 10.dp, top = 10.dp)
+                    .fillMaxWidth()
+                    .fillMaxHeight().imePadding()
+            ) {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    CloseButton(onCancel = {
+                        postViewModel.cancel()
+                        onClose()
+                    })
+
+                    PostButton(
+                        onPost = {
+                            onClose()
+                            postViewModel.upload(context)
+                            postViewModel.selectedServer?.let { account.changeDefaultFileServer(it) }
+                        },
+                        isActive = postViewModel.canPost()
+                    )
+                }
+
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .weight(1f)
+                ) {
+                    Column(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .verticalScroll(scroolState)
+                    ) {
+                        ImageVideoPost(postViewModel)
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun ImageVideoPost(postViewModel: NewMediaModel) {
+    val scope = rememberCoroutineScope()
+
+    val fileServers = listOf(
+        Triple(ServersAvailable.IMGUR_NIP_94, stringResource(id = R.string.upload_server_imgur_nip94), stringResource(id = R.string.upload_server_imgur_nip94_explainer)),
+        Triple(ServersAvailable.NOSTRIMG_NIP_94, stringResource(id = R.string.upload_server_nostrimg_nip94), stringResource(id = R.string.upload_server_nostrimg_nip94_explainer)),
+        Triple(ServersAvailable.NIP95, stringResource(id = R.string.upload_server_relays_nip95), stringResource(id = R.string.upload_server_relays_nip95_explainer))
+    )
+
+    val fileServerOptions = fileServers.map { it.second }
+    val fileServerExplainers = fileServers.map { it.third }
+    val resolver = LocalContext.current.contentResolver
+
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(bottom = 10.dp)
+            .windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp))
+    ) {
+        if (postViewModel.isImage() == true) {
+            AsyncImage(
+                model = postViewModel.galleryUri.toString(),
+                contentDescription = postViewModel.galleryUri.toString(),
+                contentScale = ContentScale.FillWidth,
+                modifier = Modifier
+                    .padding(top = 4.dp)
+                    .fillMaxWidth()
+                    .windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp))
+            )
+        } else if (postViewModel.isVideo() == true && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            var bitmap by remember { mutableStateOf<Bitmap?>(null) }
+
+            LaunchedEffect(key1 = postViewModel.galleryUri) {
+                scope.launch(Dispatchers.IO) {
+                    postViewModel.galleryUri?.let {
+                        try {
+                            bitmap = resolver.loadThumbnail(it, Size(1200, 1000), null)
+                        } catch (e: Exception) {
+                            postViewModel.imageUploadingError.emit("Unable to load file")
+                        }
+                    }
+                }
+            }
+
+            bitmap?.let {
+                Image(
+                    bitmap = it.asImageBitmap(),
+                    contentDescription = "some useful description",
+                    contentScale = ContentScale.FillWidth,
+                    modifier = Modifier
+                        .padding(top = 4.dp)
+                        .fillMaxWidth()
+                )
+            }
+        } else {
+            postViewModel.galleryUri?.let {
+                VideoView(it)
+            }
+        }
+    }
+
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        TextSpinner(
+            label = stringResource(id = R.string.file_server),
+            placeholder = fileServers.firstOrNull { it.first == postViewModel.selectedServer }?.second ?: fileServers[0].second,
+            options = fileServerOptions,
+            explainers = fileServerExplainers,
+            onSelect = {
+                postViewModel.selectedServer = fileServers[it].first
+            },
+            modifier = Modifier
+                .windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp))
+                .weight(1f)
+        )
+    }
+
+    if (postViewModel.selectedServer == ServersAvailable.NOSTRIMG_NIP_94 ||
+        postViewModel.selectedServer == ServersAvailable.IMGUR_NIP_94 ||
+        postViewModel.selectedServer == ServersAvailable.NIP95
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier
+                .fillMaxWidth()
+                .windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp))
+        ) {
+            OutlinedTextField(
+                label = { Text(text = stringResource(R.string.content_description)) },
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)),
+                value = postViewModel.description,
+                onValueChange = { postViewModel.description = it },
+                placeholder = {
+                    Text(
+                        text = stringResource(R.string.content_description_example),
+                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                    )
+                },
+                keyboardOptions = KeyboardOptions.Default.copy(
+                    capitalization = KeyboardCapitalization.Sentences
+                )
+            )
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMessageTagger.kt

@@ -9,21 +9,21 @@ import com.vitorpamplona.amethyst.service.nip19.Nip19
 
 class NewMessageTagger(var channel: Channel?, var mentions: List<User>?, var replyTos: List<Note>?, var message: String) {
 
-    open fun addUserToMentions(user: User) {
+    fun addUserToMentions(user: User) {
         mentions = if (mentions?.contains(user) == true) mentions else mentions?.plus(user) ?: listOf(user)
     }
 
-    open fun addNoteToReplyTos(note: Note) {
+    fun addNoteToReplyTos(note: Note) {
         note.author?.let { addUserToMentions(it) }
         replyTos = if (replyTos?.contains(note) == true) replyTos else replyTos?.plus(note) ?: listOf(note)
     }
 
-    open fun tagIndex(user: User): Int {
+    fun tagIndex(user: User): Int {
         // Postr Events assembles replies before mentions in the tag order
         return (if (channel != null) 1 else 0) + (replyTos?.size ?: 0) + (mentions?.indexOf(user) ?: 0)
     }
 
-    open fun tagIndex(note: Note): Int {
+    fun tagIndex(note: Note): Int {
         // Postr Events assembles replies before mentions in the tag order
         return (if (channel != null) 1 else 0) + (replyTos?.indexOf(note) ?: 0)
     }
@@ -56,19 +56,19 @@ class NewMessageTagger(var channel: Channel?, var mentions: List<User>?, var rep
                 if (results?.key?.type == Nip19.Type.USER) {
                     val user = LocalCache.getOrCreateUser(results.key.hex)
 
-                    "#[${tagIndex(user)}]${results.restOfWord}"
+                    "nostr:${user.pubkeyNpub()}${results.restOfWord}"
                 } else if (results?.key?.type == Nip19.Type.NOTE) {
                     val note = LocalCache.getOrCreateNote(results.key.hex)
 
-                    "#[${tagIndex(note)}]${results.restOfWord}"
+                    "nostr:${note.toNEvent()}${results.restOfWord}"
                 } else if (results?.key?.type == Nip19.Type.EVENT) {
                     val note = LocalCache.getOrCreateNote(results.key.hex)
 
-                    "#[${tagIndex(note)}]${results.restOfWord}"
+                    "nostr:${note.toNEvent()}${results.restOfWord}"
                 } else if (results?.key?.type == Nip19.Type.ADDRESS) {
                     val note = LocalCache.checkGetOrCreateAddressableNote(results.key.hex)
                     if (note != null) {
-                        "#[${tagIndex(note)}]${results.restOfWord}"
+                        "nostr:${note.idNote()}${results.restOfWord}"
                     } else {
                         word
                     }

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollOption.kt

@@ -7,7 +7,6 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.tooling.preview.Preview
@@ -15,15 +14,6 @@ import com.vitorpamplona.amethyst.R
 
 @Composable
 fun NewPollOption(pollViewModel: NewPostViewModel, optionIndex: Int) {
-    val colorInValid = TextFieldDefaults.outlinedTextFieldColors(
-        focusedBorderColor = MaterialTheme.colors.error,
-        unfocusedBorderColor = Color.Red
-    )
-    val colorValid = TextFieldDefaults.outlinedTextFieldColors(
-        focusedBorderColor = MaterialTheme.colors.primary,
-        unfocusedBorderColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-    )
-
     Row {
         val deleteIcon: @Composable (() -> Unit) = {
             IconButton(

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollView.kt

@@ -116,7 +116,7 @@ fun NewPollView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                             Text(stringResource(R.string.poll_heading_required))
                             // NewPollRecipientsField(pollViewModel, account)
                             NewPollPrimaryDescription(pollViewModel)
-                            pollViewModel.pollOptions.values.forEachIndexed { index, element ->
+                            pollViewModel.pollOptions.values.forEachIndexed { index, _ ->
                                 NewPollOption(pollViewModel, index)
                             }
                             Button(
@@ -150,7 +150,7 @@ fun NewPollView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                             itemsIndexed(
                                 userSuggestions,
                                 key = { _, item -> item.pubkeyHex }
-                            ) { index, item ->
+                            ) { _, item ->
                                 UserLine(item, account) {
                                     pollViewModel.autocompleteWithUser(item)
                                 }

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt

@@ -1,5 +1,9 @@
 package com.vitorpamplona.amethyst.ui.actions
 
+import android.graphics.Bitmap
+import android.net.Uri
+import android.os.Build
+import android.util.Size
 import android.widget.Toast
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
@@ -13,10 +17,19 @@ import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.MonetizationOn
+import androidx.compose.material.icons.filled.ArrowForwardIos
+import androidx.compose.material.icons.filled.Bolt
+import androidx.compose.material.icons.filled.Cancel
+import androidx.compose.material.icons.filled.CurrencyBitcoin
+import androidx.compose.material.icons.outlined.ArrowForwardIos
+import androidx.compose.material.icons.outlined.Bolt
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
@@ -25,18 +38,22 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
@@ -44,12 +61,17 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.ui.components.*
 import com.vitorpamplona.amethyst.ui.note.ReplyInformation
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.UserLine
+import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
-fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = null, account: Account) {
+fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = null, account: Account, accountViewModel: AccountViewModel, navController: NavController) {
     val postViewModel: NewPostViewModel = viewModel()
 
     val context = LocalContext.current
@@ -166,7 +188,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                             )
 
                             if (postViewModel.wantsPoll) {
-                                postViewModel.pollOptions.values.forEachIndexed { index, element ->
+                                postViewModel.pollOptions.values.forEachIndexed { index, _ ->
                                     NewPollOption(postViewModel, index)
                                 }
 
@@ -185,10 +207,27 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                 }
                             }
 
+                            val url = postViewModel.contentToAddUrl
+                            if (url != null) {
+                                Row(verticalAlignment = Alignment.CenterVertically) {
+                                    ImageVideoDescription(
+                                        url,
+                                        account.defaultFileServer,
+                                        onAdd = { description, server ->
+                                            postViewModel.upload(url, description, server, context)
+                                            account.changeDefaultFileServer(server)
+                                        },
+                                        onCancel = {
+                                            postViewModel.contentToAddUrl = null
+                                        }
+                                    )
+                                }
+                            }
+
                             val user = postViewModel.account?.userProfile()
                             val lud16 = user?.info?.lnAddress()
 
-                            if (lud16 != null && user != null && postViewModel.wantsInvoice) {
+                            if (lud16 != null && postViewModel.wantsInvoice) {
                                 Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = 5.dp)) {
                                     InvoiceRequest(
                                         lud16,
@@ -233,6 +272,14 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                         } else {
                                             UrlPreview(myUrlPreview, myUrlPreview)
                                         }
+                                    } else if (isBechLink(myUrlPreview)) {
+                                        BechLink(
+                                            myUrlPreview,
+                                            true,
+                                            MaterialTheme.colors.background,
+                                            accountViewModel,
+                                            navController
+                                        )
                                     } else if (noProtocolUrlValidator.matcher(myUrlPreview).matches()) {
                                         UrlPreview("https://$myUrlPreview", myUrlPreview)
                                     }
@@ -260,26 +307,37 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                         }
                     }
 
-                    Row(modifier = Modifier.fillMaxWidth()) {
+                    Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(50.dp),
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
                         UploadFromGallery(
                             isUploading = postViewModel.isUploadingImage,
                             tint = MaterialTheme.colors.onBackground,
-                            modifier = Modifier.padding(bottom = 10.dp)
+                            modifier = Modifier
                         ) {
-                            postViewModel.upload(it, context)
+                            postViewModel.selectImage(it)
                         }
 
-                        if (postViewModel.canUsePoll()) {
+                        if (postViewModel.canUsePoll) {
+                            val hashtag = stringResource(R.string.poll_hashtag)
                             AddPollButton(postViewModel.wantsPoll) {
                                 postViewModel.wantsPoll = !postViewModel.wantsPoll
+                                postViewModel.includePollHashtagInMessage(postViewModel.wantsPoll, hashtag)
                             }
                         }
 
-                        if (postViewModel.canAddLnInvoice()) {
+                        if (postViewModel.canAddInvoice) {
                             AddLnInvoiceButton(postViewModel.wantsInvoice) {
                                 postViewModel.wantsInvoice = !postViewModel.wantsInvoice
                             }
                         }
+
+                        ForwardZapTo(postViewModel) {
+                            postViewModel.wantsForwardZapTo = !postViewModel.wantsForwardZapTo
+                        }
                     }
                 }
             }
@@ -327,22 +385,103 @@ private fun AddLnInvoiceButton(
     ) {
         if (!isLnInvoiceActive) {
             Icon(
-                imageVector = Icons.Default.MonetizationOn,
+                imageVector = Icons.Default.CurrencyBitcoin,
                 null,
                 modifier = Modifier.size(20.dp),
                 tint = MaterialTheme.colors.onBackground
             )
         } else {
             Icon(
-                imageVector = Icons.Default.MonetizationOn,
+                imageVector = Icons.Default.CurrencyBitcoin,
                 null,
                 modifier = Modifier.size(20.dp),
-                tint = Color.Green.copy(alpha = 0.52f)
+                tint = BitcoinOrange
             )
         }
     }
 }
 
+@Composable
+private fun ForwardZapTo(
+    postViewModel: NewPostViewModel,
+    onClick: () -> Unit
+) {
+    IconButton(
+        onClick = {
+            onClick()
+        }
+    ) {
+        Box(
+            Modifier
+                .height(20.dp)
+                .width(25.dp)
+        ) {
+            if (!postViewModel.wantsForwardZapTo) {
+                Icon(
+                    imageVector = Icons.Default.Bolt,
+                    contentDescription = stringResource(R.string.zaps),
+                    modifier = Modifier
+                        .size(20.dp)
+                        .align(Alignment.CenterStart),
+                    tint = MaterialTheme.colors.onBackground
+                )
+                Icon(
+                    imageVector = Icons.Default.ArrowForwardIos,
+                    contentDescription = stringResource(R.string.zaps),
+                    modifier = Modifier
+                        .size(13.dp)
+                        .align(Alignment.CenterEnd),
+                    tint = MaterialTheme.colors.onBackground
+                )
+            } else {
+                Icon(
+                    imageVector = Icons.Outlined.Bolt,
+                    contentDescription = stringResource(id = R.string.zaps),
+                    modifier = Modifier
+                        .size(20.dp)
+                        .align(Alignment.CenterStart),
+                    tint = BitcoinOrange
+                )
+                Icon(
+                    imageVector = Icons.Outlined.ArrowForwardIos,
+                    contentDescription = stringResource(id = R.string.zaps),
+                    modifier = Modifier
+                        .size(13.dp)
+                        .align(Alignment.CenterEnd),
+                    tint = BitcoinOrange
+                )
+            }
+        }
+    }
+
+    if (postViewModel.wantsForwardZapTo) {
+        OutlinedTextField(
+            value = postViewModel.forwardZapToEditting,
+            onValueChange = {
+                postViewModel.updateZapForwardTo(it)
+            },
+            modifier = Modifier
+                .fillMaxWidth()
+                .windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp))
+                .padding(0.dp),
+            placeholder = {
+                Text(
+                    text = stringResource(R.string.zap_forward_lnAddress),
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                    fontSize = 14.sp
+                )
+            },
+            colors = TextFieldDefaults
+                .outlinedTextFieldColors(
+                    unfocusedBorderColor = Color.Transparent,
+                    focusedBorderColor = Color.Transparent
+                ),
+            visualTransformation = UrlUserTagTransformation(MaterialTheme.colors.primary),
+            textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+        )
+    }
+}
+
 @Composable
 fun CloseButton(onCancel: () -> Unit) {
     Button(
@@ -444,3 +583,206 @@ fun SearchButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier
         )
     }
 }
+
+enum class ServersAvailable {
+    IMGUR,
+    NOSTR_BUILD,
+    NOSTRIMG,
+    IMGUR_NIP_94,
+    NOSTRIMG_NIP_94,
+    NIP95
+}
+
+@Composable
+fun ImageVideoDescription(
+    uri: Uri,
+    defaultServer: ServersAvailable,
+    onAdd: (String, ServersAvailable) -> Unit,
+    onCancel: () -> Unit
+) {
+    val resolver = LocalContext.current.contentResolver
+    val mediaType = resolver.getType(uri) ?: ""
+    val scope = rememberCoroutineScope()
+
+    val isImage = mediaType.startsWith("image")
+    val isVideo = mediaType.startsWith("video")
+
+    val fileServers = listOf(
+        Triple(ServersAvailable.IMGUR, stringResource(id = R.string.upload_server_imgur), stringResource(id = R.string.upload_server_imgur_explainer)),
+        Triple(ServersAvailable.NOSTRIMG, stringResource(id = R.string.upload_server_nostrimg), stringResource(id = R.string.upload_server_nostrimg_explainer)),
+        Triple(ServersAvailable.IMGUR_NIP_94, stringResource(id = R.string.upload_server_imgur_nip94), stringResource(id = R.string.upload_server_imgur_nip94_explainer)),
+        Triple(ServersAvailable.NOSTRIMG_NIP_94, stringResource(id = R.string.upload_server_nostrimg_nip94), stringResource(id = R.string.upload_server_nostrimg_nip94_explainer)),
+        Triple(ServersAvailable.NIP95, stringResource(id = R.string.upload_server_relays_nip95), stringResource(id = R.string.upload_server_relays_nip95_explainer))
+    )
+
+    val fileServerOptions = fileServers.map { it.second }
+    val fileServerExplainers = fileServers.map { it.third }
+
+    var selectedServer by remember { mutableStateOf(defaultServer) }
+    var message by remember { mutableStateOf("") }
+
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(start = 30.dp, end = 30.dp)
+            .clip(shape = RoundedCornerShape(10.dp))
+            .border(
+                1.dp,
+                MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
+                RoundedCornerShape(15.dp)
+            )
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(30.dp)
+        ) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(bottom = 10.dp)
+            ) {
+                Text(
+                    text = stringResource(
+                        if (isImage) {
+                            R.string.content_description_add_image
+                        } else {
+                            if (isVideo) {
+                                R.string.content_description_add_video
+                            } else {
+                                R.string.content_description_add_document
+                            }
+                        }
+                    ),
+                    fontSize = 20.sp,
+                    fontWeight = FontWeight.W500,
+                    modifier = Modifier
+                        .padding(start = 10.dp)
+                        .weight(1.0f)
+                        .windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp))
+                )
+
+                IconButton(
+                    modifier = Modifier.size(30.dp),
+                    onClick = onCancel
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.Cancel,
+                        null,
+                        modifier = Modifier
+                            .padding(end = 5.dp)
+                            .size(30.dp),
+                        tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                    )
+                }
+            }
+
+            Divider()
+
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(bottom = 10.dp)
+                    .windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp))
+            ) {
+                if (mediaType.startsWith("image")) {
+                    AsyncImage(
+                        model = uri.toString(),
+                        contentDescription = uri.toString(),
+                        contentScale = ContentScale.FillWidth,
+                        modifier = Modifier
+                            .padding(top = 4.dp)
+                            .fillMaxWidth()
+                            .windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp))
+                    )
+                } else if (mediaType.startsWith("video") && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    var bitmap by remember { mutableStateOf<Bitmap?>(null) }
+
+                    LaunchedEffect(key1 = uri) {
+                        scope.launch(Dispatchers.IO) {
+                            bitmap = resolver.loadThumbnail(uri, Size(1200, 1000), null)
+                        }
+                    }
+
+                    bitmap?.let {
+                        Image(
+                            bitmap = it.asImageBitmap(),
+                            contentDescription = "some useful description",
+                            contentScale = ContentScale.FillWidth,
+                            modifier = Modifier
+                                .padding(top = 4.dp)
+                                .fillMaxWidth()
+                        )
+                    }
+                } else {
+                    VideoView(uri)
+                }
+            }
+
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                TextSpinner(
+                    label = stringResource(id = R.string.file_server),
+                    placeholder = fileServers.filter { it.first == defaultServer }.firstOrNull()?.second ?: fileServers[0].second,
+                    options = fileServerOptions,
+                    explainers = fileServerExplainers,
+                    onSelect = {
+                        selectedServer = fileServers[it].first
+                    },
+                    modifier = Modifier
+                        .windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp))
+                        .weight(1f)
+                )
+            }
+
+            if (selectedServer == ServersAvailable.NOSTRIMG_NIP_94 ||
+                selectedServer == ServersAvailable.IMGUR_NIP_94 ||
+                selectedServer == ServersAvailable.NIP95
+            ) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp))
+                ) {
+                    OutlinedTextField(
+                        label = { Text(text = stringResource(R.string.content_description)) },
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)),
+                        value = message,
+                        onValueChange = { message = it },
+                        placeholder = {
+                            Text(
+                                text = stringResource(R.string.content_description_example),
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                            )
+                        },
+                        keyboardOptions = KeyboardOptions.Default.copy(
+                            capitalization = KeyboardCapitalization.Sentences
+                        )
+                    )
+                }
+            }
+
+            Button(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(vertical = 10.dp),
+                onClick = {
+                    onAdd(message, selectedServer)
+                },
+                shape = RoundedCornerShape(15.dp),
+                colors = ButtonDefaults.buttonColors(
+                    backgroundColor = MaterialTheme.colors.primary
+                )
+            ) {
+                Text(text = stringResource(R.string.add_content), color = Color.White, fontSize = 20.sp)
+            }
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt

@@ -13,6 +13,7 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.*
+import com.vitorpamplona.amethyst.service.FileHeader
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.ui.components.isValidURL
@@ -36,8 +37,13 @@ open class NewPostViewModel : ViewModel() {
 
     var userSuggestions by mutableStateOf<List<User>>(emptyList())
     var userSuggestionAnchor: TextRange? = null
+    var userSuggestionsMainMessage: Boolean? = null
+
+    // Images and Videos
+    var contentToAddUrl by mutableStateOf<Uri?>(null)
 
     // Polls
+    var canUsePoll by mutableStateOf(false)
     var wantsPoll by mutableStateOf(false)
     var zapRecipients = mutableStateListOf<HexKey>()
     var pollOptions = newStateMapPollOptions()
@@ -53,8 +59,14 @@ open class NewPostViewModel : ViewModel() {
     var isValidClosedAt = mutableStateOf(true)
 
     // Invoices
+    var canAddInvoice by mutableStateOf(false)
     var wantsInvoice by mutableStateOf(false)
 
+    // Forward Zap to
+    var wantsForwardZapTo by mutableStateOf(false)
+    var forwardZapTo by mutableStateOf<User?>(null)
+    var forwardZapToEditting by mutableStateOf(TextFieldValue(""))
+
     open fun load(account: Account, replyingTo: Note?, quote: Note?) {
         originalNote = replyingTo
         replyingTo?.let { replyNote ->
@@ -70,15 +82,24 @@ open class NewPostViewModel : ViewModel() {
                     this.mentions = currentMentions.plus(replyUser)
                 }
             }
-        } ?: {
+        } ?: run {
             replyTos = null
             mentions = null
         }
 
         quote?.let {
-            message = TextFieldValue(message.text + "\n\n@${it.idNote()}")
+            message = TextFieldValue(message.text + "\n\nnostr:${it.toNEvent()}")
+            urlPreview = findUrlInMessage()
         }
 
+        canAddInvoice = account.userProfile().info?.lnAddress() != null
+        canUsePoll = originalNote?.event !is PrivateDmEvent && originalNote?.channel() == null
+        contentToAddUrl = null
+
+        wantsForwardZapTo = false
+        forwardZapTo = null
+        forwardZapToEditting = TextFieldValue("")
+
         this.account = account
     }
 
@@ -86,45 +107,67 @@ open class NewPostViewModel : ViewModel() {
         val tagger = NewMessageTagger(originalNote?.channel(), mentions, replyTos, message.text)
         tagger.run()
 
-        if (wantsPoll) {
-            account?.sendPoll(tagger.message, tagger.replyTos, tagger.mentions, pollOptions, valueMaximum, valueMinimum, consensusThreshold, closedAt)
-        } else if (originalNote?.channel() != null) {
-            account?.sendChannelMessage(tagger.message, tagger.channel!!.idHex, tagger.replyTos, tagger.mentions)
-        } else if (originalNote?.event is PrivateDmEvent) {
-            account?.sendPrivateMessage(tagger.message, originalNote!!.author!!.pubkeyHex, originalNote!!, tagger.mentions)
+        val zapReceiver = if (wantsForwardZapTo) {
+            if (forwardZapTo != null) {
+                forwardZapTo?.info?.lud16 ?: forwardZapTo?.info?.lud06
+            } else {
+                forwardZapToEditting.text
+            }
         } else {
-            account?.sendPost(tagger.message, tagger.replyTos, tagger.mentions)
+            null
+        }
+
+        if (wantsPoll) {
+            account?.sendPoll(tagger.message, tagger.replyTos, tagger.mentions, pollOptions, valueMaximum, valueMinimum, consensusThreshold, closedAt, zapReceiver)
+        } else if (originalNote?.channel() != null) {
+            account?.sendChannelMessage(tagger.message, tagger.channel!!.idHex, tagger.replyTos, tagger.mentions, zapReceiver)
+        } else if (originalNote?.event is PrivateDmEvent) {
+            account?.sendPrivateMessage(tagger.message, originalNote!!.author!!.pubkeyHex, originalNote!!, tagger.mentions, zapReceiver)
+        } else {
+            account?.sendPost(tagger.message, tagger.replyTos, tagger.mentions, null, zapReceiver)
         }
 
         cancel()
     }
 
-    fun upload(it: Uri, context: Context) {
+    fun upload(it: Uri, description: String, server: ServersAvailable, context: Context) {
         isUploadingImage = true
+        contentToAddUrl = null
 
-        ImageUploader.uploadImage(
-            uri = it,
-            contentResolver = context.contentResolver,
-            onSuccess = { imageUrl ->
-                isUploadingImage = false
-                message = TextFieldValue(message.text + "\n\n" + imageUrl)
+        val contentResolver = context.contentResolver
 
-                viewModelScope.launch(Dispatchers.IO) {
-                    delay(2000)
-                    urlPreview = findUrlInMessage()
-                }
-            },
-            onError = {
-                isUploadingImage = false
-                viewModelScope.launch {
-                    imageUploadingError.emit("Failed to upload the image / video")
-                }
+        if (server == ServersAvailable.NIP95) {
+            val contentType = contentResolver.getType(it)
+            contentResolver.openInputStream(it)?.use {
+                createNIP95Record(it.readBytes(), contentType, description)
             }
-        )
+        } else {
+            ImageUploader.uploadImage(
+                uri = it,
+                server = server,
+                contentResolver = contentResolver,
+                onSuccess = { imageUrl, mimeType ->
+                    if (server == ServersAvailable.IMGUR_NIP_94 || server == ServersAvailable.NOSTRIMG_NIP_94) {
+                        createNIP94Record(imageUrl, mimeType, description)
+                    } else {
+                        isUploadingImage = false
+                        message = TextFieldValue(message.text + "\n\n" + imageUrl)
+                        urlPreview = findUrlInMessage()
+                    }
+                },
+                onError = {
+                    isUploadingImage = false
+                    viewModelScope.launch {
+                        imageUploadingError.emit("Failed to upload the image / video")
+                    }
+                }
+            )
+        }
     }
 
     open fun cancel() {
         message = TextFieldValue("")
+        contentToAddUrl = null
         urlPreview = null
         isUploadingImage = false
         mentions = null
@@ -138,6 +181,14 @@ open class NewPostViewModel : ViewModel() {
         closedAt = null
 
         wantsInvoice = false
+
+        wantsForwardZapTo = false
+        forwardZapTo = null
+        forwardZapToEditting = TextFieldValue("")
+
+        userSuggestions = emptyList()
+        userSuggestionAnchor = null
+        userSuggestionsMainMessage = null
     }
 
     open fun findUrlInMessage(): String? {
@@ -159,6 +210,21 @@ open class NewPostViewModel : ViewModel() {
         if (it.selection.collapsed) {
             val lastWord = it.text.substring(0, it.selection.end).substringAfterLast("\n").substringAfterLast(" ")
             userSuggestionAnchor = it.selection
+            userSuggestionsMainMessage = true
+            if (lastWord.startsWith("@") && lastWord.length > 2) {
+                userSuggestions = LocalCache.findUsersStartingWith(lastWord.removePrefix("@"))
+            } else {
+                userSuggestions = emptyList()
+            }
+        }
+    }
+
+    open fun updateZapForwardTo(it: TextFieldValue) {
+        forwardZapToEditting = it
+        if (it.selection.collapsed) {
+            val lastWord = it.text.substring(0, it.selection.end).substringAfterLast("\n").substringAfterLast(" ")
+            userSuggestionAnchor = it.selection
+            userSuggestionsMainMessage = false
             if (lastWord.startsWith("@") && lastWord.length > 2) {
                 userSuggestions = LocalCache.findUsersStartingWith(lastWord.removePrefix("@"))
             } else {
@@ -169,15 +235,29 @@ open class NewPostViewModel : ViewModel() {
 
     open fun autocompleteWithUser(item: User) {
         userSuggestionAnchor?.let {
-            val lastWord = message.text.substring(0, it.end).substringAfterLast("\n").substringAfterLast(" ")
-            val lastWordStart = it.end - lastWord.length
-            val wordToInsert = "@${item.pubkeyNpub()}"
+            if (userSuggestionsMainMessage == true) {
+                val lastWord = message.text.substring(0, it.end).substringAfterLast("\n").substringAfterLast(" ")
+                val lastWordStart = it.end - lastWord.length
+                val wordToInsert = "@${item.pubkeyNpub()}"
+
+                message = TextFieldValue(
+                    message.text.replaceRange(lastWordStart, it.end, wordToInsert),
+                    TextRange(lastWordStart + wordToInsert.length, lastWordStart + wordToInsert.length)
+                )
+            } else {
+                val lastWord = forwardZapToEditting.text.substring(0, it.end).substringAfterLast("\n").substringAfterLast(" ")
+                val lastWordStart = it.end - lastWord.length
+                val wordToInsert = "@${item.pubkeyNpub()}"
+                forwardZapTo = item
+
+                forwardZapToEditting = TextFieldValue(
+                    forwardZapToEditting.text.replaceRange(lastWordStart, it.end, wordToInsert),
+                    TextRange(lastWordStart + wordToInsert.length, lastWordStart + wordToInsert.length)
+                )
+            }
 
-            message = TextFieldValue(
-                message.text.replaceRange(lastWordStart, it.end, wordToInsert),
-                TextRange(lastWordStart + wordToInsert.length, lastWordStart + wordToInsert.length)
-            )
             userSuggestionAnchor = null
+            userSuggestionsMainMessage = null
             userSuggestions = emptyList()
         }
     }
@@ -188,14 +268,89 @@ open class NewPostViewModel : ViewModel() {
 
     fun canPost(): Boolean {
         return message.text.isNotBlank() && !isUploadingImage && !wantsInvoice &&
-            (!wantsPoll || pollOptions.values.all { it.isNotEmpty() })
+            (!wantsPoll || pollOptions.values.all { it.isNotEmpty() }) && contentToAddUrl == null
     }
 
-    fun canUsePoll(): Boolean {
-        return originalNote?.event !is PrivateDmEvent && originalNote?.channel() == null
+    fun includePollHashtagInMessage(include: Boolean, hashtag: String) {
+        if (include) {
+            updateMessage(TextFieldValue(message.text + " $hashtag"))
+        } else {
+            updateMessage(
+                TextFieldValue(
+                    message.text.replace(" $hashtag", "")
+                        .replace(hashtag, "")
+                )
+            )
+        }
     }
 
-    fun canAddLnInvoice(): Boolean {
-        return account?.userProfile()?.info?.lnAddress() != null
+    fun createNIP94Record(imageUrl: String, mimeType: String?, description: String) {
+        viewModelScope.launch(Dispatchers.IO) {
+            // Images don't seem to be ready immediately after upload
+
+            if (mimeType?.startsWith("image/") == true) {
+                delay(2000)
+            } else {
+                delay(5000)
+            }
+
+            FileHeader.prepare(
+                imageUrl,
+                mimeType,
+                description,
+                onReady = {
+                    val note = account?.sendHeader(it)
+
+                    isUploadingImage = false
+
+                    if (note == null) {
+                        message = TextFieldValue(message.text + "\n\n" + imageUrl)
+                    } else {
+                        message = TextFieldValue(message.text + "\n\nnostr:" + note.toNEvent())
+                    }
+
+                    urlPreview = findUrlInMessage()
+                },
+                onError = {
+                    isUploadingImage = false
+                    viewModelScope.launch {
+                        imageUploadingError.emit("Failed to upload the image / video")
+                    }
+                }
+            )
+        }
+    }
+
+    fun createNIP95Record(bytes: ByteArray, mimeType: String?, description: String) {
+        viewModelScope.launch(Dispatchers.IO) {
+            FileHeader.prepare(
+                bytes,
+                "",
+                mimeType,
+                description,
+                onReady = {
+                    val nip95 = account?.createNip95(bytes, headerInfo = it)
+                    val note = nip95?.let { it1 -> account?.sendNip95(it1.first, it1.second) }
+
+                    isUploadingImage = false
+
+                    note?.let {
+                        message = TextFieldValue(message.text + "\n\nnostr:" + it.toNEvent())
+                    }
+
+                    urlPreview = findUrlInMessage()
+                },
+                onError = {
+                    isUploadingImage = false
+                    viewModelScope.launch {
+                        imageUploadingError.emit("Failed to upload the image / video")
+                    }
+                }
+            )
+        }
+    }
+
+    fun selectImage(uri: Uri) {
+        contentToAddUrl = uri
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataViewModel.kt

@@ -170,8 +170,9 @@ class NewUserMetadataViewModel : ViewModel() {
 
         ImageUploader.uploadImage(
             uri = it,
+            server = account.defaultFileServer,
             contentResolver = context.contentResolver,
-            onSuccess = { imageUrl ->
+            onSuccess = { imageUrl, mimeType ->
                 onUploading(false)
                 onUploaded(imageUrl)
             },

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/SaveToGallery.kt

@@ -18,6 +18,7 @@ import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import com.vitorpamplona.amethyst.R
 import kotlinx.coroutines.launch
+import java.io.File
 
 /**
  * A button to save the remote image to the gallery.
@@ -83,3 +84,63 @@ fun SaveToGallery(url: String) {
         Text(text = stringResource(id = R.string.save), color = Color.White)
     }
 }
+
+@OptIn(ExperimentalPermissionsApi::class)
+@Composable
+fun SaveToGallery(localFile: File, mimeType: String?) {
+    val localContext = LocalContext.current
+    val scope = rememberCoroutineScope()
+
+    fun saveImage() {
+        ImageSaver.saveImage(
+            context = localContext,
+            localFile = localFile,
+            mimeType = mimeType,
+            onSuccess = {
+                scope.launch {
+                    Toast.makeText(
+                        localContext,
+                        localContext.getString(R.string.image_saved_to_the_gallery),
+                        Toast.LENGTH_SHORT
+                    )
+                        .show()
+                }
+            },
+            onError = {
+                scope.launch {
+                    Toast.makeText(
+                        localContext,
+                        localContext.getString(R.string.failed_to_save_the_image),
+                        Toast.LENGTH_SHORT
+                    )
+                        .show()
+                }
+            }
+        )
+    }
+
+    val writeStoragePermissionState = rememberPermissionState(
+        Manifest.permission.WRITE_EXTERNAL_STORAGE
+    ) { isGranted ->
+        if (isGranted) {
+            saveImage()
+        }
+    }
+
+    Button(
+        onClick = {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q || writeStoragePermissionState.status.isGranted) {
+                saveImage()
+            } else {
+                writeStoragePermissionState.launchPermissionRequest()
+            }
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = Color.Gray
+            )
+    ) {
+        Text(text = stringResource(id = R.string.save), color = Color.White)
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/FabColumn.kt

@@ -13,9 +13,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.ui.actions.NewPollView
-import com.vitorpamplona.amethyst.ui.actions.NewPostView
 
 @Composable
 fun FabColumn(account: Account) {
@@ -88,7 +86,7 @@ fun FabColumn(account: Account) {
     }
 
     if (wantsToPost) {
-        NewPostView({ wantsToPost = false }, account = NostrAccountDataSource.account)
+        // NewPostView({ wantsToPost = false }, account = NostrAccountDataSource.account)
     }
 
     if (wantsToPoll) {

app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewNoteButton.kt

@@ -16,18 +16,20 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.ui.actions.NewPostView
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
-fun NewNoteButton(account: Account) {
+fun NewNoteButton(account: Account, accountViewModel: AccountViewModel, navController: NavController) {
     var wantsToPost by remember {
         mutableStateOf(false)
     }
 
     if (wantsToPost) {
-        NewPostView({ wantsToPost = false }, account = account)
+        NewPostView({ wantsToPost = false }, account = account, accountViewModel = accountViewModel, navController = navController)
     }
 
     OutlinedButton(

app/src/main/java/com/vitorpamplona/amethyst/ui/components/BundledUpdate.kt

@@ -9,6 +9,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.AtomicReference
 
 /**
  * This class is designed to have a waiting time between two calls of invalidate
@@ -44,3 +45,37 @@ class BundledUpdate(
         }
     }
 }
+
+/**
+ * This class is designed to have a waiting time between two calls of invalidate
+ */
+class BundledInsert<T>(
+    val delay: Long,
+    val dispatcher: CoroutineDispatcher = Dispatchers.Default
+) {
+    private var onlyOneInBlock = AtomicBoolean()
+    private var atomicSet = AtomicReference<Set<T>>(setOf<T>())
+
+    fun invalidateList(newObject: T, onUpdate: (Set<T>) -> Unit) {
+        atomicSet.updateAndGet() {
+            it + newObject
+        }
+
+        if (onlyOneInBlock.getAndSet(true)) {
+            return
+        }
+
+        val scope = CoroutineScope(Job() + dispatcher)
+        scope.launch {
+            try {
+                onUpdate(atomicSet.getAndSet(emptySet()))
+                delay(delay)
+                onUpdate(atomicSet.getAndSet(emptySet()))
+            } finally {
+                withContext(NonCancellable) {
+                    onlyOneInBlock.set(false)
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableNoteTag.kt

@@ -11,12 +11,12 @@ import com.vitorpamplona.amethyst.ui.note.toShortenHex
 
 @Composable
 fun ClickableNoteTag(
-    baesNote: Note,
+    baseNote: Note,
     navController: NavController
 ) {
     ClickableText(
-        text = AnnotatedString("@${baesNote.idNote().toShortenHex()}"),
-        onClick = { navController.navigate("Note/${baesNote.idHex}") },
+        text = AnnotatedString("@${baseNote.idNote().toShortenHex()}"),
+        onClick = { navController.navigate("Note/${baseNote.idHex}") },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
     )
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableUrl.kt

@@ -11,9 +11,11 @@ import androidx.compose.ui.text.AnnotatedString
 fun ClickableUrl(urlText: String, url: String) {
     val uri = LocalUriHandler.current
 
+    val doubleCheckedUrl = if (url.contains("://")) url else "https://$url"
+
     ClickableText(
         text = AnnotatedString(urlText),
-        onClick = { runCatching { uri.openUri(url) } },
+        onClick = { runCatching { uri.openUri(doubleCheckedUrl) } },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
     )
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableWithdrawal.kt

@@ -5,10 +5,34 @@ import android.net.Uri
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
-import androidx.compose.runtime.Composable
+import androidx.compose.material.Text
+import androidx.compose.runtime.*
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.style.TextDirection
 import androidx.core.content.ContextCompat
+import com.vitorpamplona.amethyst.service.lnurl.LnWithdrawalUtil
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+@Composable
+fun MayBeWithdrawal(lnurlWord: String) {
+    var lnWithdrawal by remember { mutableStateOf<String?>(null) }
+
+    LaunchedEffect(key1 = lnurlWord) {
+        withContext(Dispatchers.IO) {
+            lnWithdrawal = LnWithdrawalUtil.findWithdrawal(lnurlWord)
+        }
+    }
+
+    lnWithdrawal?.let {
+        ClickableWithdrawal(withdrawalString = it)
+    }
+        ?: Text(
+            text = "$lnurlWord ",
+            style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+        )
+}
 
 @Composable
 fun ClickableWithdrawal(withdrawalString: String) {

app/src/main/java/com/vitorpamplona/amethyst/ui/components/InvoicePreview.kt

@@ -9,13 +9,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Button
-import androidx.compose.material.ButtonDefaults
-import androidx.compose.material.Divider
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
+import androidx.compose.material.*
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -24,22 +19,48 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat.startActivity
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.math.BigDecimal
 import java.text.NumberFormat
 
 @Composable
-fun InvoicePreview(lnInvoice: String) {
-    val amount = try {
-        LnInvoiceUtil.getAmountInSats(lnInvoice)
-    } catch (e: Exception) {
-        e.printStackTrace()
-        null
+fun MayBeInvoicePreview(lnbcWord: String) {
+    var lnInvoice by remember { mutableStateOf<Pair<String, BigDecimal?>?>(null) }
+
+    LaunchedEffect(key1 = lnbcWord) {
+        withContext(Dispatchers.IO) {
+            val myInvoice = LnInvoiceUtil.findInvoice(lnbcWord)
+            if (myInvoice != null) {
+                val myInvoiceAmount = try {
+                    LnInvoiceUtil.getAmountInSats(myInvoice)
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                    null
+                }
+
+                lnInvoice = Pair(myInvoice, myInvoiceAmount)
+            }
+        }
     }
 
+    lnInvoice?.let {
+        InvoicePreview(it.first, it.second)
+    }
+        ?: Text(
+            text = "$lnbcWord ",
+            style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+        )
+}
+
+@Composable
+fun InvoicePreview(lnInvoice: String, amount: BigDecimal?) {
     val context = LocalContext.current
 
     Column(

app/src/main/java/com/vitorpamplona/amethyst/ui/components/InvoiceRequest.kt

@@ -135,7 +135,7 @@ fun InvoiceRequest(
             Button(
                 modifier = Modifier.fillMaxWidth().padding(vertical = 10.dp),
                 onClick = {
-                    val zapRequest = account.createZapRequestFor(toUserPubKeyHex, message)
+                    val zapRequest = account.createZapRequestFor(toUserPubKeyHex, message, account.defaultZapType)
 
                     LightningAddressResolver().lnAddressInvoice(
                         lud16,

app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt

@@ -2,7 +2,6 @@ package com.vitorpamplona.amethyst.ui.components
 
 import android.util.Log
 import android.util.Patterns
-import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.*
@@ -14,7 +13,8 @@ import androidx.compose.material.Icon
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
+import androidx.compose.runtime.*
+import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
@@ -33,13 +33,18 @@ import com.halilibo.richtext.markdown.MarkdownParseOptions
 import com.halilibo.richtext.ui.RichTextStyle
 import com.halilibo.richtext.ui.material.MaterialRichText
 import com.halilibo.richtext.ui.resolveDefaults
+import com.linkedin.urls.detection.UrlDetector
+import com.linkedin.urls.detection.UrlDetectorOptions
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.model.checkForHashtagWithIcon
-import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.service.lnurl.LnWithdrawalUtil
 import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import java.net.MalformedURLException
 import java.net.URISyntaxException
 import java.net.URL
@@ -54,7 +59,7 @@ val noProtocolUrlValidator = Pattern.compile("(([\\w\\d-]+\\.)*[a-zA-Z][\\w-]+[\
 val tagIndex = Pattern.compile("\\#\\[([0-9]+)\\](.*)")
 
 val mentionsPattern: Pattern = Pattern.compile("@([A-Za-z0-9_\\-]+)")
-val hashTagsPattern: Pattern = Pattern.compile("#([a-z0-9_\\-]+)(.*)", Pattern.CASE_INSENSITIVE)
+val hashTagsPattern: Pattern = Pattern.compile("#([^\\s!@#\$%^&*()=+./,\\[{\\]};:'\"?><]+)(.*)", Pattern.CASE_INSENSITIVE)
 val urlPattern: Pattern = Patterns.WEB_URL
 
 fun isValidURL(url: String?): Boolean {
@@ -80,109 +85,88 @@ fun RichTextViewer(
     accountViewModel: AccountViewModel,
     navController: NavController
 ) {
-    val myMarkDownStyle = richTextDefaults.copy(
-        codeBlockStyle = richTextDefaults.codeBlockStyle?.copy(
-            textStyle = TextStyle(
-                fontFamily = FontFamily.Monospace,
-                fontSize = 14.sp
-            ),
-            modifier = Modifier
-                .padding(0.dp)
-                .fillMaxWidth()
-                .clip(shape = RoundedCornerShape(15.dp))
-                .border(
-                    1.dp,
-                    MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
-                    RoundedCornerShape(15.dp)
-                )
-                .background(
-                    MaterialTheme.colors.onSurface
-                        .copy(alpha = 0.05f)
-                        .compositeOver(backgroundColor)
-                )
-        ),
-        stringStyle = richTextDefaults.stringStyle?.copy(
-            linkStyle = SpanStyle(
-                textDecoration = TextDecoration.Underline,
-                color = MaterialTheme.colors.primary
-            ),
-            codeStyle = SpanStyle(
-                fontFamily = FontFamily.Monospace,
-                fontSize = 14.sp,
-                background = MaterialTheme.colors.onSurface.copy(alpha = 0.22f).compositeOver(backgroundColor)
-            )
-        )
-    )
-
-    Column(modifier = modifier.animateContentSize()) {
-        if (content.startsWith("# ") ||
+    Column(modifier = modifier) {
+        if (content.startsWith("> ") ||
+            content.startsWith("# ") ||
             content.contains("##") ||
-            content.contains("**") ||
             content.contains("__") ||
             content.contains("```")
         ) {
+            val myMarkDownStyle = richTextDefaults.copy(
+                codeBlockStyle = richTextDefaults.codeBlockStyle?.copy(
+                    textStyle = TextStyle(
+                        fontFamily = FontFamily.Monospace,
+                        fontSize = 14.sp
+                    ),
+                    modifier = Modifier
+                        .padding(0.dp)
+                        .fillMaxWidth()
+                        .clip(shape = RoundedCornerShape(15.dp))
+                        .border(
+                            1.dp,
+                            MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
+                            RoundedCornerShape(15.dp)
+                        )
+                        .background(
+                            MaterialTheme.colors.onSurface
+                                .copy(alpha = 0.05f)
+                                .compositeOver(backgroundColor)
+                        )
+                ),
+                stringStyle = richTextDefaults.stringStyle?.copy(
+                    linkStyle = SpanStyle(
+                        textDecoration = TextDecoration.Underline,
+                        color = MaterialTheme.colors.primary
+                    ),
+                    codeStyle = SpanStyle(
+                        fontFamily = FontFamily.Monospace,
+                        fontSize = 14.sp,
+                        background = MaterialTheme.colors.onSurface.copy(alpha = 0.22f).compositeOver(backgroundColor)
+                    )
+                )
+            )
+
+            val markdownWithSpecialContent = returnMarkdownWithSpecialContent(content)
+
             MaterialRichText(
                 style = myMarkDownStyle
             ) {
                 Markdown(
-                    content = content,
+                    content = markdownWithSpecialContent,
                     markdownParseOptions = MarkdownParseOptions.Default
                 )
             }
         } else {
-            val imagesForPager = mutableListOf<String>()
-
-            content.split('\n').forEach { paragraph ->
-                paragraph.split(' ').forEach { word: String ->
-                    // sequence of images will render in a slideview
-                    if (isValidURL(word)) {
-                        val removedParamsFromUrl = word.split("?")[0].lowercase()
-                        if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
-                            imagesForPager.add(word)
-                        }
-                        if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
-                            imagesForPager.add(word)
-                        }
-                    }
+            val urls = UrlDetector(content, UrlDetectorOptions.Default).detect()
+            val urlSet = urls.mapTo(LinkedHashSet(urls.size)) { it.originalUrl }
+            val imagesForPager = urlSet.mapNotNull { fullUrl ->
+                val removedParamsFromUrl = fullUrl.split("?")[0].lowercase()
+                if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
+                    ZoomableUrlImage(fullUrl)
+                } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
+                    ZoomableUrlVideo(fullUrl)
+                } else {
+                    null
                 }
-            }
+            }.associateBy { it.url }
+            val imageList = imagesForPager.values.toList()
 
             // FlowRow doesn't work well with paragraphs. So we need to split them
             content.split('\n').forEach { paragraph ->
                 FlowRow() {
-                    val s = if (isArabic(paragraph)) paragraph.split(' ').reversed() else paragraph.split(' ')
+                    val s = if (isArabic(paragraph)) paragraph.trim().split(' ').reversed() else paragraph.trim().split(' ')
                     s.forEach { word: String ->
                         if (canPreview) {
                             // Explicit URL
-                            if (isValidURL(word)) {
-                                val removedParamsFromUrl = word.split("?")[0].lowercase()
-                                if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
-                                    ZoomableImageView(word, imagesForPager)
-                                } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
-                                    ZoomableImageView(word, imagesForPager)
-                                } else {
-                                    UrlPreview(word, "$word ")
-                                }
+                            val img = imagesForPager[word]
+                            if (img != null) {
+                                ZoomableContentView(img, imageList)
+                            } else if (urlSet.contains(word)) {
+                                UrlPreview(word, "$word ")
                             } else if (word.startsWith("lnbc", true)) {
-                                val lnInvoice = LnInvoiceUtil.findInvoice(word)
-                                if (lnInvoice != null) {
-                                    InvoicePreview(lnInvoice)
-                                } else {
-                                    Text(
-                                        text = "$word ",
-                                        style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
-                                    )
-                                }
+                                MayBeInvoicePreview(word)
                             } else if (word.startsWith("lnurl", true)) {
-                                val lnWithdrawal = LnWithdrawalUtil.findWithdrawal(word)
-                                if (lnWithdrawal != null) {
-                                    ClickableWithdrawal(withdrawalString = lnWithdrawal)
-                                } else {
-                                    Text(
-                                        text = "$word ",
-                                        style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
-                                    )
-                                }
+                                MayBeWithdrawal(word)
                             } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
                                 ClickableEmail(word)
                             } else if (word.length > 6 && Patterns.PHONE.matcher(word).matches()) {
@@ -206,7 +190,7 @@ fun RichTextViewer(
                                         navController
                                     )
                                 } else if (hashTagsPattern.matcher(word).matches()) {
-                                    HashTag(word, accountViewModel, navController)
+                                    HashTag(word, navController)
                                 } else {
                                     Text(
                                         text = "$word ",
@@ -219,8 +203,15 @@ fun RichTextViewer(
                                 val url = matcher.group(1) // url
                                 val additionalChars = matcher.group(4) ?: "" // additional chars
 
-                                ClickableUrl(url, "https://$url")
-                                Text("$additionalChars ")
+                                if (url != null) {
+                                    ClickableUrl(url, "https://$url")
+                                    Text("$additionalChars ")
+                                } else {
+                                    Text(
+                                        text = "$word ",
+                                        style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+                                    )
+                                }
                             } else {
                                 Text(
                                     text = "$word ",
@@ -228,7 +219,7 @@ fun RichTextViewer(
                                 )
                             }
                         } else {
-                            if (isValidURL(word)) {
+                            if (urlSet.contains(word)) {
                                 ClickableUrl("$word ", word)
                             } else if (word.startsWith("lnurl", true)) {
                                 val lnWithdrawal = LnWithdrawalUtil.findWithdrawal(word)
@@ -263,7 +254,7 @@ fun RichTextViewer(
                                         navController
                                     )
                                 } else if (hashTagsPattern.matcher(word).matches()) {
-                                    HashTag(word, accountViewModel, navController)
+                                    HashTag(word, navController)
                                 } else {
                                     Text(
                                         text = "$word ",
@@ -276,8 +267,15 @@ fun RichTextViewer(
                                 val url = matcher.group(1) // url
                                 val additionalChars = matcher.group(4) ?: "" // additional chars
 
-                                ClickableUrl(url, "https://$url")
-                                Text("$additionalChars ")
+                                if (url != null) {
+                                    ClickableUrl(url, "https://$url")
+                                    Text("$additionalChars ")
+                                } else {
+                                    Text(
+                                        text = "$word ",
+                                        style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+                                    )
+                                }
                             } else {
                                 Text(
                                     text = "$word ",
@@ -292,79 +290,149 @@ fun RichTextViewer(
     }
 }
 
+@Composable
+private fun getDisplayNameFromUserNip19(parsedNip19: Nip19.Return): String? {
+    if (parsedNip19.type == Nip19.Type.USER) {
+        val userHex = parsedNip19.hex
+        val userBase = LocalCache.getOrCreateUser(userHex)
+
+        val userState by userBase.live().metadata.observeAsState()
+        val displayName = userState?.user?.bestDisplayName()
+        if (displayName !== null) {
+            return displayName
+        }
+    }
+    return null
+}
+
+@Composable
+private fun returnMarkdownWithSpecialContent(content: String): String {
+    var returnContent = ""
+    content.split('\n').forEach { paragraph ->
+        paragraph.split(' ').forEach { word: String ->
+            if (isValidURL(word)) {
+                returnContent += "[$word]($word) "
+            } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
+                returnContent += "[$word](mailto:$word) "
+            } else if (Patterns.PHONE.matcher(word).matches() && word.length > 6) {
+                returnContent += "[$word](tel:$word) "
+            } else if (isBechLink(word)) {
+                val parsedNip19 = Nip19.uriToRoute(word)
+                returnContent += if (parsedNip19 !== null) {
+                    val displayName = getDisplayNameFromUserNip19(parsedNip19)
+                    if (displayName != null) {
+                        "[@$displayName](nostr://$word) "
+                    } else {
+                        "$word "
+                    }
+                } else {
+                    "$word "
+                }
+            } else {
+                returnContent += "$word "
+            }
+        }
+        returnContent += "\n"
+    }
+    return returnContent
+}
+
 private fun isArabic(text: String): Boolean {
     return text.any { it in '\u0600'..'\u06FF' || it in '\u0750'..'\u077F' }
 }
 
 fun isBechLink(word: String): Boolean {
-    val cleaned = word.lowercase().removePrefix("@").removePrefix("nostr:").removePrefix("@").take(7)
+    val cleaned = word.lowercase().removePrefix("@").removePrefix("nostr:").removePrefix("@")
 
     return listOf("npub1", "naddr1", "note1", "nprofile1", "nevent1").any { cleaned.startsWith(it) }
 }
 
 @Composable
 fun BechLink(word: String, canPreview: Boolean, backgroundColor: Color, accountViewModel: AccountViewModel, navController: NavController) {
-    val nip19Route = Nip19.uriToRoute(word)
+    var nip19Route by remember { mutableStateOf<Nip19.Return?>(null) }
+    var baseNotePair by remember { mutableStateOf<Pair<Note, String?>?>(null) }
 
-    if (nip19Route == null) {
-        Text(text = "$word ")
-    } else {
-        if (nip19Route.type == Nip19.Type.NOTE || nip19Route.type == Nip19.Type.EVENT || nip19Route.type == Nip19.Type.ADDRESS) {
-            val note = LocalCache.checkGetOrCreateNote(nip19Route.hex)
-            if (note != null) {
-                if (canPreview) {
-                    NoteCompose(
-                        baseNote = note,
-                        accountViewModel = accountViewModel,
-                        modifier = Modifier
-                            .padding(top = 2.dp, bottom = 0.dp, start = 0.dp, end = 0.dp)
-                            .fillMaxWidth()
-                            .clip(shape = RoundedCornerShape(15.dp))
-                            .border(
-                                1.dp,
-                                MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
-                                RoundedCornerShape(15.dp)
-                            ),
-                        parentBackgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.05f)
-                            .compositeOver(backgroundColor),
-                        isQuotedNote = true,
-                        navController = navController
-                    )
+    LaunchedEffect(key1 = word) {
+        withContext(Dispatchers.IO) {
+            Nip19.uriToRoute(word)?.let {
+                if (it.type == Nip19.Type.NOTE || it.type == Nip19.Type.EVENT || it.type == Nip19.Type.ADDRESS) {
+                    LocalCache.checkGetOrCreateNote(it.hex)?.let { note ->
+                        baseNotePair = Pair(note, it.additionalChars)
+                    }
                 } else {
-                    ClickableRoute(nip19Route, navController)
+                    nip19Route = it
                 }
-            } else {
-                ClickableRoute(nip19Route, navController)
             }
-        } else {
-            ClickableRoute(nip19Route, navController)
         }
     }
+
+    if (canPreview) {
+        baseNotePair?.let {
+            NoteCompose(
+                baseNote = it.first,
+                accountViewModel = accountViewModel,
+                modifier = Modifier
+                    .padding(top = 2.dp, bottom = 0.dp, start = 0.dp, end = 0.dp)
+                    .fillMaxWidth()
+                    .clip(shape = RoundedCornerShape(15.dp))
+                    .border(
+                        1.dp,
+                        MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
+                        RoundedCornerShape(15.dp)
+                    ),
+                parentBackgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.05f)
+                    .compositeOver(backgroundColor),
+                isQuotedNote = true,
+                navController = navController
+            )
+            if (!it.second.isNullOrEmpty()) {
+                Text(
+                    "${it.second} "
+                )
+            }
+        } ?: nip19Route?.let {
+            ClickableRoute(it, navController)
+        } ?: Text(text = "$word ")
+    } else {
+        nip19Route?.let {
+            ClickableRoute(it, navController)
+        } ?: Text(text = "$word ")
+    }
 }
 
 @Composable
-fun HashTag(word: String, accountViewModel: AccountViewModel, navController: NavController) {
-    val hashtagMatcher = hashTagsPattern.matcher(word)
+fun HashTag(word: String, navController: NavController) {
+    var tagSuffixPair by remember { mutableStateOf<Pair<String, String?>?>(null) }
 
-    val (tag, suffix) = try {
-        hashtagMatcher.find()
-        Pair(hashtagMatcher.group(1), hashtagMatcher.group(2))
-    } catch (e: Exception) {
-        Log.e("Hashtag Parser", "Couldn't link hashtag $word", e)
-        Pair(null, null)
+    LaunchedEffect(key1 = word) {
+        withContext(Dispatchers.IO) {
+            val hashtagMatcher = hashTagsPattern.matcher(word)
+
+            val (myTag, mySuffix) = try {
+                hashtagMatcher.find()
+                Pair(hashtagMatcher.group(1), hashtagMatcher.group(2))
+            } catch (e: Exception) {
+                Log.e("Hashtag Parser", "Couldn't link hashtag $word", e)
+                Pair(null, null)
+            }
+
+            if (myTag != null) {
+                tagSuffixPair = Pair(myTag, mySuffix)
+            }
+        }
     }
 
-    if (tag != null) {
-        val hashtagIcon = checkForHashtagWithIcon(tag)
+    tagSuffixPair?.let { tagPair ->
+        val hashtagIcon = checkForHashtagWithIcon(tagPair.first)
         ClickableText(
             text = buildAnnotatedString {
                 withStyle(
                     LocalTextStyle.current.copy(color = MaterialTheme.colors.primary).toSpanStyle()
                 ) {
-                    append("#$tag")
+                    append("#${tagPair.first}")
                 }
             },
-            onClick = { navController.navigate("Hashtag/$tag") }
+            onClick = { navController.navigate("Hashtag/${tagPair.first}") }
         )
 
         if (hashtagIcon != null) {
@@ -387,14 +455,12 @@ fun HashTag(word: String, accountViewModel: AccountViewModel, navController: Nav
                             placeholderVerticalAlign = PlaceholderVerticalAlign.Center
                         )
                     ) {
-                        if (hashtagIcon != null) {
-                            Icon(
-                                painter = painterResource(hashtagIcon.icon),
-                                contentDescription = hashtagIcon.description,
-                                tint = hashtagIcon.color,
-                                modifier = hashtagIcon.modifier
-                            )
-                        }
+                        Icon(
+                            painter = painterResource(hashtagIcon.icon),
+                            contentDescription = hashtagIcon.description,
+                            tint = hashtagIcon.color,
+                            modifier = hashtagIcon.modifier
+                        )
                     }
                 )
             )
@@ -405,69 +471,80 @@ fun HashTag(word: String, accountViewModel: AccountViewModel, navController: Nav
                 inlineContent = inlineContent
             )
         }
-        Text(text = "$suffix ")
-    } else {
-        Text(text = "$word ")
-    }
+        tagPair.second?.ifBlank { "" }?.let {
+            Text(text = "$it ")
+        }
+    } ?: Text(text = "$word ")
 }
 
 @Composable
 fun TagLink(word: String, tags: List<List<String>>, canPreview: Boolean, backgroundColor: Color, accountViewModel: AccountViewModel, navController: NavController) {
-    val matcher = tagIndex.matcher(word)
+    var baseUserPair by remember { mutableStateOf<Pair<User, String?>?>(null) }
+    var baseNotePair by remember { mutableStateOf<Pair<Note, String?>?>(null) }
 
-    val (index, extraCharacters) = try {
-        matcher.find()
-        Pair(matcher.group(1)?.toInt(), matcher.group(2) ?: "")
-    } catch (e: Exception) {
-        Log.w("Tag Parser", "Couldn't link tag $word", e)
-        Pair(null, null)
-    }
-
-    if (index == null) {
-        return Text(text = "$word ")
-    }
-
-    if (index >= 0 && index < tags.size) {
-        if (tags[index][0] == "p") {
-            val baseUser = LocalCache.checkGetOrCreateUser(tags[index][1])
-            if (baseUser != null) {
-                ClickableUserTag(baseUser, navController)
-                Text(text = "$extraCharacters ")
-            } else {
-                // if here the tag is not a valid Nostr Hex
-                Text(text = "$word ")
+    LaunchedEffect(key1 = word) {
+        withContext(Dispatchers.IO) {
+            val matcher = tagIndex.matcher(word)
+            val (index, suffix) = try {
+                matcher.find()
+                Pair(matcher.group(1)?.toInt(), matcher.group(2) ?: "")
+            } catch (e: Exception) {
+                Log.w("Tag Parser", "Couldn't link tag $word", e)
+                Pair(null, null)
             }
-        } else if (tags[index][0] == "e") {
-            val note = LocalCache.checkGetOrCreateNote(tags[index][1])
-            if (note != null) {
-                if (canPreview) {
-                    NoteCompose(
-                        baseNote = note,
-                        accountViewModel = accountViewModel,
-                        modifier = Modifier
-                            .padding(top = 2.dp, bottom = 0.dp, start = 0.dp, end = 0.dp)
-                            .fillMaxWidth()
-                            .clip(shape = RoundedCornerShape(15.dp))
-                            .border(
-                                1.dp,
-                                MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
-                                RoundedCornerShape(15.dp)
-                            ),
-                        parentBackgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.05f)
-                            .compositeOver(backgroundColor),
-                        isQuotedNote = true,
-                        navController = navController
-                    )
-                } else {
-                    ClickableNoteTag(note, navController)
-                    Text(text = "$extraCharacters ")
+
+            if (index != null && index >= 0 && index < tags.size) {
+                val tag = tags[index]
+
+                if (tag.size > 1) {
+                    if (tag[0] == "p") {
+                        LocalCache.checkGetOrCreateUser(tag[1])?.let {
+                            baseUserPair = Pair(it, suffix)
+                        }
+                    } else if (tag[0] == "e" || tag[0] == "a") {
+                        LocalCache.checkGetOrCreateNote(tag[1])?.let {
+                            baseNotePair = Pair(it, suffix)
+                        }
+                    }
                 }
-            } else {
-                // if here the tag is not a valid Nostr Hex
-                Text(text = "$word ")
             }
-        } else {
-            Text(text = "$word ")
         }
     }
+
+    baseUserPair?.let {
+        ClickableUserTag(it.first, navController)
+        Text(text = "${it.second} ")
+    }
+
+    baseNotePair?.let {
+        if (canPreview) {
+            NoteCompose(
+                baseNote = it.first,
+                accountViewModel = accountViewModel,
+                modifier = Modifier
+                    .padding(top = 2.dp, bottom = 0.dp, start = 0.dp, end = 0.dp)
+                    .fillMaxWidth()
+                    .clip(shape = RoundedCornerShape(15.dp))
+                    .border(
+                        1.dp,
+                        MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
+                        RoundedCornerShape(15.dp)
+                    ),
+                parentBackgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.05f)
+                    .compositeOver(backgroundColor),
+                isQuotedNote = true,
+                navController = navController
+            )
+            it.second?.ifBlank { null }?.let {
+                Text(text = "$it ")
+            }
+        } else {
+            ClickableNoteTag(it.first, navController)
+            Text(text = "${it.second} ")
+        }
+    }
+
+    if (baseNotePair == null && baseUserPair == null) {
+        Text(text = "$word ")
+    }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/components/Robohash.kt

@@ -11,6 +11,7 @@ import coil.fetch.Fetcher
 import coil.fetch.SourceResult
 import coil.request.ImageRequest
 import coil.request.Options
+import coil.size.Size
 import okio.Buffer
 import java.security.MessageDigest
 
@@ -61,6 +62,7 @@ private fun svgString(msg: String): String {
 
 class HashImageFetcher(
     private val context: Context,
+    private val size: Size,
     private val data: Uri
 ) : Fetcher {
 
@@ -79,16 +81,17 @@ class HashImageFetcher(
 
     object Factory : Fetcher.Factory<Uri> {
         override fun create(data: Uri, options: Options, imageLoader: ImageLoader): Fetcher {
-            return HashImageFetcher(options.context, data)
+            return HashImageFetcher(options.context, options.size, data)
         }
     }
 }
 object Robohash {
-    fun imageRequest(context: Context, message: String): ImageRequest {
+    fun imageRequest(context: Context, message: String, robotSize: Size): ImageRequest {
         return ImageRequest
             .Builder(context)
             .data("robohash:$message")
             .fetcherFactory(HashImageFetcher.Factory)
+            .size(robotSize)
             .crossfade(100)
             .build()
     }

app/src/main/java/com/vitorpamplona/amethyst/ui/components/RobohashAsyncImage.kt

@@ -9,13 +9,17 @@ import androidx.compose.ui.graphics.FilterQuality
 import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.Dp
 import coil.compose.AsyncImage
 import coil.compose.AsyncImagePainter
 import coil.compose.rememberAsyncImagePainter
+import coil.size.Size
 
 @Composable
 fun RobohashAsyncImage(
     robot: String,
+    robotSize: Dp,
     modifier: Modifier = Modifier,
     contentDescription: String? = null,
     transform: (AsyncImagePainter.State) -> AsyncImagePainter.State = AsyncImagePainter.DefaultTransform,
@@ -26,24 +30,33 @@ fun RobohashAsyncImage(
     colorFilter: ColorFilter? = null,
     filterQuality: FilterQuality = DrawScope.DefaultFilterQuality
 ) {
-    AsyncImage(
-        model = Robohash.imageRequest(LocalContext.current, robot),
-        contentDescription = contentDescription,
-        modifier = modifier,
-        transform = transform,
-        onState = onState,
-        alignment = alignment,
-        contentScale = contentScale,
-        alpha = alpha,
-        colorFilter = colorFilter,
-        filterQuality = filterQuality
-    )
+    with(LocalDensity.current) {
+        AsyncImage(
+            model = Robohash.imageRequest(
+                LocalContext.current,
+                robot,
+                Size(robotSize.roundToPx(), robotSize.roundToPx())
+            ),
+            contentDescription = contentDescription,
+            modifier = modifier,
+            transform = transform,
+            onState = onState,
+            alignment = alignment,
+            contentScale = contentScale,
+            alpha = alpha,
+            colorFilter = colorFilter,
+            filterQuality = filterQuality
+        )
+    }
 }
 
+var imageErrors = setOf<String>()
+
 @Composable
 fun RobohashFallbackAsyncImage(
     robot: String,
-    model: String?,
+    robotSize: Dp,
+    model: String,
     contentDescription: String?,
     modifier: Modifier = Modifier,
     alignment: Alignment = Alignment.Center,
@@ -52,22 +65,47 @@ fun RobohashFallbackAsyncImage(
     colorFilter: ColorFilter? = null,
     filterQuality: FilterQuality = DrawScope.DefaultFilterQuality
 ) {
-    val context = LocalContext.current
-    val painter = rememberAsyncImagePainter(model = Robohash.imageRequest(context, robot))
+    if (imageErrors.contains(model)) {
+        RobohashAsyncImage(
+            robot = robot,
+            robotSize = robotSize,
+            contentDescription = contentDescription,
+            modifier = modifier,
+            alignment = alignment,
+            contentScale = contentScale,
+            alpha = alpha,
+            colorFilter = colorFilter,
+            filterQuality = filterQuality
+        )
+    } else {
+        val context = LocalContext.current
+        val painter = with(LocalDensity.current) {
+            rememberAsyncImagePainter(
+                model = Robohash.imageRequest(
+                    context,
+                    robot,
+                    Size(robotSize.roundToPx(), robotSize.roundToPx())
+                )
+            )
+        }
 
-    AsyncImage(
-        model = model,
-        contentDescription = contentDescription,
-        modifier = modifier,
-        placeholder = painter,
-        fallback = painter,
-        error = painter,
-        alignment = alignment,
-        contentScale = contentScale,
-        alpha = alpha,
-        colorFilter = colorFilter,
-        filterQuality = filterQuality
-    )
+        AsyncImage(
+            model = model,
+            contentDescription = contentDescription,
+            modifier = modifier,
+            placeholder = painter,
+            fallback = painter,
+            error = painter,
+            alignment = alignment,
+            contentScale = contentScale,
+            alpha = alpha,
+            colorFilter = colorFilter,
+            filterQuality = filterQuality,
+            onError = {
+                imageErrors = imageErrors + model
+            }
+        )
+    }
 }
 
 @Composable
@@ -82,9 +120,11 @@ fun RobohashAsyncImageProxy(
     colorFilter: ColorFilter? = null,
     filterQuality: FilterQuality = DrawScope.DefaultFilterQuality
 ) {
-    if (model.url == null) {
+    val proxy = model.proxyUrl()
+    if (proxy == null) {
         RobohashAsyncImage(
             robot = robot,
+            robotSize = model.size,
             contentDescription = contentDescription,
             modifier = modifier,
             alignment = alignment,
@@ -96,7 +136,8 @@ fun RobohashAsyncImageProxy(
     } else {
         RobohashFallbackAsyncImage(
             robot = robot,
-            model = model.proxyUrl(),
+            robotSize = model.size,
+            model = proxy,
             contentDescription = contentDescription,
             modifier = modifier,
             alignment = alignment,

app/src/main/java/com/vitorpamplona/amethyst/ui/components/SlidingCarousel.kt

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.components
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.interaction.collectIsDraggedAsState
 import androidx.compose.foundation.layout.Box
@@ -10,6 +11,8 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
@@ -22,11 +25,8 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.google.accompanist.pager.ExperimentalPagerApi
-import com.google.accompanist.pager.HorizontalPager
-import com.google.accompanist.pager.PagerState
 
-@OptIn(ExperimentalPagerApi::class)
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun SlidingCarousel(
     modifier: Modifier = Modifier,
@@ -39,7 +39,7 @@ fun SlidingCarousel(
     Box(
         modifier = modifier.fillMaxWidth()
     ) {
-        HorizontalPager(count = itemsCount, state = pagerState) { page ->
+        HorizontalPager(pageCount = itemsCount, state = pagerState) { page ->
             itemContent(page)
         }
 

app/src/main/java/com/vitorpamplona/amethyst/ui/components/TextSpinner.kt

@@ -5,8 +5,11 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
@@ -29,7 +32,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 
 @Composable
-fun TextSpinner(label: String, placeholder: String, options: List<String>, onSelect: (Int) -> Unit, modifier: Modifier = Modifier) {
+fun TextSpinner(label: String, placeholder: String, options: List<String>, explainers: List<String>? = null, onSelect: (Int) -> Unit, modifier: Modifier = Modifier) {
     val focusRequester = remember { FocusRequester() }
     val interactionSource = remember { MutableInteractionSource() }
     var optionsShowing by remember { mutableStateOf(false) }
@@ -62,7 +65,7 @@ fun TextSpinner(label: String, placeholder: String, options: List<String>, onSel
 
     if (optionsShowing) {
         options.isNotEmpty().also {
-            SpinnerSelectionDialog(options = options, onDismiss = { optionsShowing = false }) {
+            SpinnerSelectionDialog(options = options, explainers = explainers, onDismiss = { optionsShowing = false }) {
                 currentText = options[it]
                 optionsShowing = false
                 onSelect(it)
@@ -72,7 +75,7 @@ fun TextSpinner(label: String, placeholder: String, options: List<String>, onSel
 }
 
 @Composable
-fun SpinnerSelectionDialog(options: List<String>, onDismiss: () -> Unit, onSelect: (Int) -> Unit) {
+fun SpinnerSelectionDialog(options: List<String>, explainers: List<String>?, onDismiss: () -> Unit, onSelect: (Int) -> Unit) {
     Dialog(onDismissRequest = onDismiss) {
         Surface(
             border = BorderStroke(0.25.dp, Color.LightGray),
@@ -81,7 +84,6 @@ fun SpinnerSelectionDialog(options: List<String>, onDismiss: () -> Unit, onSelec
             LazyColumn() {
                 itemsIndexed(options) { index, item ->
                     Row(
-                        horizontalArrangement = Arrangement.Center,
                         modifier = Modifier
                             .fillMaxWidth()
                             .padding(16.dp, 16.dp)
@@ -89,7 +91,25 @@ fun SpinnerSelectionDialog(options: List<String>, onDismiss: () -> Unit, onSelec
                                 onSelect(index)
                             }
                     ) {
-                        Text(text = item, color = MaterialTheme.colors.onSurface)
+                        Column() {
+                            Row(
+                                horizontalArrangement = Arrangement.Center,
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                            ) {
+                                Text(text = item, color = MaterialTheme.colors.onSurface)
+                            }
+                            explainers?.getOrNull(index)?.let {
+                                Spacer(modifier = Modifier.height(5.dp))
+                                Row(
+                                    horizontalArrangement = Arrangement.Start,
+                                    modifier = Modifier
+                                        .fillMaxWidth()
+                                ) {
+                                    Text(text = it, color = Color.Gray)
+                                }
+                            }
+                        }
                     }
                     if (index < options.lastIndex) {
                         Divider(color = Color.LightGray, thickness = 0.25.dp)

app/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreviewCard.kt

@@ -41,24 +41,24 @@ fun UrlPreviewCard(
             )
     ) {
         Column {
-            val url = URL(previewInfo.url)
+            val validatedUrl = URL(previewInfo.url)
 
             // correctly treating relative images
             val imageUrl = if (previewInfo.image.startsWith("/")) {
-                URL(url, previewInfo.image).toString()
+                URL(validatedUrl, previewInfo.image).toString()
             } else {
                 previewInfo.image
             }
 
             AsyncImage(
                 model = imageUrl,
-                contentDescription = stringResource(R.string.preview_card_image_for, url),
+                contentDescription = stringResource(R.string.preview_card_image_for, validatedUrl),
                 contentScale = ContentScale.FillWidth,
                 modifier = Modifier.fillMaxWidth()
             )
 
             Text(
-                text = url.host,
+                text = validatedUrl.host,
                 style = MaterialTheme.typography.caption,
                 modifier = Modifier
                     .fillMaxWidth()

app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt

@@ -1,64 +1,260 @@
 package com.vitorpamplona.amethyst.ui.components
 
+import android.content.Context
+import android.media.AudioManager
+import android.net.Uri
+import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.VolumeOff
+import androidx.compose.material.icons.filled.VolumeUp
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.composed
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.LayoutCoordinates
+import androidx.compose.ui.layout.boundsInWindow
+import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
+import androidx.core.net.toUri
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
 import com.google.android.exoplayer2.C
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.MediaItem
+import com.google.android.exoplayer2.MediaMetadata
 import com.google.android.exoplayer2.Player
+import com.google.android.exoplayer2.audio.AudioAttributes
 import com.google.android.exoplayer2.source.ProgressiveMediaSource
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
 import com.google.android.exoplayer2.ui.StyledPlayerView
+import com.google.android.exoplayer2.util.Util
 import com.vitorpamplona.amethyst.VideoCache
+import java.io.File
+
+public var muted = mutableStateOf(true)
 
 @Composable
-fun VideoView(videoUri: String, onDialog: ((Boolean) -> Unit)? = null) {
-    val context = LocalContext.current
+fun VideoView(localFile: File, description: String? = null, onDialog: ((Boolean) -> Unit)? = null) {
+    VideoView(localFile.toUri(), description, onDialog)
+}
+
+@Composable
+fun VideoView(videoUri: String, description: String? = null, onDialog: ((Boolean) -> Unit)? = null) {
+    VideoView(Uri.parse(videoUri), description, onDialog)
+}
+
+@Composable
+fun VideoView(videoUri: Uri, description: String? = null, onDialog: ((Boolean) -> Unit)? = null) {
+    val context = LocalContext.current
+    val lifecycleOwner = rememberUpdatedState(LocalLifecycleOwner.current)
+
+    val myAudioManager =
+        context.applicationContext.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+
+    val myAudioAttributes = AudioAttributes.Builder()
+        .setUsage(C.USAGE_MEDIA)
+        .setContentType(C.AUDIO_CONTENT_TYPE_MOVIE)
+        .build()
+
+    val exoPlayer = remember(videoUri) {
+        val mediaBuilder = MediaItem.Builder().setUri(videoUri)
+
+        description?.let {
+            mediaBuilder.setMediaMetadata(
+                MediaMetadata.Builder().setDisplayTitle(it).build()
+            )
+        }
+
+        val media = mediaBuilder.build()
 
-    val exoPlayer = remember {
         ExoPlayer.Builder(context).build().apply {
             repeatMode = Player.REPEAT_MODE_ALL
             videoScalingMode = C.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING
-            setMediaSource(
-                ProgressiveMediaSource.Factory(VideoCache.get(context.applicationContext)).createMediaSource(MediaItem.fromUri(videoUri))
-            )
+            setAudioAttributes(myAudioAttributes, true)
+            if (Util.SDK_INT >= 23) {
+                myAudioManager.adjustStreamVolume(
+                    C.STREAM_TYPE_MUSIC,
+                    if (muted.value) AudioManager.ADJUST_MUTE else AudioManager.ADJUST_UNMUTE,
+                    0
+                )
+            } else {
+                myAudioManager.setStreamMute(C.STREAM_TYPE_MUSIC, muted.value)
+            }
+            if (videoUri.scheme?.startsWith("file") == true) {
+                setMediaItem(media)
+            } else {
+                setMediaSource(
+                    ProgressiveMediaSource.Factory(VideoCache.get()).createMediaSource(
+                        media
+                    )
+                )
+            }
             prepare()
         }
     }
 
-    val playerView = remember {
-        StyledPlayerView(context).apply {
-            player = exoPlayer
-            layoutParams = FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
+    DisposableEffect(
+        Box() {
+            AndroidView(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .align(Alignment.Center)
+                    .onVisibilityChanges { visible ->
+                        if (visible) {
+                            exoPlayer.play()
+                        } else {
+                            exoPlayer.pause()
+                        }
+                    },
+                factory = {
+                    StyledPlayerView(context).apply {
+                        player = exoPlayer
+                        layoutParams = FrameLayout.LayoutParams(
+                            ViewGroup.LayoutParams.MATCH_PARENT,
+                            ViewGroup.LayoutParams.WRAP_CONTENT
+                        )
+                        controllerAutoShow = false
+                        hideController()
+                        resizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIXED_WIDTH
+                        onDialog?.let { innerOnDialog ->
+                            setFullscreenButtonClickListener {
+                                exoPlayer.pause()
+                                innerOnDialog(it)
+                            }
+                        }
+                    }
+                }
             )
-            resizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIXED_WIDTH
-            onDialog?.let { innerOnDialog ->
-                setFullscreenButtonClickListener {
-                    innerOnDialog(it)
+
+            MuteButton(muted, Modifier) {
+                muted.value = !muted.value
+                if (Util.SDK_INT >= 23) {
+                    myAudioManager.adjustStreamVolume(
+                        C.STREAM_TYPE_MUSIC,
+                        if (muted.value) AudioManager.ADJUST_MUTE else AudioManager.ADJUST_UNMUTE,
+                        0
+                    )
+                } else {
+                    myAudioManager.setStreamMute(C.STREAM_TYPE_MUSIC, muted.value)
                 }
             }
         }
-    }
 
-    DisposableEffect(exoPlayer) {
+    ) {
+        val observer = LifecycleEventObserver { _, event ->
+            when (event) {
+                Lifecycle.Event.ON_PAUSE -> {
+                    exoPlayer.pause()
+                }
+                else -> {}
+            }
+        }
+        val lifecycle = lifecycleOwner.value.lifecycle
+        lifecycle.addObserver(observer)
+
         onDispose {
             exoPlayer.release()
+            lifecycle.removeObserver(observer)
+        }
+    }
+}
+
+fun Modifier.onVisibilityChanges(onVisibilityChanges: (Boolean) -> Unit): Modifier = composed {
+    val view = LocalView.current
+    var isVisible: Boolean? by remember { mutableStateOf(null) }
+
+    LaunchedEffect(isVisible) {
+        onVisibilityChanges(isVisible == true)
+    }
+
+    onGloballyPositioned { coordinates ->
+        isVisible = coordinates.isCompletelyVisible(view)
+    }
+}
+
+fun LayoutCoordinates.isCompletelyVisible(view: View): Boolean {
+    if (!isAttached) return false
+    // Window relative bounds of our compose root view that are visible on the screen
+    val globalRootRect = android.graphics.Rect()
+    if (!view.getGlobalVisibleRect(globalRootRect)) {
+        // we aren't visible at all.
+        return false
+    }
+    val bounds = boundsInWindow()
+    // Make sure we are completely in bounds.
+    return bounds.top >= globalRootRect.top &&
+        bounds.left >= globalRootRect.left &&
+        bounds.right <= globalRootRect.right &&
+        bounds.bottom <= globalRootRect.bottom
+}
+
+@Composable
+private fun MuteButton(muted: MutableState<Boolean>, modifier: Modifier, toggle: () -> Unit) {
+    Box(
+        modifier
+            .width(70.dp)
+            .height(70.dp)
+            .padding(10.dp)
+    ) {
+        Box(
+            Modifier
+                .clip(CircleShape)
+                .fillMaxSize(0.6f)
+                .align(Alignment.Center)
+                .background(MaterialTheme.colors.background)
+        )
+
+        if (muted.value) {
+            IconButton(
+                onClick = toggle,
+                modifier = Modifier.size(50.dp)
+            ) {
+                Icon(
+                    imageVector = Icons.Default.VolumeOff,
+                    "Hash Verified",
+                    tint = MaterialTheme.colors.onBackground,
+                    modifier = Modifier.size(30.dp)
+                )
+            }
+        } else {
+            IconButton(
+                onClick = toggle,
+                modifier = Modifier.size(50.dp)
+            ) {
+                Icon(
+                    imageVector = Icons.Default.VolumeUp,
+                    "Hash Verified",
+                    tint = MaterialTheme.colors.onBackground,
+                    modifier = Modifier.size(30.dp)
+                )
+            }
         }
     }
-
-    AndroidView(
-        modifier = Modifier.fillMaxWidth(),
-        factory = {
-            playerView
-        }
-    )
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt

@@ -0,0 +1,594 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import android.content.Context
+import android.util.Log
+import android.widget.Toast
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.pager.PagerState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.InlineTextContent
+import androidx.compose.foundation.text.appendInlineContent
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Report
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.compositeOver
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.Placeholder
+import androidx.compose.ui.text.PlaceholderVerticalAlign
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import coil.annotation.ExperimentalCoilApi
+import coil.compose.AsyncImage
+import coil.compose.AsyncImagePainter
+import coil.imageLoader
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.BlurHashRequester
+import com.vitorpamplona.amethyst.ui.actions.CloseButton
+import com.vitorpamplona.amethyst.ui.actions.LoadingAnimation
+import com.vitorpamplona.amethyst.ui.actions.SaveToGallery
+import com.vitorpamplona.amethyst.ui.theme.Nip05
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import net.engawapg.lib.zoomable.rememberZoomState
+import net.engawapg.lib.zoomable.zoomable
+import java.io.File
+import java.security.MessageDigest
+
+abstract class ZoomableContent(
+    val description: String? = null
+)
+
+abstract class ZoomableUrlContent(
+    val url: String,
+    description: String? = null,
+    val hash: String? = null,
+    val uri: String? = null
+) : ZoomableContent(description)
+
+class ZoomableUrlImage(
+    url: String,
+    description: String? = null,
+    hash: String? = null,
+    val bluehash: String? = null,
+    uri: String? = null
+) : ZoomableUrlContent(url, description, hash, uri)
+
+class ZoomableUrlVideo(
+    url: String,
+    description: String? = null,
+    hash: String? = null,
+    uri: String? = null
+) : ZoomableUrlContent(url, description, hash, uri)
+
+abstract class ZoomablePreloadedContent(
+    description: String? = null,
+    val isVerified: Boolean? = null,
+    val uri: String
+) : ZoomableContent(description)
+
+class ZoomableBitmapImage(
+    val localFile: File,
+    val mimeType: String? = null,
+    description: String? = null,
+    val bluehash: String? = null,
+    isVerified: Boolean? = null,
+    uri: String
+) : ZoomablePreloadedContent(description, isVerified, uri)
+
+class ZoomableBytesVideo(
+    val localFile: File,
+    val mimeType: String? = null,
+    description: String? = null,
+    isVerified: Boolean? = null,
+    uri: String
+) : ZoomablePreloadedContent(description, isVerified, uri)
+
+fun figureOutMimeType(fullUrl: String): ZoomableContent {
+    val removedParamsFromUrl = fullUrl.split("?")[0].lowercase()
+    val isImage = imageExtensions.any { removedParamsFromUrl.endsWith(it) }
+    val isVideo = videoExtensions.any { removedParamsFromUrl.endsWith(it) }
+
+    return if (isImage) {
+        ZoomableUrlImage(fullUrl)
+    } else if (isVideo) {
+        ZoomableUrlVideo(fullUrl)
+    } else {
+        ZoomableUrlImage(fullUrl)
+    }
+}
+
+@Composable
+@OptIn(ExperimentalFoundationApi::class)
+fun ZoomableContentView(content: ZoomableContent, images: List<ZoomableContent> = listOf(content)) {
+    val clipboardManager = LocalClipboardManager.current
+    val scope = rememberCoroutineScope()
+    val context = LocalContext.current
+
+    // store the dialog open or close state
+    var dialogOpen by remember {
+        mutableStateOf(false)
+    }
+
+    // store the dialog open or close state
+    var imageState by remember {
+        mutableStateOf<AsyncImagePainter.State?>(null)
+    }
+
+    var verifiedHash by remember {
+        mutableStateOf<Boolean?>(null)
+    }
+
+    if (content is ZoomableUrlContent) {
+        LaunchedEffect(key1 = content.url, key2 = imageState) {
+            if (imageState is AsyncImagePainter.State.Success) {
+                scope.launch(Dispatchers.IO) {
+                    verifiedHash = verifyHash(content, context)
+                }
+            }
+        }
+    } else if (content is ZoomableBitmapImage) {
+        LaunchedEffect(key1 = content.localFile, key2 = imageState) {
+            if (imageState is AsyncImagePainter.State.Success) {
+                scope.launch(Dispatchers.IO) {
+                    verifiedHash = content.isVerified
+                }
+            }
+        }
+    } else if (content is ZoomableBytesVideo) {
+        LaunchedEffect(key1 = content.localFile, key2 = imageState) {
+            verifiedHash = content.isVerified
+        }
+    }
+
+    var mainImageModifier = Modifier
+        .fillMaxWidth()
+        .clip(shape = RoundedCornerShape(15.dp))
+        .border(
+            1.dp,
+            MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
+            RoundedCornerShape(15.dp)
+        )
+
+    if (content is ZoomableUrlContent) {
+        mainImageModifier = mainImageModifier.combinedClickable(
+            onClick = { dialogOpen = true },
+            onLongClick = { clipboardManager.setText(AnnotatedString(content.uri ?: content.url)) }
+        )
+    } else if (content is ZoomableBitmapImage) {
+        mainImageModifier = mainImageModifier.combinedClickable(
+            onClick = { dialogOpen = true },
+            onLongClick = { clipboardManager.setText(AnnotatedString(content.uri)) }
+        )
+    } else if (content is ZoomableBytesVideo) {
+        mainImageModifier = mainImageModifier.combinedClickable(
+            onClick = { dialogOpen = true },
+            onLongClick = { clipboardManager.setText(AnnotatedString(content.uri)) }
+        )
+    } else {
+        mainImageModifier = mainImageModifier.clickable {
+            dialogOpen = true
+        }
+    }
+
+    if (content is ZoomableUrlImage) {
+        Box(contentAlignment = Alignment.Center) {
+            AsyncImage(
+                model = content.url,
+                contentDescription = content.description,
+                contentScale = ContentScale.FillWidth,
+                modifier = mainImageModifier,
+                onLoading = {
+                    imageState = it
+                },
+                onSuccess = {
+                    imageState = it
+                }
+            )
+
+            if (imageState is AsyncImagePainter.State.Success) {
+                HashVerificationSymbol(verifiedHash, Modifier.align(Alignment.TopEnd))
+            }
+
+            AnimatedVisibility(
+                visible = imageState !is AsyncImagePainter.State.Success,
+                exit = fadeOut(animationSpec = tween(200))
+            ) {
+                if (content.bluehash != null) {
+                    DisplayBlueHash(content, mainImageModifier)
+                } else {
+                    DisplayUrlWithLoadingSymbol(content)
+                }
+            }
+        }
+    } else if (content is ZoomableUrlVideo) {
+        VideoView(content.url, content.description) { dialogOpen = true }
+    } else if (content is ZoomableBitmapImage) {
+        Box() {
+            AsyncImage(
+                model = content.localFile,
+                contentDescription = content.description,
+                contentScale = ContentScale.FillWidth,
+                modifier = mainImageModifier,
+                onLoading = {
+                    imageState = it
+                },
+                onSuccess = {
+                    imageState = it
+                }
+            )
+
+            if (imageState is AsyncImagePainter.State.Success) {
+                HashVerificationSymbol(verifiedHash, Modifier.align(Alignment.TopEnd))
+            }
+        }
+
+        if (imageState !is AsyncImagePainter.State.Success) {
+            if (content.bluehash != null) {
+                DisplayBlueHash(content, mainImageModifier)
+            } else {
+                DisplayUrlWithLoadingSymbol(content)
+            }
+        }
+    } else if (content is ZoomableBytesVideo) {
+        VideoView(content.localFile, content.description) { dialogOpen = true }
+    }
+
+    if (dialogOpen) {
+        ZoomableImageDialog(content, images, onDismiss = { dialogOpen = false })
+    }
+}
+
+@Composable
+private fun DisplayUrlWithLoadingSymbol(content: ZoomableContent) {
+    if (content is ZoomableUrlContent) {
+        ClickableUrl(urlText = "${content.url} ", url = content.url)
+    } else {
+        Text("Loading content... ")
+    }
+
+    val myId = "inlineContent"
+    val emptytext = buildAnnotatedString {
+        withStyle(
+            LocalTextStyle.current.copy(color = MaterialTheme.colors.primary).toSpanStyle()
+        ) {
+            append("")
+            appendInlineContent(myId, "[icon]")
+        }
+    }
+    val inlineContent = mapOf(
+        Pair(
+            myId,
+            InlineTextContent(
+                Placeholder(
+                    width = 17.sp,
+                    height = 17.sp,
+                    placeholderVerticalAlign = PlaceholderVerticalAlign.Center
+                )
+            ) {
+                LoadingAnimation()
+            }
+        )
+    )
+
+    // Empty Text for Size of Icon
+    Text(
+        text = emptytext,
+        inlineContent = inlineContent
+    )
+}
+
+@Composable
+private fun DisplayBlueHash(
+    content: ZoomableUrlImage,
+    modifier: Modifier
+) {
+    if (content.bluehash == null) return
+
+    val context = LocalContext.current
+    AsyncImage(
+        model = BlurHashRequester.imageRequest(
+            context,
+            content.bluehash
+        ),
+        contentDescription = content.description,
+        contentScale = ContentScale.FillWidth,
+        modifier = modifier
+    )
+}
+
+@Composable
+private fun DisplayBlueHash(
+    content: ZoomableBitmapImage,
+    modifier: Modifier
+) {
+    if (content.bluehash == null) return
+
+    val context = LocalContext.current
+    AsyncImage(
+        model = BlurHashRequester.imageRequest(
+            context,
+            content.bluehash
+        ),
+        contentDescription = content.description,
+        contentScale = ContentScale.FillWidth,
+        modifier = modifier
+    )
+}
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun ZoomableImageDialog(imageUrl: ZoomableContent, allImages: List<ZoomableContent> = listOf(imageUrl), onDismiss: () -> Unit) {
+    Dialog(
+        onDismissRequest = onDismiss,
+        properties = DialogProperties(usePlatformDefaultWidth = false)
+    ) {
+        Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
+            Column() {
+                val pagerState: PagerState = remember { PagerState() }
+
+                LaunchedEffect(key1 = pagerState, key2 = imageUrl) {
+                    val page = allImages.indexOf(imageUrl)
+                    if (page > -1) {
+                        pagerState.scrollToPage(page)
+                    }
+                }
+
+                Row(
+                    modifier = Modifier
+                        .padding(10.dp)
+                        .fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    CloseButton(onCancel = onDismiss)
+
+                    val myContent = allImages[pagerState.currentPage]
+                    if (myContent is ZoomableUrlContent) {
+                        SaveToGallery(url = myContent.url)
+                    } else if (myContent is ZoomableBitmapImage && myContent.localFile != null) {
+                        SaveToGallery(localFile = myContent.localFile, mimeType = myContent.mimeType)
+                    }
+                }
+
+                if (allImages.size > 1) {
+                    SlidingCarousel(
+                        pagerState = pagerState,
+                        itemsCount = allImages.size,
+                        itemContent = { index ->
+                            RenderImageOrVideo(allImages[index])
+                        }
+                    )
+                } else {
+                    RenderImageOrVideo(imageUrl)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun RenderImageOrVideo(content: ZoomableContent) {
+    val scope = rememberCoroutineScope()
+    val context = LocalContext.current
+
+    // store the dialog open or close state
+    var imageState by remember {
+        mutableStateOf<AsyncImagePainter.State?>(null)
+    }
+
+    var verifiedHash by remember {
+        mutableStateOf<Boolean?>(null)
+    }
+
+    if (content is ZoomableUrlContent) {
+        LaunchedEffect(key1 = content.url, key2 = imageState) {
+            if (imageState is AsyncImagePainter.State.Success) {
+                scope.launch(Dispatchers.IO) {
+                    verifiedHash = verifyHash(content, context)
+                }
+            }
+        }
+    } else if (content is ZoomableBitmapImage) {
+        LaunchedEffect(key1 = content.localFile, key2 = imageState) {
+            if (imageState is AsyncImagePainter.State.Success) {
+                scope.launch(Dispatchers.IO) {
+                    verifiedHash = content.isVerified
+                }
+            }
+        }
+    } else if (content is ZoomableBytesVideo) {
+        LaunchedEffect(key1 = content.localFile, key2 = imageState) {
+            verifiedHash = content.isVerified
+        }
+    }
+
+    if (content is ZoomableUrlImage) {
+        Box() {
+            AsyncImage(
+                model = content.url,
+                contentDescription = content.description,
+                contentScale = ContentScale.FillWidth,
+                modifier = Modifier
+                    .fillMaxSize()
+                    .zoomable(rememberZoomState()),
+                onLoading = {
+                    imageState = it
+                },
+                onSuccess = {
+                    imageState = it
+                }
+            )
+
+            if (imageState is AsyncImagePainter.State.Success) {
+                HashVerificationSymbol(verifiedHash, Modifier.align(Alignment.TopEnd))
+            }
+
+            AnimatedVisibility(
+                visible = imageState !is AsyncImagePainter.State.Success,
+                exit = fadeOut(animationSpec = tween(200))
+            ) {
+                if (content.bluehash != null) {
+                    DisplayBlueHash(content = content, modifier = Modifier.fillMaxWidth())
+                } else {
+                    DisplayUrlWithLoadingSymbol(content)
+                }
+            }
+        }
+    } else if (content is ZoomableUrlVideo) {
+        Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxSize(1f)) {
+            VideoView(content.url, content.description)
+        }
+    } else if (content is ZoomableBitmapImage) {
+        Box() {
+            AsyncImage(
+                model = content.localFile,
+                contentDescription = content.description,
+                contentScale = ContentScale.FillWidth,
+                modifier = Modifier
+                    .fillMaxSize()
+                    .zoomable(rememberZoomState()),
+                onLoading = {
+                    imageState = it
+                },
+                onSuccess = {
+                    imageState = it
+                }
+            )
+
+            if (imageState !is AsyncImagePainter.State.Success) {
+                DisplayBlueHash(content = content, modifier = Modifier.fillMaxWidth())
+            } else {
+                HashVerificationSymbol(verifiedHash, Modifier.align(Alignment.TopEnd))
+            }
+        }
+    } else if (content is ZoomableBytesVideo) {
+        Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxSize(1f)) {
+            VideoView(content.localFile, content.description)
+        }
+    }
+}
+
+@OptIn(ExperimentalCoilApi::class)
+private suspend fun verifyHash(content: ZoomableUrlContent, context: Context): Boolean? {
+    if (content.hash == null) return null
+
+    context.imageLoader.diskCache?.get(content.url)?.use { snapshot ->
+        val imageFile = snapshot.data.toFile()
+        val bytes = imageFile.readBytes()
+        val sha256 = MessageDigest.getInstance("SHA-256")
+
+        val hash = sha256.digest(bytes).toHexKey()
+
+        Log.d("Image Hash Verification", "$hash == ${content.hash}")
+
+        return hash == content.hash
+    }
+
+    return null
+}
+
+@Composable
+private fun HashVerificationSymbol(verifiedHash: Boolean?, modifier: Modifier) {
+    if (verifiedHash == null) return
+
+    val localContext = LocalContext.current
+    val scope = rememberCoroutineScope()
+
+    Box(
+        modifier
+            .width(40.dp)
+            .height(40.dp)
+            .padding(10.dp)
+    ) {
+        Box(
+            Modifier
+                .clip(CircleShape)
+                .fillMaxSize(0.6f)
+                .align(Alignment.Center)
+                .background(MaterialTheme.colors.background)
+        )
+
+        if (verifiedHash == true) {
+            IconButton(
+                onClick = {
+                    scope.launch {
+                        Toast.makeText(
+                            localContext,
+                            localContext.getString(R.string.hash_verification_passed),
+                            Toast.LENGTH_LONG
+                        ).show()
+                    }
+                }
+            ) {
+                Icon(
+                    painter = painterResource(R.drawable.ic_verified),
+                    "Hash Verified",
+                    tint = Nip05.copy(0.52f).compositeOver(MaterialTheme.colors.background),
+                    modifier = Modifier.size(30.dp)
+                )
+            }
+        } else if (verifiedHash == false) {
+            IconButton(
+                onClick = {
+                    scope.launch {
+                        Toast.makeText(
+                            localContext,
+                            localContext.getString(R.string.hash_verification_failed),
+                            Toast.LENGTH_LONG
+                        ).show()
+                    }
+                }
+            ) {
+                Icon(
+                    tint = Color.Red,
+                    imageVector = Icons.Default.Report,
+                    contentDescription = "Invalid Hash",
+                    modifier = Modifier.size(30.dp)
+                )
+            }
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableImageView.kt

@@ -1,189 +0,0 @@
-package com.vitorpamplona.amethyst.ui.components
-
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.border
-import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.InlineTextContent
-import androidx.compose.foundation.text.appendInlineContent
-import androidx.compose.material.LocalTextStyle
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalClipboardManager
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.Placeholder
-import androidx.compose.ui.text.PlaceholderVerticalAlign
-import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.withStyle
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import coil.compose.AsyncImage
-import coil.compose.AsyncImagePainter
-import com.google.accompanist.pager.ExperimentalPagerApi
-import com.google.accompanist.pager.PagerState
-import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.ui.actions.CloseButton
-import com.vitorpamplona.amethyst.ui.actions.LoadingAnimation
-import com.vitorpamplona.amethyst.ui.actions.SaveToGallery
-import net.engawapg.lib.zoomable.rememberZoomState
-import net.engawapg.lib.zoomable.zoomable
-
-@Composable
-@OptIn(ExperimentalFoundationApi::class)
-fun ZoomableImageView(word: String, images: List<String> = listOf(word)) {
-    val clipboardManager = LocalClipboardManager.current
-
-    // store the dialog open or close state
-    var dialogOpen by remember {
-        mutableStateOf(false)
-    }
-
-    // store the dialog open or close state
-    var imageState by remember {
-        mutableStateOf<AsyncImagePainter.State?>(null)
-    }
-
-    val removedParamsFromUrl = word.split("?")[0].lowercase()
-    if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
-        AsyncImage(
-            model = word,
-            contentDescription = word,
-            contentScale = ContentScale.FillWidth,
-            modifier = Modifier
-                .fillMaxWidth()
-                .clip(shape = RoundedCornerShape(15.dp))
-                .border(
-                    1.dp,
-                    MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
-                    RoundedCornerShape(15.dp)
-                )
-                .combinedClickable(
-                    onClick = { dialogOpen = true },
-                    onLongClick = { clipboardManager.setText(AnnotatedString(word)) }
-                ),
-            onLoading = {
-                imageState = it
-            },
-            onSuccess = {
-                imageState = it
-            }
-        )
-
-        if (imageState !is AsyncImagePainter.State.Success) {
-            ClickableUrl(urlText = "$word ", url = word)
-
-            val myId = "inlineContent"
-            val emptytext = buildAnnotatedString {
-                withStyle(
-                    LocalTextStyle.current.copy(color = MaterialTheme.colors.primary).toSpanStyle()
-                ) {
-                    append("")
-                    appendInlineContent(myId, "[icon]")
-                }
-            }
-            val inlineContent = mapOf(
-                Pair(
-                    myId,
-                    InlineTextContent(
-                        Placeholder(
-                            width = 17.sp,
-                            height = 17.sp,
-                            placeholderVerticalAlign = PlaceholderVerticalAlign.Center
-                        )
-                    ) {
-                        LoadingAnimation()
-                    }
-                )
-            )
-
-            // Empty Text for Size of Icon
-            Text(
-                text = emptytext,
-                inlineContent = inlineContent
-            )
-        }
-    } else {
-        VideoView(word) { dialogOpen = true }
-    }
-
-    if (dialogOpen) {
-        ZoomableImageDialog(word, images, onDismiss = { dialogOpen = false })
-    }
-}
-
-@OptIn(ExperimentalPagerApi::class)
-@Composable
-fun ZoomableImageDialog(imageUrl: String, allImages: List<String> = listOf(imageUrl), onDismiss: () -> Unit) {
-    Dialog(
-        onDismissRequest = onDismiss,
-        properties = DialogProperties(usePlatformDefaultWidth = false)
-    ) {
-        Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-            Column() {
-                var pagerState: PagerState = remember { PagerState() }
-
-                Row(
-                    modifier = Modifier
-                        .padding(10.dp)
-                        .fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    CloseButton(onCancel = onDismiss)
-
-                    SaveToGallery(url = allImages[pagerState.currentPage])
-                }
-
-                if (allImages.size > 1) {
-                    SlidingCarousel(
-                        pagerState = pagerState,
-                        itemsCount = allImages.size,
-                        itemContent = { index ->
-                            RenderImageOrVideo(allImages[index])
-                        }
-                    )
-                } else {
-                    RenderImageOrVideo(imageUrl)
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun RenderImageOrVideo(imageUrl: String) {
-    val removedParamsFromUrl = imageUrl.split("?")[0].lowercase()
-    if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
-        AsyncImage(
-            model = imageUrl,
-            contentDescription = stringResource(id = R.string.profile_image),
-            contentScale = ContentScale.FillWidth,
-            modifier = Modifier
-                .fillMaxSize()
-                .zoomable(rememberZoomState())
-        )
-    } else {
-        Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxSize(1f)) {
-            VideoView(imageUrl)
-        }
-    }
-}

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChannelFeedFilter.kt

@@ -5,7 +5,7 @@ import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 
-object ChannelFeedFilter : FeedFilter<Note>() {
+object ChannelFeedFilter : AdditiveFeedFilter<Note>() {
     lateinit var account: Account
     lateinit var channel: Channel
 
@@ -22,4 +22,14 @@ object ChannelFeedFilter : FeedFilter<Note>() {
             .sortedBy { it.createdAt() }
             .reversed()
     }
+
+    override fun applyFilter(collection: Set<Note>): Set<Note> {
+        return collection
+            .filter { it.idHex in channel.notes.keys && account.isAcceptable(it) }
+            .toSet()
+    }
+
+    override fun sort(collection: Set<Note>): List<Note> {
+        return collection.sortedBy { it.createdAt() }.reversed()
+    }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomFeedFilter.kt

@@ -5,7 +5,7 @@ import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 
-object ChatroomFeedFilter : FeedFilter<Note>() {
+object ChatroomFeedFilter : AdditiveFeedFilter<Note>() {
     var account: Account? = null
     var withUser: User? = null
 
@@ -30,4 +30,23 @@ object ChatroomFeedFilter : FeedFilter<Note>() {
             .sortedBy { it.createdAt() }
             .reversed()
     }
+
+    override fun applyFilter(collection: Set<Note>): Set<Note> {
+        val myAccount = account
+        val myUser = withUser
+
+        if (myAccount == null || myUser == null) return emptySet()
+
+        val messages = myAccount
+            .userProfile()
+            .privateChatrooms[myUser] ?: return emptySet()
+
+        return collection
+            .filter { it in messages.roomMessages && account?.isAcceptable(it) == true }
+            .toSet()
+    }
+
+    override fun sort(collection: Set<Note>): List<Note> {
+        return collection.sortedBy { it.createdAt() }.reversed()
+    }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListKnownFeedFilter.kt

@@ -10,7 +10,7 @@ object ChatroomListKnownFeedFilter : FeedFilter<Note>() {
     override fun feed(): List<Note> {
         val me = account.userProfile()
 
-        val privateChatrooms = account.userProfile().privateChatrooms
+        val privateChatrooms = me.privateChatrooms
         val messagingWith = privateChatrooms.keys.filter {
             me.hasSentMessagesTo(it) && account.isAcceptable(it)
         }

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/FeedFilter.kt

@@ -4,16 +4,37 @@ import android.util.Log
 import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
 
-abstract class FeedFilter<T>() {
+abstract class FeedFilter<T> {
     @OptIn(ExperimentalTime::class)
     fun loadTop(): List<T> {
         val (feed, elapsed) = measureTimedValue {
-            feed().take(1000)
+            feed()
+        }
+
+        Log.d("Time", "${this.javaClass.simpleName} Feed in $elapsed with ${feed.size} objects")
+        return feed.take(1000)
+    }
+
+    abstract fun feed(): List<T>
+}
+
+abstract class AdditiveFeedFilter<T> : FeedFilter<T>() {
+    abstract fun applyFilter(collection: Set<T>): Set<T>
+    abstract fun sort(collection: Set<T>): List<T>
+
+    @OptIn(ExperimentalTime::class)
+    fun updateListWith(oldList: List<T>, newItems: Set<T>): List<T> {
+        val (feed, elapsed) = measureTimedValue {
+            val newItemsToBeAdded = applyFilter(newItems)
+            if (newItemsToBeAdded.isNotEmpty()) {
+                val newList = oldList.toSet() + newItemsToBeAdded
+                sort(newList).take(1000)
+            } else {
+                oldList
+            }
         }
 
         Log.d("Time", "${this.javaClass.simpleName} Feed in $elapsed with ${feed.size} objects")
         return feed
     }
-
-    abstract fun feed(): List<T>
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/GlobalFeedFilter.kt

@@ -3,57 +3,48 @@ package com.vitorpamplona.amethyst.ui.dal
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
-import com.vitorpamplona.amethyst.service.model.PollNoteEvent
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.model.*
 
-object GlobalFeedFilter : FeedFilter<Note>() {
+object GlobalFeedFilter : AdditiveFeedFilter<Note>() {
     lateinit var account: Account
 
     override fun feed(): List<Note> {
-        val followChannels = account.followingChannels()
+        val notes = innerApplyFilter(LocalCache.notes.values)
+        val longFormNotes = innerApplyFilter(LocalCache.addressables.values)
+
+        return sort(notes + longFormNotes)
+    }
+
+    override fun applyFilter(collection: Set<Note>): Set<Note> {
+        return innerApplyFilter(collection)
+    }
+
+    private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
+        val followChannels = account.followingChannels
         val followUsers = account.followingKeySet()
+        val now = System.currentTimeMillis() / 1000
 
-        val notes = LocalCache.notes.values
+        return collection
             .asSequence()
             .filter {
-                (it.event is TextNoteEvent || it.event is LongTextNoteEvent || it.event is PollNoteEvent || it.event is ChannelMessageEvent) &&
-                    it.replyTo.isNullOrEmpty()
+                it.event is BaseTextNoteEvent && it.replyTo.isNullOrEmpty()
             }
             .filter {
+                val channel = it.channelHex()
                 // does not show events already in the public chat list
-                (it.channel() == null || it.channel() !in followChannels) &&
+                (channel == null || channel !in followChannels) &&
                     // does not show people the user already follows
                     (it.author?.pubkeyHex !in followUsers)
             }
             .filter { account.isAcceptable(it) }
             .filter {
                 // Do not show notes with the creation time exceeding the current time, as they will always stay at the top of the global feed, which is cheating.
-                it.createdAt()!! <= System.currentTimeMillis() / 1000
+                it.createdAt()!! <= now
             }
-            .toList()
+            .toSet()
+    }
 
-        val longFormNotes = LocalCache.addressables.values
-            .asSequence()
-            .filter {
-                (it.event is LongTextNoteEvent) && it.replyTo.isNullOrEmpty()
-            }
-            .filter {
-                // does not show events already in the public chat list
-                (it.channel() == null || it.channel() !in followChannels) &&
-                    // does not show people the user already follows
-                    (it.author?.pubkeyHex !in followUsers)
-            }
-            .filter { account.isAcceptable(it) }
-            .filter {
-                // Do not show notes with the creation time exceeding the current time, as they will always stay at the top of the global feed, which is cheating.
-                it.createdAt()!! <= System.currentTimeMillis() / 1000
-            }
-            .toList()
-
-        return (notes + longFormNotes)
-            .sortedBy { it.createdAt() }
-            .reversed()
+    override fun sort(collection: Set<Note>): List<Note> {
+        return collection.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HashtagFeedFilter.kt

@@ -8,14 +8,27 @@ import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 
-object HashtagFeedFilter : FeedFilter<Note>() {
+object HashtagFeedFilter : AdditiveFeedFilter<Note>() {
     lateinit var account: Account
     var tag: String? = null
 
-    override fun feed(): List<Note> {
-        val myTag = tag ?: return emptyList()
+    fun loadHashtag(account: Account, tag: String?) {
+        this.account = account
+        this.tag = tag
+    }
 
-        return LocalCache.notes.values
+    override fun feed(): List<Note> {
+        return sort(innerApplyFilter(LocalCache.notes.values))
+    }
+
+    override fun applyFilter(collection: Set<Note>): Set<Note> {
+        return innerApplyFilter(collection)
+    }
+
+    private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
+        val myTag = tag ?: return emptySet()
+
+        return collection
             .asSequence()
             .filter {
                 (
@@ -27,13 +40,10 @@ object HashtagFeedFilter : FeedFilter<Note>() {
                     it.event?.isTaggedHash(myTag) == true
             }
             .filter { account.isAcceptable(it) }
-            .sortedBy { it.createdAt() }
-            .toList()
-            .reversed()
+            .toSet()
     }
 
-    fun loadHashtag(account: Account, tag: String?) {
-        this.account = account
-        this.tag = tag
+    override fun sort(collection: Set<Note>): List<Note> {
+        return collection.sortedBy { it.createdAt() }.reversed()
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt

@@ -4,26 +4,37 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.PollNoteEvent
-import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 
-object HomeConversationsFeedFilter : FeedFilter<Note>() {
+object HomeConversationsFeedFilter : AdditiveFeedFilter<Note>() {
     lateinit var account: Account
 
     override fun feed(): List<Note> {
+        return sort(innerApplyFilter(LocalCache.notes.values))
+    }
+
+    override fun applyFilter(collection: Set<Note>): Set<Note> {
+        return innerApplyFilter(collection)
+    }
+
+    private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
         val user = account.userProfile()
         val followingKeySet = user.cachedFollowingKeySet()
         val followingTagSet = user.cachedFollowingTagSet()
 
-        return LocalCache.notes.values
+        return collection
+            .asSequence()
             .filter {
-                (it.event is TextNoteEvent || it.event is PollNoteEvent || it.event is RepostEvent) &&
+                (it.event is TextNoteEvent || it.event is PollNoteEvent) &&
                     (it.author?.pubkeyHex in followingKeySet || (it.event?.isTaggedHashes(followingTagSet) ?: false)) &&
                     // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
                     it.author?.let { !account.isHidden(it) } ?: true &&
                     !it.isNewThread()
             }
-            .sortedBy { it.createdAt() }
-            .reversed()
+            .toSet()
+    }
+
+    override fun sort(collection: Set<Note>): List<Note> {
+        return collection.sortedBy { it.createdAt() }.reversed()
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt

@@ -3,39 +3,44 @@ package com.vitorpamplona.amethyst.ui.dal
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.HighlightEvent
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.PollNoteEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 
-object HomeNewThreadFeedFilter : FeedFilter<Note>() {
+object HomeNewThreadFeedFilter : AdditiveFeedFilter<Note>() {
     lateinit var account: Account
 
     override fun feed(): List<Note> {
+        val notes = innerApplyFilter(LocalCache.notes.values)
+        val longFormNotes = innerApplyFilter(LocalCache.addressables.values)
+
+        return sort(notes + longFormNotes)
+    }
+
+    override fun applyFilter(collection: Set<Note>): Set<Note> {
+        return innerApplyFilter(collection)
+    }
+
+    private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
         val user = account.userProfile()
         val followingKeySet = user.cachedFollowingKeySet()
         val followingTagSet = user.cachedFollowingTagSet()
 
-        val notes = LocalCache.notes.values
+        return collection
+            .asSequence()
             .filter { it ->
-                (it.event is TextNoteEvent || it.event is RepostEvent || it.event is PollNoteEvent) &&
+                (it.event is TextNoteEvent || it.event is RepostEvent || it.event is LongTextNoteEvent || it.event is PollNoteEvent || it.event is HighlightEvent) &&
                     (it.author?.pubkeyHex in followingKeySet || (it.event?.isTaggedHashes(followingTagSet) ?: false)) &&
                     // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
-                    it.author?.let { !account.isHidden(it) } ?: true &&
+                    it.author?.let { !account.isHidden(it.pubkeyHex) } ?: true &&
                     it.isNewThread()
             }
+            .toSet()
+    }
 
-        val longFormNotes = LocalCache.addressables.values
-            .filter { it ->
-                (it.event is LongTextNoteEvent) &&
-                    (it.author?.pubkeyHex in followingKeySet || (it.event?.isTaggedHashes(followingTagSet) ?: false)) &&
-                    // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
-                    it.author?.let { !account.isHidden(it) } ?: true &&
-                    it.isNewThread()
-            }
-
-        return (notes + longFormNotes)
-            .sortedBy { it.createdAt() }
-            .reversed()
+    override fun sort(collection: Set<Note>): List<Note> {
+        return collection.sortedBy { it.createdAt() }.reversed()
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt

@@ -3,52 +3,56 @@ package com.vitorpamplona.amethyst.ui.dal
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.*
 
-object NotificationFeedFilter : FeedFilter<Note>() {
+object NotificationFeedFilter : AdditiveFeedFilter<Note>() {
     lateinit var account: Account
 
     override fun feed(): List<Note> {
-        val loggedInUser = account.userProfile()
-        return LocalCache.notes.values
-            .asSequence()
-            .filter {
-                it.event !is ChannelCreateEvent &&
-                    it.event !is ChannelMetadataEvent &&
-                    it.event !is LnZapRequestEvent &&
-                    it.event !is BadgeDefinitionEvent &&
-                    it.event !is BadgeProfilesEvent &&
-                    it.event?.isTaggedUser(loggedInUser.pubkeyHex) ?: false &&
-                    (it.author == null || (!account.isHidden(it.author!!) && it.author != loggedInUser))
-            }
-            .filter { it ->
-                it.event !is TextNoteEvent ||
-                    (it.event as? TextNoteEvent)?.taggedEvents()?.any {
-                    LocalCache.checkGetOrCreateNote(it)?.author == loggedInUser
-                } == true ||
-                    loggedInUser in it.directlyCiteUsers()
-            }
-            .filter { it ->
-                it.event !is PollNoteEvent ||
-                    it.replyTo?.any { it.author == account.userProfile() } == true ||
-                    account.userProfile() in it.directlyCiteUsers()
-            }
-            .filter {
-                it.event !is ReactionEvent ||
-                    it.replyTo?.lastOrNull()?.author == loggedInUser ||
-                    loggedInUser in it.directlyCiteUsers()
-            }
-            .filter {
-                it.event !is RepostEvent ||
-                    it.replyTo?.lastOrNull()?.author == loggedInUser ||
-                    loggedInUser in it.directlyCiteUsers()
-            }
-            .sortedBy { it.createdAt() }
-            .toList()
-            .reversed()
+        return sort(innerApplyFilter(LocalCache.notes.values))
     }
 
-    fun isDifferentAccount(account: Account): Boolean {
-        return this::account.isInitialized && this.account != account
+    override fun applyFilter(collection: Set<Note>): Set<Note> {
+        return innerApplyFilter(collection)
+    }
+
+    private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
+        val loggedInUser = account.userProfile()
+        val loggedInUserHex = loggedInUser.pubkeyHex
+
+        return collection.filter {
+            it.event !is ChannelCreateEvent &&
+                it.event !is ChannelMetadataEvent &&
+                it.event !is LnZapRequestEvent &&
+                it.event !is BadgeDefinitionEvent &&
+                it.event !is BadgeProfilesEvent &&
+                it.author !== loggedInUser &&
+                it.event?.isTaggedUser(loggedInUserHex) ?: false &&
+                (it.author == null || !account.isHidden(it.author!!.pubkeyHex)) &&
+                tagsAnEventByUser(it, loggedInUser)
+        }.toSet()
+    }
+
+    override fun sort(collection: Set<Note>): List<Note> {
+        return collection.sortedBy { it.createdAt() }.reversed()
+    }
+
+    fun tagsAnEventByUser(note: Note, author: User): Boolean {
+        val event = note.event
+
+        if (event is BaseTextNoteEvent) {
+            return (event.citedUsers().contains(author.pubkeyHex) || note.replyTo?.any { it.author === author } == true)
+        }
+
+        if (event is ReactionEvent) {
+            return note.replyTo?.lastOrNull()?.author === author
+        }
+
+        if (event is RepostEvent) {
+            return note.replyTo?.lastOrNull()?.author === author
+        }
+
+        return true
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/VideoFeedFilter.kt

@@ -0,0 +1,40 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.*
+
+object VideoFeedFilter : AdditiveFeedFilter<Note>() {
+    lateinit var account: Account
+
+    override fun feed(): List<Note> {
+        val notes = innerApplyFilter(LocalCache.notes.values)
+
+        return sort(notes)
+    }
+
+    override fun applyFilter(collection: Set<Note>): Set<Note> {
+        return innerApplyFilter(collection)
+    }
+
+    private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
+        val now = System.currentTimeMillis() / 1000
+
+        return collection
+            .asSequence()
+            .filter {
+                it.event is FileHeaderEvent || it.event is FileStorageHeaderEvent
+            }
+            .filter { account.isAcceptable(it) }
+            .filter {
+                // Do not show notes with the creation time exceeding the current time, as they will always stay at the top of the global feed, which is cheating.
+                it.createdAt()!! <= now
+            }
+            .toSet()
+    }
+
+    override fun sort(collection: Set<Note>): List<Note> {
+        return collection.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppBottomBar.kt

@@ -42,10 +42,12 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import kotlin.time.ExperimentalTime
 
 val bottomNavigationItems = listOf(
     Route.Home,
     Route.Message,
+    Route.Video,
     Route.Search,
     Route.Notification
 )
@@ -135,6 +137,7 @@ fun AppBottomBar(navController: NavHostController, accountViewModel: AccountView
     }
 }
 
+@OptIn(ExperimentalTime::class)
 @Composable
 private fun NotifiableIcon(route: Route, selected: Boolean, accountViewModel: AccountViewModel) {
     Box(Modifier.size(if ("Home" == route.base) 25.dp else 23.dp)) {
@@ -159,13 +162,13 @@ private fun NotifiableIcon(route: Route, selected: Boolean, accountViewModel: Ac
 
         LaunchedEffect(key1 = notif) {
             withContext(Dispatchers.IO) {
-                hasNewItems = route.hasNewItems(account, notif.cache)
+                hasNewItems = route.hasNewItems(account, notif.cache, emptySet())
             }
         }
 
         LaunchedEffect(key1 = db) {
             withContext(Dispatchers.IO) {
-                hasNewItems = route.hasNewItems(account, notif.cache)
+                hasNewItems = route.hasNewItems(account, notif.cache, db)
             }
         }
 

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt

@@ -1,5 +1,7 @@
 package com.vitorpamplona.amethyst.ui.navigation
 
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -11,15 +13,15 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import com.google.accompanist.pager.ExperimentalPagerApi
-import com.google.accompanist.pager.rememberPagerState
 import com.vitorpamplona.amethyst.ui.dal.GlobalFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.HomeConversationsFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.HomeNewThreadFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.NotificationFeedFilter
+import com.vitorpamplona.amethyst.ui.dal.VideoFeedFilter
 import com.vitorpamplona.amethyst.ui.screen.NostrGlobalFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeRepliesFeedViewModel
+import com.vitorpamplona.amethyst.ui.screen.NostrVideoFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NotificationViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.BookmarkListScreen
@@ -34,8 +36,9 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.NotificationScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ProfileScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SearchScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ThreadScreen
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.VideoScreen
 
-@OptIn(ExperimentalPagerApi::class)
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun AppNavigation(
     navController: NavHostController,
@@ -58,10 +61,31 @@ fun AppNavigation(
     GlobalFeedFilter.account = account
     val searchFeedViewModel: NostrGlobalFeedViewModel = viewModel()
 
+    VideoFeedFilter.account = account
+    val videoFeedViewModel: NostrVideoFeedViewModel = viewModel()
+
     NotificationFeedFilter.account = account
     val notifFeedViewModel: NotificationViewModel = viewModel()
 
     NavHost(navController, startDestination = Route.Home.route) {
+        Route.Video.let { route ->
+            composable(route.route, route.arguments, content = {
+                val scrollToTop = it.arguments?.getBoolean("scrollToTop") ?: false
+
+                VideoScreen(
+                    videoFeedView = videoFeedViewModel,
+                    accountViewModel = accountViewModel,
+                    navController = navController,
+                    scrollToTop = scrollToTop
+                )
+
+                // Avoids running scroll to top when back button is pressed
+                if (scrollToTop) {
+                    it.arguments?.remove("scrollToTop")
+                }
+            })
+        }
+
         Route.Search.let { route ->
             composable(route.route, route.arguments, content = {
                 val scrollToTop = it.arguments?.getBoolean("scrollToTop") ?: false

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt

@@ -10,6 +10,8 @@ import androidx.navigation.navArgument
 import com.vitorpamplona.amethyst.NotificationCache
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.ui.dal.AdditiveFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.ChatroomListKnownFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.HomeNewThreadFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.NotificationFeedFilter
@@ -17,7 +19,7 @@ import com.vitorpamplona.amethyst.ui.dal.NotificationFeedFilter
 sealed class Route(
     val route: String,
     val icon: Int,
-    val hasNewItems: (Account, NotificationCache) -> Boolean = { _, _ -> false },
+    val hasNewItems: (Account, NotificationCache, Set<com.vitorpamplona.amethyst.model.Note>) -> Boolean = { _, _, _ -> false },
     val arguments: List<NamedNavArgument> = emptyList()
 ) {
     val base: String
@@ -30,7 +32,7 @@ sealed class Route(
             navArgument("scrollToTop") { type = NavType.BoolType; defaultValue = false },
             navArgument("nip47") { type = NavType.StringType; nullable = true; defaultValue = null }
         ),
-        hasNewItems = { accountViewModel, cache -> homeHasNewItems(accountViewModel, cache) }
+        hasNewItems = { accountViewModel, cache, newNotes -> HomeLatestItem.hasNewItems(accountViewModel, cache, newNotes) }
     )
 
     object Search : Route(
@@ -39,17 +41,23 @@ sealed class Route(
         arguments = listOf(navArgument("scrollToTop") { type = NavType.BoolType; defaultValue = false })
     )
 
+    object Video : Route(
+        route = "Video?scrollToTop={scrollToTop}",
+        icon = R.drawable.ic_video,
+        arguments = listOf(navArgument("scrollToTop") { type = NavType.BoolType; defaultValue = false })
+    )
+
     object Notification : Route(
         route = "Notification?scrollToTop={scrollToTop}",
         icon = R.drawable.ic_notifications,
         arguments = listOf(navArgument("scrollToTop") { type = NavType.BoolType; defaultValue = false }),
-        hasNewItems = { accountViewModel, cache -> notificationHasNewItems(accountViewModel, cache) }
+        hasNewItems = { accountViewModel, cache, newNotes -> NotificationLatestItem.hasNewItems(accountViewModel, cache, newNotes) }
     )
 
     object Message : Route(
         route = "Message",
         icon = R.drawable.ic_dm,
-        hasNewItems = { accountViewModel, cache -> messagesHasNewItems(accountViewModel, cache) }
+        hasNewItems = { accountViewModel, cache, newNotes -> MessagesLatestItem.hasNewItems(accountViewModel, cache, newNotes) }
     )
 
     object BlockedUsers : Route(
@@ -108,36 +116,72 @@ fun currentRoute(navController: NavHostController): String? {
     return navBackStackEntry?.destination?.route
 }
 
-private fun homeHasNewItems(account: Account, cache: NotificationCache): Boolean {
-    val lastTime = cache.load("HomeFollows")
+open class LatestItem {
+    var newestItemPerAccount: Map<String, Note?> = mapOf()
 
-    HomeNewThreadFeedFilter.account = account
+    fun updateNewestItem(newNotes: Set<Note>, account: Account, filter: AdditiveFeedFilter<Note>): Note? {
+        val newestItem = newestItemPerAccount[account.userProfile().pubkeyHex]
 
-    return (
-        HomeNewThreadFeedFilter.feed().firstOrNull { it.createdAt() != null }?.createdAt()
-            ?: 0
-        ) > lastTime
+        if (newestItem == null) {
+            newestItemPerAccount = newestItemPerAccount + Pair(
+                account.userProfile().pubkeyHex,
+                filter.feed().firstOrNull { it.createdAt() != null }
+            )
+        } else {
+            newestItemPerAccount = newestItemPerAccount + Pair(
+                account.userProfile().pubkeyHex,
+                filter.sort(filter.applyFilter(newNotes) + newestItem).first()
+            )
+        }
+
+        return newestItemPerAccount[account.userProfile().pubkeyHex]
+    }
 }
 
-private fun notificationHasNewItems(account: Account, cache: NotificationCache): Boolean {
-    val lastTime = cache.load("Notification")
+object HomeLatestItem : LatestItem() {
+    fun hasNewItems(
+        account: Account,
+        cache: NotificationCache,
+        newNotes: Set<Note>
+    ): Boolean {
+        val lastTime = cache.load("HomeFollows")
+        HomeNewThreadFeedFilter.account = account
 
-    NotificationFeedFilter.account = account
+        val newestItem = updateNewestItem(newNotes, account, HomeNewThreadFeedFilter)
 
-    return (
-        NotificationFeedFilter.feed().firstOrNull { it.createdAt() != null }?.createdAt()
-            ?: 0
-        ) > lastTime
+        return (newestItem?.createdAt() ?: 0) > lastTime
+    }
 }
 
-private fun messagesHasNewItems(account: Account, cache: NotificationCache): Boolean {
-    ChatroomListKnownFeedFilter.account = account
+object NotificationLatestItem : LatestItem() {
+    fun hasNewItems(
+        account: Account,
+        cache: NotificationCache,
+        newNotes: Set<Note>
+    ): Boolean {
+        val lastTime = cache.load("Notification")
+        NotificationFeedFilter.account = account
 
-    val note = ChatroomListKnownFeedFilter.feed().firstOrNull {
-        it.createdAt() != null && it.channel() == null && it.author != account.userProfile()
-    } ?: return false
+        val newestItem = updateNewestItem(newNotes, account, NotificationFeedFilter)
 
-    val lastTime = cache.load("Room/${note.author?.pubkeyHex}")
-
-    return (note.createdAt() ?: 0) > lastTime
+        return (newestItem?.createdAt() ?: 0) > lastTime
+    }
+}
+
+object MessagesLatestItem {
+    fun hasNewItems(
+        account: Account,
+        cache: NotificationCache,
+        newNotes: Set<Note>
+    ): Boolean {
+        ChatroomListKnownFeedFilter.account = account
+
+        val note = ChatroomListKnownFeedFilter.loadTop().firstOrNull {
+            it.createdAt() != null && it.channel() == null && it.author != account.userProfile()
+        } ?: return false
+
+        val lastTime = cache.load("Room/${note.author?.pubkeyHex}")
+
+        return (note.createdAt() ?: 0) > lastTime
+    }
 }