v0.40.0

Tiktok

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
 

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 121
-        versionName "0.33.2"
+        versionCode 134
+        versionName "0.40.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -86,7 +86,7 @@ android {
 
 dependencies {
     implementation 'androidx.core:core-ktx:1.10.0'
-    implementation 'androidx.activity:activity-compose:1.7.0-beta01'
+    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"
 
@@ -108,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') {
@@ -127,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"
@@ -146,6 +146,9 @@ 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:
@@ -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

@@ -6,6 +6,7 @@
 
     <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" />
 
@@ -18,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"
@@ -50,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/ServiceManager.kt

@@ -72,6 +72,7 @@ object ServiceManager {
             LocalCache.pruneOldAndHiddenMessages(it)
             LocalCache.pruneHiddenMessages(it)
             LocalCache.pruneContactLists(it)
+            LocalCache.pruneFileStorageEvents(it)
             // LocalCache.pruneNonFollows(it)
         }
     }

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
@@ -42,6 +46,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,
@@ -164,13 +170,26 @@ class Account(
         return zapPaymentRequest != null
     }
 
-    fun sendZapPaymentRequestFor(lnInvoice: String) {
+    fun sendZapPaymentRequestFor(bolt11: String, 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) {
+                // After the response is received.
+                val privKey = nip47.secret?.toByteArray()
+                if (privKey != null) {
+                    onResponse(it.response(privKey, event.pubKey.toByteArray()))
+                }
+            }
+
+            Client.send(event, nip47.relayUri, wcListener.feedTypes) {
+                wcListener.destroy()
+            }
         }
     }
 
@@ -357,7 +376,54 @@ class Account(
         }
     }
 
-    fun sendPost(message: String, replyTo: List<Note>?, mentions: List<User>?, tags: List<String>? = null) {
+    fun sendNip95(data: ByteArray, headerInfo: FileHeader): Note? {
+        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!!
+        )
+
+        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 }
@@ -370,6 +436,7 @@ class Account(
             mentions = mentionsHex,
             addresses = addresses,
             extraTags = tags,
+            zapReceiver = zapReceiver,
             privateKey = loggedIn.privKey!!
         )
 
@@ -385,7 +452,8 @@ class Account(
         valueMaximum: Int?,
         valueMinimum: Int?,
         consensusThreshold: Int?,
-        closedAt: Int?
+        closedAt: Int?,
+        zapReceiver: String? = null
     ) {
         if (!isWriteable()) return
 
@@ -403,14 +471,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 }
@@ -422,13 +491,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
 
@@ -441,6 +511,7 @@ class Account(
             msg = message,
             replyTos = repliesToHex,
             mentions = mentionsHex,
+            zapReceiver = zapReceiver,
             privateKey = loggedIn.privKey!!,
             advertiseNip18 = false
         )
@@ -534,6 +605,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
 
@@ -605,6 +682,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()
@@ -650,11 +739,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()

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

@@ -4,6 +4,7 @@ import android.util.Log
 import androidx.lifecycle.LiveData
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.vitorpamplona.amethyst.service.NostrAccountDataSource.account
 import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.BundledInsert
@@ -30,6 +31,8 @@ object LocalCache {
     val channels = ConcurrentHashMap<HexKey, Channel>()
     val addressables = ConcurrentHashMap<String, AddressableNote>(100)
 
+    val awaitingPaymentRequests = ConcurrentHashMap<HexKey, (LnZapPaymentResponseEvent) -> Unit>(10)
+
     fun checkGetOrCreateUser(key: String): User? {
         if (isValidHexNpub(key)) {
             return getOrCreateUser(key)
@@ -593,7 +596,6 @@ object LocalCache {
 
     fun consume(event: LnZapEvent) {
         val note = getOrCreateNote(event.id)
-
         // Already processed this event.
         if (note.event != null) return
 
@@ -651,6 +653,93 @@ object LocalCache {
         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
+
+        note.loadEvent(event, author, emptyList())
+
+        refreshObservers(note)
+    }
+
+    fun consume(event: LnZapPaymentRequestEvent) {
+        // Does nothing without a response callback.
+    }
+
+    fun consume(event: LnZapPaymentRequestEvent, onResponse: (LnZapPaymentResponseEvent) -> Unit) {
+        awaitingPaymentRequests.put(event.id, onResponse)
+    }
+
+    fun consume(event: LnZapPaymentResponseEvent) {
+        val responseCallback = awaitingPaymentRequests[event.requestId()]
+
+        if (responseCallback != null) {
+            responseCallback(event)
+        }
+    }
+
     fun findUsersStartingWith(username: String): List<User> {
         return users.values.filter {
             (it.anyNameStartsWith(username)) ||
@@ -692,6 +781,14 @@ object LocalCache {
         }
     }
 
+    fun pruneFileStorageEvents(account: Account) {
+        val toBeRemoved = notes.filter { it.value.event is FileStorageEvent }
+
+        toBeRemoved.forEach {
+            notes.remove(it.key)
+        }
+    }
+
     fun pruneOldAndHiddenMessages(account: Account) {
         channels.forEach { it ->
             val toBeRemoved = it.value.pruneOldAndHiddenMessages(account)

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.model
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
 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 +21,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()
@@ -51,6 +53,11 @@ 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 channelHex(): HexKey? {
@@ -193,9 +200,11 @@ 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
+        }
     }
 
     fun isReactedBy(user: User): Boolean {

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

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,70 @@
+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) {
+            val imageData = URL(fileUrl).readBytes()
+
+            prepare(imageData, fileUrl, mimeType, description, onReady, 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.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()
@@ -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,7 +15,7 @@ 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(

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,8 +3,8 @@ 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
 
@@ -22,7 +22,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
         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,7 +49,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
         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)),
@@ -69,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,
@@ -79,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
@@ -108,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, PrivateDmEvent.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,7 +18,7 @@ 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) }
             )

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.FileStorageEvent
+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, FileStorageEvent.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,
@@ -31,6 +33,28 @@ open class BaseTextNoteEvent(
             } 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
     }
@@ -51,6 +75,35 @@ open class BaseTextNoteEvent(
             } 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) {
+                if (content.contains("Testing event")) {
+                    println("AAAA $key")
+                }
+
+                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

@@ -41,6 +41,10 @@ open class Event(
     fun taggedUsers() = tags.filter { it.size > 1 && it[0] == "p" }.map { it[1] }
     fun taggedEvents() = tags.filter { it.size > 1 && it[0] == "e" }.map { it[1] }
 
+    fun taggedUrls() = tags.filter { it.size > 1 && it[0] == "r" }.map { it[1] }
+
+    override fun 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)
@@ -222,8 +226,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

@@ -33,4 +33,6 @@ interface EventInterface {
 
     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

@@ -16,7 +16,7 @@ class LnZapEvent(
     // This event is also kept in LocalCache (same object)
     @Transient val zapRequest: LnZapRequestEvent?
 
-    private fun containedPost(): LnZapRequestEvent? = try {
+    override fun containedPost(): LnZapRequestEvent? = try {
         description()?.ifBlank { null }?.let {
             fromJson(it, Client.lenient)
         } as? LnZapRequestEvent
@@ -53,8 +53,7 @@ class LnZapEvent(
             null
         }
     }
-
-    override fun message(): String {
+    override fun content(): String {
         return content
     }
 
@@ -68,7 +67,7 @@ class LnZapEvent(
 
     enum class ZapType() {
         PUBLIC,
-        PRIVATE, // not yet implemented
+        PRIVATE,
         ANONYMOUS,
         NONZAP
     }

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

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

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,88 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.google.gson.annotations.SerializedName
+import com.vitorpamplona.amethyst.model.HexKey
+import nostr.postr.Utils
+
+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()) {
+            gson.fromJson(decrypt(privKey, pubKey), 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) :
+    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.
+    }
+}

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,
@@ -18,6 +24,8 @@ class LnZapRequestEvent(
 
     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
 
@@ -30,7 +38,7 @@ class LnZapRequestEvent(
             zapType: LnZapEvent.ZapType,
             createdAt: Long = Date().time / 1000
         ): LnZapRequestEvent {
-            val content = message
+            var content = message
             var privkey = privateKey
             var pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             var tags = listOf(
@@ -48,6 +56,14 @@ class LnZapRequestEvent(
                 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, privkey)
@@ -62,7 +78,7 @@ class LnZapRequestEvent(
             zapType: LnZapEvent.ZapType,
             createdAt: Long = Date().time / 1000
         ): LnZapRequestEvent {
-            val content = message
+            var content = message
             var privkey = privateKey
             var pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
             var tags = listOf(
@@ -70,18 +86,91 @@ class LnZapRequestEvent(
                 listOf("relays") + relays
             )
             if (zapType == LnZapEvent.ZapType.ANONYMOUS) {
-                tags = tags + listOf(listOf("anon", ""))
                 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, 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

@@ -48,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>>()
@@ -68,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

@@ -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/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/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/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(
+        byteArray: ByteArray,
+        mimeType: String?,
+        context: Context,
+        onSuccess: () -> Any?,
+        onError: (Throwable) -> Any?
+    ) {
+        try {
+            val extension = mimeType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
+            val buffer = byteArray.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,145 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import android.content.Context
+import android.net.Uri
+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
+
+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)
+
+    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, onClose: () -> Unit) {
+        isUploadingImage = true
+
+        val contentResolver = context.contentResolver
+        val uri = galleryUri ?: return
+        val serverToUse = selectedServer ?: return
+
+        if (selectedServer == ServersAvailable.NIP95) {
+            val contentType = contentResolver.getType(uri)
+            contentResolver.openInputStream(uri)?.use {
+                createNIP95Record(it.readBytes(), contentType, description, onClose)
+            }
+                ?: viewModelScope.launch {
+                    imageUploadingError.emit("Failed to upload the image / video")
+                }
+        } else {
+            ImageUploader.uploadImage(
+                uri = uri,
+                server = serverToUse,
+                contentResolver = contentResolver,
+                onSuccess = { imageUrl, mimeType ->
+                    createNIP94Record(imageUrl, mimeType, description, onClose)
+                },
+                onError = {
+                    isUploadingImage = false
+                    viewModelScope.launch {
+                        imageUploadingError.emit("Failed to upload the image / video")
+                    }
+                }
+            )
+        }
+    }
+
+    open fun cancel() {
+        galleryUri = null
+        isUploadingImage = false
+        mediaType = null
+
+        description = ""
+        selectedServer = account?.defaultFileServer
+    }
+
+    fun canPost(): Boolean {
+        return !isUploadingImage && galleryUri != null && selectedServer != null
+    }
+
+    fun createNIP94Record(imageUrl: String, mimeType: String?, description: String, onClose: () -> Unit) {
+        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
+                    cancel()
+                    onClose()
+                },
+                onError = {
+                    isUploadingImage = false
+                    viewModelScope.launch {
+                        imageUploadingError.emit("Failed to upload the image / video")
+                    }
+                }
+            )
+        }
+    }
+
+    fun createNIP95Record(bytes: ByteArray, mimeType: String?, description: String, onClose: () -> Unit) {
+        viewModelScope.launch(Dispatchers.IO) {
+            FileHeader.prepare(
+                bytes,
+                "",
+                mimeType,
+                description,
+                onReady = {
+                    account?.sendNip95(bytes, headerInfo = it)
+                    isUploadingImage = false
+                    cancel()
+                    onClose()
+                },
+                onError = {
+                    isUploadingImage = false
+                    viewModelScope.launch {
+                        imageUploadingError.emit("Failed to upload the image / video")
+                    }
+                }
+            )
+        }
+    }
+
+    fun isImage() = mediaType?.startsWith("image")
+    fun isVideo() = mediaType?.startsWith("video")
+    fun defaultServer() = account?.defaultFileServer
+}

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

@@ -0,0 +1,226 @@
+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.lifecycle.viewmodel.compose.viewModel
+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.delay
+import kotlinx.coroutines.launch
+
+@Composable
+fun NewMediaView(uri: Uri, onClose: () -> Unit, accountViewModel: AccountViewModel, navController: NavController) {
+    val account = accountViewModel.accountLiveData.value?.account ?: return
+    val resolver = LocalContext.current.contentResolver
+    val postViewModel: NewMediaModel = viewModel()
+    val context = LocalContext.current
+
+    val scroolState = rememberScrollState()
+
+    LaunchedEffect(Unit) {
+        val mediaType = resolver.getType(uri) ?: ""
+        postViewModel.load(account, uri, mediaType)
+        delay(100)
+
+        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()
+                    })
+
+                    if (postViewModel.isUploadingImage) {
+                        LoadingAnimation()
+                    }
+
+                    PostButton(
+                        onPost = {
+                            postViewModel.upload(context) {
+                                onClose()
+                            }
+                        },
+                        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 {
+                        bitmap = resolver.loadThumbnail(it, 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 {
+            postViewModel.galleryUri?.let {
+                VideoView(it)
+            }
+        }
+    }
+
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        TextSpinner(
+            label = stringResource(id = R.string.file_server),
+            placeholder = fileServers.filter { it.first == postViewModel.defaultServer() }.firstOrNull()?.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

@@ -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/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.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,13 +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
@@ -186,6 +207,23 @@ 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()
 
@@ -234,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)
                                     }
@@ -261,13 +307,18 @@ 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) {
@@ -283,6 +334,10 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                 postViewModel.wantsInvoice = !postViewModel.wantsInvoice
                             }
                         }
+
+                        ForwardZapTo(postViewModel) {
+                            postViewModel.wantsForwardZapTo = !postViewModel.wantsForwardZapTo
+                        }
                     }
                 }
             }
@@ -346,6 +401,87 @@ private fun AddLnInvoiceButton(
     }
 }
 
+@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(
@@ -447,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,6 +37,10 @@ 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)
@@ -57,6 +62,11 @@ open class NewPostViewModel : ViewModel() {
     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 ->
@@ -78,11 +88,17 @@ open class NewPostViewModel : ViewModel() {
         }
 
         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
     }
@@ -91,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
@@ -143,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? {
@@ -164,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 {
@@ -174,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()
         }
     }
@@ -193,7 +268,7 @@ 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 includePollHashtagInMessage(include: Boolean, hashtag: String) {
@@ -208,4 +283,73 @@ open class NewPostViewModel : ViewModel() {
             )
         }
     }
+
+    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 note = account?.sendNip95(bytes, headerInfo = it)
+
+                    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

@@ -83,3 +83,63 @@ fun SaveToGallery(url: String) {
         Text(text = stringResource(id = R.string.save), color = Color.White)
     }
 }
+
+@OptIn(ExperimentalPermissionsApi::class)
+@Composable
+fun SaveToGallery(byteArray: ByteArray, mimeType: String?) {
+    val localContext = LocalContext.current
+    val scope = rememberCoroutineScope()
+
+    fun saveImage() {
+        ImageSaver.saveImage(
+            context = localContext,
+            byteArray = byteArray,
+            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/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/InvoiceRequest.kt

@@ -37,7 +37,6 @@ import androidx.compose.ui.unit.sp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
-import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import kotlinx.coroutines.launch
 
 @Composable
@@ -136,7 +135,7 @@ fun InvoiceRequest(
             Button(
                 modifier = Modifier.fillMaxWidth().padding(vertical = 10.dp),
                 onClick = {
-                    val zapRequest = account.createZapRequestFor(toUserPubKeyHex, message, LnZapEvent.ZapType.PUBLIC)
+                    val zapRequest = account.createZapRequestFor(toUserPubKeyHex, message, account.defaultZapType)
 
                     LightningAddressResolver().lnAddressInvoice(
                         lud16,

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

@@ -59,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 {
@@ -86,7 +86,8 @@ fun RichTextViewer(
     navController: NavController
 ) {
     Column(modifier = modifier) {
-        if (content.startsWith("# ") ||
+        if (content.startsWith("> ") ||
+            content.startsWith("# ") ||
             content.contains("##") ||
             content.contains("**") ||
             content.contains("__") ||
@@ -139,21 +140,28 @@ fun RichTextViewer(
         } else {
             val urls = UrlDetector(content, UrlDetectorOptions.Default).detect()
             val urlSet = urls.mapTo(LinkedHashSet(urls.size)) { it.originalUrl }
-            val imagesForPager = urlSet.filter { fullUrl ->
+            val imagesForPager = urlSet.mapNotNull { fullUrl ->
                 val removedParamsFromUrl = fullUrl.split("?")[0].lowercase()
-                imageExtensions.any { removedParamsFromUrl.endsWith(it) } || videoExtensions.any { removedParamsFromUrl.endsWith(it) }
-            }
-            val imagesForPagerSet = imagesForPager.toSet()
+                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 (imagesForPagerSet.contains(word)) {
-                                ZoomableImageView(word, imagesForPager)
+                            val img = imagesForPager[word]
+                            if (img != null) {
+                                ZoomableContentView(img, imageList)
                             } else if (urlSet.contains(word)) {
                                 UrlPreview(word, "$word ")
                             } else if (word.startsWith("lnbc", true)) {
@@ -378,9 +386,11 @@ fun BechLink(word: String, canPreview: Boolean, backgroundColor: Color, accountV
                 isQuotedNote = true,
                 navController = navController
             )
-            Text(
-                "${it.second} "
-            )
+            if (!it.second.isNullOrEmpty()) {
+                Text(
+                    "${it.second} "
+                )
+            }
         } ?: nip19Route?.let {
             ClickableRoute(it, navController)
         } ?: Text(text = "$word ")

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.components
 
+import android.net.Uri
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -16,6 +17,7 @@ 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.source.ProgressiveMediaSource
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
@@ -23,16 +25,33 @@ import com.google.android.exoplayer2.ui.StyledPlayerView
 import com.vitorpamplona.amethyst.VideoCache
 
 @Composable
-fun VideoView(videoUri: String, onDialog: ((Boolean) -> Unit)? = null) {
+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 exoPlayer = remember(videoUri) {
+        val mediaBuilder = MediaItem.Builder().setUri(videoUri)
+
+        description?.let {
+            mediaBuilder.setMediaMetadata(
+                MediaMetadata.Builder().setDisplayTitle(it).build()
+            )
+        }
+
+        val media = mediaBuilder.build()
+
         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()).createMediaSource(MediaItem.fromUri(videoUri))
+                ProgressiveMediaSource.Factory(VideoCache.get()).createMediaSource(
+                    media
+                )
             )
             prepare()
         }
@@ -76,3 +95,7 @@ fun VideoView(videoUri: String, onDialog: ((Boolean) -> Unit)? = null) {
         }
     }
 }
+
+@Composable
+fun VideoView(videoBytes: ByteArray, description: String? = null, onDialog: ((Boolean) -> Unit)? = null) {
+}

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

@@ -0,0 +1,584 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import android.content.Context
+import android.util.Log
+import android.widget.Toast
+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.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 byteArray: ByteArray?,
+    val mimeType: String? = null,
+    description: String? = null,
+    val bluehash: String? = null,
+    isVerified: Boolean? = null,
+    uri: String
+) : ZoomablePreloadedContent(description, isVerified, uri)
+
+class ZoomableBytesVideo(
+    val byteArray: ByteArray,
+    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.byteArray, key2 = imageState) {
+            if (imageState is AsyncImagePainter.State.Success) {
+                scope.launch(Dispatchers.IO) {
+                    verifiedHash = content.isVerified
+                }
+            }
+        }
+    } else if (content is ZoomableBytesVideo) {
+        LaunchedEffect(key1 = content.byteArray, key2 = imageState) {
+            if (imageState is AsyncImagePainter.State.Success) {
+                scope.launch(Dispatchers.IO) {
+                    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() {
+            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))
+            }
+        }
+
+        if (imageState !is AsyncImagePainter.State.Success) {
+            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.byteArray,
+                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) {
+    }
+
+    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.byteArray != null) {
+                        SaveToGallery(byteArray = myContent.byteArray, 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.byteArray, key2 = imageState) {
+            if (imageState is AsyncImagePainter.State.Success) {
+                scope.launch(Dispatchers.IO) {
+                    verifiedHash = content.isVerified
+                }
+            }
+        }
+    } else if (content is ZoomableBytesVideo) {
+        LaunchedEffect(key1 = content.byteArray, key2 = imageState) {
+            if (imageState is AsyncImagePainter.State.Success) {
+                scope.launch(Dispatchers.IO) {
+                    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) {
+                DisplayBlueHash(content = content, modifier = Modifier.fillMaxWidth())
+            } else {
+                HashVerificationSymbol(verifiedHash, Modifier.align(Alignment.TopEnd))
+            }
+        }
+    } 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.byteArray,
+                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.byteArray, 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,188 +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.pager.PagerState
-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.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(ExperimentalFoundationApi::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/GlobalFeedFilter.kt

@@ -45,6 +45,6 @@ object GlobalFeedFilter : AdditiveFeedFilter<Note>() {
     }
 
     override fun sort(collection: Set<Note>): List<Note> {
-        return collection.sortedBy { it.createdAt() }.reversed()
+        return collection.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
     }
 }

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

@@ -3,6 +3,7 @@ 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
@@ -30,7 +31,7 @@ object HomeNewThreadFeedFilter : AdditiveFeedFilter<Note>() {
         return collection
             .asSequence()
             .filter { it ->
-                (it.event is TextNoteEvent || it.event is RepostEvent || it.event is LongTextNoteEvent || 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.pubkeyHex) } ?: 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

@@ -1,7 +1,6 @@
 package com.vitorpamplona.amethyst.ui.navigation
 
 import android.graphics.Rect
-import android.util.Log
 import android.view.ViewTreeObserver
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -44,11 +43,11 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlin.time.ExperimentalTime
-import kotlin.time.measureTimedValue
 
 val bottomNavigationItems = listOf(
     Route.Home,
     Route.Message,
+    Route.Video,
     Route.Search,
     Route.Notification
 )
@@ -141,72 +140,64 @@ fun AppBottomBar(navController: NavHostController, accountViewModel: AccountView
 @OptIn(ExperimentalTime::class)
 @Composable
 private fun NotifiableIcon(route: Route, selected: Boolean, accountViewModel: AccountViewModel) {
-    println("Notifiable Icon")
+    Box(Modifier.size(if ("Home" == route.base) 25.dp else 23.dp)) {
+        Icon(
+            painter = painterResource(id = route.icon),
+            contentDescription = null,
+            modifier = Modifier.size(if ("Home" == route.base) 24.dp else 20.dp),
+            tint = if (selected) MaterialTheme.colors.primary else Color.Unspecified
+        )
 
-    val (value, elapsed) = measureTimedValue {
-        Box(Modifier.size(if ("Home" == route.base) 25.dp else 23.dp)) {
-            Icon(
-                painter = painterResource(id = route.icon),
-                contentDescription = null,
-                modifier = Modifier.size(if ("Home" == route.base) 24.dp else 20.dp),
-                tint = if (selected) MaterialTheme.colors.primary else Color.Unspecified
-            )
+        val accountState by accountViewModel.accountLiveData.observeAsState()
+        val account = accountState?.account ?: return
 
-            println("Notifiable Icon")
+        // Notification
+        val dbState = LocalCache.live.observeAsState()
+        val db = dbState.value ?: return
 
-            val accountState by accountViewModel.accountLiveData.observeAsState()
-            val account = accountState?.account ?: return
+        val notifState = NotificationCache.live.observeAsState()
+        val notif = notifState.value ?: return
 
-            // Notification
-            val dbState = LocalCache.live.observeAsState()
-            val db = dbState.value ?: return
+        var hasNewItems by remember { mutableStateOf<Boolean>(false) }
 
-            val notifState = NotificationCache.live.observeAsState()
-            val notif = notifState.value ?: return
-
-            var hasNewItems by remember { mutableStateOf<Boolean>(false) }
-
-            LaunchedEffect(key1 = notif) {
-                withContext(Dispatchers.IO) {
-                    hasNewItems = route.hasNewItems(account, notif.cache, emptySet())
-                }
+        LaunchedEffect(key1 = notif) {
+            withContext(Dispatchers.IO) {
+                hasNewItems = route.hasNewItems(account, notif.cache, emptySet())
             }
+        }
 
-            LaunchedEffect(key1 = db) {
-                withContext(Dispatchers.IO) {
-                    hasNewItems = route.hasNewItems(account, notif.cache, db)
-                }
+        LaunchedEffect(key1 = db) {
+            withContext(Dispatchers.IO) {
+                hasNewItems = route.hasNewItems(account, notif.cache, db)
             }
+        }
 
-            if (hasNewItems) {
+        if (hasNewItems) {
+            Box(
+                Modifier
+                    .width(10.dp)
+                    .height(10.dp)
+                    .align(Alignment.TopEnd)
+            ) {
                 Box(
-                    Modifier
+                    modifier = Modifier
                         .width(10.dp)
                         .height(10.dp)
-                        .align(Alignment.TopEnd)
+                        .clip(shape = CircleShape)
+                        .background(MaterialTheme.colors.primary),
+                    contentAlignment = Alignment.TopEnd
                 ) {
-                    Box(
+                    Text(
+                        "",
+                        color = Color.White,
+                        textAlign = TextAlign.Center,
+                        fontSize = 12.sp,
                         modifier = Modifier
-                            .width(10.dp)
-                            .height(10.dp)
-                            .clip(shape = CircleShape)
-                            .background(MaterialTheme.colors.primary),
-                        contentAlignment = Alignment.TopEnd
-                    ) {
-                        Text(
-                            "",
-                            color = Color.White,
-                            textAlign = TextAlign.Center,
-                            fontSize = 12.sp,
-                            modifier = Modifier
-                                .wrapContentHeight()
-                                .align(Alignment.TopEnd)
-                        )
-                    }
+                            .wrapContentHeight()
+                            .align(Alignment.TopEnd)
+                    )
                 }
             }
         }
     }
-
-    Log.d("Notification time", "$elapsed")
 }

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

@@ -17,9 +17,11 @@ 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,6 +36,7 @@ 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(ExperimentalFoundationApi::class)
 @Composable
@@ -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

@@ -11,6 +11,7 @@ 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
@@ -40,6 +41,12 @@ 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,
@@ -109,9 +116,29 @@ fun currentRoute(navController: NavHostController): String? {
     return navBackStackEntry?.destination?.route
 }
 
-object HomeLatestItem {
-    private var newestItem: Note? = null
+open class LatestItem {
+    var newestItemPerAccount: Map<String, Note?> = mapOf()
 
+    fun updateNewestItem(newNotes: Set<Note>, account: Account, filter: AdditiveFeedFilter<Note>): Note? {
+        val newestItem = newestItemPerAccount[account.userProfile().pubkeyHex]
+
+        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]
+    }
+}
+
+object HomeLatestItem : LatestItem() {
     fun hasNewItems(
         account: Account,
         cache: NotificationCache,
@@ -120,22 +147,13 @@ object HomeLatestItem {
         val lastTime = cache.load("HomeFollows")
         HomeNewThreadFeedFilter.account = account
 
-        if (newestItem == null) {
-            newestItem = HomeNewThreadFeedFilter.feed().firstOrNull { it.createdAt() != null }
-        } else {
-            newestItem =
-                HomeNewThreadFeedFilter.sort(
-                    HomeNewThreadFeedFilter.applyFilter(newNotes + newestItem!!)
-                ).first()
-        }
+        val newestItem = updateNewestItem(newNotes, account, HomeNewThreadFeedFilter)
 
         return (newestItem?.createdAt() ?: 0) > lastTime
     }
 }
 
-object NotificationLatestItem {
-    private var newestItem: Note? = null
-
+object NotificationLatestItem : LatestItem() {
     fun hasNewItems(
         account: Account,
         cache: NotificationCache,
@@ -144,21 +162,13 @@ object NotificationLatestItem {
         val lastTime = cache.load("Notification")
         NotificationFeedFilter.account = account
 
-        if (newestItem == null) {
-            newestItem = NotificationFeedFilter.feed().firstOrNull { it.createdAt() != null }
-        } else {
-            newestItem = HomeNewThreadFeedFilter.sort(
-                NotificationFeedFilter.applyFilter(newNotes) + newestItem!!
-            ).first()
-        }
+        val newestItem = updateNewestItem(newNotes, account, NotificationFeedFilter)
 
         return (newestItem?.createdAt() ?: 0) > lastTime
     }
 }
 
 object MessagesLatestItem {
-    private var newestItem: Note? = null
-
     fun hasNewItems(
         account: Account,
         cache: NotificationCache,

app/src/main/java/com/vitorpamplona/amethyst/ui/note/MultiSetCompose.kt

@@ -6,6 +6,7 @@ import androidx.compose.foundation.combinedClickable
 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.padding
 import androidx.compose.foundation.layout.size
@@ -37,7 +38,9 @@ import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
+import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.MultiSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
@@ -81,9 +84,11 @@ fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, accoun
                 .combinedClickable(
                     onClick = {
                         if (noteEvent is ChannelMessageEvent) {
-                            note.channel()?.let {
-                                navController.navigate("Channel/${it.idHex}")
-                            }
+                            note
+                                .channel()
+                                ?.let {
+                                    navController.navigate("Channel/${it.idHex}")
+                                }
                         } else if (noteEvent is PrivateDmEvent) {
                             val replyAuthorBase =
                                 (note.event as? PrivateDmEvent)
@@ -135,7 +140,7 @@ fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, accoun
                                 )
                             }
 
-                            AuthorGallery(multiSetCard.zapEvents.keys, navController, account)
+                            AuthorGalleryZaps(multiSetCard.zapEvents, navController, account, accountViewModel)
                         }
                     }
 
@@ -156,7 +161,7 @@ fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, accoun
                                 )
                             }
 
-                            AuthorGallery(multiSetCard.boostEvents, navController, account)
+                            AuthorGallery(multiSetCard.boostEvents, navController, account, accountViewModel)
                         }
                     }
 
@@ -177,7 +182,7 @@ fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, accoun
                                 )
                             }
 
-                            AuthorGallery(multiSetCard.likeEvents, navController, account)
+                            AuthorGallery(multiSetCard.likeEvents, navController, account, accountViewModel)
                         }
                     }
 
@@ -208,10 +213,11 @@ fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, accoun
 }
 
 @Composable
-fun AuthorGallery(
-    authorNotes: Collection<Note>,
+fun AuthorGalleryZaps(
+    authorNotes: Map<Note, Note>,
     navController: NavController,
-    account: Account
+    account: Account,
+    accountViewModel: AccountViewModel
 ) {
     val accountState by account.userProfile().live().follows.observeAsState()
     val accountUser = accountState?.user ?: return
@@ -219,12 +225,95 @@ fun AuthorGallery(
     Column(modifier = Modifier.padding(start = 10.dp)) {
         FlowRow() {
             authorNotes.forEach {
-                FastNoteAuthorPicture(
-                    note = it,
-                    navController = navController,
-                    userAccount = accountUser,
-                    size = 35.dp
-                )
+                AuthorPictureAndComment(it.key, it.value, navController, accountUser, accountViewModel)
+            }
+        }
+    }
+}
+
+@Composable
+private fun AuthorPictureAndComment(
+    zapRequest: Note,
+    zapEvent: Note,
+    navController: NavController,
+    accountUser: User,
+    accountViewModel: AccountViewModel
+) {
+    val author = zapRequest.author ?: return
+
+    var content by remember { mutableStateOf<Pair<User, String?>>(Pair(author, null)) }
+
+    LaunchedEffect(key1 = zapRequest.idHex) {
+        (zapRequest.event as? LnZapRequestEvent)?.let {
+            val decryptedContent = accountViewModel.decryptZap(zapRequest)
+            if (decryptedContent != null) {
+                val author = LocalCache.getOrCreateUser(decryptedContent.pubKey)
+                content = Pair(author, decryptedContent.content)
+            } else {
+                if (!zapRequest.event?.content().isNullOrBlank()) {
+                    content = Pair(author, zapRequest.event?.content())
+                }
+            }
+        }
+    }
+
+    AuthorPictureAndComment(content.first, content.second, navController, accountUser, accountViewModel)
+}
+
+@Composable
+private fun AuthorPictureAndComment(
+    author: User,
+    comment: String?,
+    navController: NavController,
+    accountUser: User,
+    accountViewModel: AccountViewModel
+) {
+    val modifier = if (!comment.isNullOrBlank()) {
+        Modifier.fillMaxWidth()
+    } else {
+        Modifier
+    }
+
+    Row(modifier = modifier, verticalAlignment = Alignment.CenterVertically) {
+        FastNoteAuthorPicture(
+            author = author,
+            navController = navController,
+            userAccount = accountUser,
+            size = 35.dp
+        )
+
+        if (!comment.isNullOrBlank()) {
+            Spacer(modifier = Modifier.width(5.dp))
+            TranslatableRichTextViewer(
+                content = comment,
+                canPreview = true,
+                tags = null,
+                modifier = Modifier.weight(1f),
+                backgroundColor = MaterialTheme.colors.background,
+                accountViewModel = accountViewModel,
+                navController = navController
+            )
+        }
+    }
+}
+
+@Composable
+fun AuthorGallery(
+    authorNotes: Collection<Note>,
+    navController: NavController,
+    account: Account,
+    accountViewModel: AccountViewModel
+) {
+    val accountState by account.userProfile().live().follows.observeAsState()
+    val accountUser = accountState?.user ?: return
+
+    Column(modifier = Modifier.padding(start = 10.dp)) {
+        FlowRow() {
+            authorNotes.forEach {
+                val author = it.author
+                if (author != null) {
+                    AuthorPictureAndComment(author, null, navController, accountUser, accountViewModel)
+                }
             }
         }
     }
@@ -232,20 +321,16 @@ fun AuthorGallery(
 
 @Composable
 fun FastNoteAuthorPicture(
-    note: Note,
+    author: User,
     navController: NavController,
     userAccount: User,
     size: Dp,
     pictureModifier: Modifier = Modifier
 ) {
-    // can't be null if here
-    val author = note.author ?: return
-
     val userState by author.live().metadata.observeAsState()
     val user = userState?.user ?: return
 
     val showFollowingMark = userAccount.isFollowingCached(user) || user === userAccount
-
     UserPicture(
         userHex = user.pubkeyHex,
         userPicture = user.profilePicture(),

app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt

@@ -59,6 +59,7 @@ import com.vitorpamplona.amethyst.ui.theme.Following
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.math.BigDecimal
+import java.net.URL
 import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
 
@@ -167,6 +168,10 @@ fun NoteComposeInner(
         ChannelHeader(baseChannel = baseChannel, account = account, navController = navController)
     } else if (noteEvent is BadgeDefinitionEvent) {
         BadgeDisplay(baseNote = note)
+    } else if (noteEvent is FileHeaderEvent) {
+        FileHeaderDisplay(note)
+    } else if (noteEvent is FileStorageHeaderEvent) {
+        FileStorageHeaderDisplay(note)
     } else {
         var isNew by remember { mutableStateOf<Boolean>(false) }
 
@@ -373,7 +378,7 @@ fun NoteComposeInner(
                                 baseNote = replyingDirectlyTo,
                                 isQuotedNote = true,
                                 modifier = Modifier
-                                    .padding(0.dp)
+                                    .padding(top = 5.dp)
                                     .fillMaxWidth()
                                     .clip(shape = RoundedCornerShape(15.dp))
                                     .border(
@@ -448,7 +453,7 @@ fun NoteComposeInner(
                     } else if (noteEvent is LongTextNoteEvent) {
                         LongFormHeader(noteEvent, note, loggedIn)
 
-                        ReactionsRow(note, accountViewModel)
+                        ReactionsRow(note, accountViewModel, navController)
 
                         Divider(
                             modifier = Modifier.padding(top = 10.dp),
@@ -483,7 +488,7 @@ fun NoteComposeInner(
                             )
                         }
 
-                        ReactionsRow(note, accountViewModel)
+                        ReactionsRow(note, accountViewModel, navController)
 
                         Divider(
                             modifier = Modifier.padding(top = 10.dp),
@@ -510,7 +515,27 @@ fun NoteComposeInner(
                         )
 
                         if (!makeItShort) {
-                            ReactionsRow(note, accountViewModel)
+                            ReactionsRow(note, accountViewModel, navController)
+                        }
+
+                        Divider(
+                            modifier = Modifier.padding(top = 10.dp),
+                            thickness = 0.25.dp
+                        )
+                    } else if (noteEvent is HighlightEvent) {
+                        DisplayHighlight(
+                            noteEvent.quote(),
+                            noteEvent.author(),
+                            noteEvent.inUrl(),
+                            makeItShort,
+                            canPreview,
+                            backgroundColor,
+                            accountViewModel,
+                            navController
+                        )
+
+                        if (!makeItShort) {
+                            ReactionsRow(note, accountViewModel, navController)
                         }
 
                         Divider(
@@ -554,7 +579,7 @@ fun NoteComposeInner(
                         }
 
                         if (!makeItShort) {
-                            ReactionsRow(note, accountViewModel)
+                            ReactionsRow(note, accountViewModel, navController)
                         }
 
                         Divider(
@@ -570,6 +595,66 @@ fun NoteComposeInner(
     }
 }
 
+@Composable
+fun DisplayHighlight(
+    highlight: String,
+    authorHex: String?,
+    url: String?,
+    makeItShort: Boolean,
+    canPreview: Boolean,
+    backgroundColor: Color,
+    accountViewModel: AccountViewModel,
+    navController: NavController
+) {
+    val quote = highlight.split("\n").map { "> *${it.removeSuffix(" ")}*" }.joinToString("\n")
+
+    if (quote != null) {
+        TranslatableRichTextViewer(
+            quote,
+            canPreview = canPreview && !makeItShort,
+            Modifier.fillMaxWidth(),
+            emptyList(),
+            backgroundColor,
+            accountViewModel,
+            navController
+        )
+    }
+
+    FlowRow() {
+        authorHex?.let { authorHex ->
+            val userBase = LocalCache.checkGetOrCreateUser(authorHex)
+
+            if (userBase != null) {
+                val userState by userBase.live().metadata.observeAsState()
+                val user = userState?.user
+
+                if (user != null) {
+                    CreateClickableText(
+                        user.toBestDisplayName(),
+                        "",
+                        "User/${user.pubkeyHex}",
+                        navController
+                    )
+                }
+            }
+        }
+
+        url?.let { url ->
+            val validatedUrl = try {
+                URL(url)
+            } catch (e: Exception) {
+                Log.w("Note Compose", "Invalid URI: $url")
+                null
+            }
+
+            validatedUrl?.host?.let { host ->
+                Text("on ")
+                ClickableUrl(urlText = host, url = url)
+            }
+        }
+    }
+}
+
 @Composable
 fun DisplayFollowingHashtagsInPost(
     noteEvent: EventInterface,
@@ -776,6 +861,73 @@ fun BadgeDisplay(baseNote: Note) {
     }
 }
 
+@Composable
+fun FileHeaderDisplay(note: Note) {
+    val event = (note.event as? FileHeaderEvent) ?: return
+    val fullUrl = event.url() ?: return
+
+    var content by remember { mutableStateOf<ZoomableContent?>(null) }
+
+    LaunchedEffect(key1 = event.id) {
+        withContext(Dispatchers.IO) {
+            val blurHash = event.blurhash()
+            val hash = event.hash()
+            val description = event.content
+            val removedParamsFromUrl = fullUrl.split("?")[0].lowercase()
+            val isImage = imageExtensions.any { removedParamsFromUrl.endsWith(it) }
+            val isVideo = videoExtensions.any { removedParamsFromUrl.endsWith(it) }
+            val uri = "nostr:" + note.toNEvent()
+            content = if (isImage) {
+                ZoomableUrlImage(fullUrl, description, hash, blurHash, uri)
+            } else {
+                ZoomableUrlVideo(fullUrl, description, hash, uri)
+            }
+        }
+    }
+
+    content?.let {
+        ZoomableContentView(content = it, listOf(it))
+    } ?: UrlPreview(fullUrl, "$fullUrl ")
+}
+
+@Composable
+fun FileStorageHeaderDisplay(baseNote: Note) {
+    val eventHeader = (baseNote.event as? FileStorageHeaderEvent) ?: return
+
+    val fileNote = eventHeader.dataEventId()?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
+
+    val noteState by fileNote.live().metadata.observeAsState()
+    val note = noteState?.note
+
+    val eventBytes = (note?.event as? FileStorageEvent)
+
+    var content by remember { mutableStateOf<ZoomableContent?>(null) }
+
+    LaunchedEffect(key1 = eventHeader.id, key2 = noteState) {
+        withContext(Dispatchers.IO) {
+            val uri = "nostr:" + baseNote.toNEvent()
+            val bytes = eventBytes?.decode()
+            val blurHash = eventHeader.blurhash()
+            val description = eventHeader.content
+            val mimeType = eventHeader.mimeType()
+
+            content = if (mimeType?.startsWith("image") == true) {
+                ZoomableBitmapImage(bytes, mimeType, description, blurHash, true, uri)
+            } else {
+                if (bytes != null) {
+                    ZoomableBytesVideo(bytes, mimeType, description, true, uri)
+                } else {
+                    null
+                }
+            }
+        }
+    }
+
+    content?.let {
+        ZoomableContentView(content = it, listOf(it))
+    } ?: BlankNote()
+}
+
 @Composable
 private fun LongFormHeader(noteEvent: LongTextNoteEvent, note: Note, loggedIn: User) {
     Row(
@@ -1170,10 +1322,10 @@ fun NoteDropDownMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Unit,
         DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(accountViewModel.decrypt(note) ?: "")); onDismiss() }) {
             Text(stringResource(R.string.copy_text))
         }
-        DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString("@${note.author?.pubkeyNpub()}")); onDismiss() }) {
+        DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString("nostr:${note.author?.pubkeyNpub()}")); onDismiss() }) {
             Text(stringResource(R.string.copy_user_pubkey))
         }
-        DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(note.idNote())); onDismiss() }) {
+        DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString("nostr:" + note.toNEvent())); onDismiss() }) {
             Text(stringResource(R.string.copy_note_id))
         }
         DropdownMenuItem(onClick = {

app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt

@@ -85,7 +85,7 @@ val externalLinkForNote = { note: Note ->
             "https://habla.news/a/${note.address().toNAddr()}"
         }
     } else {
-        "https://snort.social/e/${note.idNote()}"
+        "https://snort.social/e/${note.toNEvent()}"
     }
 }
 
@@ -152,13 +152,13 @@ fun NoteQuickActionMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Uni
                         }
                         VerticalDivider(primaryLight)
                         NoteQuickActionItem(Icons.Default.AlternateEmail, stringResource(R.string.quick_action_copy_user_id)) {
-                            clipboardManager.setText(AnnotatedString("@${note.author?.pubkeyNpub()}"))
+                            clipboardManager.setText(AnnotatedString("nostr:${note.author?.pubkeyNpub()}"))
                             showToast(R.string.copied_user_id_to_clipboard)
                             onDismiss()
                         }
                         VerticalDivider(primaryLight)
                         NoteQuickActionItem(Icons.Default.FormatQuote, stringResource(R.string.quick_action_copy_note_id)) {
-                            clipboardManager.setText(AnnotatedString("@${note.idNote()}"))
+                            clipboardManager.setText(AnnotatedString("nostr:${note.toNEvent()}"))
                             showToast(R.string.copied_note_id_to_clipboard)
                             onDismiss()
                         }

app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt

@@ -31,12 +31,13 @@ import androidx.compose.ui.window.Popup
 import androidx.navigation.NavController
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.math.BigDecimal
 import java.util.*
 import kotlin.math.roundToInt
 
@@ -51,105 +52,150 @@ fun PollNote(
     val zapsState by baseNote.live().zaps.observeAsState()
     val zappedNote = zapsState?.note ?: return
 
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
     val pollViewModel = PollNoteViewModel()
+    pollViewModel.account = account
     pollViewModel.load(zappedNote)
 
     pollViewModel.pollEvent?.pollOptions()?.forEach { poll_op ->
-        val optionTally = pollViewModel.optionVoteTally(poll_op.key)
-        val color = if (
-            pollViewModel.consensusThreshold != null &&
-            optionTally >= pollViewModel.consensusThreshold!!
-        ) {
-            Color.Green.copy(alpha = 0.32f)
-        } else {
-            MaterialTheme.colors.primary.copy(alpha = 0.32f)
-        }
+        OptionNote(
+            poll_op.key,
+            poll_op.value,
+            pollViewModel,
+            baseNote,
+            accountViewModel,
+            canPreview,
+            backgroundColor,
+            navController
+        )
+    }
+}
 
-        Row(
-            verticalAlignment = Alignment.CenterVertically,
-            modifier = Modifier.padding(vertical = 3.dp)
-        ) {
-            if (accountViewModel.isLoggedUser(zappedNote.author) || zappedNote.isZappedBy(accountViewModel.userProfile())) {
-                ZapVote(
-                    baseNote,
-                    accountViewModel,
-                    pollViewModel,
-                    poll_op.key,
-                    nonClickablePrepend = {
-                        Box(
-                            Modifier.fillMaxWidth(0.75f).clip(shape = RoundedCornerShape(15.dp))
-                                .border(
-                                    2.dp,
-                                    color,
-                                    RoundedCornerShape(15.dp)
-                                )
-                        ) {
-                            LinearProgressIndicator(
-                                modifier = Modifier.matchParentSize(),
-                                color = color,
-                                progress = optionTally.toFloat()
+@Composable
+private fun OptionNote(
+    optionNumber: Int,
+    optionText: String,
+    pollViewModel: PollNoteViewModel,
+    baseNote: Note,
+    accountViewModel: AccountViewModel,
+    canPreview: Boolean,
+    backgroundColor: Color,
+    navController: NavController
+) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier.padding(vertical = 3.dp)
+    ) {
+        if (!pollViewModel.canZap()) {
+            val defaultColor = MaterialTheme.colors.primary.copy(alpha = 0.32f)
+            var optionTally by remember { mutableStateOf(Pair(BigDecimal.ZERO, defaultColor)) }
+
+            LaunchedEffect(key1 = optionNumber, key2 = pollViewModel) {
+                val myTally = pollViewModel.optionVoteTally(optionNumber)
+                val color = if (
+                    pollViewModel.consensusThreshold != null &&
+                    myTally >= pollViewModel.consensusThreshold!!
+                ) {
+                    Color.Green.copy(alpha = 0.32f)
+                } else {
+                    defaultColor
+                }
+
+                if (myTally > optionTally.first || color != optionTally.second) {
+                    optionTally = Pair(myTally, color)
+                }
+            }
+
+            ZapVote(
+                baseNote,
+                accountViewModel,
+                pollViewModel,
+                optionNumber,
+                nonClickablePrepend = {
+                    Box(
+                        Modifier
+                            .fillMaxWidth(0.75f)
+                            .clip(shape = RoundedCornerShape(15.dp))
+                            .border(
+                                2.dp,
+                                optionTally.second,
+                                RoundedCornerShape(15.dp)
                             )
+                    ) {
+                        LinearProgressIndicator(
+                            modifier = Modifier.matchParentSize(),
+                            color = optionTally.second,
+                            progress = optionTally.first.toFloat()
+                        )
 
-                            Row(
-                                verticalAlignment = Alignment.CenterVertically
+                        Row(
+                            verticalAlignment = Alignment.CenterVertically
+                        ) {
+                            Column(
+                                horizontalAlignment = Alignment.End,
+                                modifier = Modifier
+                                    .padding(horizontal = 10.dp)
+                                    .width(40.dp)
                             ) {
-                                Column(
-                                    horizontalAlignment = Alignment.End,
-                                    modifier = Modifier.padding(horizontal = 10.dp).width(40.dp)
-                                ) {
-                                    Text(
-                                        text = "${(optionTally.toFloat() * 100).roundToInt()}%",
-                                        fontWeight = FontWeight.Bold
-                                    )
-                                }
+                                Text(
+                                    text = "${(optionTally.first.toFloat() * 100).roundToInt()}%",
+                                    fontWeight = FontWeight.Bold
+                                )
+                            }
 
-                                Column(modifier = Modifier.fillMaxWidth().padding(15.dp)) {
-                                    TranslatableRichTextViewer(
-                                        poll_op.value,
-                                        canPreview,
-                                        Modifier,
-                                        pollViewModel.pollEvent?.tags(),
-                                        backgroundColor,
-                                        accountViewModel,
-                                        navController
-                                    )
-                                }
+                            Column(
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .padding(15.dp)
+                            ) {
+                                TranslatableRichTextViewer(
+                                    optionText,
+                                    canPreview,
+                                    Modifier,
+                                    pollViewModel.pollEvent?.tags(),
+                                    backgroundColor,
+                                    accountViewModel,
+                                    navController
+                                )
                             }
                         }
-                    },
-                    clickablePrepend = {
                     }
-                )
-            } else {
-                ZapVote(
-                    baseNote,
-                    accountViewModel,
-                    pollViewModel,
-                    poll_op.key,
-                    nonClickablePrepend = {},
-                    clickablePrepend = {
-                        Box(
-                            Modifier.fillMaxWidth(0.75f)
-                                .clip(shape = RoundedCornerShape(15.dp))
-                                .border(
-                                    2.dp,
-                                    MaterialTheme.colors.primary,
-                                    RoundedCornerShape(15.dp)
-                                )
-                        ) {
-                            TranslatableRichTextViewer(
-                                poll_op.value,
-                                canPreview,
-                                Modifier.padding(15.dp),
-                                pollViewModel.pollEvent?.tags(),
-                                backgroundColor,
-                                accountViewModel,
-                                navController
+                },
+                clickablePrepend = {
+                }
+            )
+        } else {
+            ZapVote(
+                baseNote,
+                accountViewModel,
+                pollViewModel,
+                optionNumber,
+                nonClickablePrepend = {},
+                clickablePrepend = {
+                    Box(
+                        Modifier
+                            .fillMaxWidth(0.75f)
+                            .clip(shape = RoundedCornerShape(15.dp))
+                            .border(
+                                2.dp,
+                                MaterialTheme.colors.primary,
+                                RoundedCornerShape(15.dp)
                             )
-                        }
+                    ) {
+                        TranslatableRichTextViewer(
+                            optionText,
+                            canPreview,
+                            Modifier.padding(15.dp),
+                            pollViewModel.pollEvent?.tags(),
+                            backgroundColor,
+                            accountViewModel,
+                            navController
+                        )
                     }
-                )
-            }
+                }
+            )
         }
     }
 }
@@ -250,7 +296,7 @@ fun ZapVote(
                                     zappingProgress = it
                                 }
                             },
-                            zapType = LnZapEvent.ZapType.PUBLIC
+                            zapType = account.defaultZapType
                         )
                     }
                 } else {
@@ -288,7 +334,17 @@ fun ZapVote(
 
         clickablePrepend()
 
-        if (pollViewModel.isPollOptionZappedBy(pollOption, accountViewModel.userProfile())) {
+        var optionWasZappedByLoggedInUser by remember { mutableStateOf(false) }
+
+        LaunchedEffect(key1 = zapsState) {
+            withContext(Dispatchers.IO) {
+                if (!optionWasZappedByLoggedInUser) {
+                    optionWasZappedByLoggedInUser = pollViewModel.isPollOptionZappedBy(pollOption, accountViewModel.userProfile())
+                }
+            }
+        }
+
+        if (optionWasZappedByLoggedInUser) {
             zappingProgress = 1f
             Icon(
                 imageVector = Icons.Default.Bolt,
@@ -315,8 +371,18 @@ fun ZapVote(
         }
     }
 
+    var wasZappedByLoggedInUser by remember { mutableStateOf(false) }
+
+    LaunchedEffect(key1 = zapsState) {
+        withContext(Dispatchers.IO) {
+            if (!wasZappedByLoggedInUser) {
+                wasZappedByLoggedInUser = zappedNote?.isZappedBy(accountViewModel.userProfile(), account) == true
+            }
+        }
+    }
+
     // only show tallies after a user has zapped note
-    if (baseNote.author == accountViewModel.userProfile() || zappedNote?.isZappedBy(accountViewModel.userProfile()) == true) {
+    if (baseNote.author == accountViewModel.userProfile() || wasZappedByLoggedInUser) {
         Text(
             showAmount(pollViewModel.zappedPollOptionAmount(pollOption)),
             fontSize = 14.sp,
@@ -378,7 +444,7 @@ fun FilteredZapAmountChoicePopup(
                                 context,
                                 onError,
                                 onProgress,
-                                LnZapEvent.ZapType.PUBLIC
+                                account.defaultZapType
                             )
                             onDismiss()
                         }
@@ -404,7 +470,7 @@ fun FilteredZapAmountChoicePopup(
                                         context,
                                         onError,
                                         onProgress,
-                                        LnZapEvent.ZapType.PUBLIC
+                                        account.defaultZapType
                                     )
                                     onDismiss()
                                 }
@@ -496,8 +562,7 @@ fun ZapVoteAmountChoicePopup(
                                 "",
                                 context,
                                 onError,
-                                onProgress,
-                                LnZapEvent.ZapType.PUBLIC
+                                onProgress
                             )
                             onDismiss()
                         }
@@ -522,8 +587,7 @@ fun ZapVoteAmountChoicePopup(
                                         "",
                                         context,
                                         onError,
-                                        onProgress,
-                                        LnZapEvent.ZapType.PUBLIC
+                                        onProgress
                                     )
                                     onDismiss()
                                 }

app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt

@@ -33,6 +33,13 @@ class PollNoteViewModel {
         totalZapped = totalZapped()
     }
 
+    fun canZap(): Boolean {
+        val account = account ?: return false
+        val user = account.userProfile() ?: return false
+        val note = pollNote ?: return false
+        return user != note.author && !note.isZappedBy(user, account)
+    }
+
     fun isVoteAmountAtomic() = valueMaximum != null && valueMinimum != null && valueMinimum == valueMaximum
 
     fun isPollClosed(): Boolean = closedAt?.let { // allow 2 minute leeway for zap to propagate
@@ -87,14 +94,12 @@ class PollNoteViewModel {
     }
 
     fun isPollOptionZappedBy(option: Int, user: User): Boolean {
-        if (pollNote?.zaps?.any { it.key.author === user } == true) {
-            pollNote!!.zaps
-                .any {
-                    val event = it.value?.event as? LnZapEvent
-                    event?.zappedPollOption() == option && event.zappedRequestAuthor() == user.pubkeyHex
-                }
-        }
-        return false
+        return pollNote!!.zaps
+            .any {
+                val zapEvent = it.value?.event as? LnZapEvent
+                val privateZapAuthor = account?.decryptZapContentAuthor(it.key)
+                zapEvent?.zappedPollOption() == option && (it.key.author?.pubkeyHex == user.pubkeyHex || privateZapAuthor?.pubKey == user.pubkeyHex)
+            }
     }
 
     fun zappedPollOptionAmount(option: Int): BigDecimal {
@@ -110,7 +115,13 @@ class PollNoteViewModel {
 
     fun totalZapped(): BigDecimal {
         return pollNote?.zaps?.values?.sumOf {
-            (it?.event as? LnZapEvent)?.amount ?: BigDecimal(0)
+            val zapEvent = (it?.event as? LnZapEvent)
+
+            if (zapEvent?.zappedPollOption() != null) {
+                zapEvent.amount ?: BigDecimal(0)
+            } else {
+                BigDecimal(0)
+            }
         } ?: BigDecimal(0)
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt

@@ -45,16 +45,17 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Popup
+import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import coil.request.CachePolicy
 import coil.request.ImageRequest
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.ui.actions.NewPostView
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
@@ -66,7 +67,7 @@ import java.math.RoundingMode
 import kotlin.math.roundToInt
 
 @Composable
-fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
+fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel, navController: NavController) {
     val accountState by accountViewModel.accountLiveData.observeAsState()
     val account = accountState?.account ?: return
 
@@ -79,11 +80,11 @@ fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
     }
 
     if (wantsToReplyTo != null) {
-        NewPostView({ wantsToReplyTo = null }, wantsToReplyTo, null, account)
+        NewPostView({ wantsToReplyTo = null }, wantsToReplyTo, null, account, accountViewModel, navController)
     }
 
     if (wantsToQuote != null) {
-        NewPostView({ wantsToQuote = null }, null, wantsToQuote, account)
+        NewPostView({ wantsToQuote = null }, null, wantsToQuote, account, accountViewModel, navController)
     }
 
     Spacer(modifier = Modifier.height(8.dp))
@@ -116,6 +117,7 @@ fun ReplyReaction(
     baseNote: Note,
     accountViewModel: AccountViewModel,
     showCounter: Boolean = true,
+    iconSize: Dp = 20.dp,
     onPress: () -> Unit
 ) {
     val repliesState by baseNote.live().replies.observeAsState()
@@ -125,7 +127,7 @@ fun ReplyReaction(
     val scope = rememberCoroutineScope()
 
     IconButton(
-        modifier = Modifier.size(20.dp),
+        modifier = Modifier.size(iconSize),
         onClick = {
             if (accountViewModel.isWriteable()) {
                 onPress()
@@ -140,7 +142,7 @@ fun ReplyReaction(
             }
         }
     ) {
-        ReplyIcon()
+        ReplyIcon(iconSize)
     }
 
     if (showCounter) {
@@ -153,19 +155,20 @@ fun ReplyReaction(
 }
 
 @Composable
-private fun ReplyIcon() {
+private fun ReplyIcon(iconSize: Dp = 15.dp) {
     Icon(
         painter = painterResource(R.drawable.ic_comment),
         null,
-        modifier = Modifier.size(15.dp),
+        modifier = Modifier.size(iconSize),
         tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
     )
 }
 
 @Composable
-private fun BoostReaction(
+public fun BoostReaction(
     baseNote: Note,
     accountViewModel: AccountViewModel,
+    iconSize: Dp = 20.dp,
     onQuotePress: () -> Unit
 ) {
     val boostsState by baseNote.live().boosts.observeAsState()
@@ -178,7 +181,7 @@ private fun BoostReaction(
     var wantsToBoost by remember { mutableStateOf(false) }
 
     IconButton(
-        modifier = Modifier.then(Modifier.size(20.dp)),
+        modifier = Modifier.then(Modifier.size(iconSize)),
         onClick = {
             if (accountViewModel.isWriteable()) {
                 if (accountViewModel.hasBoosted(baseNote)) {
@@ -215,14 +218,14 @@ private fun BoostReaction(
             Icon(
                 painter = painterResource(R.drawable.ic_retweeted),
                 null,
-                modifier = Modifier.size(20.dp),
+                modifier = Modifier.size(iconSize),
                 tint = Color.Unspecified
             )
         } else {
             Icon(
                 painter = painterResource(R.drawable.ic_retweet),
                 null,
-                modifier = Modifier.size(20.dp),
+                modifier = Modifier.size(iconSize),
                 tint = grayTint
             )
         }
@@ -238,7 +241,9 @@ private fun BoostReaction(
 @Composable
 fun LikeReaction(
     baseNote: Note,
-    accountViewModel: AccountViewModel
+    accountViewModel: AccountViewModel,
+    iconSize: Dp = 20.dp,
+    heartSize: Dp = 16.dp
 ) {
     val reactionsState by baseNote.live().reactions.observeAsState()
     val reactedNote = reactionsState?.note ?: return
@@ -248,7 +253,7 @@ fun LikeReaction(
     val scope = rememberCoroutineScope()
 
     IconButton(
-        modifier = Modifier.then(Modifier.size(20.dp)),
+        modifier = Modifier.then(Modifier.size(iconSize)),
         onClick = {
             if (accountViewModel.isWriteable()) {
                 if (accountViewModel.hasReactedTo(baseNote)) {
@@ -271,14 +276,14 @@ fun LikeReaction(
             Icon(
                 painter = painterResource(R.drawable.ic_liked),
                 null,
-                modifier = Modifier.size(16.dp),
+                modifier = Modifier.size(heartSize),
                 tint = Color.Unspecified
             )
         } else {
             Icon(
                 painter = painterResource(R.drawable.ic_like),
                 null,
-                modifier = Modifier.size(16.dp),
+                modifier = Modifier.size(heartSize),
                 tint = grayTint
             )
         }
@@ -296,7 +301,9 @@ fun LikeReaction(
 fun ZapReaction(
     baseNote: Note,
     accountViewModel: AccountViewModel,
-    textModifier: Modifier = Modifier
+    textModifier: Modifier = Modifier,
+    iconSize: Dp = 20.dp,
+    animationSize: Dp = 14.dp
 ) {
     val accountState by accountViewModel.accountLiveData.observeAsState()
     val account = accountState?.account ?: return
@@ -314,10 +321,19 @@ fun ZapReaction(
 
     var zappingProgress by remember { mutableStateOf(0f) }
 
+    var wasZappedByLoggedInUser by remember { mutableStateOf(false) }
+
+    LaunchedEffect(key1 = zapsState) {
+        withContext(Dispatchers.IO) {
+            if (!wasZappedByLoggedInUser) {
+                wasZappedByLoggedInUser = zappedNote?.isZappedBy(account.userProfile(), account) == true
+            }
+        }
+    }
+
     Row(
         verticalAlignment = CenterVertically,
-        modifier = Modifier
-            .then(Modifier.size(20.dp))
+        modifier = Modifier.size(iconSize)
             .combinedClickable(
                 role = Role.Button,
                 interactionSource = remember { MutableInteractionSource() },
@@ -364,7 +380,7 @@ fun ZapReaction(
                                         zappingProgress = it
                                     }
                                 },
-                                zapType = LnZapEvent.ZapType.PUBLIC
+                                zapType = account.defaultZapType
                             )
                         }
                     } else if (account.zapAmountChoices.size > 1) {
@@ -412,12 +428,12 @@ fun ZapReaction(
             ZapCustomDialog({ wantsToSetCustomZap = false }, account = account, accountViewModel, baseNote)
         }
 
-        if (zappedNote?.isZappedBy(account.userProfile()) == true) {
+        if (wasZappedByLoggedInUser) {
             zappingProgress = 1f
             Icon(
                 imageVector = Icons.Default.Bolt,
                 contentDescription = stringResource(R.string.zaps),
-                modifier = Modifier.size(20.dp),
+                modifier = Modifier.size(iconSize),
                 tint = BitcoinOrange
             )
         } else {
@@ -425,14 +441,14 @@ fun ZapReaction(
                 Icon(
                     imageVector = Icons.Outlined.Bolt,
                     contentDescription = stringResource(id = R.string.zaps),
-                    modifier = Modifier.size(20.dp),
+                    modifier = Modifier.size(iconSize),
                     tint = grayTint
                 )
             } else {
                 Spacer(Modifier.width(3.dp))
                 CircularProgressIndicator(
                     progress = zappingProgress,
-                    modifier = Modifier.size(14.dp),
+                    modifier = Modifier.size(animationSize),
                     strokeWidth = 2.dp
                 )
             }
@@ -456,18 +472,18 @@ fun ZapReaction(
 }
 
 @Composable
-private fun ViewCountReaction(idHex: String) {
+public fun ViewCountReaction(idHex: String, iconSize: Dp = 20.dp, barChartSize: Dp = 19.dp, numberSize: Dp = 24.dp) {
     val uri = LocalUriHandler.current
     val grayTint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
 
     IconButton(
-        modifier = Modifier.size(20.dp),
+        modifier = Modifier.size(iconSize),
         onClick = { uri.openUri("https://counter.amethyst.social/$idHex/") }
     ) {
         Icon(
             imageVector = Icons.Outlined.BarChart,
             null,
-            modifier = Modifier.size(19.dp),
+            modifier = Modifier.size(barChartSize),
             tint = grayTint
         )
     }
@@ -480,7 +496,7 @@ private fun ViewCountReaction(idHex: String) {
                 .memoryCachePolicy(CachePolicy.ENABLED)
                 .build(),
             contentDescription = stringResource(R.string.view_count),
-            modifier = Modifier.height(24.dp),
+            modifier = Modifier.height(numberSize),
             colorFilter = ColorFilter.tint(grayTint)
         )
     }
@@ -561,7 +577,7 @@ fun ZapAmountChoicePopup(
                                 context,
                                 onError,
                                 onProgress,
-                                LnZapEvent.ZapType.PUBLIC
+                                account.defaultZapType
                             )
                             onDismiss()
                         }
@@ -587,7 +603,7 @@ fun ZapAmountChoicePopup(
                                         context,
                                         onError,
                                         onProgress,
-                                        LnZapEvent.ZapType.PUBLIC
+                                        account.defaultZapType
                                     )
                                     onDismiss()
                                 }

app/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt

@@ -21,6 +21,7 @@ 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.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
@@ -69,9 +70,11 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.decodePublicKey
 import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.ui.actions.CloseButton
 import com.vitorpamplona.amethyst.ui.actions.SaveButton
 import com.vitorpamplona.amethyst.ui.qrcode.SimpleQrCodeScanner
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.getFragmentActivity
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -85,6 +88,7 @@ class UpdateZapAmountViewModel : ViewModel() {
     var walletConnectRelay by mutableStateOf(TextFieldValue(""))
     var walletConnectPubkey by mutableStateOf(TextFieldValue(""))
     var walletConnectSecret by mutableStateOf(TextFieldValue(""))
+    var selectedZapType by mutableStateOf(LnZapEvent.ZapType.PRIVATE)
 
     fun load(account: Account) {
         this.account = account
@@ -92,6 +96,7 @@ class UpdateZapAmountViewModel : ViewModel() {
         this.walletConnectPubkey = account.zapPaymentRequest?.pubKeyHex?.let { TextFieldValue(it) } ?: TextFieldValue("")
         this.walletConnectRelay = account.zapPaymentRequest?.relayUri?.let { TextFieldValue(it) } ?: TextFieldValue("")
         this.walletConnectSecret = account.zapPaymentRequest?.secret?.let { TextFieldValue(it) } ?: TextFieldValue("")
+        this.selectedZapType = account.defaultZapType
     }
 
     fun toListOfAmounts(commaSeparatedAmounts: String): List<Long> {
@@ -113,6 +118,7 @@ class UpdateZapAmountViewModel : ViewModel() {
 
     fun sendPost() {
         account?.changeZapAmounts(amountSet)
+        account?.changeDefaultZapType(selectedZapType)
 
         if (walletConnectRelay.text.isNotBlank() && walletConnectPubkey.text.isNotBlank()) {
             val pubkeyHex = try {
@@ -160,7 +166,8 @@ class UpdateZapAmountViewModel : ViewModel() {
 
     fun hasChanged(): Boolean {
         return (
-            amountSet != account?.zapAmountChoices ||
+            selectedZapType != account?.defaultZapType ||
+                amountSet != account?.zapAmountChoices ||
                 walletConnectPubkey.text != (account?.zapPaymentRequest?.pubKeyHex ?: "") ||
                 walletConnectRelay.text != (account?.zapPaymentRequest?.relayUri ?: "") ||
                 walletConnectSecret.text != (account?.zapPaymentRequest?.secret ?: "")
@@ -188,6 +195,16 @@ fun UpdateZapAmountDialog(onClose: () -> Unit, account: Account, nip47uri: Strin
     val postViewModel: UpdateZapAmountViewModel = viewModel()
     val uri = LocalUriHandler.current
 
+    val zapTypes = listOf(
+        Triple(LnZapEvent.ZapType.PUBLIC, stringResource(id = R.string.zap_type_public), stringResource(id = R.string.zap_type_public_explainer)),
+        Triple(LnZapEvent.ZapType.PRIVATE, stringResource(id = R.string.zap_type_private), stringResource(id = R.string.zap_type_private_explainer)),
+        Triple(LnZapEvent.ZapType.ANONYMOUS, stringResource(id = R.string.zap_type_anonymous), stringResource(id = R.string.zap_type_anonymous_explainer)),
+        Triple(LnZapEvent.ZapType.NONZAP, stringResource(id = R.string.zap_type_nonzap), stringResource(id = R.string.zap_type_nonzap_explainer))
+    )
+
+    val zapOptions = zapTypes.map { it.second }
+    val zapOptionExplainers = zapTypes.map { it.third }
+
     LaunchedEffect(account) {
         postViewModel.load(account)
         if (nip47uri != null) {
@@ -205,12 +222,16 @@ fun UpdateZapAmountDialog(onClose: () -> Unit, account: Account, nip47uri: Strin
     Dialog(
         onDismissRequest = { onClose() },
         properties = DialogProperties(
+            usePlatformDefaultWidth = false,
             dismissOnClickOutside = false,
-            usePlatformDefaultWidth = false
+            decorFitsSystemWindows = false
         )
     ) {
-        Surface() {
-            Column(modifier = Modifier.padding(10.dp)) {
+        Surface(
+            modifier = Modifier
+                .fillMaxWidth()
+        ) {
+            Column(modifier = Modifier.padding(10.dp).imePadding()) {
                 Row(
                     modifier = Modifier.fillMaxWidth(),
                     horizontalArrangement = Arrangement.SpaceBetween,
@@ -232,261 +253,293 @@ fun UpdateZapAmountDialog(onClose: () -> Unit, account: Account, nip47uri: Strin
 
                 Spacer(modifier = Modifier.height(10.dp))
 
-                Column(
-                    modifier = Modifier.verticalScroll(rememberScrollState())
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
                 ) {
-                    Row(modifier = Modifier.fillMaxWidth()) {
-                        Column(modifier = Modifier.animateContentSize()) {
-                            FlowRow(
-                                modifier = Modifier.fillMaxWidth(),
-                                horizontalArrangement = Arrangement.Center
-                            ) {
-                                postViewModel.amountSet.forEach { amountInSats ->
-                                    Button(
-                                        modifier = Modifier.padding(horizontal = 3.dp),
-                                        shape = RoundedCornerShape(20.dp),
-                                        colors = ButtonDefaults.buttonColors(
-                                            backgroundColor = MaterialTheme.colors.primary
-                                        ),
-                                        onClick = {
-                                            postViewModel.removeAmount(amountInSats)
-                                        }
-                                    ) {
-                                        Text(
-                                            "⚡ ${
-                                            showAmount(
-                                                amountInSats.toBigDecimal().setScale(1)
+                    Column(
+                        modifier = Modifier.verticalScroll(rememberScrollState())
+                    ) {
+                        Row(modifier = Modifier.fillMaxWidth()) {
+                            Column(modifier = Modifier.animateContentSize()) {
+                                FlowRow(
+                                    modifier = Modifier.fillMaxWidth(),
+                                    horizontalArrangement = Arrangement.Center
+                                ) {
+                                    postViewModel.amountSet.forEach { amountInSats ->
+                                        Button(
+                                            modifier = Modifier.padding(horizontal = 3.dp),
+                                            shape = RoundedCornerShape(20.dp),
+                                            colors = ButtonDefaults.buttonColors(
+                                                backgroundColor = MaterialTheme.colors.primary
+                                            ),
+                                            onClick = {
+                                                postViewModel.removeAmount(amountInSats)
+                                            }
+                                        ) {
+                                            Text(
+                                                "⚡ ${
+                                                showAmount(
+                                                    amountInSats.toBigDecimal().setScale(1)
+                                                )
+                                                } ✖",
+                                                color = Color.White,
+                                                textAlign = TextAlign.Center
                                             )
-                                            } ✖",
-                                            color = Color.White,
-                                            textAlign = TextAlign.Center
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        Spacer(modifier = Modifier.height(10.dp))
+
+                        Row(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(vertical = 5.dp),
+                            verticalAlignment = Alignment.CenterVertically
+                        ) {
+                            OutlinedTextField(
+                                label = { Text(text = stringResource(R.string.new_amount_in_sats)) },
+                                value = postViewModel.nextAmount,
+                                onValueChange = {
+                                    postViewModel.nextAmount = it
+                                },
+                                keyboardOptions = KeyboardOptions.Default.copy(
+                                    capitalization = KeyboardCapitalization.None,
+                                    keyboardType = KeyboardType.Number
+                                ),
+                                placeholder = {
+                                    Text(
+                                        text = "100, 1000, 5000",
+                                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                    )
+                                },
+                                singleLine = true,
+                                modifier = Modifier
+                                    .padding(end = 10.dp)
+                                    .weight(1f)
+                            )
+
+                            Button(
+                                onClick = { postViewModel.addAmount() },
+                                shape = RoundedCornerShape(20.dp),
+                                colors = ButtonDefaults.buttonColors(
+                                    backgroundColor = MaterialTheme.colors.primary
+                                )
+                            ) {
+                                Text(text = stringResource(R.string.add), color = Color.White)
+                            }
+                        }
+
+                        Row(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(vertical = 5.dp),
+                            verticalAlignment = Alignment.CenterVertically
+                        ) {
+                            TextSpinner(
+                                label = stringResource(id = R.string.zap_type_explainer),
+                                placeholder = zapTypes.filter { it.first == account.defaultZapType }
+                                    .first().second,
+                                options = zapOptions,
+                                explainers = zapOptionExplainers,
+                                onSelect = {
+                                    postViewModel.selectedZapType = zapTypes[it].first
+                                },
+                                modifier = Modifier
+                                    .weight(1f)
+                                    .padding(end = 5.dp)
+                            )
+                        }
+
+                        Divider(
+                            modifier = Modifier.padding(vertical = 10.dp),
+                            thickness = 0.25.dp
+                        )
+
+                        var qrScanning by remember { mutableStateOf(false) }
+
+                        Row(
+                            modifier = Modifier.fillMaxWidth(),
+                            verticalAlignment = Alignment.CenterVertically
+                        ) {
+                            Text(
+                                stringResource(id = R.string.wallet_connect_service),
+                                Modifier.weight(1f)
+                            )
+
+                            IconButton(onClick = {
+                                runCatching { uri.openUri("https://nwc.getalby.com/apps/new?c=Amethyst") }
+                            }) {
+                                Icon(
+                                    painter = painterResource(R.drawable.alby),
+                                    null,
+                                    modifier = Modifier.size(24.dp),
+                                    tint = Color.Unspecified
+                                )
+                            }
+
+                            IconButton(onClick = {
+                                qrScanning = true
+                            }) {
+                                Icon(
+                                    painter = painterResource(R.drawable.ic_qrcode),
+                                    null,
+                                    modifier = Modifier.size(24.dp),
+                                    tint = MaterialTheme.colors.primary
+                                )
+                            }
+                        }
+
+                        Row(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(bottom = 5.dp),
+                            verticalAlignment = Alignment.CenterVertically
+                        ) {
+                            Text(
+                                stringResource(id = R.string.wallet_connect_service_explainer),
+                                Modifier.weight(1f),
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                                fontSize = 14.sp
+                            )
+                        }
+
+                        if (qrScanning) {
+                            SimpleQrCodeScanner {
+                                qrScanning = false
+                                if (!it.isNullOrEmpty()) {
+                                    try {
+                                        postViewModel.updateNIP47(it)
+                                    } catch (e: IllegalArgumentException) {
+                                        scope.launch {
+                                            Toast.makeText(context, e.message, Toast.LENGTH_SHORT)
+                                                .show()
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        Row(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(vertical = 5.dp),
+                            verticalAlignment = Alignment.CenterVertically
+                        ) {
+                            OutlinedTextField(
+                                label = { Text(text = stringResource(R.string.wallet_connect_service_pubkey)) },
+                                value = postViewModel.walletConnectPubkey,
+                                onValueChange = {
+                                    postViewModel.walletConnectPubkey = it
+                                },
+                                keyboardOptions = KeyboardOptions.Default.copy(
+                                    capitalization = KeyboardCapitalization.None
+                                ),
+                                placeholder = {
+                                    Text(
+                                        text = "npub, hex",
+                                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                    )
+                                },
+                                singleLine = true,
+                                modifier = Modifier.weight(1f)
+                            )
+                        }
+
+                        Row(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(vertical = 5.dp),
+                            verticalAlignment = Alignment.CenterVertically
+                        ) {
+                            OutlinedTextField(
+                                label = { Text(text = stringResource(R.string.wallet_connect_service_relay)) },
+                                modifier = Modifier.weight(1f),
+                                value = postViewModel.walletConnectRelay,
+                                onValueChange = { postViewModel.walletConnectRelay = it },
+                                placeholder = {
+                                    Text(
+                                        text = "wss://relay.server.com",
+                                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                                        maxLines = 1
+                                    )
+                                },
+                                singleLine = true
+                            )
+                        }
+
+                        var showPassword by remember {
+                            mutableStateOf(false)
+                        }
+
+                        val scope = rememberCoroutineScope()
+                        val context = LocalContext.current
+
+                        val keyguardLauncher =
+                            rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
+                                if (result.resultCode == Activity.RESULT_OK) {
+                                    showPassword = true
+                                }
+                            }
+
+                        val authTitle =
+                            stringResource(id = R.string.wallet_connect_service_show_secret)
+
+                        Row(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(vertical = 5.dp),
+                            verticalAlignment = Alignment.CenterVertically
+                        ) {
+                            OutlinedTextField(
+                                label = { Text(text = stringResource(R.string.wallet_connect_service_secret)) },
+                                modifier = Modifier.weight(1f),
+                                value = postViewModel.walletConnectSecret,
+                                onValueChange = { postViewModel.walletConnectSecret = it },
+                                keyboardOptions = KeyboardOptions(
+                                    autoCorrect = false,
+                                    keyboardType = KeyboardType.Password,
+                                    imeAction = ImeAction.Go
+                                ),
+                                placeholder = {
+                                    Text(
+                                        text = stringResource(R.string.wallet_connect_service_secret_placeholder),
+                                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                    )
+                                },
+                                trailingIcon = {
+                                    IconButton(onClick = {
+                                        if (!showPassword) {
+                                            authenticate(
+                                                authTitle,
+                                                context,
+                                                scope,
+                                                keyguardLauncher
+                                            ) {
+                                                showPassword = true
+                                            }
+                                        } else {
+                                            showPassword = false
+                                        }
+                                    }) {
+                                        Icon(
+                                            imageVector = if (showPassword) Icons.Outlined.VisibilityOff else Icons.Outlined.Visibility,
+                                            contentDescription = if (showPassword) {
+                                                stringResource(R.string.show_password)
+                                            } else {
+                                                stringResource(
+                                                    R.string.hide_password
+                                                )
+                                            }
                                         )
                                     }
-                                }
-                            }
-                        }
-                    }
-
-                    Spacer(modifier = Modifier.height(10.dp))
-
-                    Row(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(vertical = 5.dp),
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        OutlinedTextField(
-                            label = { Text(text = stringResource(R.string.new_amount_in_sats)) },
-                            value = postViewModel.nextAmount,
-                            onValueChange = {
-                                postViewModel.nextAmount = it
-                            },
-                            keyboardOptions = KeyboardOptions.Default.copy(
-                                capitalization = KeyboardCapitalization.None,
-                                keyboardType = KeyboardType.Number
-                            ),
-                            placeholder = {
-                                Text(
-                                    text = "100, 1000, 5000",
-                                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-                                )
-                            },
-                            singleLine = true,
-                            modifier = Modifier
-                                .padding(end = 10.dp)
-                                .weight(1f)
-                        )
-
-                        Button(
-                            onClick = { postViewModel.addAmount() },
-                            shape = RoundedCornerShape(20.dp),
-                            colors = ButtonDefaults.buttonColors(
-                                backgroundColor = MaterialTheme.colors.primary
-                            )
-                        ) {
-                            Text(text = stringResource(R.string.add), color = Color.White)
-                        }
-                    }
-
-                    Divider(
-                        modifier = Modifier.padding(vertical = 10.dp),
-                        thickness = 0.25.dp
-                    )
-
-                    var qrScanning by remember { mutableStateOf(false) }
-
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        Text(
-                            stringResource(id = R.string.wallet_connect_service),
-                            Modifier.weight(1f)
-                        )
-
-                        IconButton(onClick = {
-                            runCatching { uri.openUri("https://nwc.getalby.com/apps/new?c=Amethyst") }
-                        }) {
-                            Icon(
-                                painter = painterResource(R.drawable.alby),
-                                null,
-                                modifier = Modifier.size(24.dp),
-                                tint = Color.Unspecified
+                                },
+                                visualTransformation = if (showPassword) VisualTransformation.None else PasswordVisualTransformation()
                             )
                         }
-
-                        IconButton(onClick = {
-                            qrScanning = true
-                        }) {
-                            Icon(
-                                painter = painterResource(R.drawable.ic_qrcode),
-                                null,
-                                modifier = Modifier.size(24.dp),
-                                tint = MaterialTheme.colors.primary
-                            )
-                        }
-                    }
-
-                    Row(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(bottom = 5.dp),
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        Text(
-                            stringResource(id = R.string.wallet_connect_service_explainer),
-                            Modifier.weight(1f),
-                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
-                            fontSize = 14.sp
-                        )
-                    }
-
-                    if (qrScanning) {
-                        SimpleQrCodeScanner {
-                            qrScanning = false
-                            if (!it.isNullOrEmpty()) {
-                                try {
-                                    postViewModel.updateNIP47(it)
-                                } catch (e: IllegalArgumentException) {
-                                    scope.launch {
-                                        Toast.makeText(context, e.message, Toast.LENGTH_SHORT)
-                                            .show()
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    Row(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(vertical = 5.dp),
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        OutlinedTextField(
-                            label = { Text(text = stringResource(R.string.wallet_connect_service_pubkey)) },
-                            value = postViewModel.walletConnectPubkey,
-                            onValueChange = {
-                                postViewModel.walletConnectPubkey = it
-                            },
-                            keyboardOptions = KeyboardOptions.Default.copy(
-                                capitalization = KeyboardCapitalization.None
-                            ),
-                            placeholder = {
-                                Text(
-                                    text = "npub, hex",
-                                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-                                )
-                            },
-                            singleLine = true,
-                            modifier = Modifier.weight(1f)
-                        )
-                    }
-
-                    Row(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(vertical = 5.dp),
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        OutlinedTextField(
-                            label = { Text(text = stringResource(R.string.wallet_connect_service_relay)) },
-                            modifier = Modifier.weight(1f),
-                            value = postViewModel.walletConnectRelay,
-                            onValueChange = { postViewModel.walletConnectRelay = it },
-                            placeholder = {
-                                Text(
-                                    text = "wss://relay.server.com",
-                                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
-                                    maxLines = 1
-                                )
-                            },
-                            singleLine = true
-                        )
-                    }
-
-                    var showPassword by remember {
-                        mutableStateOf(false)
-                    }
-
-                    val scope = rememberCoroutineScope()
-                    val context = LocalContext.current
-
-                    val keyguardLauncher =
-                        rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
-                            if (result.resultCode == Activity.RESULT_OK) {
-                                showPassword = true
-                            }
-                        }
-
-                    val authTitle = stringResource(id = R.string.wallet_connect_service_show_secret)
-
-                    Row(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(vertical = 5.dp),
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        OutlinedTextField(
-                            label = { Text(text = stringResource(R.string.wallet_connect_service_secret)) },
-                            modifier = Modifier.weight(1f),
-                            value = postViewModel.walletConnectSecret,
-                            onValueChange = { postViewModel.walletConnectSecret = it },
-                            keyboardOptions = KeyboardOptions(
-                                autoCorrect = false,
-                                keyboardType = KeyboardType.Password,
-                                imeAction = ImeAction.Go
-                            ),
-                            placeholder = {
-                                Text(
-                                    text = stringResource(R.string.wallet_connect_service_secret_placeholder),
-                                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-                                )
-                            },
-                            trailingIcon = {
-                                IconButton(onClick = {
-                                    if (!showPassword) {
-                                        authenticate(authTitle, context, scope, keyguardLauncher) {
-                                            showPassword = true
-                                        }
-                                    } else {
-                                        showPassword = false
-                                    }
-                                }) {
-                                    Icon(
-                                        imageVector = if (showPassword) Icons.Outlined.VisibilityOff else Icons.Outlined.Visibility,
-                                        contentDescription = if (showPassword) {
-                                            stringResource(R.string.show_password)
-                                        } else {
-                                            stringResource(
-                                                R.string.hide_password
-                                            )
-                                        }
-                                    )
-                                }
-                            },
-                            visualTransformation = if (showPassword) VisualTransformation.None else PasswordVisualTransformation()
-                        )
                     }
                 }
             }

app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapCustomDialog.kt

@@ -31,6 +31,7 @@ import kotlinx.coroutines.launch
 
 class ZapOptionstViewModel : ViewModel() {
     private var account: Account? = null
+
     var customAmount by mutableStateOf(TextFieldValue("21"))
     var customMessage by mutableStateOf(TextFieldValue(""))
 
@@ -59,6 +60,7 @@ fun ZapCustomDialog(onClose: () -> Unit, account: Account, accountViewModel: Acc
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
     val postViewModel: ZapOptionstViewModel = viewModel()
+
     LaunchedEffect(account) {
         postViewModel.load(account)
     }
@@ -66,13 +68,15 @@ fun ZapCustomDialog(onClose: () -> Unit, account: Account, accountViewModel: Acc
     var zappingProgress by remember { mutableStateOf(0f) }
 
     val zapTypes = listOf(
-        Pair(LnZapEvent.ZapType.PUBLIC, "Public"),
-        Pair(LnZapEvent.ZapType.ANONYMOUS, "Anonymous"),
-        Pair(LnZapEvent.ZapType.NONZAP, "Non-Zap")
+        Triple(LnZapEvent.ZapType.PUBLIC, stringResource(id = R.string.zap_type_public), stringResource(id = R.string.zap_type_public_explainer)),
+        Triple(LnZapEvent.ZapType.PRIVATE, stringResource(id = R.string.zap_type_private), stringResource(id = R.string.zap_type_private_explainer)),
+        Triple(LnZapEvent.ZapType.ANONYMOUS, stringResource(id = R.string.zap_type_anonymous), stringResource(id = R.string.zap_type_anonymous_explainer)),
+        Triple(LnZapEvent.ZapType.NONZAP, stringResource(id = R.string.zap_type_nonzap), stringResource(id = R.string.zap_type_nonzap_explainer))
     )
 
     val zapOptions = zapTypes.map { it.second }
-    var selectedZapType by remember { mutableStateOf(zapTypes[0]) }
+    val zapOptionExplainers = zapTypes.map { it.third }
+    var selectedZapType by remember { mutableStateOf(account.defaultZapType) }
 
     Dialog(
         onDismissRequest = { onClose() },
@@ -115,7 +119,7 @@ fun ZapCustomDialog(onClose: () -> Unit, account: Account, accountViewModel: Acc
                                         zappingProgress = it
                                     }
                                 },
-                                zapType = selectedZapType.first
+                                zapType = selectedZapType
                             )
                         }
                         onClose()
@@ -148,11 +152,23 @@ fun ZapCustomDialog(onClose: () -> Unit, account: Account, accountViewModel: Acc
                         },
                         singleLine = true,
                         modifier = Modifier
-                            .padding(end = 10.dp)
+                            .padding(end = 5.dp)
                             .weight(1f)
                     )
+
+                    TextSpinner(
+                        label = stringResource(id = R.string.zap_type),
+                        placeholder = zapTypes.filter { it.first == account.defaultZapType }.first().second,
+                        options = zapOptions,
+                        explainers = zapOptionExplainers,
+                        onSelect = {
+                            selectedZapType = zapTypes[it].first
+                        },
+                        modifier = Modifier
+                            .weight(1f)
+                            .padding(end = 5.dp)
+                    )
                 }
-                Spacer(modifier = Modifier.height(5.dp))
 
                 Row(
                     modifier = Modifier
@@ -162,7 +178,15 @@ fun ZapCustomDialog(onClose: () -> Unit, account: Account, accountViewModel: Acc
                 ) {
                     OutlinedTextField(
                         // stringResource(R.string.new_amount_in_sats
-                        label = { Text(text = stringResource(id = R.string.custom_zaps_add_a_message)) },
+                        label = {
+                            if (selectedZapType == LnZapEvent.ZapType.PUBLIC || selectedZapType == LnZapEvent.ZapType.ANONYMOUS) {
+                                Text(text = stringResource(id = R.string.custom_zaps_add_a_message))
+                            } else if (selectedZapType == LnZapEvent.ZapType.PRIVATE) {
+                                Text(text = stringResource(id = R.string.custom_zaps_add_a_message_private))
+                            } else if (selectedZapType == LnZapEvent.ZapType.NONZAP) {
+                                Text(text = stringResource(id = R.string.custom_zaps_add_a_message_nonzap))
+                            }
+                        },
                         value = postViewModel.customMessage,
                         onValueChange = {
                             postViewModel.customMessage = it
@@ -179,19 +203,10 @@ fun ZapCustomDialog(onClose: () -> Unit, account: Account, accountViewModel: Acc
                         },
                         singleLine = true,
                         modifier = Modifier
-                            .padding(end = 10.dp)
+                            .padding(end = 5.dp)
                             .weight(1f)
                     )
                 }
-                TextSpinner(
-                    label = "Zap Type",
-                    placeholder = "Public",
-                    options = zapOptions,
-                    onSelect = {
-                        selectedZapType = zapTypes[it]
-                    },
-                    modifier = Modifier.fillMaxWidth()
-                )
             }
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt

@@ -89,6 +89,8 @@ open class CardFeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
                 if (zappedPost != null) {
                     val zapRequest = zappedPost.zaps.filter { it.value == zapEvent }.keys.firstOrNull()
                     if (zapRequest != null) {
+                        // var newZapRequestEvent = LocalCache.checkPrivateZap(zapRequest.event as Event)
+                        // zapRequest.event = newZapRequestEvent
                         zapsPerEvent.getOrPut(zappedPost, { mutableMapOf() }).put(zapRequest, zapEvent)
                     }
                 } else {

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt

@@ -23,6 +23,7 @@ import com.vitorpamplona.amethyst.ui.dal.UserProfileBookmarksFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.UserProfileConversationsFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.UserProfileNewThreadFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.UserProfileReportsFeedFilter
+import com.vitorpamplona.amethyst.ui.dal.VideoFeedFilter
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -34,6 +35,7 @@ import kotlinx.coroutines.launch
 class NostrChannelFeedViewModel : FeedViewModel(ChannelFeedFilter)
 class NostrChatRoomFeedViewModel : FeedViewModel(ChatroomFeedFilter)
 class NostrGlobalFeedViewModel : FeedViewModel(GlobalFeedFilter)
+class NostrVideoFeedViewModel : FeedViewModel(VideoFeedFilter)
 class NostrThreadFeedViewModel : FeedViewModel(ThreadFeedFilter)
 class NostrHashtagFeedViewModel : FeedViewModel(HashtagFeedFilter)
 class NostrUserProfileNewThreadsFeedViewModel : FeedViewModel(UserProfileNewThreadFeedFilter)

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt

@@ -54,6 +54,7 @@ import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.BadgeDefinitionEvent
+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.ui.components.ObserveDisplayNip05Status
@@ -348,37 +349,50 @@ fun NoteMaster(
                     )
             ) {
                 Column() {
-                    val eventContent = note.event?.content()
-
-                    val canPreview = note.author == account.userProfile() ||
-                        (note.author?.let { account.userProfile().isFollowingCached(it) } ?: true) ||
-                        !noteForReports.hasAnyReports()
-
-                    if (eventContent != null) {
-                        TranslatableRichTextViewer(
-                            eventContent,
-                            canPreview,
-                            Modifier.fillMaxWidth(),
-                            note.event?.tags(),
-                            MaterialTheme.colors.background,
+                    if (noteEvent is HighlightEvent) {
+                        DisplayHighlight(
+                            noteEvent.quote(),
+                            noteEvent.author(),
+                            noteEvent.inUrl(),
+                            false,
+                            true,
+                            backgroundColor,
                             accountViewModel,
                             navController
                         )
+                    } else {
+                        val eventContent = note.event?.content()
 
-                        DisplayUncitedHashtags(noteEvent.hashtags(), eventContent, navController)
+                        val canPreview = note.author == account.userProfile() ||
+                            (note.author?.let { account.userProfile().isFollowingCached(it) } ?: true) ||
+                            !noteForReports.hasAnyReports()
 
-                        if (noteEvent is PollNoteEvent) {
-                            PollNote(
-                                note,
+                        if (eventContent != null) {
+                            TranslatableRichTextViewer(
+                                eventContent,
                                 canPreview,
-                                backgroundColor,
+                                Modifier.fillMaxWidth(),
+                                note.event?.tags(),
+                                MaterialTheme.colors.background,
                                 accountViewModel,
                                 navController
                             )
+
+                            DisplayUncitedHashtags(noteEvent.hashtags(), eventContent, navController)
+
+                            if (noteEvent is PollNoteEvent) {
+                                PollNote(
+                                    note,
+                                    canPreview,
+                                    backgroundColor,
+                                    accountViewModel,
+                                    navController
+                                )
+                            }
                         }
                     }
 
-                    ReactionsRow(note, accountViewModel)
+                    ReactionsRow(note, accountViewModel, navController)
 
                     Divider(
                         modifier = Modifier.padding(top = 10.dp),

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt

@@ -14,7 +14,9 @@ import com.vitorpamplona.amethyst.model.AccountState
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
+import com.vitorpamplona.amethyst.service.model.Event
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.service.model.PayInvoiceErrorResponse
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -53,8 +55,12 @@ class AccountViewModel(private val account: Account) : ViewModel() {
         account.delete(account.boostsTo(note))
     }
 
+    fun zap(note: Note, amount: Long, pollOption: Int?, message: String, context: Context, onError: (String) -> Unit, onProgress: (percent: Float) -> Unit) {
+        zap(note, amount, pollOption, message, context, onError, onProgress, account.defaultZapType)
+    }
+
     fun zap(note: Note, amount: Long, pollOption: Int?, message: String, context: Context, onError: (String) -> Unit, onProgress: (percent: Float) -> Unit, zapType: LnZapEvent.ZapType) {
-        val lud16 = note.author?.info?.lud16?.trim() ?: note.author?.info?.lud06?.trim()
+        val lud16 = note.event?.zapAddress() ?: note.author?.info?.lud16?.trim() ?: note.author?.info?.lud06?.trim()
 
         if (lud16.isNullOrBlank()) {
             onError(context.getString(R.string.user_does_not_have_a_lightning_address_setup_to_receive_sats))
@@ -80,7 +86,21 @@ class AccountViewModel(private val account: Account) : ViewModel() {
             onSuccess = {
                 onProgress(0.7f)
                 if (account.hasWalletConnectSetup()) {
-                    account.sendZapPaymentRequestFor(it)
+                    account.sendZapPaymentRequestFor(
+                        bolt11 = it,
+                        onResponse = { response ->
+                            if (response is PayInvoiceErrorResponse) {
+                                onProgress(0.0f)
+                                onError(
+                                    response.error?.message
+                                        ?: response.error?.code?.toString()
+                                        ?: "Error parsing error message"
+                                )
+                            } else {
+                                onProgress(0.99f)
+                            }
+                        }
+                    )
                     onProgress(0.8f)
 
                     // Awaits for the event to come back to LocalCache.
@@ -149,6 +169,10 @@ class AccountViewModel(private val account: Account) : ViewModel() {
         return account.decryptContent(note)
     }
 
+    fun decryptZap(note: Note): Event? {
+        return account.decryptZapContentAuthor(note)
+    }
+
     fun hide(user: User) {
         account.hideUser(user.pubkeyHex)
     }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt

@@ -89,6 +89,8 @@ fun ChannelScreen(
     val context = LocalContext.current
     val channelScreenModel: NewPostViewModel = viewModel()
 
+    channelScreenModel.account = account
+
     if (account != null && channelId != null) {
         val replyTo = remember { mutableStateOf<Note?>(null) }
 
@@ -231,7 +233,7 @@ fun ChannelScreen(
                             tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
                             modifier = Modifier.padding(start = 5.dp)
                         ) {
-                            channelScreenModel.upload(it, context)
+                            channelScreenModel.upload(it, "", account.defaultFileServer, context)
                         }
                     },
                     colors = TextFieldDefaults.textFieldColors(

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt

@@ -67,6 +67,8 @@ fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navContr
     val context = LocalContext.current
     val chatRoomScreenModel: NewPostViewModel = viewModel()
 
+    chatRoomScreenModel.account = account
+
     if (account != null && userId != null) {
         val replyTo = remember { mutableStateOf<Note?>(null) }
 
@@ -192,7 +194,7 @@ fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navContr
                             tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
                             modifier = Modifier.padding(start = 5.dp)
                         ) {
-                            chatRoomScreenModel.upload(it, context)
+                            chatRoomScreenModel.upload(it, "", account.defaultFileServer, context)
                         }
                     },
                     colors = TextFieldDefaults.textFieldColors(

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt

@@ -73,7 +73,7 @@ fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: Accoun
                 }
             },
             floatingActionButton = {
-                FloatingButtons(navController, accountStateViewModel)
+                FloatingButtons(navController, accountViewModel, accountStateViewModel)
             },
             scaffoldState = scaffoldState
         ) {
@@ -85,37 +85,27 @@ fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: Accoun
 }
 
 @Composable
-fun FloatingButtons(navController: NavHostController, accountViewModel: AccountStateViewModel) {
-    val accountState by accountViewModel.accountContent.collectAsState()
+fun FloatingButtons(navController: NavHostController, accountViewModel: AccountViewModel, accountStateViewModel: AccountStateViewModel) {
+    val accountState by accountStateViewModel.accountContent.collectAsState()
 
-    if (currentRoute(navController)?.substringBefore("?") == Route.Home.base) {
-        Crossfade(targetState = accountState, animationSpec = tween(durationMillis = 100)) { state ->
-            when (state) {
-                is AccountState.LoggedInViewOnly -> {
-                    // Does nothing.
-                }
-                is AccountState.LoggedOff -> {
-                    // Does nothing.
-                }
-                is AccountState.LoggedIn -> {
-                    NewNoteButton(state.account)
-                }
+    Crossfade(targetState = accountState, animationSpec = tween(durationMillis = 100)) { state ->
+        when (state) {
+            is AccountState.LoggedInViewOnly -> {
+                // Does nothing.
             }
-        }
-    }
-
-    if (currentRoute(navController) == Route.Message.base) {
-        Crossfade(targetState = accountState, animationSpec = tween(durationMillis = 100)) { state ->
-            when (state) {
-                is AccountState.LoggedInViewOnly -> {
-                    // Does nothing.
+            is AccountState.LoggedOff -> {
+                // Does nothing.
+            }
+            is AccountState.LoggedIn -> {
+                if (currentRoute(navController)?.substringBefore("?") == Route.Home.base) {
+                    NewNoteButton(state.account, accountViewModel, navController)
                 }
-                is AccountState.LoggedOff -> {
-                    // Does nothing.
-                }
-                is AccountState.LoggedIn -> {
+                if (currentRoute(navController) == Route.Message.base) {
                     NewChannelButton(state.account)
                 }
+                if (currentRoute(navController)?.substringBefore("?") == Route.Video.base) {
+                    NewImageButton(accountViewModel, navController)
+                }
             }
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn
 
 import android.content.Intent
 import android.net.Uri
+import android.widget.Toast
 import androidx.compose.foundation.*
 import androidx.compose.foundation.gestures.scrollBy
 import androidx.compose.foundation.layout.*
@@ -59,6 +60,8 @@ import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
 import com.vitorpamplona.amethyst.service.model.BadgeDefinitionEvent
 import com.vitorpamplona.amethyst.service.model.BadgeProfilesEvent
 import com.vitorpamplona.amethyst.service.model.IdentityClaim
+import com.vitorpamplona.amethyst.service.model.PayInvoiceErrorResponse
+import com.vitorpamplona.amethyst.service.model.PayInvoiceSuccessResponse
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.ui.actions.NewUserMetadataView
 import com.vitorpamplona.amethyst.ui.components.DisplayNip05ProfileStatus
@@ -68,6 +71,7 @@ import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImage
 import com.vitorpamplona.amethyst.ui.components.RobohashFallbackAsyncImage
 import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
 import com.vitorpamplona.amethyst.ui.components.ZoomableImageDialog
+import com.vitorpamplona.amethyst.ui.components.figureOutMimeType
 import com.vitorpamplona.amethyst.ui.dal.UserProfileBookmarksFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.UserProfileConversationsFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.UserProfileFollowersFeedFilter
@@ -401,8 +405,9 @@ private fun ProfileHeader(
         }
     }
 
-    if (zoomImageDialogOpen) {
-        ZoomableImageDialog(baseUser.profilePicture()!!, onDismiss = { zoomImageDialogOpen = false })
+    val profilePic = baseUser.profilePicture()
+    if (zoomImageDialogOpen && profilePic != null) {
+        ZoomableImageDialog(figureOutMimeType(profilePic), onDismiss = { zoomImageDialogOpen = false })
     }
 }
 
@@ -418,6 +423,7 @@ private fun DrawAdditionalInfo(baseUser: User, account: Account, accountViewMode
     val uri = LocalUriHandler.current
     val clipboardManager = LocalClipboardManager.current
     val context = LocalContext.current
+    val scope = rememberCoroutineScope()
 
     Row(verticalAlignment = Alignment.Bottom) {
         user.bestDisplayName()?.let {
@@ -490,7 +496,7 @@ private fun DrawAdditionalInfo(baseUser: User, account: Account, accountViewMode
 
     userBadge.acceptedBadges?.let { note ->
         (note.event as? BadgeProfilesEvent)?.let { event ->
-            FlowRow(verticalArrangement = Arrangement.Center, modifier = Modifier.padding(vertical = 5.dp)) {
+            FlowRow(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = 5.dp)) {
                 event.badgeAwardEvents().forEach { badgeAwardEvent ->
                     val baseNote = LocalCache.notes[badgeAwardEvent]
                     if (baseNote != null) {
@@ -559,7 +565,27 @@ private fun DrawAdditionalInfo(baseUser: User, account: Account, accountViewMode
                     onSuccess = {
                         // pay directly
                         if (account.hasWalletConnectSetup()) {
-                            account.sendZapPaymentRequestFor(it)
+                            account.sendZapPaymentRequestFor(it) { response ->
+                                if (response is PayInvoiceSuccessResponse) {
+                                    scope.launch {
+                                        Toast.makeText(
+                                            context,
+                                            "Payment Successful", // Turn this into a UI animation
+                                            Toast.LENGTH_LONG
+                                        ).show()
+                                    }
+                                } else if (response is PayInvoiceErrorResponse) {
+                                    scope.launch {
+                                        Toast.makeText(
+                                            context,
+                                            response.error?.message
+                                                ?: response.error?.code?.toString()
+                                                ?: "Error parsing error message",
+                                            Toast.LENGTH_LONG
+                                        ).show()
+                                    }
+                                }
+                            }
                         } else {
                             runCatching {
                                 val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$it"))
@@ -706,7 +732,7 @@ private fun DrawBanner(baseUser: User) {
         )
 
         if (zoomImageDialogOpen) {
-            ZoomableImageDialog(imageUrl = banner, onDismiss = { zoomImageDialogOpen = false })
+            ZoomableImageDialog(imageUrl = figureOutMimeType(banner), onDismiss = { zoomImageDialogOpen = false })
         }
     } else {
         Image(

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt

@@ -0,0 +1,356 @@
+package com.vitorpamplona.amethyst.ui.screen.loggedIn
+
+import android.Manifest
+import android.net.Uri
+import android.os.Build
+import androidx.compose.animation.Crossfade
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+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.pager.VerticalPager
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedButton
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+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.graphics.Color
+import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.navigation.NavController
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.isGranted
+import com.google.accompanist.permissions.rememberPermissionState
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.NostrVideoDataSource
+import com.vitorpamplona.amethyst.service.model.FileHeaderEvent
+import com.vitorpamplona.amethyst.service.model.FileStorageHeaderEvent
+import com.vitorpamplona.amethyst.ui.actions.GallerySelect
+import com.vitorpamplona.amethyst.ui.actions.NewMediaView
+import com.vitorpamplona.amethyst.ui.actions.NewPostView
+import com.vitorpamplona.amethyst.ui.components.ObserveDisplayNip05Status
+import com.vitorpamplona.amethyst.ui.dal.VideoFeedFilter
+import com.vitorpamplona.amethyst.ui.note.FileHeaderDisplay
+import com.vitorpamplona.amethyst.ui.note.FileStorageHeaderDisplay
+import com.vitorpamplona.amethyst.ui.note.LikeReaction
+import com.vitorpamplona.amethyst.ui.note.NoteAuthorPicture
+import com.vitorpamplona.amethyst.ui.note.NoteDropDownMenu
+import com.vitorpamplona.amethyst.ui.note.NoteUsernameDisplay
+import com.vitorpamplona.amethyst.ui.note.ViewCountReaction
+import com.vitorpamplona.amethyst.ui.note.ZapReaction
+import com.vitorpamplona.amethyst.ui.screen.FeedEmpty
+import com.vitorpamplona.amethyst.ui.screen.FeedError
+import com.vitorpamplona.amethyst.ui.screen.FeedState
+import com.vitorpamplona.amethyst.ui.screen.LoadingFeed
+import com.vitorpamplona.amethyst.ui.screen.NostrVideoFeedViewModel
+
+@Composable
+fun VideoScreen(
+    videoFeedView: NostrVideoFeedViewModel,
+    accountViewModel: AccountViewModel,
+    navController: NavController,
+    scrollToTop: Boolean = false
+) {
+    val lifeCycleOwner = LocalLifecycleOwner.current
+    val account = accountViewModel.accountLiveData.value?.account ?: return
+
+    VideoFeedFilter.account = account
+
+    LaunchedEffect(accountViewModel) {
+        VideoFeedFilter.account = account
+        NostrVideoDataSource.resetFilters()
+        videoFeedView.invalidateData()
+    }
+
+    DisposableEffect(accountViewModel) {
+        val observer = LifecycleEventObserver { _, event ->
+            if (event == Lifecycle.Event.ON_RESUME) {
+                println("Video Start")
+                VideoFeedFilter.account = account
+                NostrVideoDataSource.start()
+                videoFeedView.invalidateData()
+            }
+            if (event == Lifecycle.Event.ON_PAUSE) {
+                println("Video Stop")
+                NostrVideoDataSource.stop()
+            }
+        }
+
+        lifeCycleOwner.lifecycle.addObserver(observer)
+        onDispose {
+            lifeCycleOwner.lifecycle.removeObserver(observer)
+        }
+    }
+
+    Column(Modifier.fillMaxHeight()) {
+        Column(
+            modifier = Modifier.padding(vertical = 0.dp)
+        ) {
+            FeedView(videoFeedView, accountViewModel, navController)
+        }
+    }
+}
+
+@Composable
+fun FeedView(
+    videoFeedView: NostrVideoFeedViewModel,
+    accountViewModel: AccountViewModel,
+    navController: NavController
+) {
+    val feedState by videoFeedView.feedContent.collectAsState()
+
+    Box() {
+        Column {
+            Crossfade(
+                targetState = feedState,
+                animationSpec = tween(durationMillis = 100)
+            ) { state ->
+                when (state) {
+                    is FeedState.Empty -> {
+                        FeedEmpty {}
+                    }
+
+                    is FeedState.FeedError -> {
+                        FeedError(state.errorMessage) {}
+                    }
+
+                    is FeedState.Loaded -> {
+                        SlidingCarousel(
+                            state.feed,
+                            accountViewModel,
+                            navController
+                        )
+                    }
+
+                    is FeedState.Loading -> {
+                        LoadingFeed()
+                    }
+                }
+            }
+        }
+    }
+}
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun SlidingCarousel(
+    feed: MutableState<List<Note>>,
+    accountViewModel: AccountViewModel,
+    navController: NavController
+) {
+    val pagerState: PagerState = remember { PagerState() }
+
+    VerticalPager(
+        pageCount = feed.value.size,
+        state = pagerState,
+        beyondBoundsPageCount = 1,
+        modifier = Modifier.fillMaxSize(1f)
+    ) { index ->
+        feed.value.getOrNull(index)?.let { note ->
+            RenderVideoOrPictureNote(note, accountViewModel, navController)
+        }
+    }
+}
+
+@Composable
+private fun RenderVideoOrPictureNote(
+    note: Note,
+    accountViewModel: AccountViewModel,
+    navController: NavController
+) {
+    val noteEvent = note.event
+
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+    val loggedIn = account.userProfile()
+
+    var moreActionsExpanded by remember { mutableStateOf(false) }
+
+    Column(Modifier.fillMaxSize(1f)) {
+        Row(Modifier.weight(1f, true), verticalAlignment = Alignment.CenterVertically) {
+            if (noteEvent is FileHeaderEvent) {
+                FileHeaderDisplay(note)
+            } else if (noteEvent is FileStorageHeaderEvent) {
+                FileStorageHeaderDisplay(note)
+            }
+        }
+    }
+
+    Row(verticalAlignment = Alignment.Bottom, modifier = Modifier.fillMaxSize(1f)) {
+        Column(Modifier.weight(1f)) {
+            Row(Modifier.padding(10.dp), verticalAlignment = Alignment.Bottom) {
+                Column(Modifier.size(45.dp), verticalArrangement = Arrangement.Center) {
+                    NoteAuthorPicture(note, navController, loggedIn, 45.dp)
+                }
+
+                Column(
+                    Modifier
+                        .padding(start = 10.dp, end = 10.dp)
+                        .height(45.dp)
+                        .weight(1f),
+                    verticalArrangement = Arrangement.Center
+                ) {
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        NoteUsernameDisplay(note, Modifier.weight(1f))
+
+                        IconButton(
+                            modifier = Modifier.size(24.dp),
+                            onClick = { moreActionsExpanded = true }
+                        ) {
+                            Icon(
+                                imageVector = Icons.Default.MoreVert,
+                                null,
+                                modifier = Modifier.size(15.dp),
+                                tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                            )
+
+                            NoteDropDownMenu(note, moreActionsExpanded, { moreActionsExpanded = false }, accountViewModel)
+                        }
+                    }
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        ObserveDisplayNip05Status(note.author!!, Modifier.weight(1f))
+                    }
+                }
+            }
+        }
+
+        Column(
+            Modifier
+                .width(65.dp)
+                .padding(bottom = 10.dp),
+            verticalArrangement = Arrangement.Center
+        ) {
+            Row(horizontalArrangement = Arrangement.Center) {
+                ReactionsColumn(note, accountViewModel, navController)
+            }
+        }
+    }
+}
+
+@Composable
+fun ReactionsColumn(baseNote: Note, accountViewModel: AccountViewModel, navController: NavController) {
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
+    var wantsToReplyTo by remember {
+        mutableStateOf<Note?>(null)
+    }
+
+    var wantsToQuote by remember {
+        mutableStateOf<Note?>(null)
+    }
+
+    if (wantsToReplyTo != null) {
+        NewPostView({ wantsToReplyTo = null }, wantsToReplyTo, null, account, accountViewModel, navController)
+    }
+
+    if (wantsToQuote != null) {
+        NewPostView({ wantsToQuote = null }, null, wantsToQuote, account, accountViewModel, navController)
+    }
+
+    Spacer(modifier = Modifier.height(8.dp))
+
+    Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.padding(bottom = 75.dp, end = 20.dp)) {
+        /*
+        ReplyReaction(baseNote, accountViewModel, iconSize = 40.dp) {
+            wantsToReplyTo = baseNote
+        }
+        BoostReaction(baseNote, accountViewModel, iconSize = 40.dp) {
+            wantsToQuote = baseNote
+        }*/
+        LikeReaction(baseNote, accountViewModel, iconSize = 40.dp, heartSize = 35.dp)
+        ZapReaction(baseNote, accountViewModel, iconSize = 40.dp, animationSize = 35.dp)
+        ViewCountReaction(baseNote.idHex, iconSize = 40.dp, barChartSize = 39.dp)
+    }
+}
+
+@OptIn(ExperimentalPermissionsApi::class)
+@Composable
+fun NewImageButton(accountViewModel: AccountViewModel, navController: NavController) {
+    var wantsToPost by remember {
+        mutableStateOf(false)
+    }
+
+    var pickedURI by remember {
+        mutableStateOf<Uri?>(null)
+    }
+
+    if (wantsToPost) {
+        val cameraPermissionState =
+            rememberPermissionState(
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    Manifest.permission.READ_MEDIA_IMAGES
+                } else {
+                    Manifest.permission.READ_EXTERNAL_STORAGE
+                }
+            )
+
+        if (cameraPermissionState.status.isGranted) {
+            var showGallerySelect by remember { mutableStateOf(false) }
+            if (showGallerySelect) {
+                GallerySelect(
+                    onImageUri = { uri ->
+                        wantsToPost = false
+                        showGallerySelect = false
+                        pickedURI = uri
+                    }
+                )
+            }
+
+            showGallerySelect = true
+        } else {
+            LaunchedEffect(key1 = accountViewModel) {
+                cameraPermissionState.launchPermissionRequest()
+            }
+        }
+    }
+
+    pickedURI?.let {
+        NewMediaView(it, onClose = { pickedURI = null }, accountViewModel = accountViewModel, navController = navController)
+    }
+
+    OutlinedButton(
+        onClick = { wantsToPost = true },
+        modifier = Modifier.size(55.dp),
+        shape = CircleShape,
+        colors = ButtonDefaults.outlinedButtonColors(backgroundColor = MaterialTheme.colors.primary),
+        contentPadding = PaddingValues(0.dp)
+    ) {
+        Icon(
+            painter = painterResource(R.drawable.ic_compose),
+            null,
+            modifier = Modifier.size(26.dp),
+            tint = Color.White
+        )
+    }
+}

app/src/main/res/drawable-xxxhdpi/footstr.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="236dp"
+    android:height="236dp"
+    android:viewportWidth="236"
+    android:viewportHeight="236">
+
+    <path
+        android:fillColor="#E102C2"
+        android:strokeWidth="1"
+        android:pathData="M168,2 C166.799,8.18727,164.947,14.0171,163,20 L173,19 C172.51,13.3852,171.014,6.79588,168,2 M180,142 C184.601,142.041,190.655,144.838,194.96,143.242 C198.824,141.81,201.214,137.39,203.124,134 C210.078,121.662,205.608,109.019,208.529,96 C209.595,91.2476,211.618,86.9521,211.907,82 C212.185,77.2133,210.665,72.7095,210.17,68 C209.701,63.5467,209.857,58.574,205.786,55.608 C201.265,52.3132,197.605,56.5867,197.109,61.0008 C196.625,65.3034,197.297,69.6886,196.896,74 C196.545,77.7718,195.281,81.1715,195.192,85 C195.122,88.0362,193.994,92.9444,190,92.9444 C182.816,92.9444,184.436,81.2708,183.471,77 C181.705,69.1818,178.855,62.145,178.174,54 C177.671,47.9876,179.574,42.0776,178.815,36 C178.301,31.8835,176.341,26.0742,171.957,24.6474 C165.913,22.6804,163.112,29.2432,163.019,34 C162.92,39.1355,164.73,43.9125,164.961,49 C165.331,57.1618,165.938,65.6008,166.06,73.7145 C166.102,76.5167,164.978,79.1797,165.148,82.0008 C165.401,86.2009,171.219,91.7501,168.342,95.6366 C164.867,100.33,159.865,95.1623,157.698,91.9992 C153.406,85.7334,150.568,78.4766,146.637,72.0193 C144.788,68.9835,141.904,66.4794,138.105,67.4529 C127.951,70.0551,136.163,83.457,139.475,88 C148.178,99.9397,155.763,112.385,165.069,124 C170.248,130.463,177.624,133.778,180,142 M201,31 C201.873,37.4822,203,43.4025,203,50 L211,53 C210.634,44.6039,207.808,36.2575,201,31 M134,45 C130.221,51.7137,128.788,59.5176,131,67 C133.684,65.6449,136.047,64.5637,139,64 C138.115,58.0095,136.467,50.4928,134,45 M69,46 C67.7386,52.0951,65.8947,58.0744,64,64 L75,65 C73.0087,58.8781,72.0169,51.6331,69,46 M58,187 C60.1785,179.456,65.298,178.506,69.5756,172.891 C76.4258,163.899,83.8065,155.158,90.3627,146 C93.3233,141.864,95.3809,137.163,98.3634,133 C101.618,128.457,110.219,115.016,99.9452,112.453 C96.1093,111.496,93.2422,113.949,91.3627,117.019 C87.4224,123.456,84.5515,130.765,80.3009,136.999 C78.2049,140.073,73.9249,144.782,70.3727,140.793 C66.7916,136.772,72.5283,131.392,72.8765,127 C73.1057,124.109,72.0273,121.426,71.99,118.576 C71.8412,107.222,73.1025,95.215,74.6998,84 C75.461,78.656,74.6292,66.8531,66.0432,69.6474 C61.6591,71.0742,59.6995,76.8835,59.1852,81 C58.5106,86.3994,60.0712,91.6669,59.6752,97 C59.0126,105.922,56.2059,113.456,54.3897,122 C53.4709,126.322,55.3265,137.793,48,137.793 C43.4396,137.793,42.7212,132.308,42.7153,129 C42.7089,125.453,41.0904,122.469,40.814,119 C40.4715,114.701,41.3203,110.323,40.9414,106.001 C40.5785,101.862,36.9418,97.2305,32.3904,100.032 C28.1086,102.668,28.2839,108.688,27.8302,113 C27.371,117.365,25.9672,121.574,26.054,126 C26.1513,130.962,27.9426,135.298,29.2153,140 C32.8567,153.455,27.7081,166.117,35.0432,179 C37.0472,182.52,39.8521,187.101,44.0008,188.303 C47.9872,189.459,53.7392,187.036,58,187 M36,76 C30.3783,82.2632,27.1802,89.5415,27,98 C29.653,96.7567,32.1579,95.7118,35,95 C35,89.2612,37.5867,81.2251,36,76 M103,90 C102.725,96.2961,100.405,101.927,99,108 C101.839,109.086,104.364,110.488,107,112 C109.117,104.839,108.468,95.4737,103,90 M180.108,151.742 C169.428,156.306,179.297,171.326,188.907,167.141 C201.335,161.729,191.315,146.953,180.108,151.742 M172,170 C172,176.766,171.53,183.278,171,190 C175.401,185.315,179.315,179.294,183,174 C179.113,173.098,175.607,171.693,172,170 M49.0046,196.533 C37.7274,199.326,45.4118,214.867,55,212.412 C61.5523,210.735,65.5024,202.582,59.581,197.603 C56.911,195.359,52.1706,195.749,49.0046,196.533 M65,215 C61.7705,216.818,58.5543,217.97,55,219 C59.1283,224.051,63.1959,229.072,66,235 C67.2105,229.96,67.0167,219.806,65,215 Z" />
+</vector>

app/src/main/res/drawable-xxxhdpi/grownostr.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+
+    <path
+        android:fillColor="#FF3700B3"
+        android:strokeWidth="1"
+        android:pathData="M18,1 C18.9992,13.6607,22.1338,27.7425,34,34.6366 C40.7028,38.5308,48.5179,39.5903,56,41 C54.3404,31.8037,49.5418,30.0009,41,30 L41,27 L48,27 C43.5259,17.4059,36.6076,16,27,16 L27,13 L34,13 C32.6931,11.3029,31.5948,10.0267,31,8 C26.6436,5.68091,22.6182,2.74787,18,1 Z" />
+    <path
+        android:fillColor="#FF6200EE"
+        android:strokeWidth="1"
+        android:pathData="M20,1 C23.7028,5.01085,28.4333,6.60192,33,9.37886 C37.2327,11.9527,40.6939,15.5138,45,18 C45,16.2032,45.0143,16.4785,46,15 C49.1978,22.5154,52.8144,28.929,57,36 C58.7383,31.8481,57.6225,27.1823,56.2508,23 C50.9595,6.86786,35.7333,1.01042,20,1 Z" />
+    <path
+        android:fillColor="#818181"
+        android:strokeWidth="1"
+        android:pathData="M39,4 L40,5 L39,4 Z" />
+    <path
+        android:fillColor="#35b458"
+        android:strokeWidth="1"
+        android:pathData="M30,9 C31.3926,10.4336,32.2328,11.0449,34,12 C31.5819,12.7224,29.5283,12.9481,27,13 L27,16 C36.9436,16,42.0965,18.6193,48,27 L41,27 L41,30 C44.205,30.0025,47.9651,29.5304,50.6713,31.6034 C54.7802,34.7509,55.7328,40.3378,57.0108,45 C60.2954,56.9827,62,69.5839,62,82 C62,87.7274,59.4347,99.821,66,102 C66,95.3343,66.0617,88.6654,66,82 C65.9762,79.4328,65.067,76.5127,65.5556,74 C66.6821,68.2063,71.7932,59.9436,75.0278,55 C76.5417,52.6862,78.2725,50.2574,81,49.3333 C84.7977,48.0467,89.9365,50.9632,91,46 L81,47 C87.2435,39.3331,91.8803,35.0279,102,35 L102,33 L95,33 L99,28 C92.7626,28.2768,88.8779,34.5639,84,38 C83.7893,35.2614,83.6975,34.578,81,34 C81.9074,41.9128,77.8444,45.756,73.5046,52 C70.4878,56.3406,67.7521,61.3024,64,65 C63.9237,55.7794,62.0513,45.3541,58.0193,37 C55.6122,32.0127,52.0583,27.809,49.4151,23 C47.9915,20.4099,47.5242,17.5234,46,15 C45.3152,16.2483,45.2512,16.5484,45,18 C40.5825,14.4148,35.9467,8.78864,30,9 Z" />
+    <path
+        android:fillColor="#818181"
+        android:strokeWidth="1"
+        android:pathData="M47,9 L48,10 L47,9 Z" />
+    <path
+        android:fillColor="#FF6200EE"
+        android:strokeWidth="1"
+        android:pathData="M70,57 C76.3094,50.934,82.6356,42.9806,81,34 C83.0347,35.2259,83.3265,35.7026,84,38 C90.3127,35.0562,94.6995,29.2957,101,26.0247 C103.882,24.5284,105.934,22.6997,109,24 C109.683,22.494,109.826,21.6852,110,20 C92.9496,20.3519,76.459,26.2355,71.2091,44 C69.9432,48.2837,70.0005,52.5793,70,57 Z" />
+    <path
+        android:fillColor="#818181"
+        android:strokeWidth="1"
+        android:pathData="M96,21 L97,22 L96,21 Z" />
+    <path
+        android:fillColor="#FF3700B3"
+        android:strokeWidth="1"
+        android:pathData="M98,27 C97.4257,29.3388,96.3153,30.952,95,33 L102,33 L102,35 C91.9916,35.0066,86.152,38.087,81,47 C84.4218,46.9717,87.6368,46.6245,91,46 C88.2508,50.2406,84.2142,47.9848,80.0401,49.6034 C75.8011,51.2471,73.6765,56.1154,72,60 C93.0315,59.0947,111.529,44.7797,109,22 C104.967,22.9474,101.721,25.2426,98,27 Z" />
+    <path
+        android:fillColor="#01ff01"
+        android:strokeWidth="1"
+        android:pathData="M23,23 L24,24 L23,23 M85,25 L86,26 L85,25 Z" />
+    <path
+        android:fillColor="#818181"
+        android:strokeWidth="1"
+        android:pathData="M72,40 L73,41 L72,40 Z" />
+    <path
+        android:fillColor="#f99721"
+        android:strokeWidth="1"
+        android:pathData="M18,127 C24.7416,127,33.546,128.5,40,126.437 C43.9557,125.172,46.9708,122.016,51,120.8 C53.8127,119.952,57.0165,120.515,59.7145,119.397 C66.4359,116.613,70.376,110.812,78,109 C73.2583,102.431,64.8777,99.3157,57,102.667 C53.9866,103.95,51.8253,106.485,49,108.066 C46.1443,109.665,42.7844,109.921,40.0147,111.727 C37.7156,113.226,36.0905,115.611,33.7145,116.977 C27.2551,120.69,22.0281,119.305,18,127 Z" />
+    <path
+        android:fillColor="#857f2d"
+        android:strokeWidth="1"
+        android:pathData="M62,101 L63,102 L62,101 Z" />
+    <path
+        android:fillColor="#ffff01"
+        android:strokeWidth="1"
+        android:pathData="M52,105 L53,106 L52,105 M75,105 L76,106 L75,105 Z" />
+    <path
+        android:fillColor="#df7f07"
+        android:strokeWidth="1"
+        android:pathData="M41,127 L110,127 C105.972,119.305,100.745,120.69,94.2855,116.977 C87.4988,113.076,83.904,107.518,75,109.53 C68.1753,111.072,64.8143,116.981,58.8302,119.397 C51.9278,122.185,46.424,120.458,41,127 Z" />
+</vector>

app/src/main/res/drawable/amethyst_monochrome.xml

@@ -0,0 +1,7 @@
+<vector android:height="108dp" android:viewportHeight="216"
+    android:viewportWidth="216" android:width="108dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000"
+        android:pathData="M90.2,73.6l-17.2,16.6 0,19.7 0,19.7 3,2.9c1.6,1.6 3.3,2.6 3.6,2.2 0.4,-0.4 1,-4.2 1.5,-8.4 0.9,-9.6 4.5,-25.4 6.9,-30.8 0.5,-1.1 1.9,-4.4 3.1,-7.3 1.9,-4.6 2.4,-5.2 4.3,-4.5 1.1,0.5 5.5,0.7 9.6,0.5 10.8,-0.3 13.7,0.3 15.5,3.8 0.8,1.6 1.5,5 1.5,7.5 0,6.1 1,7.7 7,11.4 8,4.9 5.6,8.7 -4.4,6.8 -3.9,-0.7 -6.2,-0.5 -9.6,0.6 -2.5,0.9 -5.8,1.8 -7.3,2.2 -4.4,0.9 -5.7,5.3 -5.7,19.8 0,6.8 -0.5,13.9 -1.1,15.7 -1.1,3 -1,3.4 2.9,7.3l4.1,4.1 5.8,-5.4c3.2,-3 11.3,-10.7 18.1,-17.2l12.2,-11.9 0,-18.9 0,-19 -13.2,-12.8c-14.2,-13.7 -22.3,-21.2 -22.9,-21.2 -0.2,-0 -8.2,7.5 -17.7,16.6z" android:strokeColor="#00000000"/>
+    <path android:fillColor="#000000"
+        android:pathData="M111,91.5c0,3.1 2.6,4.3 4.6,2.3 2,-2 0.7,-4.8 -2.2,-4.8 -1.9,-0 -2.4,0.5 -2.4,2.5z" android:strokeColor="#00000000"/>
+</vector>

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,35 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="192.62"
+    android:viewportHeight="288.93">
+  <group android:scaleX="0.33333334"
+      android:scaleY="0.5"
+      android:translateX="64.206665"
+      android:translateY="72.2325">
+    <group>
+      <clip-path
+          android:pathData="m111.18,103.42c-4.68,-0 -8.47,-3.8 -8.47,-8.48 0,-4.68 3.79,-8.48 8.47,-8.48 4.68,-0 8.48,3.8 8.48,8.48 0,4.68 -3.79,8.48 -8.48,8.48zM96.31,-0 L0,91.3L0,197.63l19.9,18.86c0.63,-43.4 14.08,-106.43 37.41,-146.62 0,-0 6.05,5.23 16.74,5.93 11.02,0.73 36.71,-4.37 48.32,0.36 10.87,4.43 11.66,17.34 10.79,27.84 -1.66,20.02 8.14,25.99 25.54,34.66 8.67,4.32 10.67,9.28 7.87,14.44 -3.09,5.68 -17.49,3.05 -33.55,1.1 -17.16,-2.08 -26.79,9.45 -43.37,8.39 -23.4,30.62 -0.84,73.09 -16.14,104.73l22.81,21.62 96.31,-91.31l0,-106.32z"/>
+      <path
+          android:pathData="m111.18,103.42c-4.68,-0 -8.47,-3.8 -8.47,-8.48 0,-4.68 3.79,-8.48 8.47,-8.48 4.68,-0 8.48,3.8 8.48,8.48 0,4.68 -3.79,8.48 -8.48,8.48zM96.31,-0 L0,91.3L0,197.63l19.9,18.86c0.63,-43.4 14.08,-106.43 37.41,-146.62 0,-0 6.05,5.23 16.74,5.93 11.02,0.73 36.71,-4.37 48.32,0.36 10.87,4.43 11.66,17.34 10.79,27.84 -1.66,20.02 8.14,25.99 25.54,34.66 8.67,4.32 10.67,9.28 7.87,14.44 -3.09,5.68 -17.49,3.05 -33.55,1.1 -17.16,-2.08 -26.79,9.45 -43.37,8.39 -23.4,30.62 -0.84,73.09 -16.14,104.73L96.31,288.93 192.62,197.63L192.62,91.3L96.31,-0"
+          android:strokeWidth="0.04"
+          android:strokeColor="#00000000"
+          android:fillType="nonZero">
+        <aapt:attr name="android:fillColor">
+          <gradient 
+              android:startX="33.75"
+              android:startY="252.82"
+              android:endX="158.87"
+              android:endY="36.12"
+              android:tileMode="clamp"
+              android:type="linear">
+            <item android:offset="0" android:color="#FF550066"/>
+            <item android:offset="0" android:color="#FF550066"/>
+            <item android:offset="1" android:color="#FFA75CCC"/>
+          </gradient>
+        </aapt:attr>
+      </path>
+    </group>
+    </group>
+</vector>

app/src/main/res/drawable/ic_video.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="122.88dp"
+    android:height="111.34dp"
+    android:viewportWidth="122.88"
+    android:viewportHeight="111.34">
+  <path
+      android:fillColor="#FF9C9C9C"
+      android:pathData="M23.59,0h75.7a23.68,23.68 0,0 1,23.59 23.59L122.88,87.75A23.56,23.56 0,0 1,116 104.41l-0.22,0.2a23.53,23.53 0,0 1,-16.44 6.73L23.59,111.34a23.53,23.53 0,0 1,-16.66 -6.93l-0.2,-0.22A23.46,23.46 0,0 1,0 87.75L0,23.59A23.66,23.66 0,0 1,23.59 0ZM54,47.73 L79.25,65.36a3.79,3.79 0,0 1,0.14 6.3L54.22,89.05a3.75,3.75 0,0 1,-2.4 0.87A3.79,3.79 0,0 1,48 86.13L48,50.82h0A3.77,3.77 0,0 1,54 47.73ZM7.35,26.47h14L30.41,7.35L23.59,7.35A16.29,16.29 0,0 0,7.35 23.59v2.88ZM37.05,7.35 L28,26.47L53.36,26.47L62.43,7.38v0ZM69.05,7.35L59.92,26.47h24.7L93.7,7.35ZM100.37,7.35L91.26,26.47h24.27L115.53,23.59a16.32,16.32 0,0 0,-15.2 -16.21ZM115.57,34.03L7.35,34.03L7.35,87.75A16.21,16.21 0,0 0,12 99.05l0.17,0.16A16.19,16.19 0,0 0,23.59 104h75.7a16.21,16.21 0,0 0,11.3 -4.6l0.16,-0.18a16.17,16.17 0,0 0,4.78 -11.46L115.53,34.06Z"/>
+</vector>