v0.32.2

Previews Notes that are not a citation using #[n]
Adds a New Message Tagger to Chats (tags Notes and Users by default) and Private Message (doesn't tag Users and Notes)
2026-08-04 22:04:38 +00:00 · 2023-04-06 12:23:35 -04:00 · 2023-04-06 11:59:21 -04:00 · 2023-04-06 11:58:49 -04:00 · 2023-04-06 11:57:28 -04:00 · 2023-04-06 11:56:23 -04:00
208 changed files with 15915 additions and 3193 deletions
@@ -28,10 +28,19 @@ jobs:
      - name: Build AAB
        run: ./gradlew clean bundleRelease --stacktrace

-      - name: Sign AAB
+      - name: Sign AAB (Google Play)
        uses: r0adkll/sign-android-release@v1
        with:
-          releaseDirectory: app/build/outputs/bundle/release
+          releaseDirectory: app/build/outputs/bundle/playRelease
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.KEY_ALIAS }}
+          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+      - name: Sign AAB (F-Droid)
+        uses: r0adkll/sign-android-release@v1
+        with:
+          releaseDirectory: app/build/outputs/bundle/fdroidRelease
          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
          alias: ${{ secrets.KEY_ALIAS }}
          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
@@ -40,10 +49,19 @@ jobs:
      - name: Build APK
        run: ./gradlew assembleRelease --stacktrace --no-daemon

-      - name: Sign APK
+      - name: Sign APK (Google Play)
        uses: r0adkll/sign-android-release@v1
        with:
-          releaseDirectory: app/build/outputs/apk/release
+          releaseDirectory: app/build/outputs/apk/play/release
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.KEY_ALIAS }}
+          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+      - name: Sign APK (F-Droid)
+        uses: r0adkll/sign-android-release@v1
+        with:
+          releaseDirectory: app/build/outputs/apk/fdroid/release
          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
          alias: ${{ secrets.KEY_ALIAS }}
          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
@@ -60,24 +78,96 @@ jobs:
          draft: false
          prerelease: false

-      - name: Upload APK Asset
-        id: upload-release-asset-apk
+      # Google Play APK
+      - name: Upload Play APK Universal Asset
+        id: upload-release-asset-play-universal-apk
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ steps.create_release.outputs.upload_url }} 
-          asset_path: app/build/outputs/apk/release/app-release-unsigned-signed.apk
-          asset_name: app-release-${{ github.ref_name }}.apk
+          asset_path: app/build/outputs/apk/play/release/app-play-universal-release-unsigned-signed.apk
+          asset_name: amethyst-googleplay-universal-${{ github.ref_name }}.apk
          asset_content_type: application/zip

-      - name: Upload AAB Asset
-        id: upload-release-asset-aab
+      - name: Upload Play APK x86 Asset
+        id: upload-release-asset-play-x86-apk
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/bundle/release/app-release.aab
-          asset_name: app-release-${{ github.ref_name }}.aab
+          asset_path: app/build/outputs/apk/play/release/app-play-x86-release-unsigned-signed.apk
+          asset_name: amethyst-googleplay-x86-${{ github.ref_name }}.apk
          asset_content_type: application/zip
+
+      - name: Upload Play APK x86_64 Asset
+        id: upload-release-asset-play-x86-64-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/apk/play/release/app-play-x86_64-release-unsigned-signed.apk
+          asset_name: amethyst-googleplay-x86_64-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
+      # F-Droid APK
+      - name: Upload F-Droid APK Universal Asset
+        id: upload-release-asset-fdroid-universal-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-universal-release-unsigned-signed.apk
+          asset_name: amethyst-fdroid-universal-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
+      - name: Upload F-Droid APK x86 Asset
+        id: upload-release-asset-fdroid-x86-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-x86-release-unsigned-signed.apk
+          asset_name: amethyst-fdroid-x86-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
+      - name: Upload F-Droid APK x86_64 Asset
+        id: upload-release-asset-fdroid-x86-64-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-x86_64-release-unsigned-signed.apk
+          asset_name: amethyst-fdroid-x86_64-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
+
+
+      # Google Play AAB
+      - name: Upload Google Play AAB Asset
+        id: upload-release-asset-play-aab
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/bundle/playRelease/app-play-release.aab
+          asset_name: amethyst-googleplay-${{ github.ref_name }}.aab
+          asset_content_type: application/zip
+
+      # FDroid AAB
+      - name: Upload F-Droid AAB Asset
+        id: upload-release-asset-fdroid-aab
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/bundle/fdroidRelease/app-fdroid-release.aab
+          asset_name: amethyst-fdroid-${{ github.ref_name }}.aab
+          asset_content_type: application/zip
@@ -6,6 +6,7 @@
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 /.idea/androidTestResultsUserPreferences.xml
+/.idea/deploymentTargetDropDown.xml
 .DS_Store
 /build
 /captures
@@ -68,6 +69,7 @@ render.experimental.xml
 .idea/**/caches/
 .idea/**/libraries/
 .idea/**/shelf/
+.idea/**/codeStyles
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 .idea/**/.name
@@ -4,6 +4,15 @@

 Amethyst brings the best social network to your Android phone. Just insert your Nostr private key and start posting. 

+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+     alt="Get it on F-Droid"
+     height="80">](https://f-droid.org/packages/com.vitorpamplona.amethyst/)
+[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
+     alt="Get it on Google Play"
+     height="80">](https://play.google.com/store/apps/details?id=com.vitorpamplona.amethyst)
+
+Or get the latest APK from the [Releases Section](https://github.com/vitorpamplona/amethyst/releases/latest).
+
 # Current Features

 - [x] Event Builders / WebSocket Subscriptions (NIP-01, NIP-15)
@@ -32,6 +41,7 @@ Amethyst brings the best social network to your Android phone. Just insert your
 - [x] Online Relay Search (NIP-50)
 - [x] Internationalization
 - [x] Badges (NIP-58)
+- [x] Hashtags
 - [ ] Local Database 
 - [ ] View Individual Reactions (Like, Boost, Zaps, Reports) per Post
 - [ ] Bookmarks, Pinned Posts, Muted Events (NIP-51)
@@ -49,6 +59,7 @@ Amethyst brings the best social network to your Android phone. Just insert your
 - [ ] Delegated Event Signing (NIP-26)
 - [ ] Account Creation / Backup Guidance (NIP-06)
 - [ ] Message Sent feedback (NIP-20)
+- [ ] Polls (NIP-69)

 # Development Overview

@@ -104,8 +115,15 @@ Build the app:
 ```

 ## Installing on device
+
+For the F-Droid build:
 ```bash
-./gradlew installDebug
+./gradlew installFdroidDebug
+```
+
+For the Play build:
+```bash
+./gradlew installPlayDebug
 ```

 ## How to Deploy
@@ -12,8 +12,8 @@ android {
        applicationId "com.vitorpamplona.amethyst"
        minSdk 26
        targetSdk 33
-        versionCode 94
-        versionName "0.25.2"
+        versionCode 117
+        versionName "0.32.2"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables {
@@ -33,19 +33,46 @@ android {
            resValue "string", "app_name", "@string/app_name_debug"
        }
    }
+
+    flavorDimensions "channel"
+
+    productFlavors {
+        play {
+            getIsDefault().set(true)
+            dimension "channel"
+        }
+
+        fdroid {
+            dimension "channel"
+        }
+    }
+
+    splits {
+        abi {
+            enable true
+            reset()
+            include "x86", "x86_64"
+            universalApk true
+        }
+    }
+
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_11
        targetCompatibility JavaVersion.VERSION_11
    }
+
    kotlinOptions {
        jvmTarget = '11'
    }
+
    buildFeatures {
        compose true
    }
+
    composeOptions {
        kotlinCompilerExtensionVersion "1.4.3"
    }
+
    packagingOptions {
        resources {
            excludes += '/META-INF/{AL2.0,LGPL2.1}'
@@ -77,11 +104,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"
+
    // Biometrics
    implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"

    // Bitcoin secp256k1 bindings to Android
-    implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.7.1'
+    implementation 'fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.8.0'

    // Nostr Base Protocol
    implementation('com.github.vitorpamplona.NostrPostr:nostrpostrlib:master-SNAPSHOT') {
@@ -104,14 +133,14 @@ dependencies {
    implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha05'

    // view videos
-    implementation 'com.google.android.exoplayer:exoplayer:2.18.4'
+    implementation 'com.google.android.exoplayer:exoplayer:2.18.5'

    // Load images from the web.
-    implementation "io.coil-kt:coil-compose:2.2.2"
+    implementation "io.coil-kt:coil-compose:$coil_version"
    // view gifs
-    implementation "io.coil-kt:coil-gif:2.2.2"
+    implementation "io.coil-kt:coil-gif:$coil_version"
    // view svgs
-    implementation("io.coil-kt:coil-svg:2.2.2")
+    implementation "io.coil-kt:coil-svg:$coil_version"

    // Rendering clickable text
    implementation "com.google.accompanist:accompanist-flowlayout:$accompanist_version"
@@ -135,10 +164,10 @@ dependencies {
    implementation "com.halilibo.compose-richtext:richtext-commonmark:0.16.0"

    // Local model for language identification
-    implementation 'com.google.mlkit:language-id:17.0.4'
+    playImplementation 'com.google.mlkit:language-id:17.0.4'

    // Google services model the translate text
-    implementation 'com.google.mlkit:translate:17.0.1'
+    playImplementation 'com.google.mlkit:translate:17.0.1'

    // Automatic memory leak detection
    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
@@ -155,3 +184,35 @@ dependencies {
 ktlint {
    disabledRules.set(["no-wildcard-imports"])
 }
+
+// https://gitlab.com/fdroid/wiki/-/wikis/HOWTO:-diff-&-fix-APKs-for-Reproducible-Builds#differing-assetsdexoptbaselineprofm-easy-to-fix
+// NB: Android Studio can't find the imports; this does not affect the
+// actual build since Gradle can find them just fine.
+import com.android.tools.profgen.ArtProfileKt
+import com.android.tools.profgen.ArtProfileSerializer
+import com.android.tools.profgen.DexFile
+
+project.afterEvaluate {
+    tasks.each { task ->
+        if (task.name.startsWith("compile") && task.name.endsWith("ReleaseArtProfile")) {
+            task.doLast {
+                outputs.files.each { file ->
+                    if (file.name.endsWith(".profm")) {
+                        println("Sorting ${file} ...")
+                        def version = ArtProfileSerializer.valueOf("METADATA_0_0_2")
+                        def profile = ArtProfileKt.ArtProfile(file)
+                        def keys = new ArrayList(profile.profileData.keySet())
+                        def sortedData = new LinkedHashMap()
+                        Collections.sort keys, new DexFile.Companion()
+                        keys.each { key -> sortedData[key] = profile.profileData[key] }
+                        new FileOutputStream(file).with {
+                            write(version.magicBytes$profgen)
+                            write(version.versionBytes$profgen)
+                            version.write$profgen(it, sortedData, "")
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
@@ -77,4 +77,13 @@ class TranslationsTest {
            "pt"
        )
    }
+
+    @Test
+    fun testNostrEvents() {
+        assertTranslateContains(
+            "nostr:nevent1qqs0tsw8hjacs4fppgdg7f5yhgwwfkyua4xcs3re9wwkpkk2qeu6mhql22rcy",
+            "sure, nostr:nevent1qqs0tsw8hjacs4fppgdg7f5yhgwwfkyua4xcs3re9wwkpkk2qeu6mhql22rcy",
+            "en"
+        )
+    }
 }
@@ -0,0 +1,26 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun TranslatableRichTextViewer(
+    content: String,
+    canPreview: Boolean,
+    modifier: Modifier = Modifier,
+    tags: List<List<String>>?,
+    backgroundColor: Color,
+    accountViewModel: AccountViewModel,
+    navController: NavController
+) = ExpandableRichTextViewer(
+    content,
+    canPreview,
+    modifier,
+    tags,
+    backgroundColor,
+    accountViewModel,
+    navController
+)
@@ -43,6 +43,13 @@
                <data android:scheme="nostr" />
            </intent-filter>

+            <intent-filter android:label="Amethyst">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="nostrwalletconnect" />
+            </intent-filter>
+
            <meta-data
                android:name="android.app.lib_name"
                android:value="" />
@@ -11,6 +11,7 @@ import com.vitorpamplona.amethyst.model.toByteArray
 import com.vitorpamplona.amethyst.service.model.ContactListEvent
 import com.vitorpamplona.amethyst.service.model.Event
 import com.vitorpamplona.amethyst.service.model.Event.Companion.getRefinedEvent
+import com.vitorpamplona.amethyst.ui.note.Nip47URI
 import fr.acinq.secp256k1.Hex
 import nostr.postr.Persona
 import nostr.postr.toHex
@@ -26,10 +27,7 @@ private const val DEBUG_PREFERENCES_NAME = "debug_prefs"

 data class AccountInfo(
    val npub: String,
-    val hasPrivKey: Boolean,
-    val current: Boolean,
-    val displayName: String?,
-    val profilePicture: String?
+    val hasPrivKey: Boolean = false
 )

 private object PrefKeys {
@@ -37,8 +35,6 @@ private object PrefKeys {
    const val SAVED_ACCOUNTS = "all_saved_accounts"
    const val NOSTR_PRIVKEY = "nostr_privkey"
    const val NOSTR_PUBKEY = "nostr_pubkey"
-    const val DISPLAY_NAME = "display_name"
-    const val PROFILE_PICTURE_URL = "profile_picture"
    const val FOLLOWING_CHANNELS = "following_channels"
    const val HIDDEN_USERS = "hidden_users"
    const val RELAYS = "relays"
@@ -46,8 +42,10 @@ private object PrefKeys {
    const val LANGUAGE_PREFS = "languagePreferences"
    const val TRANSLATE_TO = "translateTo"
    const val ZAP_AMOUNTS = "zapAmounts"
+    const val ZAP_PAYMENT_REQUEST_SERVER = "zapPaymentServer"
    const val LATEST_CONTACT_LIST = "latestContactList"
-    const val HIDE_DELETE_REQUEST_INFO = "hideDeleteRequestInfo"
+    const val HIDE_DELETE_REQUEST_DIALOG = "hide_delete_request_dialog"
+    const val HIDE_BLOCK_ALERT_DIALOG = "hide_block_alert_dialog"
    val LAST_READ: (String) -> String = { route -> "last_read_route_$route" }
 }

@@ -56,53 +54,73 @@ private val gson = GsonBuilder().create()
 object LocalPreferences {
    private const val comma = ","

-    private var currentAccount: String?
-        get() = encryptedPreferences().getString(PrefKeys.CURRENT_ACCOUNT, null)
-        set(npub) {
-            val prefs = encryptedPreferences()
-            prefs.edit().apply {
+    private var _currentAccount: String? = null
+
+    private fun currentAccount(): String? {
+        if (_currentAccount == null) {
+            _currentAccount = encryptedPreferences().getString(PrefKeys.CURRENT_ACCOUNT, null)
+        }
+        return _currentAccount
+    }
+
+    private fun updateCurrentAccount(npub: String) {
+        if (_currentAccount != npub) {
+            _currentAccount = npub
+
+            encryptedPreferences().edit().apply {
                putString(PrefKeys.CURRENT_ACCOUNT, npub)
            }.apply()
        }
+    }

-    private val savedAccounts: List<String>
-        get() = encryptedPreferences()
-            .getString(PrefKeys.SAVED_ACCOUNTS, null)?.split(comma) ?: listOf()
+    private var _savedAccounts: List<String>? = null
+
+    private fun savedAccounts(): List<String> {
+        if (_savedAccounts == null) {
+            _savedAccounts = encryptedPreferences()
+                .getString(PrefKeys.SAVED_ACCOUNTS, null)?.split(comma) ?: listOf()
+        }
+        return _savedAccounts!!
+    }
+
+    private fun updateSavedAccounts(accounts: List<String>) {
+        if (_savedAccounts != accounts) {
+            _savedAccounts = accounts
+
+            encryptedPreferences().edit().apply {
+                putString(PrefKeys.SAVED_ACCOUNTS, accounts.joinToString(comma).ifBlank { null })
+            }.apply()
+        }
+    }

    private val prefsDirPath: String
        get() = "${Amethyst.instance.filesDir.parent}/shared_prefs/"

    private fun addAccount(npub: String) {
-        val accounts = savedAccounts.toMutableList()
+        val accounts = savedAccounts().toMutableList()
        if (npub !in accounts) {
            accounts.add(npub)
+            updateSavedAccounts(accounts)
        }
-        val prefs = encryptedPreferences()
-        prefs.edit().apply {
-            putString(PrefKeys.SAVED_ACCOUNTS, accounts.joinToString(comma).ifBlank { null })
-        }.apply()
    }

    private fun setCurrentAccount(account: Account) {
        val npub = account.userProfile().pubkeyNpub()
-        currentAccount = npub
+        updateCurrentAccount(npub)
        addAccount(npub)
    }

    fun switchToAccount(npub: String) {
-        currentAccount = npub
+        updateCurrentAccount(npub)
    }

    /**
     * Removes the account from the app level shared preferences
     */
    private fun removeAccount(npub: String) {
-        val accounts = savedAccounts.toMutableList()
+        val accounts = savedAccounts().toMutableList()
        if (accounts.remove(npub)) {
-            val prefs = encryptedPreferences()
-            prefs.edit().apply {
-                putString(PrefKeys.SAVED_ACCOUNTS, accounts.joinToString(comma).ifBlank { null })
-            }.apply()
+            updateSavedAccounts(accounts)
        }
    }

@@ -142,11 +160,11 @@ object LocalPreferences {
        removeAccount(npub)
        deleteUserPreferenceFile(npub)

-        if (savedAccounts.isEmpty()) {
+        if (savedAccounts().isEmpty()) {
            val appPrefs = encryptedPreferences()
            appPrefs.edit().clear().apply()
-        } else if (currentAccount == npub) {
-            currentAccount = savedAccounts.elementAt(0)
+        } else if (currentAccount() == npub) {
+            updateCurrentAccount(savedAccounts().elementAt(0))
        }
    }

@@ -156,17 +174,8 @@ object LocalPreferences {
    }

    fun allSavedAccounts(): List<AccountInfo> {
-        return savedAccounts.map { npub ->
-            val prefs = encryptedPreferences(npub)
-            val hasPrivKey = prefs.getString(PrefKeys.NOSTR_PRIVKEY, null) != null
-
-            AccountInfo(
-                npub = npub,
-                hasPrivKey = hasPrivKey,
-                current = npub == currentAccount,
-                displayName = prefs.getString(PrefKeys.DISPLAY_NAME, null),
-                profilePicture = prefs.getString(PrefKeys.PROFILE_PICTURE_URL, null)
-            )
+        return savedAccounts().map { npub ->
+            AccountInfo(npub = npub)
        }
    }

@@ -182,15 +191,15 @@ 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.ZAP_PAYMENT_REQUEST_SERVER, gson.toJson(account.zapPaymentRequest))
            putString(PrefKeys.LATEST_CONTACT_LIST, Event.gson.toJson(account.backupContactList))
-            putBoolean(PrefKeys.HIDE_DELETE_REQUEST_INFO, account.hideDeleteRequestInfo)
-            putString(PrefKeys.DISPLAY_NAME, account.userProfile().toBestDisplayName())
-            putString(PrefKeys.PROFILE_PICTURE_URL, account.userProfile().profilePicture())
+            putBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, account.hideDeleteRequestDialog)
+            putBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, account.hideBlockAlertDialog)
        }.apply()
    }

    fun loadFromEncryptedStorage(): Account? {
-        encryptedPreferences(currentAccount).apply {
+        encryptedPreferences(currentAccount()).apply {
            val pubKey = getString(PrefKeys.NOSTR_PUBKEY, null) ?: return null
            val privKey = getString(PrefKeys.NOSTR_PRIVKEY, null)
            val followingChannels = getStringSet(PrefKeys.FOLLOWING_CHANNELS, null) ?: setOf()
@@ -208,6 +217,15 @@ object LocalPreferences {
                object : TypeToken<List<Long>>() {}.type
            ) ?: listOf(500L, 1000L, 5000L)

+            val zapPaymentRequestServer = try {
+                getString(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, null)?.let {
+                    gson.fromJson(it, Nip47URI::class.java)
+                }
+            } catch (e: Throwable) {
+                e.printStackTrace()
+                null
+            }
+
            val latestContactList = try {
                getString(PrefKeys.LATEST_CONTACT_LIST, null)?.let {
                    Event.gson.fromJson(it, Event::class.java)
@@ -230,9 +248,10 @@ object LocalPreferences {
                mapOf()
            }

-            val hideDeleteRequestInfo = getBoolean(PrefKeys.HIDE_DELETE_REQUEST_INFO, false)
+            val hideDeleteRequestDialog = getBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, false)
+            val hideBlockAlertDialog = getBoolean(PrefKeys.HIDE_BLOCK_ALERT_DIALOG, false)

-            return Account(
+            val a = Account(
                Persona(privKey = privKey?.toByteArray(), pubKey = pubKey.toByteArray()),
                followingChannels,
                hiddenUsers,
@@ -241,26 +260,30 @@ object LocalPreferences {
                languagePreferences,
                translateTo,
                zapAmountChoices,
-                hideDeleteRequestInfo,
+                zapPaymentRequestServer,
+                hideDeleteRequestDialog,
+                hideBlockAlertDialog,
                latestContactList
            )
+
+            return a
        }
    }

    fun saveLastRead(route: String, timestampInSecs: Long) {
-        encryptedPreferences(currentAccount).edit().apply {
+        encryptedPreferences(currentAccount()).edit().apply {
            putLong(PrefKeys.LAST_READ(route), timestampInSecs)
        }.apply()
    }

    fun loadLastRead(route: String): Long {
-        encryptedPreferences(currentAccount).run {
+        encryptedPreferences(currentAccount()).run {
            return getLong(PrefKeys.LAST_READ(route), 0)
        }
    }

    fun migrateSingleUserPrefs() {
-        if (currentAccount != null) return
+        if (currentAccount() != null) return

        val pubkey = encryptedPreferences().getString(PrefKeys.NOSTR_PUBKEY, null) ?: return
        val npub = Hex.decode(pubkey).toNpub()
@@ -289,14 +312,14 @@ object LocalPreferences {
                stringPrefs.forEach { userPrefs.putString(it, appPrefs.getString(it, null)) }
                stringSetPrefs.forEach { userPrefs.putStringSet(it, appPrefs.getStringSet(it, null)) }
                userPrefs.putBoolean(
-                    PrefKeys.HIDE_DELETE_REQUEST_INFO,
-                    appPrefs.getBoolean(PrefKeys.HIDE_DELETE_REQUEST_INFO, false)
+                    PrefKeys.HIDE_DELETE_REQUEST_DIALOG,
+                    appPrefs.getBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, false)
                )
            }.apply()
        }

        encryptedPreferences().edit().clear().apply()
        addAccount(npub)
-        currentAccount = npub
+        updateCurrentAccount(npub)
    }
 }
@@ -1,14 +1,11 @@
 package com.vitorpamplona.amethyst

 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.util.concurrent.atomic.AtomicBoolean

 object NotificationCache {
    val lastReadByRoute = mutableMapOf<String, Long>()
@@ -41,23 +38,14 @@ object NotificationCache {

 class NotificationLiveData(val cache: NotificationCache) : LiveData<NotificationState>(NotificationState(cache)) {
    // Refreshes observers in batches.
-    var handlerWaiting = AtomicBoolean()
+    private val bundler = BundledUpdate(300, Dispatchers.Main) {
+        if (hasActiveObservers()) {
+            refresh()
+        }
+    }

    fun invalidateData() {
-        if (!hasActiveObservers()) return
-        if (handlerWaiting.getAndSet(true)) return
-
-        val scope = CoroutineScope(Job() + Dispatchers.Main)
-        scope.launch {
-            try {
-                delay(100)
-                refresh()
-            } finally {
-                withContext(NonCancellable) {
-                    handlerWaiting.set(false)
-                }
-            }
-        }
+        bundler.invalidate()
    }

    fun refresh() {
@@ -71,6 +71,7 @@ object ServiceManager {
        account?.let {
            LocalCache.pruneOldAndHiddenMessages(it)
            LocalCache.pruneHiddenMessages(it)
+            LocalCache.pruneContactLists(it)
            // LocalCache.pruneNonFollows(it)
        }
    }
@@ -4,14 +4,9 @@ import android.util.Log
 import android.util.LruCache
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.model.Event
-import kotlinx.coroutines.CoroutineScope
+import com.vitorpamplona.amethyst.service.relays.Relay
+import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.util.concurrent.atomic.AtomicBoolean

 data class Spammer(val pubkeyHex: HexKey, var duplicatedMessages: Set<HexKey>)

@@ -20,7 +15,7 @@ class AntiSpamFilter {
    val spamMessages = LruCache<Int, Spammer>(1000)

    @Synchronized
-    fun isSpam(event: Event): Boolean {
+    fun isSpam(event: Event, relay: Relay?): Boolean {
        val idHex = event.id

        // if short message, ok
@@ -33,7 +28,7 @@ class AntiSpamFilter {
        val hash = (event.content + event.tags.flatten().joinToString(",")).hashCode()

        if ((recentMessages[hash] != null && recentMessages[hash] != idHex) || spamMessages[hash] != null) {
-            Log.w("Potential SPAM Message", "${event.id} ${recentMessages[hash]} ${spamMessages[hash] != null} ${event.content.replace("\n", " | ")}")
+            Log.w("Potential SPAM Message", "${event.id} ${recentMessages[hash]} ${spamMessages[hash] != null} ${relay?.url} ${event.content.replace("\n", " | ")}")

            // Log down offenders
            if (spamMessages.get(hash) == null) {
@@ -60,23 +55,14 @@ class AntiSpamFilter {
 class AntiSpamLiveData(val cache: AntiSpamFilter) : LiveData<AntiSpamState>(AntiSpamState(cache)) {

    // Refreshes observers in batches.
-    var handlerWaiting = AtomicBoolean()
+    private val bundler = BundledUpdate(300, Dispatchers.Main) {
+        if (hasActiveObservers()) {
+            refresh()
+        }
+    }

    fun invalidateData() {
-        if (!hasActiveObservers()) return
-        if (handlerWaiting.getAndSet(true)) return
-
-        val scope = CoroutineScope(Job() + Dispatchers.Main)
-        scope.launch {
-            try {
-                delay(100)
-                refresh()
-            } finally {
-                withContext(NonCancellable) {
-                    handlerWaiting.set(false)
-                }
-            }
-        }
+        bundler.invalidate()
    }

    private fun refresh() {
@@ -3,8 +3,10 @@ package com.vitorpamplona.amethyst.model
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
+import kotlinx.coroutines.Dispatchers
 import java.util.concurrent.ConcurrentHashMap

 class Channel(val idHex: String) {
@@ -27,12 +29,16 @@ class Channel(val idHex: String) {
        notes[note.idHex] = note
    }

+    fun removeNote(note: Note) {
+        notes.remove(note.idHex)
+    }
+
    fun updateChannelInfo(creator: User, channelInfo: ChannelCreateEvent.ChannelData, updatedAt: Long) {
        this.creator = creator
        this.info = channelInfo
        this.updatedMetadataAt = updatedAt

-        live.refresh()
+        live.invalidateData()
    }

    fun profilePicture(): String? {
@@ -67,7 +73,18 @@ class Channel(val idHex: String) {
 }

 class ChannelLiveData(val channel: Channel) : LiveData<ChannelState>(ChannelState(channel)) {
-    fun refresh() {
+    // Refreshes observers in batches.
+    private val bundler = BundledUpdate(300, Dispatchers.Main) {
+        if (hasActiveObservers()) {
+            refresh()
+        }
+    }
+
+    fun invalidateData() {
+        bundler.invalidate()
+    }
+
+    private fun refresh() {
        postValue(ChannelState(channel))
    }

@@ -0,0 +1,26 @@
+package com.vitorpamplona.amethyst.model
+import androidx.compose.foundation.layout.padding
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import com.vitorpamplona.amethyst.R
+fun checkForHashtagWithIcon(tag: String): HashtagIcon? {
+    return when (tag.lowercase()) {
+        "bitcoin", "btc" -> HashtagIcon(R.drawable.ht_btc, "Bitcoin", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp))
+        "nostr", "nostrich", "nostriches", "nostrichs" -> HashtagIcon(R.drawable.ht_nostr, "Nostr", Color.Unspecified, Modifier.padding(1.dp, 2.dp, 0.dp, 0.dp))
+        "lightning", "lightningnetwork" -> HashtagIcon(R.drawable.ht_lightning, "Lightning", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
+        "zap", "zaps", "zapper", "zappers", "zapping", "zapped", "zapathon", "zapraiser", "zaplife", "zapchain" -> HashtagIcon(R.drawable.zap, "Zap", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
+        "amethyst" -> HashtagIcon(R.drawable.amethyst, "Amethyst", Color.Unspecified, Modifier.padding(3.dp, 2.dp, 0.dp, 0.dp))
+        "plebs", "pleb", "plebchain" -> HashtagIcon(R.drawable.plebs, "Pleb", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 1.dp))
+        "coffee", "coffeechain" -> HashtagIcon(R.drawable.coffee, "Coffee", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp))
+        "skullofsatoshi" -> HashtagIcon(R.drawable.skull, "SkullofSatoshi", Color.Unspecified, Modifier.padding(2.dp, 1.dp, 0.dp, 0.dp))
+
+        else -> null
+    }
+}
+class HashtagIcon(
+    val icon: Int,
+    val description: String,
+    val color: Color,
+    val modifier: Modifier
+)
@@ -38,14 +38,14 @@ fun HexKey.toDisplayHexKey(): String {
 }

 fun decodePublicKey(key: String): ByteArray {
+    val parsed = Nip19.uriToRoute(key)
+    val pubKeyParsed = parsed?.hex?.toByteArray()
+
    return if (key.startsWith("nsec")) {
        Persona(privKey = key.bechToBytes()).pubKey
-    } else if (key.startsWith("npub")) {
-        key.bechToBytes()
-    } else if (key.startsWith("note")) {
-        key.bechToBytes()
-    } else { // if (pattern.matcher(key).matches()) {
-        // } else {
+    } else if (pubKeyParsed != null) {
+        pubKeyParsed
+    } else {
        Hex.decode(key)
    }
 }
@@ -4,9 +4,9 @@ import android.util.Log
 import androidx.lifecycle.LiveData
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.google.gson.reflect.TypeToken
 import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.relays.Relay
+import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import fr.acinq.secp256k1.Hex
 import kotlinx.coroutines.*
 import nostr.postr.toNpub
@@ -15,19 +15,20 @@ import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.atomic.AtomicBoolean

 object LocalCache {
-    val metadataParser = jacksonObjectMapper()
-        .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-        .readerFor(UserMetadata::class.java)
+    val metadataParser by lazy {
+        jacksonObjectMapper()
+            .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+            .readerFor(UserMetadata::class.java)
+    }

    val antiSpam = AntiSpamFilter()

-    val users = ConcurrentHashMap<HexKey, User>()
-    val notes = ConcurrentHashMap<HexKey, Note>()
+    val users = ConcurrentHashMap<HexKey, User>(5000)
+    val notes = ConcurrentHashMap<HexKey, Note>(5000)
    val channels = ConcurrentHashMap<HexKey, Channel>()
-    val addressables = ConcurrentHashMap<String, AddressableNote>()
+    val addressables = ConcurrentHashMap<String, AddressableNote>(100)

    fun checkGetOrCreateUser(key: String): User? {
        if (isValidHexNpub(key)) {
@@ -138,6 +139,18 @@ object LocalCache {
        }
    }

+    fun consume(event: BookmarkListEvent) {
+        val user = getOrCreateUser(event.pubKey)
+        if (user.latestBookmarkList == null || event.createdAt > user.latestBookmarkList!!.createdAt) {
+            if (event.dTag() == "bookmark") {
+                user.updateBookmark(event)
+            }
+            // Log.d("MT", "New User Metadata ${oldUser.pubkeyDisplayHex} ${oldUser.toBestDisplayName()}")
+        } else {
+            // Log.d("MT","Relay sent a previous Metadata Event ${oldUser.toBestDisplayName()} ${formattedDateTime(event.createdAt)} > ${formattedDateTime(oldUser.updatedAt)}")
+        }
+    }
+
    fun formattedDateTime(timestamp: Long): String {
        return Instant.ofEpochSecond(timestamp).atZone(ZoneId.systemDefault())
            .format(DateTimeFormatter.ofPattern("uuuu MMM d hh:mm a"))
@@ -155,31 +168,22 @@ object LocalCache {
        // Already processed this event.
        if (note.event != null) return

-        if (antiSpam.isSpam(event)) {
+        if (antiSpam.isSpam(event, relay)) {
            relay?.let {
                it.spamCounter++
            }
            return
        }

-        val mentions = event.mentions().mapNotNull { checkGetOrCreateUser(it) }
-        val replyTo = tagsWithoutCitations(event).mapNotNull { checkGetOrCreateNote(it) }
+        val replyTo = event.tagsWithoutCitations().mapNotNull { checkGetOrCreateNote(it) }

-        note.loadEvent(event, author, mentions, replyTo)
+        note.loadEvent(event, author, replyTo)

        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()?.take(100)} ${formattedDateTime(event.createdAt)}")

        // Prepares user's profile view.
        author.addNote(note)

-        // Adds notifications to users.
-        mentions.forEach {
-            it.addTaggedPost(note)
-        }
-        replyTo.forEach {
-            it.author?.addTaggedPost(note)
-        }
-
        // Counts the replies
        replyTo.forEach {
            it.addReply(note)
@@ -200,33 +204,60 @@ object LocalCache {
        // Already processed this event.
        if (note.event?.id() == event.id()) return

-        if (antiSpam.isSpam(event)) {
+        if (antiSpam.isSpam(event, relay)) {
            relay?.let {
                it.spamCounter++
            }
            return
        }

-        val mentions = event.mentions().mapNotNull { checkGetOrCreateUser(it) }
-        val replyTo = tagsWithoutCitations(event).mapNotNull { checkGetOrCreateNote(it) }
+        val replyTo = event.tagsWithoutCitations().mapNotNull { checkGetOrCreateNote(it) }

        if (event.createdAt > (note.createdAt() ?: 0)) {
-            note.loadEvent(event, author, mentions, replyTo)
+            note.loadEvent(event, author, replyTo)

            author.addNote(note)

-            // Adds notifications to users.
-            mentions.forEach {
-                it.addTaggedPost(note)
-            }
-            replyTo.forEach {
-                it.author?.addTaggedPost(note)
-            }
-
            refreshObservers()
        }
    }

+    fun consume(event: PollNoteEvent, relay: Relay? = null) {
+        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
+
+        if (antiSpam.isSpam(event, relay)) {
+            relay?.let {
+                it.spamCounter++
+            }
+            return
+        }
+
+        val replyTo = event.tagsWithoutCitations().mapNotNull { checkGetOrCreateNote(it) }
+
+        note.loadEvent(event, author, replyTo)
+
+        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()?.take(100)} ${formattedDateTime(event.createdAt)}")
+
+        // Prepares user's profile view.
+        author.addNote(note)
+
+        // Counts the replies
+        replyTo.forEach {
+            it.addReply(note)
+        }
+
+        refreshObservers()
+    }
+
    fun consume(event: BadgeDefinitionEvent) {
        val note = getOrCreateAddressableNote(event.address())
        val author = getOrCreateUser(event.pubKey)
@@ -235,7 +266,7 @@ object LocalCache {
        if (note.event?.id() == event.id()) return

        if (event.createdAt > (note.createdAt() ?: 0)) {
-            note.loadEvent(event, author, emptyList<User>(), emptyList<Note>())
+            note.loadEvent(event, author, emptyList<Note>())

            refreshObservers()
        }
@@ -252,7 +283,7 @@ object LocalCache {
            event.badgeAwardDefinitions().mapNotNull { getOrCreateAddressableNote(it) }

        if (event.createdAt > (note.createdAt() ?: 0)) {
-            note.loadEvent(event, author, emptyList(), replyTo)
+            note.loadEvent(event, author, replyTo)

            author.updateAcceptedBadges(note)

@@ -269,15 +300,9 @@ object LocalCache {
        // Log.d("TN", "New Boost (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")

        val author = getOrCreateUser(event.pubKey)
-        val awardees = event.awardees().mapNotNull { checkGetOrCreateUser(it) }
        val awardDefinition = event.awardDefinition().map { getOrCreateAddressableNote(it) }

-        note.loadEvent(event, author, awardees, awardDefinition)
-
-        // Adds notifications to users.
-        awardees.forEach {
-            it.addTaggedPost(note)
-        }
+        note.loadEvent(event, author, awardDefinition)

        // Replies of an Badge Definition are Award Events
        awardDefinition.forEach {
@@ -287,53 +312,6 @@ object LocalCache {
        refreshObservers()
    }

-    private fun findCitations(event: Event): Set<String> {
-        var citations = mutableSetOf<String>()
-        // Removes citations from replies:
-        val matcher = tagSearch.matcher(event.content)
-        while (matcher.find()) {
-            try {
-                val tag = matcher.group(1)?.let { event.tags[it.toInt()] }
-                if (tag != null && tag[0] == "e") {
-                    citations.add(tag[1])
-                }
-                if (tag != null && tag[0] == "a") {
-                    citations.add(tag[1])
-                }
-            } catch (e: Exception) {
-            }
-        }
-        return citations
-    }
-
-    private fun tagsWithoutCitations(event: TextNoteEvent): List<String> {
-        val repliesTo = event.replyTos()
-        val tagAddresses = event.taggedAddresses().map { it.toTag() }
-        if (repliesTo.isEmpty() && tagAddresses.isEmpty()) return emptyList()
-
-        val citations = findCitations(event)
-
-        return if (citations.isEmpty()) {
-            repliesTo + tagAddresses
-        } else {
-            repliesTo.filter { it !in citations }
-        }
-    }
-
-    private fun tagsWithoutCitations(event: LongTextNoteEvent): List<String> {
-        val repliesTo = event.replyTos()
-        val tagAddresses = event.taggedAddresses().map { it.toTag() }
-        if (repliesTo.isEmpty() && tagAddresses.isEmpty()) return emptyList()
-
-        val citations = findCitations(event)
-
-        return if (citations.isEmpty()) {
-            repliesTo + tagAddresses
-        } else {
-            repliesTo.filter { it !in citations }
-        }
-    }
-
    @Suppress("UNUSED_PARAMETER")
    fun consume(event: RecommendRelayEvent) {
 //        // Log.d("RR", event.toJson())
@@ -341,42 +319,10 @@ object LocalCache {

    fun consume(event: ContactListEvent) {
        val user = getOrCreateUser(event.pubKey)
-        val follows = event.follows()
-
-        if (event.createdAt > user.updatedFollowsAt && !follows.isNullOrEmpty()) {
-            // Saves relay list only if it's a user that is currently been seen
-            user.latestContactList = event
-
-            user.updateFollows(
-                follows.map {
-                    try {
-                        val pubKey = decodePublicKey(it.pubKeyHex)
-                        getOrCreateUser(pubKey.toHexKey())
-                    } catch (e: Exception) {
-                        Log.w("ContactList Parser", "Ignoring: Could not parse Hex key: ${it.pubKeyHex} in ${event.toJson()}")
-                        // e.printStackTrace()
-                        null
-                    }
-                }.filterNotNull().toSet(),
-                event.createdAt
-            )
-
-            // Saves relay list only if it's a user that is currently been seen
-            try {
-                if (event.content.isNotEmpty()) {
-                    val relays: Map<String, ContactListEvent.ReadWrite> =
-                        Event.gson.fromJson(
-                            event.content,
-                            object : TypeToken<Map<String, ContactListEvent.ReadWrite>>() {}.type
-                        )
-
-                    user.updateRelays(relays)
-                }
-            } catch (e: Exception) {
-                Log.w("Relay List Parser", "Relay import issue ${e.message}", e)
-                e.printStackTrace()
-            }

+        // avoids processing empty contact lists.
+        if (event.createdAt > (user.latestContactList?.createdAt ?: 0) && !event.tags.isEmpty()) {
+            user.updateContactList(event)
            // Log.d("CL", "AAA ${user.toBestDisplayName()} ${follows.size}")
        }
    }
@@ -397,10 +343,10 @@ object LocalCache {

        // Log.d("PM", "${author.toBestDisplayName()} to ${recipient?.toBestDisplayName()}")

-        val repliesTo = event.tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }.mapNotNull { checkGetOrCreateNote(it) }
-        val mentions = event.tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }.mapNotNull { checkGetOrCreateUser(it) }
+        val repliesTo = event.tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+            .mapNotNull { checkGetOrCreateNote(it) }

-        note.loadEvent(event, author, mentions, repliesTo)
+        note.loadEvent(event, author, repliesTo)

        if (recipient != null) {
            author.addMessage(recipient, note)
@@ -419,13 +365,11 @@ object LocalCache {
                deleteNote.author?.removeNote(deleteNote)

                // reverts the add
-                deleteNote.mentions?.forEach { user ->
-                    user.removeTaggedPost(deleteNote)
-                    user.removeReport(deleteNote)
-                }
+                val mentions = deleteNote.event?.tags()?.filter { it.firstOrNull() == "p" }
+                    ?.mapNotNull { it.getOrNull(1) }?.mapNotNull { checkGetOrCreateUser(it) }

-                deleteNote.replyTo?.forEach { replyingNote ->
-                    replyingNote.author?.removeTaggedPost(deleteNote)
+                mentions?.forEach { user ->
+                    user.removeReport(deleteNote)
                }

                // Counts the replies
@@ -437,6 +381,19 @@ object LocalCache {
                    masterNote.removeReport(deleteNote)
                }

+                val channel = deleteNote.channel()
+                channel?.removeNote(deleteNote)
+
+                if (deleteNote.event is PrivateDmEvent) {
+                    val author = deleteNote.author
+                    val recipient = (deleteNote.event as? PrivateDmEvent)?.recipientPubKey()?.let { checkGetOrCreateUser(it) }
+
+                    if (recipient != null && author != null) {
+                        author.removeMessage(recipient, deleteNote)
+                        recipient.removeMessage(author, deleteNote)
+                    }
+                }
+
                notes.remove(deleteNote.idHex)

                deletedAtLeastOne = true
@@ -457,23 +414,14 @@ object LocalCache {
        // Log.d("TN", "New Boost (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")

        val author = getOrCreateUser(event.pubKey)
-        val mentions = event.originalAuthor().mapNotNull { checkGetOrCreateUser(it) }
        val repliesTo = event.boostedPost().mapNotNull { checkGetOrCreateNote(it) } +
            event.taggedAddresses().mapNotNull { getOrCreateAddressableNote(it) }

-        note.loadEvent(event, author, mentions, repliesTo)
+        note.loadEvent(event, author, repliesTo)

        // Prepares user's profile view.
        author.addNote(note)

-        // Adds notifications to users.
-        mentions.forEach {
-            it.addTaggedPost(note)
-        }
-        repliesTo.forEach {
-            it.author?.addTaggedPost(note)
-        }
-
        // Counts the replies
        repliesTo.forEach {
            it.addBoost(note)
@@ -489,22 +437,13 @@ object LocalCache {
        if (note.event != null) return

        val author = getOrCreateUser(event.pubKey)
-        val mentions = event.originalAuthor().mapNotNull { checkGetOrCreateUser(it) }
        val repliesTo = event.originalPost().mapNotNull { checkGetOrCreateNote(it) } +
            event.taggedAddresses().mapNotNull { getOrCreateAddressableNote(it) }

-        note.loadEvent(event, author, mentions, repliesTo)
+        note.loadEvent(event, author, repliesTo)

        // Log.d("RE", "New Reaction ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")

-        // Adds notifications to users.
-        mentions.forEach {
-            it.addTaggedPost(note)
-        }
-        repliesTo.forEach {
-            it.author?.addTaggedPost(note)
-        }
-
        if (
            event.content == "" ||
            event.content == "+" ||
@@ -542,9 +481,9 @@ object LocalCache {

        val mentions = event.reportedAuthor().mapNotNull { checkGetOrCreateUser(it.key) }
        val repliesTo = event.reportedPost().mapNotNull { checkGetOrCreateNote(it.key) } +
-            event.taggedAddresses().mapNotNull { getOrCreateAddressableNote(it) }
+            event.taggedAddresses().map { getOrCreateAddressableNote(it) }

-        note.loadEvent(event, author, mentions, repliesTo)
+        note.loadEvent(event, author, repliesTo)

        // Log.d("RP", "New Report ${event.content} by ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
        // Adds notifications to users.
@@ -570,7 +509,7 @@ object LocalCache {

            val note = getOrCreateNote(event.id)
            oldChannel.addNote(note)
-            note.loadEvent(event, author, emptyList(), emptyList())
+            note.loadEvent(event, author, emptyList())

            refreshObservers()
        }
@@ -590,7 +529,7 @@ object LocalCache {

                val note = getOrCreateNote(event.id)
                oldChannel.addNote(note)
-                note.loadEvent(event, author, emptyList(), emptyList())
+                note.loadEvent(event, author, emptyList())

                refreshObservers()
            }
@@ -619,30 +558,21 @@ object LocalCache {
        // Already processed this event.
        if (note.event != null) return

-        if (antiSpam.isSpam(event)) {
+        if (antiSpam.isSpam(event, relay)) {
            relay?.let {
                it.spamCounter++
            }
            return
        }

-        val mentions = event.mentions().mapNotNull { checkGetOrCreateUser(it) }
-        val replyTo = event.replyTos()
+        val replyTo = event.tagsWithoutCitations()
+            .filter { it != event.channel() }
            .mapNotNull { checkGetOrCreateNote(it) }
-            .filter { it.event !is ChannelCreateEvent }

-        note.loadEvent(event, author, mentions, replyTo)
+        note.loadEvent(event, author, replyTo)

        // Log.d("CM", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()} ${formattedDateTime(event.createdAt)}")

-        // Adds notifications to users.
-        mentions.forEach {
-            it.addTaggedPost(note)
-        }
-        replyTo.forEach {
-            it.author?.addTaggedPost(note)
-        }
-
        // Counts the replies
        replyTo.forEach {
            it.addReply(note)
@@ -671,9 +601,11 @@ object LocalCache {
        val mentions = event.zappedAuthor().mapNotNull { checkGetOrCreateUser(it) }
        val repliesTo = event.zappedPost().mapNotNull { checkGetOrCreateNote(it) } +
            event.taggedAddresses().map { getOrCreateAddressableNote(it) } +
-            ((zapRequest?.event as? LnZapRequestEvent)?.taggedAddresses()?.map { getOrCreateAddressableNote(it) } ?: emptySet<Note>())
+            (
+                (zapRequest?.event as? LnZapRequestEvent)?.taggedAddresses()?.map { getOrCreateAddressableNote(it) } ?: emptySet<Note>()
+                )

-        note.loadEvent(event, author, mentions, repliesTo)
+        note.loadEvent(event, author, repliesTo)

        if (zapRequest == null) {
            Log.e("ZP", "Zap Request not found. Unable to process Zap {${event.toJson()}}")
@@ -682,14 +614,6 @@ object LocalCache {

        // Log.d("ZP", "New ZapEvent ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")

-        // Adds notifications to users.
-        mentions.forEach {
-            it.addTaggedPost(note)
-        }
-        repliesTo.forEach {
-            it.author?.addTaggedPost(note)
-        }
-
        repliesTo.forEach {
            it.addZap(zapRequest, note)
        }
@@ -709,18 +633,10 @@ object LocalCache {
        val repliesTo = event.zappedPost().mapNotNull { checkGetOrCreateNote(it) } +
            event.taggedAddresses().map { getOrCreateAddressableNote(it) }

-        note.loadEvent(event, author, mentions, repliesTo)
+        note.loadEvent(event, author, repliesTo)

        // Log.d("ZP", "New Zap Request ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")

-        // Adds notifications to users.
-        mentions.forEach {
-            it.addTaggedPost(note)
-        }
-        repliesTo.forEach {
-            it.author?.addTaggedPost(note)
-        }
-
        repliesTo.forEach {
            it.addZap(note, null)
        }
@@ -740,6 +656,7 @@ object LocalCache {
    fun findNotesStartingWith(text: String): List<Note> {
        return notes.values.filter {
            (it.event is TextNoteEvent && it.event?.content()?.contains(text, true) ?: false) ||
+                (it.event is PollNoteEvent && it.event?.content()?.contains(text, true) ?: false) ||
                (it.event is ChannelMessageEvent && it.event?.content()?.contains(text, true) ?: false) ||
                it.idHex.startsWith(text, true) ||
                it.idNote().startsWith(text, true)
@@ -778,12 +695,9 @@ object LocalCache {
                // Doesn't need to clean up the replies and mentions.. Too small to matter.

                // reverts the add
-                it.mentions?.forEach { user ->
-                    user.removeTaggedPost(it)
-                }
-                it.replyTo?.forEach { replyingNote ->
-                    replyingNote.author?.removeTaggedPost(it)
-                }
+                val mentions =
+                    it.event?.tags()?.filter { it.firstOrNull() == "p" }?.mapNotNull { it.getOrNull(1) }
+                        ?.mapNotNull { checkGetOrCreateUser(it) }

                // Counts the replies
                it.replyTo?.forEach { _ ->
@@ -795,40 +709,6 @@ object LocalCache {
        }
    }

-    fun pruneNonFollows(account: Account) {
-        val follows = account.userProfile().follows
-        val knownPMs = account.userProfile().privateChatrooms.filter {
-            account.userProfile().hasSentMessagesTo(it.key) && account.isAcceptable(it.key)
-        }
-
-        val followsFollow = follows.map {
-            it.follows
-        }.flatten()
-
-        val followSet = follows.plus(knownPMs).plus(account.userProfile()).plus(followsFollow)
-
-        val toBeRemoved = notes
-            .filter {
-                (it.value.author == null || it.value.author!! !in followSet) && it.value.event?.kind() == TextNoteEvent.kind && it.value.liveSet?.isInUse() != true
-            }
-
-        toBeRemoved.forEach {
-            notes.remove(it.key)
-        }
-
-        val toBeRemovedUsers = users
-            .filter {
-                (it.value !in followSet) && it.value.liveSet?.isInUse() != true
-            }
-
-        toBeRemovedUsers.forEach {
-            users.remove(it.key)
-        }
-
-        println("PRUNE: ${toBeRemoved.size} messages removed because they came from NonFollows")
-        println("PRUNE: ${toBeRemovedUsers.size} users removed because are NonFollows")
-    }
-
    fun pruneHiddenMessages(account: Account) {
        val toBeRemoved = account.hiddenUsers.map {
            (users[it]?.notes ?: emptySet())
@@ -841,14 +721,6 @@ object LocalCache {
        toBeRemoved.forEach {
            it.author?.removeNote(it)

-            // reverts the add
-            it.mentions?.forEach { user ->
-                user.removeTaggedPost(it)
-            }
-            it.replyTo?.forEach { replyingNote ->
-                replyingNote.author?.removeTaggedPost(it)
-            }
-
            // Counts the replies
            it.replyTo?.forEach { masterNote ->
                masterNote.removeReply(it)
@@ -864,6 +736,18 @@ object LocalCache {
        println("PRUNE: ${toBeRemoved.size} messages removed because they were Hidden")
    }

+    fun pruneContactLists(userAccount: Account) {
+        var removingContactList = 0
+        users.values.forEach {
+            if (it != userAccount.userProfile() && (it.liveSet == null || it.liveSet?.isInUse() == false) && it.latestContactList != null) {
+                it.latestContactList = null
+                removingContactList++
+            }
+        }
+
+        println("PRUNE: $removingContactList contact lists")
+    }
+
    // Observers line up here.
    val live: LocalCacheLiveData = LocalCacheLiveData(this)

@@ -872,26 +756,18 @@ object LocalCache {
    }
 }

-class LocalCacheLiveData(val cache: LocalCache) : LiveData<LocalCacheState>(LocalCacheState(cache)) {
+class LocalCacheLiveData(val cache: LocalCache) :
+    LiveData<LocalCacheState>(LocalCacheState(cache)) {

    // Refreshes observers in batches.
-    var handlerWaiting = AtomicBoolean()
+    private val bundler = BundledUpdate(300, Dispatchers.Main) {
+        if (hasActiveObservers()) {
+            refresh()
+        }
+    }

    fun invalidateData() {
-        if (!hasActiveObservers()) return
-        if (handlerWaiting.getAndSet(true)) return
-
-        val scope = CoroutineScope(Job() + Dispatchers.Main)
-        scope.launch {
-            try {
-                delay(50)
-                refresh()
-            } finally {
-                withContext(NonCancellable) {
-                    handlerWaiting.set(false)
-                }
-            }
-        }
+        bundler.invalidate()
    }

    private fun refresh() {
@@ -3,22 +3,17 @@ 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.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.Relay
+import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import java.math.BigDecimal
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.util.Date
-import java.util.concurrent.atomic.AtomicBoolean
 import java.util.regex.Pattern

 val tagSearch = Pattern.compile("(?:\\s|\\A)\\#\\[([0-9]+)\\]")
@@ -35,7 +30,6 @@ open class Note(val idHex: String) {
    // They are immutable after that.
    var event: EventInterface? = null
    var author: User? = null
-    var mentions: List<User>? = null
    var replyTo: List<Note>? = null

    // These fields are updated every time an event related to this note is received.
@@ -53,7 +47,7 @@ open class Note(val idHex: String) {
    var relays = setOf<String>()
        private set

-    var lastReactionsDownloadTime: Long? = null
+    var lastReactionsDownloadTime: Map<String, EOSETime> = emptyMap()

    fun id() = Hex.decode(idHex)
    open fun idNote() = id().toNote()
@@ -68,14 +62,13 @@ open class Note(val idHex: String) {
        return channelHex?.let { LocalCache.checkGetOrCreateChannel(it) }
    }

-    open fun address() = (event as? LongTextNoteEvent)?.address()
+    open fun address(): ATag? = null

    open fun createdAt() = event?.createdAt()

-    fun loadEvent(event: Event, author: User, mentions: List<User>, replyTo: List<Note>) {
+    fun loadEvent(event: Event, author: User, replyTo: List<Note>) {
        this.event = event
        this.author = author
-        this.mentions = mentions
        this.replyTo = replyTo

        liveSet?.metadata?.invalidateData()
@@ -162,6 +155,7 @@ open class Note(val idHex: String) {
        }
    }

+    @Synchronized
    fun addZap(zapRequest: Note, zap: Note?) {
        if (zapRequest !in zaps.keys) {
            zaps = zaps + Pair(zapRequest, zap)
@@ -215,15 +209,15 @@ open class Note(val idHex: String) {
        return reports[user] ?: emptySet()
    }

-    fun reportAuthorsBy(users: Set<User>): List<User> {
-        return reports.keys.filter { it in users }
+    fun reportAuthorsBy(users: Set<HexKey>): List<User> {
+        return reports.keys.filter { it.pubkeyHex in users }
    }

-    fun countReportAuthorsBy(users: Set<User>): Int {
-        return reports.keys.count { it in users }
+    fun countReportAuthorsBy(users: Set<HexKey>): Int {
+        return reports.keys.count { it.pubkeyHex in users }
    }

-    fun reportsBy(users: Set<User>): List<Note> {
+    fun reportsBy(users: Set<HexKey>): List<Note> {
        return reportAuthorsBy(users).mapNotNull {
            reports[it]
        }.flatten()
@@ -237,13 +231,42 @@ open class Note(val idHex: String) {
            }.sumOf { it }
    }

+    fun hasPledgeBy(user: User): Boolean {
+        return replies
+            .filter { it.event?.isTaggedHash("bounty-added-reward") ?: false }
+            .any {
+                val pledgeValue = try {
+                    BigDecimal(it.event?.content())
+                } catch (e: Exception) {
+                    null
+                    // do nothing if it can't convert to bigdecimal
+                }
+
+                pledgeValue != null && it.author == user
+            }
+    }
+
+    fun pledgedAmountByOthers(): BigDecimal {
+        return replies
+            .filter { it.event?.isTaggedHash("bounty-added-reward") ?: false }
+            .mapNotNull {
+                try {
+                    BigDecimal(it.event?.content())
+                } catch (e: Exception) {
+                    null
+                    // do nothing if it can't convert to bigdecimal
+                }
+            }
+            .sumOf { it }
+    }
+
    fun hasAnyReports(): Boolean {
        val dayAgo = Date().time / 1000 - 24 * 60 * 60
        return reports.isNotEmpty() ||
            (
-                author?.reports?.values?.filter {
+                author?.reports?.values?.any {
                    it.firstOrNull { (it.createdAt() ?: 0) > dayAgo } != null
-                }?.isNotEmpty() ?: false
+                } ?: false
                )
    }

@@ -351,23 +374,14 @@ class NoteLiveSet(u: Note) {

 class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
    // Refreshes observers in batches.
-    var handlerWaiting = AtomicBoolean()
+    private val bundler = BundledUpdate(300, Dispatchers.Main) {
+        if (hasActiveObservers()) {
+            refresh()
+        }
+    }

    fun invalidateData() {
-        if (!hasActiveObservers()) return
-        if (handlerWaiting.getAndSet(true)) return
-
-        val scope = CoroutineScope(Job() + Dispatchers.Main)
-        scope.launch {
-            try {
-                delay(100)
-                refresh()
-            } finally {
-                withContext(NonCancellable) {
-                    handlerWaiting.set(false)
-                }
-            }
-        }
+        bundler.invalidate()
    }

    private fun refresh() {
@@ -7,8 +7,8 @@ data class RelaySetupInfo(
    val read: Boolean,
    val write: Boolean,
    val errorCount: Int = 0,
-    val downloadCount: Int = 0,
-    val uploadCount: Int = 0,
+    val downloadCountInBytes: Int = 0,
+    val uploadCountInBytes: Int = 0,
    val spamCount: Int = 0,
    val feedTypes: Set<FeedType>
 )
@@ -53,6 +53,11 @@ class ThreadAssembler {
                val threadRoot = searchRoot(note, thread) ?: note

                loadDown(threadRoot, thread)
+                // adds the replies of the note in case the search for Root
+                // did not added them.
+                note.replies.forEach {
+                    loadDown(it, thread)
+                }

                thread.toSet()
            } else {
@@ -3,10 +3,6 @@ package com.vitorpamplona.amethyst.model
 import com.baha.url.preview.BahaUrlPreview
 import com.baha.url.preview.IUrlPreviewCallback
 import com.baha.url.preview.UrlInfoItem
-import com.vitorpamplona.amethyst.ui.components.imageExtension
-import com.vitorpamplona.amethyst.ui.components.isValidURL
-import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
-import com.vitorpamplona.amethyst.ui.components.videoExtension
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -47,29 +43,4 @@ object UrlCachedPreviewer {
            ).fetchUrlPreview()
        }
    }
-
-    fun findUrlsInMessage(message: String): List<String> {
-        return message.split('\n').map { paragraph ->
-            paragraph.split(' ').filter { word: String ->
-                isValidURL(word) || noProtocolUrlValidator.matcher(word).matches()
-            }
-        }.flatten()
-    }
-
-    fun preloadPreviewsFor(note: Note) {
-        note.event?.content()?.let {
-            findUrlsInMessage(it).forEach {
-                val removedParamsFromUrl = it.split("?")[0].lowercase()
-                if (imageExtension.matcher(removedParamsFromUrl).matches()) {
-                    // Preload Images? Isn't this too heavy?
-                } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
-                    // Do nothing for now.
-                } else if (isValidURL(removedParamsFromUrl)) {
-                    previewInfo(it)
-                } else {
-                    previewInfo("https://$it")
-                }
-            }
-        }
-    }
 }
@@ -2,58 +2,41 @@ package com.vitorpamplona.amethyst.model

 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
+import com.vitorpamplona.amethyst.service.model.BookmarkListEvent
 import com.vitorpamplona.amethyst.service.model.ContactListEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.MetadataEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
+import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.Relay
+import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import nostr.postr.Bech32
 import nostr.postr.toNpub
 import java.math.BigDecimal
-import java.util.concurrent.atomic.AtomicBoolean
 import java.util.regex.Pattern

 val lnurlpPattern = Pattern.compile("(?i:http|https):\\/\\/((.+)\\/)*\\.well-known\\/lnurlp\\/(.*)")

-class Badges(val definition: Note, val awardees: Set<Note>)
-
 class User(val pubkeyHex: String) {
    var info: UserMetadata? = null

-    var updatedFollowsAt: Long = 0
    var latestContactList: ContactListEvent? = null
-
-    var follows = setOf<User>()
-        private set
-    var followers = setOf<User>()
-        private set
+    var latestBookmarkList: BookmarkListEvent? = null

    var notes = setOf<Note>()
        private set

-    var taggedPosts = setOf<Note>()
-        private set
-
    var reports = mapOf<User, Set<Note>>()
        private set

-    var latestReportTime: Long = 0
+    var latestEOSEs: Map<String, EOSETime> = emptyMap()

    var zaps = mapOf<Note, Note?>()
        private set

-    var relays: Map<String, ContactListEvent.ReadWrite>? = null
-        private set
-
    var relaysBeingUsed = mapOf<String, RelayInfo>()
        private set

@@ -89,54 +72,32 @@ class User(val pubkeyHex: String) {
        return info?.picture
    }

-    fun follow(user: User) {
-        follows = follows + user
-        user.followers = user.followers + this
+    fun updateBookmark(event: BookmarkListEvent) {
+        if (event.id == latestBookmarkList?.id) return

-        liveSet?.follows?.invalidateData()
-        user.liveSet?.follows?.invalidateData()
+        latestBookmarkList = event
+        liveSet?.bookmarks?.invalidateData()
    }

-    fun unfollow(user: User) {
-        follows = follows - user
-        user.followers = user.followers - this
+    fun updateContactList(event: ContactListEvent) {
+        if (event.id == latestContactList?.id) return

+        val oldContactListEvent = latestContactList
+        latestContactList = event
+
+        // Update following of the current user
        liveSet?.follows?.invalidateData()
-        user.liveSet?.follows?.invalidateData()
-    }

-    fun follow(users: Set<User>) {
-        follows = follows + users
-        users.forEach {
-            if (this !in it.followers && it.liveSet?.isInUse() == true) {
-                it.followers = it.followers + this
-                it.liveSet?.follows?.invalidateData()
-            }
+        // Update Followers of the past user list
+        // Update Followers of the new contact list
+        (oldContactListEvent)?.unverifiedFollowKeySet()?.forEach {
+            LocalCache.users[it]?.liveSet?.follows?.invalidateData()
+        }
+        (latestContactList)?.unverifiedFollowKeySet()?.forEach {
+            LocalCache.users[it]?.liveSet?.follows?.invalidateData()
        }

-        liveSet?.follows?.invalidateData()
-    }
-
-    fun unfollow(users: Set<User>) {
-        follows = follows - users
-        users.forEach {
-            if (this in it.followers && it.liveSet?.isInUse() == true) {
-                it.followers = it.followers - this
-                it.liveSet?.follows?.invalidateData()
-            }
-        }
-        liveSet?.follows?.invalidateData()
-    }
-
-    fun addTaggedPost(note: Note) {
-        if (note !in taggedPosts) {
-            taggedPosts = taggedPosts + note
-            // No need for Listener yet
-        }
-    }
-
-    fun removeTaggedPost(note: Note) {
-        taggedPosts = taggedPosts - note
+        liveSet?.relays?.invalidateData()
    }

    fun addNote(note: Note) {
@@ -164,11 +125,6 @@ class User(val pubkeyHex: String) {
            reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
            liveSet?.reports?.invalidateData()
        }
-
-        val reportTime = note.createdAt() ?: 0
-        if (reportTime > latestReportTime) {
-            latestReportTime = reportTime
-        }
    }

    fun removeReport(deleteNote: Note) {
@@ -209,15 +165,15 @@ class User(val pubkeyHex: String) {
        return reports[user] ?: emptySet()
    }

-    fun reportAuthorsBy(users: Set<User>): List<User> {
-        return reports.keys.filter { it in users }
+    fun reportAuthorsBy(users: Set<HexKey>): List<User> {
+        return reports.keys.filter { it.pubkeyHex in users }
    }

-    fun countReportAuthorsBy(users: Set<User>): Int {
-        return reports.keys.count { it in users }
+    fun countReportAuthorsBy(users: Set<HexKey>): Int {
+        return reports.keys.count { it.pubkeyHex in users }
    }

-    fun reportsBy(users: Set<User>): List<Note> {
+    fun reportsBy(users: Set<HexKey>): List<Note> {
        return reportAuthorsBy(users).mapNotNull {
            reports[it]
        }.flatten()
@@ -232,6 +188,7 @@ class User(val pubkeyHex: String) {
        }
    }

+    @Synchronized
    fun addMessage(user: User, msg: Note) {
        val privateChatroom = getOrCreatePrivateChatroom(user)
        if (msg !in privateChatroom.roomMessages) {
@@ -240,6 +197,15 @@ class User(val pubkeyHex: String) {
        }
    }

+    @Synchronized
+    fun removeMessage(user: User, msg: Note) {
+        val privateChatroom = getOrCreatePrivateChatroom(user)
+        if (msg in privateChatroom.roomMessages) {
+            privateChatroom.roomMessages = privateChatroom.roomMessages - msg
+            liveSet?.messages?.invalidateData()
+        }
+    }
+
    fun addRelayBeingUsed(relay: Relay, eventTime: Long) {
        val here = relaysBeingUsed[relay.url]
        if (here == null) {
@@ -254,22 +220,6 @@ class User(val pubkeyHex: String) {
        liveSet?.relayInfo?.invalidateData()
    }

-    fun updateFollows(newFollows: Set<User>, updateAt: Long) {
-        val toBeAdded = newFollows - follows
-        val toBeRemoved = follows - newFollows
-
-        follow(toBeAdded)
-        unfollow(toBeRemoved)
-
-        updatedFollowsAt = updateAt
-    }
-
-    fun updateRelays(relayUse: Map<String, ContactListEvent.ReadWrite>) {
-        // no need to test if relays are different. The Account will check for us.
-        relays = relayUse
-        liveSet?.relays?.invalidateData()
-    }
-
    fun updateUserInfo(newUserInfo: UserMetadata, latestMetadata: MetadataEvent) {
        info = newUserInfo
        info?.latestMetadata = latestMetadata
@@ -295,7 +245,51 @@ class User(val pubkeyHex: String) {
    }

    fun isFollowing(user: User): Boolean {
-        return follows.contains(user)
+        return latestContactList?.unverifiedFollowKeySet()?.toSet()?.let {
+            return user.pubkeyHex in it
+        } ?: false
+    }
+
+    fun isFollowingHashtag(tag: String): Boolean {
+        return latestContactList?.unverifiedFollowTagSet()?.toSet()?.let {
+            return tag in it
+        } ?: false
+    }
+
+    fun isFollowingHashtagCached(tag: String): Boolean {
+        return latestContactList?.verifiedFollowTagSet?.let {
+            return tag.lowercase() in it
+        } ?: false
+    }
+
+    fun isFollowingCached(user: User): Boolean {
+        return latestContactList?.verifiedFollowKeySet?.let {
+            return user.pubkeyHex in it
+        } ?: false
+    }
+
+    fun transientFollowCount(): Int? {
+        return latestContactList?.unverifiedFollowKeySet()?.size
+    }
+
+    fun transientFollowerCount(): Int {
+        return LocalCache.users.values.count { it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
+    }
+
+    fun cachedFollowingKeySet(): Set<HexKey> {
+        return latestContactList?.verifiedFollowKeySet ?: emptySet()
+    }
+
+    fun cachedFollowingTagSet(): Set<HexKey> {
+        return latestContactList?.verifiedFollowTagSet ?: emptySet()
+    }
+
+    fun cachedFollowCount(): Int? {
+        return latestContactList?.verifiedFollowKeySet?.size
+    }
+
+    fun cachedFollowerCount(): Int {
+        return LocalCache.users.values.count { it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
    }

    fun hasSentMessagesTo(user: User?): Boolean {
@@ -340,6 +334,7 @@ class UserLiveSet(u: User) {
    val metadata: UserLiveData = UserLiveData(u)
    val zaps: UserLiveData = UserLiveData(u)
    val badges: UserLiveData = UserLiveData(u)
+    val bookmarks: UserLiveData = UserLiveData(u)

    fun isInUse(): Boolean {
        return follows.hasObservers() ||
@@ -349,7 +344,8 @@ class UserLiveSet(u: User) {
            relayInfo.hasObservers() ||
            metadata.hasObservers() ||
            zaps.hasObservers() ||
-            badges.hasObservers()
+            badges.hasObservers() ||
+            bookmarks.hasObservers()
    }
 }

@@ -391,27 +387,22 @@ class UserMetadata {
        return listOfNotNull(name, username, display_name, displayName, nip05, lud06, lud16)
            .any { it.startsWith(prefix, true) }
    }
+
+    fun lnAddress(): String? {
+        return (lud16?.trim() ?: lud06?.trim())?.ifBlank { null }
+    }
 }

 class UserLiveData(val user: User) : LiveData<UserState>(UserState(user)) {
-
    // Refreshes observers in batches.
-    var handlerWaiting = AtomicBoolean()
+    private val bundler = BundledUpdate(300, Dispatchers.Main) {
+        if (hasActiveObservers()) {
+            refresh()
+        }
+    }

    fun invalidateData() {
-        if (handlerWaiting.getAndSet(true)) return
-
-        val scope = CoroutineScope(Job() + Dispatchers.Main)
-        scope.launch {
-            try {
-                delay(100)
-                refresh()
-            } finally {
-                withContext(NonCancellable) {
-                    handlerWaiting.set(false)
-                }
-            }
-        }
+        bundler.invalidate()
    }

    private fun refresh() {
@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.service

 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.vitorpamplona.amethyst.BuildConfig
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -43,7 +44,7 @@ class Nip05Verifier {
        withContext(Dispatchers.IO) {
            try {
                val request = Request.Builder()
-                    .header("User-Agent", "Amethyst")
+                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                    .url(url)
                    .build()

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

 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.model.BadgeAwardEvent
 import com.vitorpamplona.amethyst.service.model.BadgeProfilesEvent
+import com.vitorpamplona.amethyst.service.model.BookmarkListEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ContactListEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
@@ -11,6 +13,7 @@ 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.EOSEAccount
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
@@ -18,6 +21,8 @@ import com.vitorpamplona.amethyst.service.relays.TypedFilter
 object NostrAccountDataSource : NostrDataSource("AccountData") {
    lateinit var account: Account

+    val latestEOSEs = EOSEAccount()
+
    fun createAccountContactListFilter(): TypedFilter {
        return TypedFilter(
            types = FeedType.values().toSet(),
@@ -51,12 +56,24 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
        )
    }

+    fun createAccountBookmarkListFilter(): TypedFilter {
+        return TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(BookmarkListEvent.kind),
+                authors = listOf(account.userProfile().pubkeyHex),
+                limit = 1
+            )
+        )
+    }
+
    fun createAccountReportsFilter(): TypedFilter {
        return TypedFilter(
            types = FeedType.values().toSet(),
            filter = JsonFilter(
                kinds = listOf(ReportEvent.kind),
-                authors = listOf(account.userProfile().pubkeyHex)
+                authors = listOf(account.userProfile().pubkeyHex),
+                since = latestEOSEs.users[account.userProfile()]?.relayList
            )
        )
    }
@@ -66,6 +83,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
        filter = JsonFilter(
            kinds = listOf(
                TextNoteEvent.kind,
+                PollNoteEvent.kind,
                ReactionEvent.kind,
                RepostEvent.kind,
                ReportEvent.kind,
@@ -74,11 +92,14 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                BadgeAwardEvent.kind
            ),
            tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
-            limit = 200
+            limit = 400,
+            since = latestEOSEs.users[account.userProfile()]?.relayList
        )
    )

-    val accountChannel = requestNewChannel()
+    val accountChannel = requestNewChannel { time, relayUrl ->
+        latestEOSEs.addOrUpdate(account.userProfile(), relayUrl, time)
+    }

    override fun updateChannelFilters() {
        // gets everthing about the user logged in
@@ -87,7 +108,8 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
            createAccountContactListFilter(),
            createNotificationFilter(),
            createAccountReportsFilter(),
-            createAccountAcceptedAwardsFilter()
+            createAccountAcceptedAwardsFilter(),
+            createAccountBookmarkListFilter()
        ).ifEmpty { null }
    }
 }
@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.service

+import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
@@ -8,13 +9,39 @@ import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter

 object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
+    var account: Account? = null
    var channel: Channel? = null

-    fun loadMessagesBetween(channelId: String) {
+    fun loadMessagesBetween(account: Account, channelId: String) {
+        this.account = account
        channel = LocalCache.getOrCreateChannel(channelId)
        resetFilters()
    }

+    fun clear() {
+        account = null
+        channel = null
+    }
+
+    fun createMessagesByMeToChannelFilter(): TypedFilter? {
+        val myAccount = account ?: return null
+
+        if (channel != null) {
+            // Brings on messages by the user from all other relays.
+            // Since we ship with write to public, read from private only
+            // this guarantees that messages from the author do not disappear.
+            return TypedFilter(
+                types = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS, FeedType.GLOBAL, FeedType.SEARCH),
+                filter = JsonFilter(
+                    kinds = listOf(ChannelMessageEvent.kind),
+                    authors = listOf(myAccount.userProfile().pubkeyHex),
+                    limit = 50
+                )
+            )
+        }
+        return null
+    }
+
    fun createMessagesToChannelFilter(): TypedFilter? {
        if (channel != null) {
            return TypedFilter(
@@ -32,6 +59,9 @@ object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
    val messagesChannel = requestNewChannel()

    override fun updateChannelFilters() {
-        messagesChannel.typedFilters = listOfNotNull(createMessagesToChannelFilter()).ifEmpty { null }
+        messagesChannel.typedFilters = listOfNotNull(
+            createMessagesToChannelFilter(),
+            createMessagesByMeToChannelFilter()
+        ).ifEmpty { null }
    }
 }
@@ -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.EOSEAccount
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
@@ -12,11 +13,14 @@ import com.vitorpamplona.amethyst.service.relays.TypedFilter
 object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
    lateinit var account: Account

+    val latestEOSEs = EOSEAccount()
+
    fun createMessagesToMeFilter() = TypedFilter(
        types = setOf(FeedType.PRIVATE_DMS),
        filter = JsonFilter(
            kinds = listOf(PrivateDmEvent.kind),
-            tags = mapOf("p" to listOf(account.userProfile().pubkeyHex))
+            tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
+            since = latestEOSEs.users[account.userProfile()]?.relayList
        )
    )

@@ -24,7 +28,8 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
        types = setOf(FeedType.PRIVATE_DMS),
        filter = JsonFilter(
            kinds = listOf(PrivateDmEvent.kind),
-            authors = listOf(account.userProfile().pubkeyHex)
+            authors = listOf(account.userProfile().pubkeyHex),
+            since = latestEOSEs.users[account.userProfile()]?.relayList
        )
    )

@@ -32,7 +37,8 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
        types = setOf(FeedType.PUBLIC_CHATS),
        filter = JsonFilter(
            kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind),
-            authors = listOf(account.userProfile().pubkeyHex)
+            authors = listOf(account.userProfile().pubkeyHex),
+            since = latestEOSEs.users[account.userProfile()]?.relayList
        )
    )

@@ -40,7 +46,8 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
        types = FeedType.values().toSet(), // Metadata comes from any relay
        filter = JsonFilter(
            kinds = listOf(ChannelCreateEvent.kind),
-            ids = account.followingChannels.toList()
+            ids = account.followingChannels.toList(),
+            since = latestEOSEs.users[account.userProfile()]?.relayList
        )
    )

@@ -64,13 +71,16 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
                filter = JsonFilter(
                    kinds = listOf(ChannelMessageEvent.kind),
                    tags = mapOf("e" to listOf(it)),
-                    limit = 100 // Remember to consider spam that is being removed from the UI
+                    since = latestEOSEs.users[account.userProfile()]?.relayList,
+                    limit = 25 // Remember to consider spam that is being removed from the UI
                )
            )
        }
    }

-    val chatroomListChannel = requestNewChannel()
+    val chatroomListChannel = requestNewChannel { time, relayUrl ->
+        latestEOSEs.addOrUpdate(account.userProfile(), relayUrl, time)
+    }

    override fun updateChannelFilters() {
        val list = listOf(
@@ -2,9 +2,11 @@ package com.vitorpamplona.amethyst.service

 import android.util.Log
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.model.BadgeAwardEvent
 import com.vitorpamplona.amethyst.service.model.BadgeDefinitionEvent
 import com.vitorpamplona.amethyst.service.model.BadgeProfilesEvent
+import com.vitorpamplona.amethyst.service.model.BookmarkListEvent
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelHideMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
@@ -26,16 +28,13 @@ import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.service.relays.Subscription
+import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import java.util.Date
 import java.util.UUID
-import java.util.concurrent.atomic.AtomicBoolean

 abstract class NostrDataSource(val debugName: String) {
    private var subscriptions = mapOf<String, Subscription>()
@@ -67,6 +66,7 @@ abstract class NostrDataSource(val debugName: String) {
                        is BadgeAwardEvent -> LocalCache.consume(event)
                        is BadgeDefinitionEvent -> LocalCache.consume(event)
                        is BadgeProfilesEvent -> LocalCache.consume(event)
+                        is BookmarkListEvent -> LocalCache.consume(event)
                        is ChannelCreateEvent -> LocalCache.consume(event)
                        is ChannelHideMessageEvent -> LocalCache.consume(event)
                        is ChannelMessageEvent -> LocalCache.consume(event, relay)
@@ -91,6 +91,7 @@ abstract class NostrDataSource(val debugName: String) {
                            LocalCache.consume(event)
                        }
                        is TextNoteEvent -> LocalCache.consume(event, relay)
+                        is PollNoteEvent -> LocalCache.consume(event, relay)
                        else -> {
                            Log.w("Event Not Supported", event.toJson())
                        }
@@ -115,7 +116,7 @@ abstract class NostrDataSource(val debugName: String) {

            if (type == Relay.Type.EOSE && channel != null) {
                // updates a per subscripton since date
-                subscriptions[channel]?.updateEOSE(Date().time / 1000)
+                subscriptions[channel]?.updateEOSE(Date().time / 1000, relay.url)
            }
        }

@@ -140,7 +141,7 @@ abstract class NostrDataSource(val debugName: String) {
        }
    }

-    fun requestNewChannel(onEOSE: ((Long) -> Unit)? = null): Subscription {
+    fun requestNewChannel(onEOSE: ((Long, String) -> Unit)? = null): Subscription {
        val newSubscription = Subscription(UUID.randomUUID().toString().substring(0, 4), onEOSE)
        subscriptions = subscriptions + Pair(newSubscription.id, newSubscription)
        return newSubscription
@@ -152,24 +153,16 @@ abstract class NostrDataSource(val debugName: String) {
    }

    // Refreshes observers in batches.
-    var handlerWaiting = AtomicBoolean()
-
-    fun invalidateFilters() {
-        if (handlerWaiting.getAndSet(true)) return
-
+    private val bundler = BundledUpdate(250, Dispatchers.IO) {
        println("DataSource: ${this.javaClass.simpleName} InvalidateFilters")

-        val scope = CoroutineScope(Job() + Dispatchers.IO)
-        scope.launch {
-            try {
-                delay(200)
-                resetFiltersSuspend()
-            } finally {
-                withContext(NonCancellable) {
-                    handlerWaiting.set(false)
-                }
-            }
-        }
+        // adds the time to perform the refresh into this delay
+        // holding off new updates in case of heavy refresh routines.
+        resetFiltersSuspend()
+    }
+
+    fun invalidateFilters() {
+        bundler.invalidate()
    }

    fun resetFilters() {
@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.service

 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.PollNoteEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
@@ -11,7 +12,7 @@ object NostrGlobalDataSource : NostrDataSource("GlobalFeed") {
    fun createGlobalFilter() = TypedFilter(
        types = setOf(FeedType.GLOBAL),
        filter = JsonFilter(
-            kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind),
+            kinds = listOf(TextNoteEvent.kind, PollNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind),
            limit = 200
        )
    )
@@ -0,0 +1,38 @@
+package com.vitorpamplona.amethyst.service
+
+import androidx.compose.ui.text.capitalize
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.relays.FeedType
+import com.vitorpamplona.amethyst.service.relays.JsonFilter
+import com.vitorpamplona.amethyst.service.relays.TypedFilter
+
+object NostrHashtagDataSource : NostrDataSource("SingleHashtagFeed") {
+    private var hashtagToWatch: String? = null
+
+    fun createLoadHashtagFilter(): TypedFilter? {
+        val hashToLoad = hashtagToWatch ?: return null
+
+        return TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                tags = mapOf("t" to listOf(hashToLoad, hashToLoad.lowercase(), hashToLoad.uppercase(), hashToLoad.capitalize())),
+                kinds = listOf(TextNoteEvent.kind, ChannelMessageEvent.kind, LongTextNoteEvent.kind),
+                limit = 200
+            )
+        )
+    }
+
+    val loadHashtagChannel = requestNewChannel()
+
+    override fun updateChannelFilters() {
+        loadHashtagChannel.typedFilters = listOfNotNull(createLoadHashtagFilter()).ifEmpty { null }
+    }
+
+    fun loadHashtag(tag: String?) {
+        hashtagToWatch = tag
+
+        invalidateFilters()
+    }
+}
@@ -3,7 +3,9 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.UserState
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.PollNoteEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
@@ -15,6 +17,8 @@ import kotlinx.coroutines.launch
 object NostrHomeDataSource : NostrDataSource("HomeFeed") {
    lateinit var account: Account

+    val latestEOSEs = EOSEAccount()
+
    private val cacheListener: (UserState) -> Unit = {
        invalidateFilters()
    }
@@ -40,10 +44,10 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
    }

    fun createFollowAccountsFilter(): TypedFilter {
-        val follows = account.userProfile().follows
+        val follows = account.followingKeySet()

        val followKeys = follows.map {
-            it.pubkeyHex.substring(0, 6)
+            it.substring(0, 6)
        }

        val followSet = followKeys.plus(account.userProfile().pubkeyHex.substring(0, 6))
@@ -51,16 +55,39 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
        return TypedFilter(
            types = setOf(FeedType.FOLLOWS),
            filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind),
+                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind),
                authors = followSet,
-                limit = 400
+                limit = 400,
+                since = latestEOSEs.users[account.userProfile()]?.relayList
            )
        )
    }

-    val followAccountChannel = requestNewChannel()
+    fun createFollowTagsFilter(): TypedFilter? {
+        val hashToLoad = account.followingTagSet()
+
+        if (hashToLoad.isEmpty()) return null
+
+        return TypedFilter(
+            types = setOf(FeedType.FOLLOWS),
+            filter = JsonFilter(
+                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind),
+                tags = mapOf(
+                    "t" to hashToLoad.map {
+                        listOf(it, it.lowercase(), it.uppercase(), it.capitalize())
+                    }.flatten()
+                ),
+                limit = 100,
+                since = latestEOSEs.users[account.userProfile()]?.relayList
+            )
+        )
+    }
+
+    val followAccountChannel = requestNewChannel { time, relayUrl ->
+        latestEOSEs.addOrUpdate(account.userProfile(), relayUrl, time)
+    }

    override fun updateChannelFilters() {
-        followAccountChannel.typedFilters = listOf(createFollowAccountsFilter()).ifEmpty { null }
+        followAccountChannel.typedFilters = listOfNotNull(createFollowAccountsFilter(), createFollowTagsFilter()).ifEmpty { null }
    }
 }
@@ -1,12 +1,7 @@
 package com.vitorpamplona.amethyst.service

 import com.vitorpamplona.amethyst.model.decodePublicKey
-import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
-import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
-import com.vitorpamplona.amethyst.service.model.MetadataEvent
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
@@ -18,7 +13,7 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {

    private fun createAnythingWithIDFilter(): List<TypedFilter>? {
        val mySearchString = searchString
-        if (mySearchString == null) {
+        if (mySearchString.isNullOrBlank()) {
            return null
        }

@@ -35,25 +30,25 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
            null
        }

-        if (hexToWatch == null) {
-            return null
-        }
-
        // downloads all the reactions to a given event.
-        return listOf(
-            TypedFilter(
-                types = FeedType.values().toSet(),
-                filter = JsonFilter(
-                    ids = listOfNotNull(hexToWatch)
+        return listOfNotNull(
+            hexToWatch?.let {
+                TypedFilter(
+                    types = FeedType.values().toSet(),
+                    filter = JsonFilter(
+                        ids = listOfNotNull(hexToWatch)
+                    )
                )
-            ),
-            TypedFilter(
-                types = FeedType.values().toSet(),
-                filter = JsonFilter(
-                    kinds = listOf(MetadataEvent.kind),
-                    authors = listOfNotNull(hexToWatch)
+            },
+            hexToWatch?.let {
+                TypedFilter(
+                    types = FeedType.values().toSet(),
+                    filter = JsonFilter(
+                        kinds = listOf(MetadataEvent.kind),
+                        authors = listOfNotNull(hexToWatch)
+                    )
                )
-            ),
+            },
            TypedFilter(
                types = FeedType.values().toSet(),
                filter = JsonFilter(
@@ -65,7 +60,7 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
            TypedFilter(
                types = FeedType.values().toSet(),
                filter = JsonFilter(
-                    kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, ChannelMetadataEvent.kind, ChannelCreateEvent.kind, ChannelMessageEvent.kind),
+                    kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind, ChannelMetadataEvent.kind, ChannelCreateEvent.kind, ChannelMessageEvent.kind),
                    search = mySearchString,
                    limit = 20
                )
@@ -2,19 +2,8 @@ package com.vitorpamplona.amethyst.service

 import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.service.model.BadgeAwardEvent
-import com.vitorpamplona.amethyst.service.model.BadgeDefinitionEvent
-import com.vitorpamplona.amethyst.service.model.BadgeProfilesEvent
-import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
-import com.vitorpamplona.amethyst.service.model.LnZapEvent
-import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
-import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
-import com.vitorpamplona.amethyst.service.model.ReactionEvent
-import com.vitorpamplona.amethyst.service.model.ReportEvent
-import com.vitorpamplona.amethyst.service.model.RepostEvent
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.model.*
+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
@@ -33,10 +22,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {

        val now = Date().time / 1000

-        return addressesToWatch.filter {
-            val lastTime = it.lastReactionsDownloadTime
-            lastTime == null || lastTime < (now - 10)
-        }.mapNotNull {
+        return addressesToWatch.mapNotNull {
            it.address()?.let { aTag ->
                TypedFilter(
                    types = FeedType.values().toSet(),
@@ -45,7 +31,8 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                            TextNoteEvent.kind, LongTextNoteEvent.kind,
                            ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind,
                            LnZapEvent.kind, LnZapRequestEvent.kind,
-                            BadgeAwardEvent.kind, BadgeDefinitionEvent.kind, BadgeProfilesEvent.kind
+                            BadgeAwardEvent.kind, BadgeDefinitionEvent.kind, BadgeProfilesEvent.kind,
+                            PollNoteEvent.kind
                        ),
                        tags = mapOf("a" to listOf(aTag.toTag())),
                        since = it.lastReactionsDownloadTime
@@ -64,10 +51,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {

        val now = Date().time / 1000

-        return addressesToWatch.filter {
-            val lastTime = it.lastReactionsDownloadTime
-            lastTime == null || lastTime < (now - 10)
-        }.mapNotNull {
+        return addressesToWatch.mapNotNull {
            it.address()?.let { aTag ->
                TypedFilter(
                    types = FeedType.values().toSet(),
@@ -88,12 +72,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
            return null
        }

-        val now = Date().time / 1000
-
-        return reactionsToWatch.filter {
-            val lastTime = it.lastReactionsDownloadTime
-            lastTime == null || lastTime < (now - 10)
-        }.map {
+        return reactionsToWatch.map {
            TypedFilter(
                types = FeedType.values().toSet(),
                filter = JsonFilter(
@@ -104,7 +83,8 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                        RepostEvent.kind,
                        ReportEvent.kind,
                        LnZapEvent.kind,
-                        LnZapRequestEvent.kind
+                        LnZapRequestEvent.kind,
+                        PollNoteEvent.kind
                    ),
                    tags = mapOf("e" to listOf(it.idHex)),
                    since = it.lastReactionsDownloadTime
@@ -137,7 +117,8 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                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
+                        ChannelMessageEvent.kind, ChannelCreateEvent.kind, ChannelMetadataEvent.kind, BadgeDefinitionEvent.kind, BadgeAwardEvent.kind, BadgeProfilesEvent.kind,
+                        PollNoteEvent.kind
                    ),
                    ids = interestedEvents.toList()
                )
@@ -145,10 +126,16 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
        )
    }

-    val singleEventChannel = requestNewChannel { time ->
+    val singleEventChannel = requestNewChannel { time, relayUrl ->
        eventsToWatch.forEach {
-            it.lastReactionsDownloadTime = time
+            val eose = it.lastReactionsDownloadTime[relayUrl]
+            if (eose == null) {
+                it.lastReactionsDownloadTime = it.lastReactionsDownloadTime + Pair(relayUrl, EOSETime(time))
+            } else {
+                eose.time = time
+            }
        }
+
        // Many relays operate with limits in the amount of filters.
        // As information comes, the filters will be rotated to get more data.
        invalidateFilters()
@@ -160,7 +147,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
        val addresses = createAddressFilter()
        val addressReactions = createTagToAddressFilter()

-        singleEventChannel.typedFilters = listOfNotNull(reactions, missing, addresses, addressReactions).flatten().ifEmpty { null }
+        singleEventChannel.typedFilters = listOfNotNull(missing, addresses, reactions, addressReactions).flatten().ifEmpty { null }
    }

    fun add(eventId: Note) {
@@ -3,6 +3,7 @@ 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.EOSETime
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
@@ -34,13 +35,22 @@ object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
                filter = JsonFilter(
                    kinds = listOf(ReportEvent.kind),
                    tags = mapOf("p" to listOf(it.pubkeyHex)),
-                    since = it.latestReportTime
+                    since = it.latestEOSEs
                )
            )
        }
    }

-    val userChannel = requestNewChannel() {
+    val userChannel = requestNewChannel() { time, relayUrl ->
+        usersToWatch.forEach {
+            val eose = it.latestEOSEs[relayUrl]
+            if (eose == null) {
+                it.latestEOSEs = it.latestEOSEs + Pair(relayUrl, EOSETime(time))
+            } else {
+                eose.time = time
+            }
+        }
+
        // Many relays operate with limits in the amount of filters.
        // As information comes, the filters will be rotated to get more data.
        invalidateFilters()
@@ -25,7 +25,7 @@ object NostrThreadDataSource : NostrDataSource("SingleThreadFeed") {
        )
    }

-    val loadEventsChannel = requestNewChannel() {
+    val loadEventsChannel = requestNewChannel() { eoseTime, relay ->
        // Many relays operate with limits in the amount of filters.
        // As information comes, the filters will be rotated to get more data.
        invalidateFilters()
@@ -2,13 +2,7 @@ package com.vitorpamplona.amethyst.service

 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.service.model.BadgeAwardEvent
-import com.vitorpamplona.amethyst.service.model.BadgeProfilesEvent
-import com.vitorpamplona.amethyst.service.model.ContactListEvent
-import com.vitorpamplona.amethyst.service.model.LnZapEvent
-import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
-import com.vitorpamplona.amethyst.service.model.MetadataEvent
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
@@ -41,7 +35,7 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
        TypedFilter(
            types = FeedType.values().toSet(),
            filter = JsonFilter(
-                kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind),
+                kinds = listOf(TextNoteEvent.kind, RepostEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind),
                authors = listOf(it.pubkeyHex),
                limit = 200
            )
@@ -90,6 +84,17 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
        )
    }

+    fun createBookmarksFilter() = user?.let {
+        TypedFilter(
+            types = FeedType.values().toSet(),
+            filter = JsonFilter(
+                kinds = listOf(BookmarkListEvent.kind),
+                authors = listOf(it.pubkeyHex),
+                limit = 1
+            )
+        )
+    }
+
    fun createReceivedAwardsFilter() = user?.let {
        TypedFilter(
            types = FeedType.values().toSet(),
@@ -111,7 +116,8 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
            createFollowersFilter(),
            createUserReceivedZapsFilter(),
            createAcceptedAwardsFilter(),
-            createReceivedAwardsFilter()
+            createReceivedAwardsFilter(),
+            createBookmarksFilter()
        ).ifEmpty { null }
    }
 }
@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.service.lnurl

 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.vitorpamplona.amethyst.BuildConfig
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -12,6 +13,7 @@ import okhttp3.Callback
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
+import java.math.BigDecimal
 import java.net.URLEncoder

 class LightningAddressResolver {
@@ -52,7 +54,7 @@ class LightningAddressResolver {

        withContext(Dispatchers.IO) {
            val request: Request = Request.Builder()
-                .header("User-Agent", "Amethyst")
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                .url(url)
                .build()

@@ -95,7 +97,7 @@ class LightningAddressResolver {
            }

            val request: Request = Request.Builder()
-                .header("User-Agent", "Amethyst")
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                .url(url)
                .build()

@@ -128,12 +130,14 @@ class LightningAddressResolver {
        )
    }

-    fun lnAddressInvoice(lnaddress: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    fun lnAddressInvoice(lnaddress: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit, onProgress: (percent: Float) -> Unit) {
        val mapper = jacksonObjectMapper()

        fetchLightningAddressJson(
            lnaddress,
            onSuccess = { lnAddressJson ->
+                onProgress(0.4f)
+
                val lnurlp = try {
                    mapper.readTree(lnAddressJson)
                } catch (t: Throwable) {
@@ -156,6 +160,8 @@ class LightningAddressResolver {
                        message,
                        if (allowsNostr) nostrRequest else null,
                        onSuccess = {
+                            onProgress(0.6f)
+
                            val lnInvoice = try {
                                mapper.readTree(it)
                            } catch (t: Throwable) {
@@ -164,7 +170,14 @@ class LightningAddressResolver {
                            }

                            lnInvoice?.get("pr")?.asText()?.let { pr ->
-                                onSuccess(pr)
+                                // Forces LN Invoice amount to be the requested amount.
+                                val invoiceAmount = LnInvoiceUtil.getAmountInSats(pr)
+                                if (invoiceAmount.multiply(BigDecimal(1000)).toLong() == BigDecimal(milliSats).toLong()) {
+                                    onProgress(0.7f)
+                                    onSuccess(pr)
+                                } else {
+                                    onError("Incorrect invoice amount (${invoiceAmount.toLong()} sats) from server")
+                                }
                            } ?: onError("Invoice Not Created (element pr not found in the resulting JSON)")
                        },
                        onError = onError
@@ -0,0 +1,29 @@
+package com.vitorpamplona.amethyst.service.lnurl
+
+import java.util.regex.Pattern
+
+object LnWithdrawalUtil {
+    private val withdrawalPattern = Pattern.compile(
+        "lnurl.*",
+        Pattern.CASE_INSENSITIVE
+    )
+
+    /**
+     * Finds LN withdrawal in the provided input string and returns it.
+     * For example for input = "aaa bbb lnbc1xxx ccc" it will return "lnbc1xxx"
+     * It will only return the first withdrawal found in the input.
+     *
+     * @return the invoice if it was found. null for null input or if no invoice is found
+     */
+    fun findWithdrawal(input: String?): String? {
+        if (input == null) {
+            return null
+        }
+        val matcher = withdrawalPattern.matcher(input)
+        return if (matcher.find()) {
+            matcher.group()
+        } else {
+            null
+        }
+    }
+}
@@ -0,0 +1,50 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.tagSearch
+
+open class BaseTextNoteEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    kind: Int,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun mentions() = taggedUsers()
+    open fun replyTos() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+
+    fun findCitations(): Set<String> {
+        var citations = mutableSetOf<String>()
+        // Removes citations from replies:
+        val matcher = tagSearch.matcher(content)
+        while (matcher.find()) {
+            try {
+                val tag = matcher.group(1)?.let { tags[it.toInt()] }
+                if (tag != null && tag[0] == "e") {
+                    citations.add(tag[1])
+                }
+                if (tag != null && tag[0] == "a") {
+                    citations.add(tag[1])
+                }
+            } catch (e: Exception) {
+            }
+        }
+        return citations
+    }
+
+    fun tagsWithoutCitations(): List<String> {
+        val repliesTo = replyTos()
+        val tagAddresses = taggedAddresses().map { it.toTag() }
+        if (repliesTo.isEmpty() && tagAddresses.isEmpty()) return emptyList()
+
+        val citations = findCitations()
+
+        return if (citations.isEmpty()) {
+            repliesTo + tagAddresses
+        } else {
+            repliesTo.filter { it !in citations }
+        }
+    }
+}
@@ -0,0 +1,117 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.google.gson.reflect.TypeToken
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toByteArray
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.util.Date
+
+class BookmarkListEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
+    fun address() = ATag(kind, pubKey, dTag(), null)
+
+    fun category() = dTag()
+    fun bookmarkedPosts() = tags.filter { it[0] == "e" }.mapNotNull { it.getOrNull(1) }
+
+    fun plainContent(privKey: ByteArray): String? {
+        return try {
+            val sharedSecret = Utils.getSharedSecret(privKey, pubKey.toByteArray())
+
+            return Utils.decrypt(content, sharedSecret)
+        } catch (e: Exception) {
+            Log.w("BookmarkList", "Error decrypting the message ${e.message}")
+            null
+        }
+    }
+
+    @Transient
+    private var privateTagsCache: List<List<String>>? = null
+
+    fun privateTags(privKey: ByteArray): List<List<String>>? {
+        if (privateTagsCache != null) {
+            return privateTagsCache
+        }
+
+        privateTagsCache = try {
+            gson.fromJson(plainContent(privKey), object : TypeToken<List<List<String>>>() {}.type)
+        } catch (e: Throwable) {
+            Log.w("BookmarkList", "Error parsing the JSON ${e.message}")
+            null
+        }
+        return privateTagsCache
+    }
+
+    fun privateTaggedUsers(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "p" }?.mapNotNull { it.getOrNull(1) }
+    fun privateTaggedEvents(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "e" }?.mapNotNull { it.getOrNull(1) }
+    fun privateTaggedAddresses(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "a" }?.mapNotNull {
+        val aTagValue = it.getOrNull(1)
+        val relay = it.getOrNull(2)
+
+        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
+    }
+
+    companion object {
+        const val kind = 30001
+
+        fun create(
+            name: String = "",
+
+            events: List<String>? = null,
+            users: List<String>? = null,
+            addresses: List<ATag>? = null,
+
+            privEvents: List<String>? = null,
+            privUsers: List<String>? = null,
+            privAddresses: List<ATag>? = null,
+
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): BookmarkListEvent {
+            val pubKey = Utils.pubkeyCreate(privateKey)
+
+            val privTags = mutableListOf<List<String>>()
+            privEvents?.forEach {
+                privTags.add(listOf("e", it))
+            }
+            privUsers?.forEach {
+                privTags.add(listOf("p", it))
+            }
+            privAddresses?.forEach {
+                privTags.add(listOf("a", it.toTag()))
+            }
+            val msg = gson.toJson(privTags)
+
+            val content = Utils.encrypt(
+                msg,
+                privateKey,
+                pubKey
+            )
+
+            val tags = mutableListOf<List<String>>()
+            tags.add(listOf("d", name))
+
+            events?.forEach {
+                tags.add(listOf("e", it))
+            }
+            users?.forEach {
+                tags.add(listOf("p", it))
+            }
+            addresses?.forEach {
+                tags.add(listOf("a", it.toTag()))
+            }
+
+            val id = generateId(pubKey.toHexKey(), createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return BookmarkListEvent(id.toHexKey(), pubKey.toHexKey(), createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}
@@ -14,7 +14,7 @@ class ChannelCreateEvent(
    content: String,
    sig: HexKey
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun channelInfo() = try {
+    fun channelInfo(): ChannelData = try {
        MetadataEvent.gson.fromJson(content, ChannelData::class.java)
    } catch (e: Exception) {
        Log.e("ChannelMetadataEvent", "Can't parse channel info $content", e)
@@ -12,11 +12,10 @@ class ChannelMessageEvent(
    tags: List<List<String>>,
    content: String,
    sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+) : BaseTextNoteEvent(id, pubKey, createdAt, kind, tags, content, sig) {

    fun channel() = tags.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1) ?: tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
-    fun replyTos() = tags.filter { it.getOrNull(1) != channel() }.mapNotNull { it.getOrNull(1) }
-    fun mentions() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+    override fun replyTos() = tags.filter { it.firstOrNull() == "e" && it.getOrNull(1) != channel() }.mapNotNull { it.getOrNull(1) }

    companion object {
        const val kind = 42
@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.service.model
 import android.util.Log
 import com.google.gson.reflect.TypeToken
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.decodePublicKey
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
 import java.util.Date
@@ -17,28 +18,60 @@ class ContactListEvent(
    content: String,
    sig: HexKey
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun follows() = try {
-        tags.filter { it[0] == "p" }.map { Contact(it[1], it.getOrNull(2)) }
-    } catch (e: Exception) {
-        Log.e("ContactListEvent", "can't parse tags as follows: $tags", e)
-        null
+    // This function is only used by the user logged in
+    // But it is used all the time.
+    val verifiedFollowKeySet: Set<HexKey> by lazy {
+        tags.filter { it[0] == "p" }.mapNotNull {
+            it.getOrNull(1)?.let { unverifiedHex: String ->
+                try {
+                    decodePublicKey(unverifiedHex).toHexKey()
+                } catch (e: Exception) {
+                    Log.w("ContactListEvent", "Can't parse tags as a follows: ${it[1]}", e)
+                    null
+                }
+            }
+        }.toSet()
    }

-    fun relayUse() = try {
+    val verifiedFollowTagSet: Set<String> by lazy {
+        unverifiedFollowTagSet().map { it.lowercase() }.toSet()
+    }
+
+    val verifiedFollowKeySetAndMe: Set<HexKey> by lazy {
+        verifiedFollowKeySet + pubKey
+    }
+
+    fun unverifiedFollowKeySet() = tags.filter { it[0] == "p" }.mapNotNull { it.getOrNull(1) }
+    fun unverifiedFollowTagSet() = tags.filter { it[0] == "t" }.mapNotNull { it.getOrNull(1) }
+
+    fun follows() = tags.filter { it[0] == "p" }.mapNotNull {
+        try {
+            Contact(decodePublicKey(it[1]).toHexKey(), it.getOrNull(2))
+        } catch (e: Exception) {
+            Log.w("ContactListEvent", "Can't parse tags as a follows: ${it[1]}", e)
+            null
+        }
+    }
+
+    fun followsTags() = tags.filter { it[0] == "t" }.mapNotNull {
+        it.getOrNull(2)
+    }
+
+    fun relays(): Map<String, ReadWrite>? = try {
        if (content.isNotEmpty()) {
-            gson.fromJson(content, object : TypeToken<Map<String, ReadWrite>>() {}.type)
+            gson.fromJson(content, object : TypeToken<Map<String, ReadWrite>>() {}.type) as Map<String, ReadWrite>
        } else {
            null
        }
    } catch (e: Exception) {
-        Log.e("ContactListEvent", "can't parse content as relay lists: $tags", e)
+        Log.w("ContactListEvent", "Can't parse content as relay lists: $content", e)
        null
    }

    companion object {
        const val kind = 3

-        fun create(follows: List<Contact>, relayUse: Map<String, ReadWrite>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ContactListEvent {
+        fun create(follows: List<Contact>, followTags: List<String>, relayUse: Map<String, ReadWrite>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ContactListEvent {
            val content = if (relayUse != null) {
                gson.toJson(relayUse)
            } else {
@@ -51,7 +84,10 @@ class ContactListEvent(
                } else {
                    listOf("p", it.pubKeyHex)
                }
+            } + followTags.map {
+                listOf("t", it)
            }
+
            val id = generateId(pubKey, createdAt, kind, tags, content)
            val sig = Utils.sign(id, privateKey)
            return ContactListEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
@@ -9,6 +9,7 @@ import fr.acinq.secp256k1.Secp256k1
 import nostr.postr.Utils
 import nostr.postr.toHex
 import java.lang.reflect.Type
+import java.math.BigDecimal
 import java.security.MessageDigest
 import java.util.*

@@ -37,6 +38,53 @@ open class Event(

    override fun toJson(): String = gson.toJson(this)

+    fun taggedUsers() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+    fun taggedEvents() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+
+    fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
+        val aTagValue = it.getOrNull(1)
+        val relay = it.getOrNull(2)
+
+        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
+    }
+
+    override fun hashtags() = tags.filter { it.firstOrNull() == "t" }.mapNotNull { it.getOrNull(1) }
+
+    override fun isTaggedUser(idHex: String) = tags.any { it.getOrNull(0) == "p" && it.getOrNull(1) == idHex }
+
+    override fun isTaggedHash(hashtag: String) = tags.any { it.getOrNull(0) == "t" && it.getOrNull(1).equals(hashtag, true) }
+    override fun isTaggedHashes(hashtags: Set<String>) = tags.any { it.getOrNull(0) == "t" && it.getOrNull(1)?.lowercase() in hashtags }
+    override fun firstIsTaggedHashes(hashtags: Set<String>) = tags.firstOrNull { it.getOrNull(0) == "t" && it.getOrNull(1)?.lowercase() in hashtags }?.getOrNull(1)
+
+    override fun getPoWRank(): Int {
+        var rank = 0
+        for (i in 0..id.length) {
+            if (id[i] == '0') {
+                rank += 4
+            } else if (id[i] in '4'..'7') {
+                rank += 1
+                break
+            } else if (id[i] in '2'..'3') {
+                rank += 2
+                break
+            } else if (id[i] == '1') {
+                rank += 3
+                break
+            } else {
+                break
+            }
+        }
+        return rank
+    }
+
+    override fun getReward(): BigDecimal? {
+        return try {
+            tags.filter { it.firstOrNull() == "reward" }.mapNotNull { BigDecimal(it.getOrNull(1)) }.firstOrNull()
+        } catch (e: Exception) {
+            null
+        }
+    }
+
    /**
     * Checks if the ID is correct and then if the pubKey's secret key signed the event.
     */
@@ -165,7 +213,7 @@ open class Event(
            BadgeAwardEvent.kind -> BadgeAwardEvent(id, pubKey, createdAt, tags, content, sig)
            BadgeDefinitionEvent.kind -> BadgeDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
            BadgeProfilesEvent.kind -> BadgeProfilesEvent(id, pubKey, createdAt, tags, content, sig)
-
+            BookmarkListEvent.kind -> BookmarkListEvent(id, pubKey, createdAt, tags, content, sig)
            ChannelCreateEvent.kind -> ChannelCreateEvent(id, pubKey, createdAt, tags, content, sig)
            ChannelHideMessageEvent.kind -> ChannelHideMessageEvent(id, pubKey, createdAt, tags, content, sig)
            ChannelMessageEvent.kind -> ChannelMessageEvent(id, pubKey, createdAt, tags, content, sig)
@@ -175,9 +223,11 @@ open class Event(
            DeletionEvent.kind -> DeletionEvent(id, pubKey, createdAt, tags, content, sig)

            LnZapEvent.kind -> LnZapEvent(id, pubKey, createdAt, tags, content, sig)
+            LnZapPaymentRequestEvent.kind -> LnZapPaymentRequestEvent(id, pubKey, createdAt, tags, content, sig)
            LnZapRequestEvent.kind -> LnZapRequestEvent(id, pubKey, createdAt, tags, content, sig)
            LongTextNoteEvent.kind -> LongTextNoteEvent(id, pubKey, createdAt, tags, content, sig)
            MetadataEvent.kind -> MetadataEvent(id, pubKey, createdAt, tags, content, sig)
+            PollNoteEvent.kind -> PollNoteEvent(id, pubKey, createdAt, tags, content, sig)
            PrivateDmEvent.kind -> PrivateDmEvent(id, pubKey, createdAt, tags, content, sig)
            ReactionEvent.kind -> ReactionEvent(id, pubKey, createdAt, tags, content, sig)
            RecommendRelayEvent.kind -> RecommendRelayEvent(id, pubKey, createdAt, tags, content, sig, lenient)
@@ -196,7 +246,15 @@ open class Event(
                tags,
                content
            )
+
+            // GSON decided to hardcode these replacements.
+            // They break Nostr's hash check.
+            // These lines revert their code.
+            // https://github.com/google/gson/issues/2295
            val rawEventJson = gson.toJson(rawEvent)
+                .replace("\\u2028", "\u2028")
+                .replace("\\u2029", "\u2029")
+
            return sha256.digest(rawEventJson.toByteArray())
        }

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.service.model

 import com.vitorpamplona.amethyst.model.HexKey
+import java.math.BigDecimal

 interface EventInterface {
    fun id(): HexKey
@@ -22,4 +23,14 @@ interface EventInterface {
    fun checkSignature()

    fun hasValidSignature(): Boolean
+
+    fun isTaggedUser(loggedInUser: String): Boolean
+
+    fun isTaggedHash(hashtag: String): Boolean
+    fun isTaggedHashes(hashtag: Set<String>): Boolean
+    fun firstIsTaggedHashes(hashtag: Set<String>): String?
+    fun hashtags(): List<String>
+
+    fun getReward(): BigDecimal?
+    fun getPoWRank(): Int
 }
@@ -1,71 +1,72 @@
-package com.vitorpamplona.amethyst.service.model
-
-import android.util.Log
-import com.vitorpamplona.amethyst.model.HexKey
-import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
-import com.vitorpamplona.amethyst.service.relays.Client
-import java.math.BigDecimal
-
-class LnZapEvent(
-    id: HexKey,
-    pubKey: HexKey,
-    createdAt: Long,
-    tags: List<List<String>>,
-    content: String,
-    sig: HexKey
-) : LnZapEventInterface, Event(id, pubKey, createdAt, kind, tags, content, sig) {
-
-    override fun zappedPost() = tags
-        .filter { it.firstOrNull() == "e" }
-        .mapNotNull { it.getOrNull(1) }
-
-    override fun zappedAuthor() = tags
-        .filter { it.firstOrNull() == "p" }
-        .mapNotNull { it.getOrNull(1) }
-
-    override fun taggedAddresses(): List<ATag> = tags
-        .filter { it.firstOrNull() == "a" }
-        .mapNotNull {
-            val aTagValue = it.getOrNull(1)
-            val relay = it.getOrNull(2)
-
-            if (aTagValue != null) ATag.parse(aTagValue, relay) else null
-        }
-
-    override fun amount(): BigDecimal? {
-        return amount
-    }
-
-    // Keeps this as a field because it's a heavier function used everywhere.
-    val amount by lazy {
-        try {
-            lnInvoice()?.let { LnInvoiceUtil.getAmountInSats(it) }
-        } catch (e: Exception) {
-            Log.e("LnZapEvent", "Failed to Parse LnInvoice ${description()}", e)
-            null
-        }
-    }
-
-    override fun containedPost(): Event? = try {
-        description()?.let {
-            fromJson(it, Client.lenient)
-        }
-    } catch (e: Exception) {
-        Log.e("LnZapEvent", "Failed to Parse Contained Post ${description()}", e)
-        null
-    }
-
-    private fun lnInvoice(): String? = tags
-        .filter { it.firstOrNull() == "bolt11" }
-        .mapNotNull { it.getOrNull(1) }
-        .firstOrNull()
-
-    private fun description(): String? = tags
-        .filter { it.firstOrNull() == "description" }
-        .mapNotNull { it.getOrNull(1) }
-        .firstOrNull()
-
-    companion object {
-        const val kind = 9735
-    }
-}
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
+import com.vitorpamplona.amethyst.service.relays.Client
+import java.math.BigDecimal
+
+class LnZapEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : LnZapEventInterface, Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    override fun zappedPost() = tags
+        .filter { it.firstOrNull() == "e" }
+        .mapNotNull { it.getOrNull(1) }
+
+    override fun zappedPollOption(): Int? = containedPost()?.tags
+        ?.filter { it.firstOrNull() == POLL_OPTION }
+        ?.getOrNull(0)?.getOrNull(1)?.toInt()
+
+    override fun zappedAuthor() = tags
+        .filter { it.firstOrNull() == "p" }
+        .mapNotNull { it.getOrNull(1) }
+
+    override fun zappedRequestAuthor(): String? = containedPost()?.pubKey()
+
+    override fun amount(): BigDecimal? {
+        return amount
+    }
+
+    // Keeps this as a field because it's a heavier function used everywhere.
+    val amount by lazy {
+        try {
+            lnInvoice()?.let { LnInvoiceUtil.getAmountInSats(it) }
+        } catch (e: Exception) {
+            Log.e("LnZapEvent", "Failed to Parse LnInvoice ${description()}", e)
+            null
+        }
+    }
+    override fun message(): String {
+        return message
+    }
+    val message = content
+
+    override fun containedPost(): Event? = try {
+        description()?.ifBlank { null }?.let {
+            fromJson(it, Client.lenient)
+        }
+    } catch (e: Exception) {
+        Log.e("LnZapEvent", "Failed to Parse Contained Post ${description()}", e)
+        null
+    }
+
+    private fun lnInvoice(): String? = tags
+        .filter { it.firstOrNull() == "bolt11" }
+        .mapNotNull { it.getOrNull(1) }
+        .firstOrNull()
+
+    private fun description(): String? = tags
+        .filter { it.firstOrNull() == "description" }
+        .mapNotNull { it.getOrNull(1) }
+        .firstOrNull()
+
+    companion object {
+        const val kind = 9735
+    }
+}
@@ -6,11 +6,17 @@ interface LnZapEventInterface : EventInterface {

    fun zappedPost(): List<String>

+    fun zappedPollOption(): Int?
+
    fun zappedAuthor(): List<String>

+    fun zappedRequestAuthor(): String?
+
    fun taggedAddresses(): List<ATag>

    fun amount(): BigDecimal?

    fun containedPost(): Event?
+
+    fun message(): String
 }
@@ -0,0 +1,55 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toByteArray
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.util.Date
+
+class LnZapPaymentRequestEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    fun lnInvoice(privKey: ByteArray): String? {
+        return try {
+            val sharedSecret = Utils.getSharedSecret(privKey, pubKey.toByteArray())
+
+            return Utils.decrypt(content, sharedSecret)
+        } catch (e: Exception) {
+            Log.w("BookmarkList", "Error decrypting the message ${e.message}")
+            null
+        }
+    }
+
+    companion object {
+        const val kind = 23194
+
+        fun create(
+            lnInvoice: String,
+            walletServicePubkey: String,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): LnZapPaymentRequestEvent {
+            val pubKey = Utils.pubkeyCreate(privateKey)
+
+            val content = Utils.encrypt(
+                lnInvoice,
+                privateKey,
+                walletServicePubkey.toByteArray()
+            )
+
+            val tags = mutableListOf<List<String>>()
+            tags.add(listOf("p", walletServicePubkey))
+
+            val id = generateId(pubKey.toHexKey(), createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return LnZapPaymentRequestEvent(id.toHexKey(), pubKey.toHexKey(), createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}
@@ -1,91 +1,106 @@
-package com.vitorpamplona.amethyst.service.model
-
-import com.vitorpamplona.amethyst.model.HexKey
-import com.vitorpamplona.amethyst.model.toHexKey
-import nostr.postr.Utils
-import java.util.Date
-
-class LnZapRequestEvent(
-    id: HexKey,
-    pubKey: HexKey,
-    createdAt: Long,
-    tags: List<List<String>>,
-    content: String,
-    sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun zappedPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-    fun zappedAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
-    fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
-        val aTagValue = it.getOrNull(1)
-        val relay = it.getOrNull(2)
-
-        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
-    }
-
-    companion object {
-        const val kind = 9734
-
-        fun create(originalNote: EventInterface, relays: Set<String>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): LnZapRequestEvent {
-            val content = ""
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
-            var tags = listOf(
-                listOf("e", originalNote.id()),
-                listOf("p", originalNote.pubKey()),
-                listOf("relays") + relays
-            )
-            if (originalNote is LongTextNoteEvent) {
-                tags = tags + listOf(listOf("a", originalNote.address().toTag()))
-            }
-
-            val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
-            return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
-        }
-
-        fun create(userHex: String, relays: Set<String>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): LnZapRequestEvent {
-            val content = ""
-            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
-            val tags = listOf(
-                listOf("p", userHex),
-                listOf("relays") + relays
-            )
-            val id = generateId(pubKey, createdAt, kind, tags, content)
-            val sig = Utils.sign(id, privateKey)
-            return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
-        }
-    }
-}
-
-/*
-{
-  "pubkey": "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245",
-  "content": "",
-  "id": "d9cc14d50fcb8c27539aacf776882942c1a11ea4472f8cdec1dea82fab66279d",
-  "created_at": 1674164539,
-  "sig": "77127f636577e9029276be060332ea565deaf89ff215a494ccff16ae3f757065e2bc59b2e8c113dd407917a010b3abd36c8d7ad84c0e3ab7dab3a0b0caa9835d",
-  "kind": 9734,
-  "tags": [
-  [
-    "e",
-    "3624762a1274dd9636e0c552b53086d70bc88c165bc4dc0f9e836a1eaf86c3b8"
-  ],
-  [
-    "p",
-    "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245"
-  ],
-  [
-    "relays",
-    "wss://relay.damus.io",
-    "wss://nostr-relay.wlvs.space",
-    "wss://nostr.fmt.wiz.biz",
-    "wss://relay.nostr.bg",
-    "wss://nostr.oxtr.dev",
-    "wss://nostr.v0l.io",
-    "wss://brb.io",
-    "wss://nostr.bitcoiner.social",
-    "ws://monad.jb55.com:8080",
-    "wss://relay.snort.social"
-  ]
-  ]
-}
-*/
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.util.Date
+
+class LnZapRequestEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun zappedPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    fun zappedAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+
+    companion object {
+        const val kind = 9734
+
+        fun create(
+            originalNote: EventInterface,
+            relays: Set<String>,
+            privateKey: ByteArray,
+            pollOption: Int?,
+            message: String,
+            createdAt: Long = Date().time / 1000
+        ): LnZapRequestEvent {
+            val content = message
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            var tags = listOf(
+                listOf("e", originalNote.id()),
+                listOf("p", originalNote.pubKey()),
+                listOf("relays") + relays
+            )
+            if (originalNote is LongTextNoteEvent) {
+                tags = tags + listOf(listOf("a", originalNote.address().toTag()))
+            }
+            if (pollOption != null && pollOption >= 0) {
+                tags = tags + listOf(listOf(POLL_OPTION, pollOption.toString()))
+            }
+
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+
+        fun create(
+            userHex: String,
+            relays: Set<String>,
+            privateKey: ByteArray,
+            message: String,
+            createdAt: Long = Date().time / 1000
+        ): LnZapRequestEvent {
+            val content = message
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = listOf(
+                listOf("p", userHex),
+                listOf("relays") + relays
+            )
+
+            val id = generateId(pubKey, createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return LnZapRequestEvent(id.toHexKey(), pubKey, createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}
+
+/*
+{
+  "pubkey": "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245",
+  "content": "",
+  "id": "d9cc14d50fcb8c27539aacf776882942c1a11ea4472f8cdec1dea82fab66279d",
+  "created_at": 1674164539,
+  "sig": "77127f636577e9029276be060332ea565deaf89ff215a494ccff16ae3f757065e2bc59b2e8c113dd407917a010b3abd36c8d7ad84c0e3ab7dab3a0b0caa9835d",
+  "kind": 9734,
+  "tags": [
+  [
+    "e",
+    "3624762a1274dd9636e0c552b53086d70bc88c165bc4dc0f9e836a1eaf86c3b8"
+  ],
+  [
+    "p",
+    "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245"
+  ],
+  [
+    "relays",
+    "wss://relay.damus.io",
+    "wss://nostr-relay.wlvs.space",
+    "wss://nostr.fmt.wiz.biz",
+    "wss://relay.nostr.bg",
+    "wss://nostr.oxtr.dev",
+    "wss://nostr.v0l.io",
+    "wss://brb.io",
+    "wss://nostr.bitcoiner.social",
+    "ws://monad.jb55.com:8080",
+    "wss://relay.snort.social"
+  ],
+  [
+    "poll_option", "n"
+  ]
+  ],
+  "ots": <base64-encoded OTS file data> // TODO
+}
+*/
@@ -12,16 +12,7 @@ class LongTextNoteEvent(
    tags: List<List<String>>,
    content: String,
    sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun replyTos() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-    fun mentions() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
-    fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
-        val aTagValue = it.getOrNull(1)
-        val relay = it.getOrNull(2)
-
-        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
-    }
-
+) : BaseTextNoteEvent(id, pubKey, createdAt, kind, tags, content, sig) {
    fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
    fun address() = ATag(kind, pubKey, dTag(), null)

@@ -0,0 +1,110 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import com.google.gson.reflect.TypeToken
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toByteArray
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.util.Date
+
+class MuteListEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun dTag() = tags.filter { it.firstOrNull() == "d" }.mapNotNull { it.getOrNull(1) }.firstOrNull() ?: ""
+    fun address() = ATag(kind, pubKey, dTag(), null)
+
+    fun plainContent(privKey: ByteArray): String? {
+        return try {
+            val sharedSecret = Utils.getSharedSecret(privKey, pubKey.toByteArray())
+
+            return Utils.decrypt(content, sharedSecret)
+        } catch (e: Exception) {
+            Log.w("BookmarkList", "Error decrypting the message ${e.message}")
+            null
+        }
+    }
+
+    @Transient
+    private var privateTagsCache: List<List<String>>? = null
+
+    fun privateTags(privKey: ByteArray): List<List<String>>? {
+        if (privateTagsCache != null) {
+            return privateTagsCache
+        }
+
+        privateTagsCache = try {
+            gson.fromJson(plainContent(privKey), object : TypeToken<List<List<String>>>() {}.type)
+        } catch (e: Throwable) {
+            Log.w("BookmarkList", "Error parsing the JSON ${e.message}")
+            null
+        }
+        return privateTagsCache
+    }
+
+    fun privateTaggedUsers(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "p" }?.mapNotNull { it.getOrNull(1) }
+    fun privateTaggedEvents(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "e" }?.mapNotNull { it.getOrNull(1) }
+    fun privateTaggedAddresses(privKey: ByteArray) = privateTags(privKey)?.filter { it.firstOrNull() == "a" }?.mapNotNull {
+        val aTagValue = it.getOrNull(1)
+        val relay = it.getOrNull(2)
+
+        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
+    }
+
+    companion object {
+        const val kind = 10000
+
+        fun create(
+            events: List<String>? = null,
+            users: List<String>? = null,
+            addresses: List<ATag>? = null,
+
+            privEvents: List<String>? = null,
+            privUsers: List<String>? = null,
+            privAddresses: List<ATag>? = null,
+
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): MuteListEvent {
+            val pubKey = Utils.pubkeyCreate(privateKey)
+
+            val privTags = mutableListOf<List<String>>()
+            privEvents?.forEach {
+                privTags.add(listOf("e", it))
+            }
+            privUsers?.forEach {
+                privTags.add(listOf("p", it))
+            }
+            privAddresses?.forEach {
+                privTags.add(listOf("a", it.toTag()))
+            }
+            val msg = gson.toJson(privTags)
+
+            val content = Utils.encrypt(
+                msg,
+                privateKey,
+                pubKey
+            )
+
+            val tags = mutableListOf<List<String>>()
+            events?.forEach {
+                tags.add(listOf("e", it))
+            }
+            users?.forEach {
+                tags.add(listOf("p", it))
+            }
+            addresses?.forEach {
+                tags.add(listOf("a", it.toTag()))
+            }
+
+            val id = generateId(pubKey.toHexKey(), createdAt, kind, tags, content)
+            val sig = Utils.sign(id, privateKey)
+            return MuteListEvent(id.toHexKey(), pubKey.toHexKey(), createdAt, tags, content, sig.toHexKey())
+        }
+    }
+}
@@ -0,0 +1,106 @@
+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
+
+const val POLL_OPTION = "poll_option"
+const val VALUE_MAXIMUM = "value_maximum"
+const val VALUE_MINIMUM = "value_minimum"
+const val CONSENSUS_THRESHOLD = "consensus_threshold"
+const val CLOSED_AT = "closed_at"
+
+class PollNoteEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    // ots: String?, TODO implement OTS: https://github.com/opentimestamps/java-opentimestamps
+    content: String,
+    sig: HexKey
+) : BaseTextNoteEvent(id, pubKey, createdAt, kind, tags, content, sig) {
+    fun pollOptions(): Map<Int, String> {
+        val map = mutableMapOf<Int, String>()
+        tags.filter { it.first() == POLL_OPTION }
+            .forEach { map[it[1].toInt()] = it[2] }
+        return map
+    }
+
+    fun getTagInt(property: String): Int? {
+        val tagList = tags.filter {
+            it.firstOrNull() == property
+        }
+        val tag = tagList.getOrNull(0)
+        val s = tag?.getOrNull(1)
+
+        return if (s.isNullOrBlank() || s == "null") {
+            null
+        } else {
+            s.toInt()
+        }
+    }
+
+    companion object {
+        const val kind = 6969
+
+        fun create(
+            msg: String,
+            replyTos: List<String>?,
+            mentions: List<String>?,
+            addresses: List<ATag>?,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000,
+            pollOptions: Map<Int, String>,
+            valueMaximum: Int?,
+            valueMinimum: Int?,
+            consensusThreshold: Int?,
+            closedAt: Int?
+        ): PollNoteEvent {
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val tags = mutableListOf<List<String>>()
+            replyTos?.forEach {
+                tags.add(listOf("e", it))
+            }
+            mentions?.forEach {
+                tags.add(listOf("p", it))
+            }
+            addresses?.forEach {
+                tags.add(listOf("a", it.toTag()))
+            }
+            pollOptions.forEach { poll_op ->
+                tags.add(listOf(POLL_OPTION, poll_op.key.toString(), poll_op.value))
+            }
+            tags.add(listOf(VALUE_MAXIMUM, valueMaximum.toString()))
+            tags.add(listOf(VALUE_MINIMUM, valueMinimum.toString()))
+            tags.add(listOf(CONSENSUS_THRESHOLD, consensusThreshold.toString()))
+            tags.add(listOf(CLOSED_AT, closedAt.toString()))
+            val id = generateId(pubKey, createdAt, kind, tags, msg)
+            val sig = Utils.sign(id, privateKey)
+            return PollNoteEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
+        }
+    }
+}
+
+/*
+{
+  "id": <32-bytes lowercase hex-encoded sha256 of the serialized event data>
+  "pubkey": <32-bytes lowercase hex-encoded public key of the event creator>,
+  "created_at": <unix timestamp in seconds>,
+  "kind": 6969,
+  "tags": [
+    ["e", <32-bytes hex of the id of the poll event>, <primary poll host relay URL>],
+    ["p", <32-bytes hex of the key>, <primary poll host relay URL>],
+    ["poll_option", "0", "poll option 0 description string"],
+    ["poll_option", "1", "poll option 1 description string"],
+    ["poll_option", "n", "poll option <n> description string"],
+    ["value_maximum", "maximum satoshi value for inclusion in tally"],
+    ["value_minimum", "minimum satoshi value for inclusion in tally"],
+    ["consensus_threshold", "required percentage to attain consensus <0..100>"],
+    ["closed_at", "unix timestamp in seconds"],
+  ],
+  "ots": <base64-encoded OTS file data>
+  "content": <primary poll description string>,
+  "sig": <64-bytes hex of the signature of the sha256 hash of the serialized event data, which is the same as the "id" field>
+}
+ */
@@ -16,12 +16,6 @@ class ReactionEvent(

    fun originalPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
    fun originalAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
-    fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
-        val aTagValue = it.getOrNull(1)
-        val relay = it.getOrNull(2)
-
-        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
-    }

    companion object {
        const val kind = 7
@@ -47,19 +47,16 @@ class ReportEvent(
            )
        }

-    fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
-        val aTagValue = it.getOrNull(1)
-        val relay = it.getOrNull(2)
-
-        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
-    }
-
    companion object {
        const val kind = 1984

-        fun create(reportedPost: EventInterface, type: ReportType, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ReportEvent {
-            val content = ""
-
+        fun create(
+            reportedPost: EventInterface,
+            type: ReportType,
+            privateKey: ByteArray,
+            content: String = "",
+            createdAt: Long = Date().time / 1000
+        ): ReportEvent {
            val reportPostTag = listOf("e", reportedPost.id(), type.name.lowercase())
            val reportAuthorTag = listOf("p", reportedPost.pubKey(), type.name.lowercase())

@@ -17,12 +17,6 @@ class RepostEvent(

    fun boostedPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
    fun originalAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
-    fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
-        val aTagValue = it.getOrNull(1)
-        val relay = it.getOrNull(2)
-
-        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
-    }

    fun containedPost() = try {
        fromJson(content, Client.lenient)
@@ -1,7 +1,10 @@
 package com.vitorpamplona.amethyst.service.model

+import com.linkedin.urls.detection.UrlDetector
+import com.linkedin.urls.detection.UrlDetectorOptions
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.findHashtags
 import nostr.postr.Utils
 import java.util.Date

@@ -12,21 +15,20 @@ class TextNoteEvent(
    tags: List<List<String>>,
    content: String,
    sig: HexKey
-) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun mentions() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
-    fun taggedAddresses() = tags.filter { it.firstOrNull() == "a" }.mapNotNull {
-        val aTagValue = it.getOrNull(1)
-        val relay = it.getOrNull(2)
-
-        if (aTagValue != null) ATag.parse(aTagValue, relay) else null
-    }
-
-    fun replyTos() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+) : BaseTextNoteEvent(id, pubKey, createdAt, kind, tags, content, sig) {

    companion object {
        const val kind = 1

-        fun create(msg: String, replyTos: List<String>?, mentions: List<String>?, addresses: List<ATag>?, privateKey: ByteArray, createdAt: Long = Date().time / 1000): TextNoteEvent {
+        fun create(
+            msg: String,
+            replyTos: List<String>?,
+            mentions: List<String>?,
+            addresses: List<ATag>?,
+            extraTags: List<String>?,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): TextNoteEvent {
            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
            val tags = mutableListOf<List<String>>()
            replyTos?.forEach {
@@ -38,9 +40,22 @@ class TextNoteEvent(
            addresses?.forEach {
                tags.add(listOf("a", it.toTag()))
            }
+            findHashtags(msg).forEach {
+                tags.add(listOf("t", it))
+            }
+            extraTags?.forEach {
+                tags.add(listOf("t", it))
+            }
+            findURLs(msg).forEach {
+                tags.add(listOf("r", it))
+            }
            val id = generateId(pubKey, createdAt, kind, tags, msg)
            val sig = Utils.sign(id, privateKey)
            return TextNoteEvent(id.toHexKey(), pubKey, createdAt, tags, msg, sig.toHexKey())
        }
    }
 }
+
+fun findURLs(text: String): List<String> {
+    return UrlDetector(text, UrlDetectorOptions.Default).detect().map { it.originalUrl }
+}
@@ -1,35 +1,46 @@
 package com.vitorpamplona.amethyst.service.nip19

+import android.util.Log
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.bechToBytes
+import java.util.regex.Pattern

 object Nip19 {
    enum class Type {
-        USER, NOTE, RELAY, ADDRESS
+        USER, NOTE, EVENT, RELAY, ADDRESS
    }

-    data class Return(val type: Type, val hex: String, val relay: String? = null)
+    val nip19regex = Pattern.compile("(nostr:)?@?(nsec1|npub1|nevent1|naddr1|note1|nprofile1|nrelay1)([qpzry9x8gf2tvdw0s3jn54khce6mua7l]+)(.*)", Pattern.CASE_INSENSITIVE)
+
+    data class Return(val type: Type, val hex: String, val relay: String? = null, val additionalChars: String = "")

    fun uriToRoute(uri: String?): Return? {
-        try {
-            val key = uri?.removePrefix("nostr:") ?: return null
+        if (uri == null) return null

-            val bytes = key.bechToBytes()
-            if (key.startsWith("npub")) {
-                return npub(bytes)
-            } else if (key.startsWith("note")) {
-                return note(bytes)
-            } else if (key.startsWith("nprofile")) {
-                return nprofile(bytes)
-            } else if (key.startsWith("nevent")) {
-                return nevent(bytes)
-            } else if (key.startsWith("nrelay")) {
-                return nrelay(bytes)
-            } else if (key.startsWith("naddr")) {
-                return naddr(bytes)
+        try {
+            val matcher = nip19regex.matcher(uri)
+            if (!matcher.find()) {
+                return null
            }
+
+            val uriScheme = matcher.group(1) // nostr:
+            val type = matcher.group(2) // npub1
+            val key = matcher.group(3) // bech32
+            val additionalChars = matcher.group(4) ?: "" // additional chars
+
+            val bytes = (type + key).bechToBytes()
+            val parsed = when (type.lowercase()) {
+                "npub1" -> npub(bytes)
+                "note1" -> note(bytes)
+                "nprofile1" -> nprofile(bytes)
+                "nevent1" -> nevent(bytes)
+                "nrelay1" -> nrelay(bytes)
+                "naddr1" -> naddr(bytes)
+                else -> null
+            }
+            return parsed?.copy(additionalChars = additionalChars)
        } catch (e: Throwable) {
-            println("Issue trying to Decode NIP19 $uri: ${e.message}")
+            Log.e("NIP19 Parser", "Issue trying to Decode NIP19 $uri: ${e.message}", e)
        }

        return null
@@ -68,7 +79,7 @@ object Nip19 {
            ?.get(0)
            ?.toString(Charsets.UTF_8)

-        return Return(Type.USER, hex, relay)
+        return Return(Type.EVENT, hex, relay)
    }

    private fun nrelay(bytes: ByteArray): Return? {
@@ -64,8 +64,24 @@ object Client : RelayPool.Listener {
        RelayPool.sendFilterOnlyIfDisconnected()
    }

-    fun send(signedEvent: EventInterface) {
-        RelayPool.send(signedEvent)
+    fun send(signedEvent: EventInterface, relay: String? = null) {
+        if (relay == null) {
+            RelayPool.send(signedEvent)
+        } else {
+            val useConnectedRelay = relays.filter { it.url == relay }
+
+            if (useConnectedRelay.isNotEmpty()) {
+                useConnectedRelay.forEach {
+                    it.send(signedEvent)
+                }
+            } else {
+                /** temporary connection */
+                Relay(relay, false, true, emptySet()).requestAndWatch() {
+                    it.send(signedEvent)
+                    it.disconnect()
+                }
+            }
+        }
    }

    fun close(subscriptionId: String) {
@@ -4,6 +4,7 @@ import com.vitorpamplona.amethyst.model.RelaySetupInfo

 object Constants {
    val activeTypes = setOf(FeedType.FOLLOWS, FeedType.PRIVATE_DMS)
+    val activeTypesChats = setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.PRIVATE_DMS)
    val activeTypesGlobalChats = setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.PRIVATE_DMS, FeedType.GLOBAL)
    val activeTypesSearch = setOf(FeedType.SEARCH)

@@ -14,16 +15,18 @@ object Constants {
    }

    val defaultRelays = arrayOf(
-        // Free relays
-        RelaySetupInfo("wss://nostr.bitcoiner.social", read = true, write = true, feedTypes = activeTypes),
-        RelaySetupInfo("wss://relay.nostr.bg", read = true, write = true, feedTypes = activeTypes),
+        // Free relays for DMs and Follows
+        RelaySetupInfo("wss://no.str.cr", read = true, write = true, feedTypes = activeTypes),
        RelaySetupInfo("wss://relay.snort.social", read = true, write = true, feedTypes = activeTypes),
        RelaySetupInfo("wss://relay.damus.io", read = true, write = true, feedTypes = activeTypes),
-        RelaySetupInfo("wss://nostr.oxtr.dev", read = true, write = true, feedTypes = activeTypes),
-        RelaySetupInfo("wss://nostr-pub.wellorder.net", read = true, write = true, feedTypes = activeTypes),
-        RelaySetupInfo("wss://nostr.mom", read = true, write = true, feedTypes = activeTypes),
-        RelaySetupInfo("wss://no.str.cr", read = true, write = true, feedTypes = activeTypes),
-        RelaySetupInfo("wss://nos.lol", read = true, write = true, feedTypes = activeTypes),
+
+        // Chats
+        RelaySetupInfo("wss://nostr.bitcoiner.social", read = true, write = true, feedTypes = activeTypesChats),
+        RelaySetupInfo("wss://relay.nostr.bg", read = true, write = true, feedTypes = activeTypesChats),
+        RelaySetupInfo("wss://nostr.oxtr.dev", read = true, write = true, feedTypes = activeTypesChats),
+        RelaySetupInfo("wss://nostr-pub.wellorder.net", read = true, write = true, feedTypes = activeTypesChats),
+        RelaySetupInfo("wss://nostr.mom", read = true, write = true, feedTypes = activeTypesChats),
+        RelaySetupInfo("wss://nos.lol", read = true, write = true, feedTypes = activeTypesChats),

        // Less Reliable
        // NewRelayListViewModel.Relay("wss://nostr.orangepill.dev", read = true, write = true, feedTypes = activeTypes),
@@ -0,0 +1,31 @@
+package com.vitorpamplona.amethyst.service.relays
+
+import com.vitorpamplona.amethyst.model.User
+
+class EOSETime(var time: Long) {
+    override fun toString(): String {
+        return time.toString()
+    }
+}
+
+class EOSERelayList(var relayList: Map<String, EOSETime> = emptyMap()) {
+    fun addOrUpdate(relayUrl: String, time: Long) {
+        val eose = relayList[relayUrl]
+        if (eose == null) {
+            relayList = relayList + Pair(relayUrl, EOSETime(time))
+        } else {
+            eose.time = time
+        }
+    }
+}
+
+class EOSEAccount(var users: Map<User, EOSERelayList> = emptyMap()) {
+    fun addOrUpdate(user: User, relayUrl: String, time: Long) {
+        val relayList = users[user]
+        if (relayList == null) {
+            users = users + mapOf(user to EOSERelayList(mapOf(relayUrl to EOSETime(time))))
+        } else {
+            relayList.addOrUpdate(relayUrl, time)
+        }
+    }
+}
@@ -4,26 +4,18 @@ import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
-import com.vitorpamplona.amethyst.service.model.Event
-import java.io.Serializable
-import java.util.*
-
-interface Filter {
-    fun match(event: Event): Boolean
-    fun toShortString(): String
-}

 class JsonFilter(
    val ids: List<String>? = null,
    val authors: List<String>? = null,
    val kinds: List<Int>? = null,
    val tags: Map<String, List<String>>? = null,
-    val since: Long? = null,
+    val since: Map<String, EOSETime>? = null,
    val until: Long? = null,
    val limit: Int? = null,
    val search: String? = null
-) : Filter, Serializable {
-    fun toJson(): String {
+) {
+    fun toJson(forRelay: String? = null): String {
        val jsonObject = JsonObject()
        ids?.run {
            jsonObject.add("ids", JsonArray().apply { ids.forEach { add(it) } })
@@ -40,7 +32,20 @@ class JsonFilter(
            }
        }
        since?.run {
-            jsonObject.addProperty("since", since)
+            if (!isEmpty()) {
+                if (forRelay != null) {
+                    val relaySince = get(forRelay)
+                    if (relaySince != null) {
+                        jsonObject.addProperty("since", relaySince.time)
+                    }
+                } else {
+                    val jsonObjectSince = JsonObject()
+                    entries.forEach { sincePairs ->
+                        jsonObjectSince.addProperty(sincePairs.key, "${sincePairs.value}")
+                    }
+                    jsonObject.add("since", jsonObjectSince)
+                }
+            }
        }
        until?.run {
            jsonObject.addProperty("until", until)
@@ -54,90 +59,7 @@ class JsonFilter(
        return gson.toJson(jsonObject)
    }

-    override fun match(event: Event): Boolean {
-        if (ids?.any { event.id == it } == false) return false
-        if (kinds?.any { event.kind == it } == false) return false
-        if (authors?.any { event.pubKey == it } == false) return false
-        tags?.forEach { tag ->
-            if (!event.tags.any { it.first() == tag.key && it[1] in tag.value }) return false
-        }
-        if (event.createdAt !in (since ?: Long.MIN_VALUE)..(until ?: Long.MAX_VALUE)) {
-            return false
-        }
-        return true
-    }
-
-    override fun toString(): String = "JsonFilter${toJson()}"
-
-    override fun toShortString(): String {
-        val list = ArrayList<String>()
-        ids?.run {
-            list.add("ids")
-        }
-        authors?.run {
-            list.add("authors")
-        }
-        kinds?.run {
-            list.add("kinds[${kinds.joinToString()}]")
-        }
-        tags?.run {
-            list.add("tags")
-        }
-        since?.run {
-            list.add("since")
-        }
-        until?.run {
-            list.add("until")
-        }
-        limit?.run {
-            list.add("limit")
-        }
-        search?.run {
-            list.add("search")
-        }
-        return list.joinToString()
-    }
-
    companion object {
        val gson: Gson = GsonBuilder().create()
-
-        fun fromJson(json: String): JsonFilter {
-            val jsonFilter = gson.fromJson(json, JsonObject::class.java)
-            return fromJson(jsonFilter)
-        }
-
-        val declaredFields = JsonFilter::class.java.declaredFields.map { it.name }
-        fun fromJson(json: JsonObject): JsonFilter {
-            // sanity check
-            if (json.keySet().any { !(it.startsWith("#") || it in declaredFields) }) {
-                println("Filter $json contains unknown parameters.")
-            }
-            return JsonFilter(
-                ids = if (json.has("ids")) json.getAsJsonArray("ids").map { it.asString } else null,
-                authors = if (json.has("authors")) {
-                    json.getAsJsonArray("authors")
-                        .map { it.asString }
-                } else {
-                    null
-                },
-                kinds = if (json.has("kinds")) {
-                    json.getAsJsonArray("kinds")
-                        .map { it.asInt }
-                } else {
-                    null
-                },
-                tags = json
-                    .entrySet()
-                    .filter { it.key.startsWith("#") }
-                    .associate {
-                        it.key.substring(1) to it.value.asJsonArray.map { it.asString }
-                    }
-                    .ifEmpty { null },
-                since = if (json.has("since")) json.get("since").asLong else null,
-                until = if (json.has("until")) json.get("until").asLong else null,
-                limit = if (json.has("limit")) json.get("limit").asInt else null,
-                search = if (json.has("search")) json.get("search").asString else null
-            )
-        }
    }
 }
@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.service.relays

 import android.util.Log
 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 okhttp3.OkHttpClient
@@ -30,14 +31,17 @@ class Relay(
    private var socket: WebSocket? = null
    private var isReady: Boolean = false

-    var eventDownloadCounter = 0
+    var eventDownloadCounterInBytes = 0
+    var eventUploadCounterInBytes = 0
+
    var spamCounter = 0
-    var eventUploadCounter = 0
    var errorCounter = 0
    var ping: Long? = null

    var closingTime = 0L

+    var afterEOSE = false
+
    fun register(listener: Listener) {
        listeners = listeners.plus(listener)
    }
@@ -52,46 +56,60 @@ class Relay(

    @Synchronized
    fun requestAndWatch() {
+        requestAndWatch {
+            // Sends everything.
+            Client.allSubscriptions().forEach {
+                sendFilter(requestId = it)
+            }
+        }
+    }
+
+    @Synchronized
+    fun requestAndWatch(onConnected: (Relay) -> Unit) {
        if (socket != null) return

        try {
            val request = Request.Builder()
-                .header("User-Agent", "Amethyst")
+                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
                .url(url.trim())
                .build()
            val listener = object : WebSocketListener() {

                override fun onOpen(webSocket: WebSocket, response: Response) {
+                    afterEOSE = false
                    isReady = true
                    ping = response.receivedResponseAtMillis - response.sentRequestAtMillis
-
                    // Log.w("Relay", "Relay OnOpen, Loading All subscriptions $url")
-                    // Sends everything.
-                    Client.allSubscriptions().forEach {
-                        sendFilter(requestId = it)
-                    }
+                    onConnected(this@Relay)
+
                    listeners.forEach { it.onRelayStateChange(this@Relay, Type.CONNECT, null) }
                }

                override fun onMessage(webSocket: WebSocket, text: String) {
+                    eventDownloadCounterInBytes += text.bytesUsedInMemory()
+
                    try {
                        val msg = Event.gson.fromJson(text, JsonElement::class.java).asJsonArray
                        val type = msg[0].asString
                        val channel = msg[1].asString
+
                        when (type) {
                            "EVENT" -> {
                                // Log.w("Relay", "Relay onEVENT $url, $channel")
-                                eventDownloadCounter++
-                                val event = Event.fromJson(msg[2], Client.lenient)
-                                listeners.forEach { it.onEvent(this@Relay, channel, event) }
+                                listeners.forEach {
+                                    it.onEvent(this@Relay, channel, Event.fromJson(msg[2], Client.lenient))
+                                    if (afterEOSE) {
+                                        it.onRelayStateChange(this@Relay, Type.EOSE, channel)
+                                    }
+                                }
                            }
                            "EOSE" -> listeners.forEach {
+                                afterEOSE = true
                                // Log.w("Relay", "Relay onEOSE $url, $channel")
                                it.onRelayStateChange(this@Relay, Type.EOSE, channel)
                            }
                            "NOTICE" -> listeners.forEach {
                                // Log.w("Relay", "Relay onNotice $url, $channel")
-                                // "channel" being the second string in the string array ...
                                it.onError(this@Relay, channel, Error("Relay sent notice: " + channel))
                            }
                            "OK" -> listeners.forEach {
@@ -128,6 +146,7 @@ class Relay(
                override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
                    socket = null
                    isReady = false
+                    afterEOSE = false
                    closingTime = Date().time / 1000
                    listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECT, null) }
                }
@@ -139,6 +158,7 @@ class Relay(
                    // Failures disconnect the relay.
                    socket = null
                    isReady = false
+                    afterEOSE = false
                    closingTime = Date().time / 1000

                    Log.w("Relay", "Relay onFailure $url, ${response?.message} $response")
@@ -153,6 +173,7 @@ class Relay(
        } catch (e: Exception) {
            errorCounter++
            isReady = false
+            afterEOSE = false
            closingTime = Date().time / 1000
            Log.e("Relay", "Relay Invalid $url")
            e.printStackTrace()
@@ -165,6 +186,7 @@ class Relay(
        socket?.close(1000, "Normal close")
        socket = null
        isReady = false
+        afterEOSE = false
    }

    fun sendFilter(requestId: String) {
@@ -174,9 +196,11 @@ class Relay(
                    val filters = Client.getSubscriptionFilters(requestId).filter { activeTypes.intersect(it.types).isNotEmpty() }
                    if (filters.isNotEmpty()) {
                        val request =
-                            """["REQ","$requestId",${filters.take(10).joinToString(",") { it.filter.toJson() }}]"""
-                        // println("FILTERSSENT ${url} ${request}")
+                            """["REQ","$requestId",${filters.take(40).joinToString(",") { it.filter.toJson(url) }}]"""
+                        // println("FILTERSSENT $url $request")
                        socket?.send(request)
+                        eventUploadCounterInBytes += request.bytesUsedInMemory()
+                        afterEOSE = false
                    }
                }
            } else {
@@ -201,8 +225,9 @@ class Relay(

    fun send(signedEvent: EventInterface) {
        if (write) {
-            socket?.send("""["EVENT",${signedEvent.toJson()}]""")
-            eventUploadCounter++
+            val event = """["EVENT",${signedEvent.toJson()}]"""
+            socket?.send(event)
+            eventUploadCounterInBytes += event.bytesUsedInMemory()
        }
    }

@@ -249,3 +274,7 @@ class Relay(
        fun onRelayStateChange(relay: Relay, type: Type, channel: String?)
    }
 }
+
+fun String.bytesUsedInMemory(): Int {
+    return (8 * ((((this.length) * 2) + 45) / 8))
+}
@@ -7,12 +7,12 @@ import java.util.UUID

 data class Subscription(
    val id: String = UUID.randomUUID().toString().substring(0, 4),
-    val onEOSE: ((Long) -> Unit)? = null
+    val onEOSE: ((Long, String) -> Unit)? = null
 ) {
    var typedFilters: List<TypedFilter>? = null // Inactive when null

-    fun updateEOSE(l: Long) {
-        onEOSE?.let { it(l) }
+    fun updateEOSE(time: Long, relay: String) {
+        onEOSE?.let { it(time, relay) }
    }

    fun toJson(): String {
@@ -40,9 +40,15 @@ class TypedFilter(
                jsonObject.add("#${kv.key}", JsonArray().apply { kv.value.forEach { add(it) } })
            }
        }
+        /*
+        Does not include since in the json comparison
        filter.since?.run {
-            jsonObject.addProperty("since", filter.since)
-        }
+            val jsonObjectSince = JsonObject()
+            entries.forEach { sincePairs ->
+                jsonObjectSince.addProperty(sincePairs.key, "${sincePairs.value}")
+            }
+            jsonObject.add("since", jsonObjectSince)
+        }*/
        filter.until?.run {
            jsonObject.addProperty("until", filter.until)
        }
@@ -1,8 +1,11 @@
 package com.vitorpamplona.amethyst.ui

+import android.content.Context
+import android.content.Intent
 import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
 import androidx.activity.compose.setContent
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
@@ -18,6 +21,8 @@ import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
 import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.Client
+import com.vitorpamplona.amethyst.ui.navigation.Route
+import com.vitorpamplona.amethyst.ui.note.Nip47
 import com.vitorpamplona.amethyst.ui.screen.AccountScreen
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.theme.AmethystTheme
@@ -25,6 +30,8 @@ import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import java.net.URLEncoder
+import java.nio.charset.StandardCharsets

 class MainActivity : FragmentActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
@@ -34,7 +41,17 @@ class MainActivity : FragmentActivity() {
        val startingPage = when (nip19?.type) {
            Nip19.Type.USER -> "User/${nip19.hex}"
            Nip19.Type.NOTE -> "Note/${nip19.hex}"
+            Nip19.Type.EVENT -> "Event/${nip19.hex}"
+            Nip19.Type.ADDRESS -> "Note/${nip19.hex}"
            else -> null
+        } ?: try {
+            intent?.data?.toString()?.let {
+                Nip47.parse(it)
+                val encodedUri = URLEncoder.encode(it, StandardCharsets.UTF_8.toString())
+                Route.Home.base + "?nip47=" + encodedUri
+            }
+        } catch (e: Exception) {
+            null
        }

        Coil.setImageLoader {
@@ -94,3 +111,13 @@ class MainActivity : FragmentActivity() {
        ServiceManager.cleanUp()
    }
 }
+
+class GetMediaActivityResultContract : ActivityResultContracts.GetContent() {
+
+    override fun createIntent(context: Context, input: String): Intent {
+        return super.createIntent(context, input).apply {
+            // Force only images and videos to be selectable
+            putExtra(Intent.EXTRA_MIME_TYPES, arrayOf("image/*", "video/*"))
+        }
+    }
+}
@@ -8,6 +8,7 @@ import android.os.Build
 import android.os.Environment
 import android.provider.MediaStore
 import androidx.annotation.RequiresApi
+import com.vitorpamplona.amethyst.BuildConfig
 import okhttp3.*
 import okio.BufferedSource
 import okio.IOException
@@ -30,7 +31,7 @@ object ImageSaver {
        val client = OkHttpClient.Builder().build()

        val request = Request.Builder()
-            .header("User-Agent", "Amethyst")
+            .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
            .get()
            .url(url)
            .build()
@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.ui.actions
 import android.content.ContentResolver
 import android.net.Uri
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.vitorpamplona.amethyst.BuildConfig
 import okhttp3.*
 import okhttp3.MediaType.Companion.toMediaType
 import okio.BufferedSink
@@ -18,13 +19,16 @@ object ImageUploader {
        onError: (Throwable) -> Unit
    ) {
        val contentType = contentResolver.getType(uri)
+        val category = contentType?.toMediaType()?.toString()?.split("/")?.get(0) ?: "image"
+
+        val url = if (category == "image") "https://api.imgur.com/3/image" else "https://api.imgur.com/3/upload"

        val client = OkHttpClient.Builder().build()

        val requestBody: RequestBody = MultipartBody.Builder()
            .setType(MultipartBody.FORM)
            .addFormDataPart(
-                "image",
+                category,
                "${UUID.randomUUID()}",
                object : RequestBody() {
                    override fun contentType(): MediaType? =
@@ -44,8 +48,8 @@ object ImageUploader {

        val request: Request = Request.Builder()
            .header("Authorization", "Client-ID e6aea87296f3f96")
-            .header("User-Agent", "Amethyst")
-            .url("https://api.imgur.com/3/image")
+            .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+            .url(url)
            .post(requestBody)
            .build()

@@ -0,0 +1,81 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.model.parseDirtyWordForKey
+import com.vitorpamplona.amethyst.service.nip19.Nip19
+
+class NewMessageTagger(var channel: Channel?, var mentions: List<User>?, var replyTos: List<Note>?, var message: String) {
+
+    open fun addUserToMentions(user: User) {
+        mentions = if (mentions?.contains(user) == true) mentions else mentions?.plus(user) ?: listOf(user)
+    }
+
+    open fun addNoteToReplyTos(note: Note) {
+        note.author?.let { addUserToMentions(it) }
+        replyTos = if (replyTos?.contains(note) == true) replyTos else replyTos?.plus(note) ?: listOf(note)
+    }
+
+    open fun tagIndex(user: User): Int {
+        // Postr Events assembles replies before mentions in the tag order
+        return (if (channel != null) 1 else 0) + (replyTos?.size ?: 0) + (mentions?.indexOf(user) ?: 0)
+    }
+
+    open fun tagIndex(note: Note): Int {
+        // Postr Events assembles replies before mentions in the tag order
+        return (if (channel != null) 1 else 0) + (replyTos?.indexOf(note) ?: 0)
+    }
+
+    fun run() {
+        // adds all references to mentions and reply tos
+        message.split('\n').forEach { paragraph: String ->
+            paragraph.split(' ').forEach { word: String ->
+                val results = parseDirtyWordForKey(word)
+
+                if (results?.key?.type == Nip19.Type.USER) {
+                    addUserToMentions(LocalCache.getOrCreateUser(results.key.hex))
+                } else if (results?.key?.type == Nip19.Type.NOTE) {
+                    addNoteToReplyTos(LocalCache.getOrCreateNote(results.key.hex))
+                } else if (results?.key?.type == Nip19.Type.EVENT) {
+                    addNoteToReplyTos(LocalCache.getOrCreateNote(results.key.hex))
+                } else if (results?.key?.type == Nip19.Type.ADDRESS) {
+                    val note = LocalCache.checkGetOrCreateAddressableNote(results.key.hex)
+                    if (note != null) {
+                        addNoteToReplyTos(note)
+                    }
+                }
+            }
+        }
+
+        // Tags the text in the correct order.
+        message = message.split('\n').map { paragraph: String ->
+            paragraph.split(' ').map { word: String ->
+                val results = parseDirtyWordForKey(word)
+                if (results?.key?.type == Nip19.Type.USER) {
+                    val user = LocalCache.getOrCreateUser(results.key.hex)
+
+                    "#[${tagIndex(user)}]${results.restOfWord}"
+                } else if (results?.key?.type == Nip19.Type.NOTE) {
+                    val note = LocalCache.getOrCreateNote(results.key.hex)
+
+                    "#[${tagIndex(note)}]${results.restOfWord}"
+                } else if (results?.key?.type == Nip19.Type.EVENT) {
+                    val note = LocalCache.getOrCreateNote(results.key.hex)
+
+                    "#[${tagIndex(note)}]${results.restOfWord}"
+                } else if (results?.key?.type == Nip19.Type.ADDRESS) {
+                    val note = LocalCache.checkGetOrCreateAddressableNote(results.key.hex)
+                    if (note != null) {
+                        "#[${tagIndex(note)}]${results.restOfWord}"
+                    } else {
+                        word
+                    }
+                } else {
+                    word
+                }
+            }.joinToString(" ")
+        }.joinToString("\n")
+    }
+}
@@ -0,0 +1,79 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Text
+import androidx.compose.material.TextFieldDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.actions.NewPostViewModel
+
+@Composable
+fun NewPollClosing(pollViewModel: NewPostViewModel) {
+    var text by rememberSaveable { mutableStateOf("") }
+
+    pollViewModel.isValidClosedAt.value = true
+    if (text.isNotEmpty()) {
+        try {
+            val int = text.toInt()
+            if (int < 0) {
+                pollViewModel.isValidClosedAt.value = false
+            } else { pollViewModel.closedAt = int }
+        } catch (e: Exception) { pollViewModel.isValidClosedAt.value = false }
+    }
+
+    val colorInValid = TextFieldDefaults.outlinedTextFieldColors(
+        focusedBorderColor = MaterialTheme.colors.error,
+        unfocusedBorderColor = Color.Red
+    )
+    val colorValid = TextFieldDefaults.outlinedTextFieldColors(
+        focusedBorderColor = MaterialTheme.colors.primary,
+        unfocusedBorderColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+    )
+
+    Row(
+        Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.Center
+    ) {
+        OutlinedTextField(
+            value = text,
+            onValueChange = { text = it },
+            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+            modifier = Modifier.width(150.dp),
+            colors = if (pollViewModel.isValidClosedAt.value) colorValid else colorInValid,
+            label = {
+                Text(
+                    text = stringResource(R.string.poll_closing_time),
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+            },
+            placeholder = {
+                Text(
+                    text = stringResource(R.string.poll_closing_time_days),
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+            }
+        )
+    }
+}
+
+@Preview
+@Composable
+fun NewPollClosingPreview() {
+    NewPollClosing(NewPostViewModel())
+}
@@ -0,0 +1,79 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Text
+import androidx.compose.material.TextFieldDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.actions.NewPostViewModel
+
+@Composable
+fun NewPollConsensusThreshold(pollViewModel: NewPostViewModel) {
+    var text by rememberSaveable { mutableStateOf("") }
+
+    pollViewModel.isValidConsensusThreshold.value = true
+    if (text.isNotEmpty()) {
+        try {
+            val int = text.toInt()
+            if (int < 0 || int > 100) {
+                pollViewModel.isValidConsensusThreshold.value = false
+            } else { pollViewModel.consensusThreshold = int }
+        } catch (e: Exception) { pollViewModel.isValidConsensusThreshold.value = false }
+    }
+
+    val colorInValid = TextFieldDefaults.outlinedTextFieldColors(
+        focusedBorderColor = MaterialTheme.colors.error,
+        unfocusedBorderColor = Color.Red
+    )
+    val colorValid = TextFieldDefaults.outlinedTextFieldColors(
+        focusedBorderColor = MaterialTheme.colors.primary,
+        unfocusedBorderColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+    )
+
+    Row(
+        Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.Center
+    ) {
+        OutlinedTextField(
+            value = text,
+            onValueChange = { text = it },
+            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+            modifier = Modifier.width(150.dp),
+            colors = if (pollViewModel.isValidConsensusThreshold.value) colorValid else colorInValid,
+            label = {
+                Text(
+                    text = stringResource(R.string.poll_consensus_threshold),
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+            },
+            placeholder = {
+                Text(
+                    text = stringResource(R.string.poll_consensus_threshold_percent),
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+            }
+        )
+    }
+}
+
+@Preview
+@Composable
+fun NewPollConsensusThresholdPreview() {
+    NewPollConsensusThreshold(NewPostViewModel())
+}
@@ -0,0 +1,70 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Delete
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.tooling.preview.Preview
+import com.vitorpamplona.amethyst.R
+
+@Composable
+fun NewPollOption(pollViewModel: NewPostViewModel, optionIndex: Int) {
+    val colorInValid = TextFieldDefaults.outlinedTextFieldColors(
+        focusedBorderColor = MaterialTheme.colors.error,
+        unfocusedBorderColor = Color.Red
+    )
+    val colorValid = TextFieldDefaults.outlinedTextFieldColors(
+        focusedBorderColor = MaterialTheme.colors.primary,
+        unfocusedBorderColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+    )
+
+    Row {
+        val deleteIcon: @Composable (() -> Unit) = {
+            IconButton(
+                onClick = {
+                    pollViewModel.pollOptions.remove(optionIndex)
+                }
+            ) {
+                Icon(
+                    imageVector = Icons.Default.Delete,
+                    contentDescription = stringResource(R.string.clear)
+                )
+            }
+        }
+
+        OutlinedTextField(
+            modifier = Modifier.weight(1F),
+            value = pollViewModel.pollOptions[optionIndex] ?: "",
+            onValueChange = { pollViewModel.pollOptions[optionIndex] = it },
+            label = {
+                Text(
+                    text = stringResource(R.string.poll_option_index).format(optionIndex + 1),
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+            },
+            placeholder = {
+                Text(
+                    text = stringResource(R.string.poll_option_description),
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+            },
+            keyboardOptions = KeyboardOptions.Default.copy(
+                capitalization = KeyboardCapitalization.Sentences
+            ),
+            // colors = if (pollViewModel.pollOptions[optionIndex]?.isNotEmpty() == true) colorValid else colorInValid,
+            trailingIcon = if (optionIndex > 1) deleteIcon else null
+        )
+    }
+}
+
+@Preview
+@Composable
+fun NewPollOptionPreview() {
+    NewPollOption(NewPostViewModel(), 0)
+}
@@ -0,0 +1,77 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+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.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.style.TextDirection
+import androidx.compose.ui.unit.dp
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.actions.NewPostViewModel
+import com.vitorpamplona.amethyst.ui.actions.UrlUserTagTransformation
+
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+fun NewPollPrimaryDescription(pollViewModel: NewPostViewModel) {
+    // initialize focus reference to be able to request focus programmatically
+    val focusRequester = remember { FocusRequester() }
+    val keyboardController = LocalSoftwareKeyboardController.current
+
+    var isInputValid = true
+    if (pollViewModel.message.text.isEmpty()) {
+        isInputValid = false
+    }
+
+    val colorInValid = TextFieldDefaults.outlinedTextFieldColors(
+        focusedBorderColor = MaterialTheme.colors.error,
+        unfocusedBorderColor = Color.Red
+    )
+    val colorValid = TextFieldDefaults.outlinedTextFieldColors(
+        focusedBorderColor = MaterialTheme.colors.primary,
+        unfocusedBorderColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+    )
+
+    OutlinedTextField(
+        value = pollViewModel.message,
+        onValueChange = {
+            pollViewModel.updateMessage(it)
+        },
+        label = {
+            Text(
+                text = stringResource(R.string.poll_primary_description),
+                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+            )
+        },
+        keyboardOptions = KeyboardOptions.Default.copy(
+            capitalization = KeyboardCapitalization.Sentences
+        ),
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(top = 8.dp)
+            .focusRequester(focusRequester)
+            .onFocusChanged {
+                if (it.isFocused) {
+                    keyboardController?.show()
+                }
+            },
+        placeholder = {
+            Text(
+                text = stringResource(R.string.poll_primary_description),
+                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+            )
+        },
+        colors = if (isInputValid) colorValid else colorInValid,
+        visualTransformation = UrlUserTagTransformation(MaterialTheme.colors.primary),
+        textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+    )
+}
@@ -0,0 +1,43 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.ui.actions.NewPostViewModel
+
+@Composable
+fun NewPollRecipientsField(pollViewModel: NewPostViewModel, account: Account) {
+    // if no recipients, add user's pubkey
+    if (pollViewModel.zapRecipients.isEmpty()) {
+        pollViewModel.zapRecipients.add(account.userProfile().pubkeyHex)
+    }
+
+    // TODO allow add multiple recipients and check input validity
+
+    OutlinedTextField(
+        modifier = Modifier
+            .fillMaxWidth(),
+        value = pollViewModel.zapRecipients[0],
+        onValueChange = { /* TODO */ },
+        enabled = false, // TODO enable add recipients
+        label = {
+            Text(
+                text = stringResource(R.string.poll_zap_recipients),
+                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+            )
+        },
+        placeholder = {
+            Text(
+                text = stringResource(R.string.poll_zap_recipients),
+                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+            )
+        }
+
+    )
+}
@@ -0,0 +1,197 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import android.widget.Toast
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+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 com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Account
+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.UserLine
+import kotlinx.coroutines.delay
+
+@Composable
+fun NewPollView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = null, account: Account) {
+    val pollViewModel: NewPostViewModel = viewModel()
+
+    val context = LocalContext.current
+
+    val scrollState = rememberScrollState()
+
+    LaunchedEffect(Unit) {
+        pollViewModel.load(account, baseReplyTo, quote)
+        delay(100)
+
+        pollViewModel.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()
+                .fillMaxHeight()
+        ) {
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .fillMaxHeight()
+            ) {
+                Column(
+                    modifier = Modifier
+                        .padding(start = 10.dp, end = 10.dp, top = 10.dp)
+                        .imePadding()
+                        .weight(1f)
+                ) {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        CloseButton(onCancel = {
+                            pollViewModel.cancel()
+                            onClose()
+                        })
+
+                        PollButton(
+                            onPost = {
+                                pollViewModel.sendPost()
+                                onClose()
+                            },
+                            isActive = pollViewModel.message.text.isNotBlank() &&
+                                pollViewModel.pollOptions.values.all { it.isNotEmpty() } &&
+                                pollViewModel.isValidRecipients.value &&
+                                pollViewModel.isValidvalueMaximum.value &&
+                                pollViewModel.isValidvalueMinimum.value &&
+                                pollViewModel.isValidConsensusThreshold.value &&
+                                pollViewModel.isValidClosedAt.value
+                        )
+                    }
+
+                    Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .weight(1f)
+                    ) {
+                        Column(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .verticalScroll(scrollState)
+                        ) {
+                            if (pollViewModel.replyTos != null && baseReplyTo?.event is TextNoteEvent) {
+                                ReplyInformation(pollViewModel.replyTos, pollViewModel.mentions, account, "✖ ") {
+                                    pollViewModel.removeFromReplyList(it)
+                                }
+                            }
+
+                            Text(stringResource(R.string.poll_heading_required))
+                            // NewPollRecipientsField(pollViewModel, account)
+                            NewPollPrimaryDescription(pollViewModel)
+                            pollViewModel.pollOptions.values.forEachIndexed { index, element ->
+                                NewPollOption(pollViewModel, index)
+                            }
+                            Button(
+                                onClick = { pollViewModel.pollOptions[pollViewModel.pollOptions.size] = "" },
+                                border = BorderStroke(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.32f)),
+                                colors = ButtonDefaults.outlinedButtonColors(
+                                    contentColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                )
+                            ) {
+                                Image(
+                                    painterResource(id = android.R.drawable.ic_input_add),
+                                    contentDescription = "Add poll option button",
+                                    modifier = Modifier.size(18.dp)
+                                )
+                            }
+                            Text(stringResource(R.string.poll_heading_optional))
+                            NewPollVoteValueRange(pollViewModel)
+                            NewPollConsensusThreshold(pollViewModel)
+                            NewPollClosing(pollViewModel)
+                        }
+                    }
+
+                    val userSuggestions = pollViewModel.userSuggestions
+                    if (userSuggestions.isNotEmpty()) {
+                        LazyColumn(
+                            contentPadding = PaddingValues(
+                                top = 10.dp
+                            ),
+                            modifier = Modifier.heightIn(0.dp, 300.dp)
+                        ) {
+                            itemsIndexed(
+                                userSuggestions,
+                                key = { _, item -> item.pubkeyHex }
+                            ) { index, item ->
+                                UserLine(item, account) {
+                                    pollViewModel.autocompleteWithUser(item)
+                                }
+                            }
+                        }
+                    }
+
+                    Row(modifier = Modifier.fillMaxWidth()) {
+                        /*UploadFromGallery(
+                            isUploading = pollViewModel.isUploadingImage
+                        ) {
+                            pollViewModel.upload(it, context)
+                        }*/
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun PollButton(modifier: Modifier = Modifier, onPost: () -> Unit = {}, isActive: Boolean) {
+    Button(
+        modifier = modifier,
+        onClick = {
+            if (isActive) {
+                onPost()
+            }
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
+            )
+    ) {
+        Text(text = stringResource(R.string.post_poll), color = Color.White)
+    }
+}
+
+/*@Preview
+@Composable
+fun NewPollViewPreview() {
+    NewPollView(onClose = {}, account = Account(loggedIn = Persona()))
+}*/
@@ -0,0 +1,126 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Text
+import androidx.compose.material.TextFieldDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.vitorpamplona.amethyst.R
+
+@Composable
+fun NewPollVoteValueRange(pollViewModel: NewPostViewModel) {
+    var textMax by rememberSaveable { mutableStateOf("") }
+    var textMin by rememberSaveable { mutableStateOf("") }
+
+    // check for zapMax amounts < 1
+    pollViewModel.isValidvalueMaximum.value = true
+    if (textMax.isNotEmpty()) {
+        try {
+            val int = textMax.toInt()
+            if (int < 1) {
+                pollViewModel.isValidvalueMaximum.value = false
+            } else { pollViewModel.valueMaximum = int }
+        } catch (e: Exception) { pollViewModel.isValidvalueMaximum.value = false }
+    }
+
+    // check for minZap amounts < 1
+    pollViewModel.isValidvalueMinimum.value = true
+    if (textMin.isNotEmpty()) {
+        try {
+            val int = textMin.toInt()
+            if (int < 1) {
+                pollViewModel.isValidvalueMinimum.value = false
+            } else { pollViewModel.valueMinimum = int }
+        } catch (e: Exception) { pollViewModel.isValidvalueMinimum.value = false }
+    }
+
+    // check for zapMin > zapMax
+    if (textMin.isNotEmpty() && textMax.isNotEmpty()) {
+        try {
+            val intMin = textMin.toInt()
+            val intMax = textMax.toInt()
+
+            if (intMin > intMax) {
+                pollViewModel.isValidvalueMinimum.value = false
+                pollViewModel.isValidvalueMaximum.value = false
+            }
+        } catch (e: Exception) {
+            pollViewModel.isValidvalueMinimum.value = false
+            pollViewModel.isValidvalueMaximum.value = false
+        }
+    }
+
+    val colorInValid = TextFieldDefaults.outlinedTextFieldColors(
+        focusedBorderColor = MaterialTheme.colors.error,
+        unfocusedBorderColor = Color.Red
+    )
+    val colorValid = TextFieldDefaults.outlinedTextFieldColors(
+        focusedBorderColor = MaterialTheme.colors.primary,
+        unfocusedBorderColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+    )
+
+    Row(
+        Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.Center
+    ) {
+        OutlinedTextField(
+            value = textMin,
+            onValueChange = { textMin = it },
+            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+            modifier = Modifier.width(150.dp),
+            colors = if (pollViewModel.isValidvalueMinimum.value) colorValid else colorInValid,
+            label = {
+                Text(
+                    text = stringResource(R.string.poll_zap_value_min),
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+            },
+            placeholder = {
+                Text(
+                    text = stringResource(R.string.sats),
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+            }
+        )
+        OutlinedTextField(
+            value = textMax,
+            onValueChange = { textMax = it },
+            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+            modifier = Modifier.width(150.dp),
+            colors = if (pollViewModel.isValidvalueMaximum.value) colorValid else colorInValid,
+            label = {
+                Text(
+                    text = stringResource(R.string.poll_zap_value_max),
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+            },
+            placeholder = {
+                Text(
+                    text = stringResource(R.string.sats),
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+            }
+        )
+    }
+}
+
+@Preview
+@Composable
+fun NewPollVoteValueRangePreview() {
+    NewPollVoteValueRange(NewPostViewModel())
+}
@@ -1,6 +1,8 @@
 package com.vitorpamplona.amethyst.ui.actions

 import android.widget.Toast
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
@@ -10,6 +12,8 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.MonetizationOn
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
@@ -27,6 +31,7 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 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.window.Dialog
@@ -104,8 +109,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                postViewModel.sendPost()
                                onClose()
                            },
-                            isActive = postViewModel.message.text.isNotBlank() &&
-                                !postViewModel.isUploadingImage
+                            isActive = postViewModel.canPost()
                        )
                    }

@@ -161,13 +165,55 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
                            )

+                            if (postViewModel.wantsPoll) {
+                                postViewModel.pollOptions.values.forEachIndexed { index, element ->
+                                    NewPollOption(postViewModel, index)
+                                }
+
+                                Button(
+                                    onClick = { postViewModel.pollOptions[postViewModel.pollOptions.size] = "" },
+                                    border = BorderStroke(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.32f)),
+                                    colors = ButtonDefaults.outlinedButtonColors(
+                                        contentColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                    )
+                                ) {
+                                    Image(
+                                        painterResource(id = android.R.drawable.ic_input_add),
+                                        contentDescription = "Add poll option button",
+                                        modifier = Modifier.size(18.dp)
+                                    )
+                                }
+                            }
+
+                            val user = postViewModel.account?.userProfile()
+                            val lud16 = user?.info?.lnAddress()
+
+                            if (lud16 != null && user != null && postViewModel.wantsInvoice) {
+                                Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = 5.dp)) {
+                                    InvoiceRequest(
+                                        lud16,
+                                        user.pubkeyHex,
+                                        account,
+                                        stringResource(id = R.string.lightning_invoice),
+                                        stringResource(id = R.string.lightning_create_and_add_invoice),
+                                        onSuccess = {
+                                            postViewModel.message = TextFieldValue(postViewModel.message.text + "\n\n" + it)
+                                            postViewModel.wantsInvoice = false
+                                        },
+                                        onClose = {
+                                            postViewModel.wantsInvoice = false
+                                        }
+                                    )
+                                }
+                            }
+
                            val myUrlPreview = postViewModel.urlPreview
                            if (myUrlPreview != null) {
                                Row(modifier = Modifier.padding(top = 5.dp)) {
                                    if (isValidURL(myUrlPreview)) {
                                        val removedParamsFromUrl =
                                            myUrlPreview.split("?")[0].lowercase()
-                                        if (imageExtension.matcher(removedParamsFromUrl).matches()) {
+                                        if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
                                            AsyncImage(
                                                model = myUrlPreview,
                                                contentDescription = myUrlPreview,
@@ -182,9 +228,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                                        RoundedCornerShape(15.dp)
                                                    )
                                            )
-                                        } else if (videoExtension.matcher(removedParamsFromUrl)
-                                            .matches()
-                                        ) {
+                                        } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
                                            VideoView(myUrlPreview)
                                        } else {
                                            UrlPreview(myUrlPreview, myUrlPreview)
@@ -219,11 +263,23 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                    Row(modifier = Modifier.fillMaxWidth()) {
                        UploadFromGallery(
                            isUploading = postViewModel.isUploadingImage,
-                            tint = MaterialTheme.colors.primary,
+                            tint = MaterialTheme.colors.onBackground,
                            modifier = Modifier.padding(bottom = 10.dp)
                        ) {
                            postViewModel.upload(it, context)
                        }
+
+                        if (postViewModel.canUsePoll()) {
+                            AddPollButton(postViewModel.wantsPoll) {
+                                postViewModel.wantsPoll = !postViewModel.wantsPoll
+                            }
+                        }
+
+                        if (postViewModel.canAddLnInvoice()) {
+                            AddLnInvoiceButton(postViewModel.wantsInvoice) {
+                                postViewModel.wantsInvoice = !postViewModel.wantsInvoice
+                            }
+                        }
                    }
                }
            }
@@ -231,6 +287,62 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
    }
 }

+@Composable
+private fun AddPollButton(
+    isPollActive: Boolean,
+    onClick: () -> Unit
+) {
+    IconButton(
+        onClick = {
+            onClick()
+        }
+    ) {
+        if (!isPollActive) {
+            Icon(
+                painter = painterResource(R.drawable.ic_poll),
+                null,
+                modifier = Modifier.size(20.dp),
+                tint = MaterialTheme.colors.onBackground
+            )
+        } else {
+            Icon(
+                painter = painterResource(R.drawable.ic_lists),
+                null,
+                modifier = Modifier.size(20.dp),
+                tint = MaterialTheme.colors.onBackground
+            )
+        }
+    }
+}
+
+@Composable
+private fun AddLnInvoiceButton(
+    isLnInvoiceActive: Boolean,
+    onClick: () -> Unit
+) {
+    IconButton(
+        onClick = {
+            onClick()
+        }
+    ) {
+        if (!isLnInvoiceActive) {
+            Icon(
+                imageVector = Icons.Default.MonetizationOn,
+                null,
+                modifier = Modifier.size(20.dp),
+                tint = MaterialTheme.colors.onBackground
+            )
+        } else {
+            Icon(
+                imageVector = Icons.Default.MonetizationOn,
+                null,
+                modifier = Modifier.size(20.dp),
+                tint = Color.Green.copy(alpha = 0.52f)
+            )
+        }
+    }
+}
+
@Composable
 fun CloseButton(onCancel: () -> Unit) {
    Button(
@@ -3,22 +3,28 @@ package com.vitorpamplona.amethyst.ui.actions
 import android.content.Context
 import android.net.Uri
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateMapOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshots.SnapshotStateMap
 import androidx.compose.ui.text.TextRange
 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.nip19.Nip19
+import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
+import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.ui.components.isValidURL
 import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch

-class NewPostViewModel : ViewModel() {
-    private var account: Account? = null
-    private var originalNote: Note? = null
+open class NewPostViewModel : ViewModel() {
+    var account: Account? = null
+    var originalNote: Note? = null

    var mentions by mutableStateOf<List<User>?>(null)
    var replyTos by mutableStateOf<List<Note>?>(null)
@@ -31,18 +37,42 @@ class NewPostViewModel : ViewModel() {
    var userSuggestions by mutableStateOf<List<User>>(emptyList())
    var userSuggestionAnchor: TextRange? = null

-    fun load(account: Account, replyingTo: Note?, quote: Note?) {
+    // Polls
+    var wantsPoll by mutableStateOf(false)
+    var zapRecipients = mutableStateListOf<HexKey>()
+    var pollOptions = newStateMapPollOptions()
+    var valueMaximum: Int? = null
+    var valueMinimum: Int? = null
+    var consensusThreshold: Int? = null
+    var closedAt: Int? = null
+
+    var isValidRecipients = mutableStateOf(true)
+    var isValidvalueMaximum = mutableStateOf(true)
+    var isValidvalueMinimum = mutableStateOf(true)
+    var isValidConsensusThreshold = mutableStateOf(true)
+    var isValidClosedAt = mutableStateOf(true)
+
+    // Invoices
+    var wantsInvoice by mutableStateOf(false)
+
+    open fun load(account: Account, replyingTo: Note?, quote: Note?) {
        originalNote = replyingTo
        replyingTo?.let { replyNote ->
            this.replyTos = (replyNote.replyTo ?: emptyList()).plus(replyNote)
            replyNote.author?.let { replyUser ->
-                val currentMentions = replyNote.mentions ?: emptyList()
+                val currentMentions = (replyNote.event as? TextNoteEvent)
+                    ?.mentions()
+                    ?.map { LocalCache.getOrCreateUser(it) } ?: emptyList()
+
                if (currentMentions.contains(replyUser)) {
                    this.mentions = currentMentions
                } else {
                    this.mentions = currentMentions.plus(replyUser)
                }
            }
+        } ?: {
+            replyTos = null
+            mentions = null
        }

        quote?.let {
@@ -52,79 +82,21 @@ class NewPostViewModel : ViewModel() {
        this.account = account
    }

-    fun addUserToMentions(user: User) {
-        mentions = if (mentions?.contains(user) == true) mentions else mentions?.plus(user) ?: listOf(user)
-    }
-
-    fun addNoteToReplyTos(note: Note) {
-        note.author?.let { addUserToMentions(it) }
-        replyTos = if (replyTos?.contains(note) == true) replyTos else replyTos?.plus(note) ?: listOf(note)
-    }
-
-    fun tagIndex(user: User): Int {
-        // Postr Events assembles replies before mentions in the tag order
-        return (if (originalNote?.channel() != null) 1 else 0) + (replyTos?.size ?: 0) + (mentions?.indexOf(user) ?: 0)
-    }
-
-    fun tagIndex(note: Note): Int {
-        // Postr Events assembles replies before mentions in the tag order
-        return (if (originalNote?.channel() != null) 1 else 0) + (replyTos?.indexOf(note) ?: 0)
-    }
-
    fun sendPost() {
-        // adds all references to mentions and reply tos
-        message.text.split('\n').forEach { paragraph: String ->
-            paragraph.split(' ').forEach { word: String ->
-                val results = parseDirtyWordForKey(word)
+        val tagger = NewMessageTagger(originalNote?.channel(), mentions, replyTos, message.text)
+        tagger.run()

-                if (results?.key?.type == Nip19.Type.USER) {
-                    addUserToMentions(LocalCache.getOrCreateUser(results.key.hex))
-                } else if (results?.key?.type == Nip19.Type.NOTE) {
-                    addNoteToReplyTos(LocalCache.getOrCreateNote(results.key.hex))
-                } else if (results?.key?.type == Nip19.Type.ADDRESS) {
-                    val note = LocalCache.checkGetOrCreateAddressableNote(results.key.hex)
-                    if (note != null) {
-                        addNoteToReplyTos(note)
-                    }
-                }
-            }
-        }
-
-        // Tags the text in the correct order.
-        val newMessage = message.text.split('\n').map { paragraph: String ->
-            paragraph.split(' ').map { word: String ->
-                val results = parseDirtyWordForKey(word)
-                if (results?.key?.type == Nip19.Type.USER) {
-                    val user = LocalCache.getOrCreateUser(results.key.hex)
-
-                    "#[${tagIndex(user)}]${results.restOfWord}"
-                } else if (results?.key?.type == Nip19.Type.NOTE) {
-                    val note = LocalCache.getOrCreateNote(results.key.hex)
-
-                    "#[${tagIndex(note)}]${results.restOfWord}"
-                } else if (results?.key?.type == Nip19.Type.ADDRESS) {
-                    val note = LocalCache.checkGetOrCreateAddressableNote(results.key.hex)
-                    if (note != null) {
-                        "#[${tagIndex(note)}]${results.restOfWord}"
-                    } else {
-                        word
-                    }
-                } else {
-                    word
-                }
-            }.joinToString(" ")
-        }.joinToString("\n")
-
-        if (originalNote?.channel() != null) {
-            account?.sendChannelMessage(newMessage, originalNote!!.channel()!!.idHex, originalNote!!, mentions)
+        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)
        } else {
-            account?.sendPost(newMessage, replyTos, mentions)
+            account?.sendPost(tagger.message, tagger.replyTos, tagger.mentions)
        }

-        message = TextFieldValue("")
-        urlPreview = null
-        isUploadingImage = false
-        mentions = null
+        cancel()
    }

    fun upload(it: Uri, context: Context) {
@@ -136,25 +108,39 @@ class NewPostViewModel : ViewModel() {
            onSuccess = { imageUrl ->
                isUploadingImage = false
                message = TextFieldValue(message.text + "\n\n" + imageUrl)
-                urlPreview = findUrlInMessage()
+
+                viewModelScope.launch(Dispatchers.IO) {
+                    delay(2000)
+                    urlPreview = findUrlInMessage()
+                }
            },
            onError = {
                isUploadingImage = false
                viewModelScope.launch {
-                    imageUploadingError.emit("Failed to upload the image")
+                    imageUploadingError.emit("Failed to upload the image / video")
                }
            }
        )
    }

-    fun cancel() {
+    open fun cancel() {
        message = TextFieldValue("")
        urlPreview = null
        isUploadingImage = false
        mentions = null
+
+        wantsPoll = false
+        zapRecipients = mutableStateListOf<HexKey>()
+        pollOptions = newStateMapPollOptions()
+        valueMaximum = null
+        valueMinimum = null
+        consensusThreshold = null
+        closedAt = null
+
+        wantsInvoice = false
    }

-    fun findUrlInMessage(): String? {
+    open fun findUrlInMessage(): String? {
        return message.text.split('\n').firstNotNullOfOrNull { paragraph ->
            paragraph.split(' ').firstOrNull { word: String ->
                isValidURL(word) || noProtocolUrlValidator.matcher(word).matches()
@@ -162,11 +148,11 @@ class NewPostViewModel : ViewModel() {
        }
    }

-    fun removeFromReplyList(it: User) {
+    open fun removeFromReplyList(it: User) {
        mentions = mentions?.minus(it)
    }

-    fun updateMessage(it: TextFieldValue) {
+    open fun updateMessage(it: TextFieldValue) {
        message = it
        urlPreview = findUrlInMessage()

@@ -181,11 +167,11 @@ class NewPostViewModel : ViewModel() {
        }
    }

-    fun autocompleteWithUser(item: User) {
+    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()} "
+            val wordToInsert = "@${item.pubkeyNpub()}"

            message = TextFieldValue(
                message.text.replaceRange(lastWordStart, it.end, wordToInsert),
@@ -195,4 +181,21 @@ class NewPostViewModel : ViewModel() {
            userSuggestions = emptyList()
        }
    }
+
+    private fun newStateMapPollOptions(): SnapshotStateMap<Int, String> {
+        return mutableStateMapOf(Pair(0, ""), Pair(1, ""))
+    }
+
+    fun canPost(): Boolean {
+        return message.text.isNotBlank() && !isUploadingImage && !wantsInvoice &&
+            (!wantsPoll || pollOptions.values.all { it.isNotEmpty() })
+    }
+
+    fun canUsePoll(): Boolean {
+        return originalNote?.event !is PrivateDmEvent && originalNote?.channel() == null
+    }
+
+    fun canAddLnInvoice(): Boolean {
+        return account?.userProfile()?.info?.lnAddress() != null
+    }
 }
@@ -150,27 +150,27 @@ fun ServerConfigHeader() {

            Column(Modifier.weight(1.4f)) {
                Row(verticalAlignment = Alignment.CenterVertically) {
-                    Spacer(modifier = Modifier.size(25.dp))
+                    Spacer(modifier = Modifier.size(30.dp))

                    Text(
-                        text = stringResource(R.string.posts),
+                        text = stringResource(R.string.bytes),
                        maxLines = 1,
                        fontSize = 14.sp,
-                        modifier = Modifier.weight(1f),
+                        modifier = Modifier.weight(1.2f),
                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                    )

-                    Spacer(modifier = Modifier.size(10.dp))
+                    Spacer(modifier = Modifier.size(5.dp))

                    Text(
-                        text = stringResource(id = R.string.posts),
+                        text = stringResource(id = R.string.bytes),
                        maxLines = 1,
                        fontSize = 14.sp,
-                        modifier = Modifier.weight(1f),
+                        modifier = Modifier.weight(1.2f),
                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                    )

-                    Spacer(modifier = Modifier.size(10.dp))
+                    Spacer(modifier = Modifier.size(5.dp))

                    Text(
                        text = stringResource(R.string.errors),
@@ -371,10 +371,10 @@ fun ServerConfig(
                            }

                            Text(
-                                text = "${countToHumanReadable(item.downloadCount)}",
+                                text = "${countToHumanReadable(item.downloadCountInBytes)}",
                                maxLines = 1,
-                                fontSize = 14.sp,
-                                modifier = Modifier.weight(1f),
+                                fontSize = 12.sp,
+                                modifier = Modifier.weight(1.2f),
                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                            )

@@ -399,10 +399,10 @@ fun ServerConfig(
                            }

                            Text(
-                                text = "${countToHumanReadable(item.uploadCount)}",
+                                text = "${countToHumanReadable(item.uploadCountInBytes)}",
                                maxLines = 1,
-                                fontSize = 14.sp,
-                                modifier = Modifier.weight(1f),
+                                fontSize = 12.sp,
+                                modifier = Modifier.weight(1.2f),
                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                            )

@@ -418,7 +418,7 @@ fun ServerConfig(
                            Text(
                                text = "${countToHumanReadable(item.errorCount)}",
                                maxLines = 1,
-                                fontSize = 14.sp,
+                                fontSize = 12.sp,
                                modifier = Modifier.weight(1f),
                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                            )
@@ -433,7 +433,7 @@ fun ServerConfig(
                            Text(
                                text = "${countToHumanReadable(item.spamCount)}",
                                maxLines = 1,
-                                fontSize = 14.sp,
+                                fontSize = 12.sp,
                                modifier = Modifier.weight(1f),
                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                            )
@@ -32,7 +32,7 @@ class NewRelayListViewModel : ViewModel() {

    fun clear() {
        _relays.update {
-            var relayFile = account.userProfile().relays
+            var relayFile = account.userProfile().latestContactList?.relays()

            // Ugly, but forces nostr.band as the only search-supporting relay today.
            // TODO: Remove when search becomes more available.
@@ -49,23 +49,23 @@ class NewRelayListViewModel : ViewModel() {
                    val localInfoFeedTypes = account.localRelays.filter { localRelay -> localRelay.url == it.key }.firstOrNull()?.feedTypes ?: FeedType.values().toSet()

                    val errorCounter = liveRelay?.errorCounter ?: 0
-                    val eventDownloadCounter = liveRelay?.eventDownloadCounter ?: 0
-                    val eventUploadCounter = liveRelay?.eventUploadCounter ?: 0
+                    val eventDownloadCounter = liveRelay?.eventDownloadCounterInBytes ?: 0
+                    val eventUploadCounter = liveRelay?.eventUploadCounterInBytes ?: 0
                    val spamCounter = liveRelay?.spamCounter ?: 0

                    RelaySetupInfo(it.key, it.value.read, it.value.write, errorCounter, eventDownloadCounter, eventUploadCounter, spamCounter, localInfoFeedTypes)
-                }.sortedBy { it.downloadCount }.reversed()
+                }.sortedBy { it.downloadCountInBytes }.reversed()
            } else {
                account.localRelays.map {
                    val liveRelay = RelayPool.getRelay(it.url)

                    val errorCounter = liveRelay?.errorCounter ?: 0
-                    val eventDownloadCounter = liveRelay?.eventDownloadCounter ?: 0
-                    val eventUploadCounter = liveRelay?.eventUploadCounter ?: 0
+                    val eventDownloadCounter = liveRelay?.eventDownloadCounterInBytes ?: 0
+                    val eventUploadCounter = liveRelay?.eventUploadCounterInBytes ?: 0
                    val spamCounter = liveRelay?.spamCounter ?: 0

                    RelaySetupInfo(it.url, it.read, it.write, errorCounter, eventDownloadCounter, eventUploadCounter, spamCounter, it.feedTypes)
-                }.sortedBy { it.downloadCount }.reversed()
+                }.sortedBy { it.downloadCountInBytes }.reversed()
            }
        }
    }
@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.actions

+import android.widget.Toast
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -18,6 +19,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+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
@@ -30,9 +32,14 @@ import com.vitorpamplona.amethyst.model.Account
@Composable
 fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
    val postViewModel: NewUserMetadataViewModel = viewModel()
+    val context = LocalContext.current

    LaunchedEffect(Unit) {
        postViewModel.load(account)
+
+        postViewModel.imageUploadingError.collect { error ->
+            Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
+        }
    }

    Dialog(
@@ -141,6 +148,15 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                            )
                        },
+                        leadingIcon = {
+                            UploadFromGallery(
+                                isUploading = postViewModel.isUploadingImageForPicture,
+                                tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                                modifier = Modifier.padding(start = 5.dp)
+                            ) {
+                                postViewModel.uploadForPicture(it, context)
+                            }
+                        },
                        singleLine = true
                    )

@@ -157,6 +173,15 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                            )
                        },
+                        leadingIcon = {
+                            UploadFromGallery(
+                                isUploading = postViewModel.isUploadingImageForBanner,
+                                tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                                modifier = Modifier.padding(start = 5.dp)
+                            ) {
+                                postViewModel.uploadForBanner(it, context)
+                            }
+                        },
                        singleLine = true
                    )

@@ -1,13 +1,20 @@
 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.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.node.ObjectNode
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.model.GitHubIdentity
 import com.vitorpamplona.amethyst.service.model.MastodonIdentity
 import com.vitorpamplona.amethyst.service.model.TwitterIdentity
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.launch
 import java.io.ByteArrayInputStream
 import java.io.StringWriter

@@ -30,6 +37,10 @@ class NewUserMetadataViewModel : ViewModel() {
    val github = mutableStateOf("")
    val mastodon = mutableStateOf("")

+    var isUploadingImageForPicture by mutableStateOf(false)
+    var isUploadingImageForBanner by mutableStateOf(false)
+    val imageUploadingError = MutableSharedFlow<String?>()
+
    fun load(account: Account) {
        this.account = account

@@ -127,4 +138,49 @@ class NewUserMetadataViewModel : ViewModel() {
        github.value = ""
        mastodon.value = ""
    }
+
+    fun uploadForPicture(uri: Uri, context: Context) {
+        upload(
+            uri,
+            context,
+            onUploading = {
+                isUploadingImageForPicture = it
+            },
+            onUploaded = {
+                picture.value = it
+            }
+        )
+    }
+
+    fun uploadForBanner(uri: Uri, context: Context) {
+        upload(
+            uri,
+            context,
+            onUploading = {
+                isUploadingImageForBanner = it
+            },
+            onUploaded = {
+                banner.value = it
+            }
+        )
+    }
+
+    fun upload(it: Uri, context: Context, onUploading: (Boolean) -> Unit, onUploaded: (String) -> Unit) {
+        onUploading(true)
+
+        ImageUploader.uploadImage(
+            uri = it,
+            contentResolver = context.contentResolver,
+            onSuccess = { imageUrl ->
+                onUploading(false)
+                onUploaded(imageUrl)
+            },
+            onError = {
+                onUploading(false)
+                viewModelScope.launch {
+                    imageUploadingError.emit("Failed to upload the image / video")
+                }
+            }
+        )
+    }
 }
@@ -3,7 +3,6 @@ package com.vitorpamplona.amethyst.ui.actions
 import android.net.Uri
 import android.os.Build
 import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.core.LinearEasing
 import androidx.compose.animation.core.animateFloat
 import androidx.compose.animation.core.infiniteRepeatable
@@ -28,6 +27,7 @@ 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.ui.GetMediaActivityResultContract
 import java.util.concurrent.atomic.AtomicBoolean

@OptIn(ExperimentalPermissionsApi::class)
@@ -150,7 +150,7 @@ fun GallerySelect(
 ) {
    var hasLaunched by remember { mutableStateOf(AtomicBoolean(false)) }
    val launcher = rememberLauncherForActivityResult(
-        contract = ActivityResultContracts.GetContent(),
+        contract = GetMediaActivityResultContract(),
        onResult = { uri: Uri? ->
            onImageUri(uri)
            hasLaunched.set(false)
@@ -161,7 +161,7 @@ fun GallerySelect(
    fun LaunchGallery() {
        SideEffect {
            if (!hasLaunched.getAndSet(true)) {
-                launcher.launch("image/*")
+                launcher.launch("*/*")
            }
        }
    }
@@ -0,0 +1,97 @@
+package com.vitorpamplona.amethyst.ui.buttons
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedButton
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+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) {
+    var isOpen by remember {
+        mutableStateOf(false)
+    }
+    var wantsToPoll by remember {
+        mutableStateOf(false)
+    }
+    var wantsToPost by remember {
+        mutableStateOf(false)
+    }
+
+    Column() {
+        if (isOpen) {
+            OutlinedButton(
+                onClick = {
+                    wantsToPoll = true
+                    isOpen = false
+                },
+                modifier = Modifier.size(45.dp),
+                shape = CircleShape,
+                colors = ButtonDefaults.outlinedButtonColors(backgroundColor = MaterialTheme.colors.primary),
+                contentPadding = PaddingValues(0.dp)
+            ) {
+                Icon(
+                    painter = painterResource(R.drawable.ic_poll),
+                    null,
+                    modifier = Modifier.size(26.dp),
+                    tint = Color.White
+                )
+            }
+
+            Spacer(modifier = Modifier.height(20.dp))
+
+            OutlinedButton(
+                onClick = {
+                    wantsToPost = true
+                    isOpen = false
+                },
+                modifier = Modifier.size(45.dp),
+                shape = CircleShape,
+                colors = ButtonDefaults.outlinedButtonColors(backgroundColor = MaterialTheme.colors.primary),
+                contentPadding = PaddingValues(0.dp)
+            ) {
+                Icon(
+                    painter = painterResource(R.drawable.ic_lists),
+                    null,
+                    modifier = Modifier.size(26.dp),
+                    tint = Color.White
+                )
+            }
+
+            Spacer(modifier = Modifier.height(20.dp))
+        }
+        OutlinedButton(
+            onClick = { isOpen = !isOpen },
+            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
+            )
+        }
+    }
+
+    if (wantsToPost) {
+        NewPostView({ wantsToPost = false }, account = NostrAccountDataSource.account)
+    }
+
+    if (wantsToPoll) {
+        NewPollView({ wantsToPoll = false }, account = account)
+    }
+}
@@ -1,4 +1,4 @@
-package com.vitorpamplona.amethyst.buttons
+package com.vitorpamplona.amethyst.ui.buttons

 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.size
@@ -0,0 +1,46 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.util.concurrent.atomic.AtomicBoolean
+
+/**
+ * This class is designed to have a waiting time between two calls of invalidate
+ */
+class BundledUpdate(
+    val delay: Long,
+    val dispatcher: CoroutineDispatcher = Dispatchers.Default,
+    val onUpdate: () -> Unit
+) {
+    private var onlyOneInBlock = AtomicBoolean()
+    private var invalidatesAgain = false
+
+    fun invalidate() {
+        if (onlyOneInBlock.getAndSet(true)) {
+            invalidatesAgain = true
+            return
+        }
+
+        val scope = CoroutineScope(Job() + dispatcher)
+        scope.launch {
+            try {
+                onUpdate()
+                delay(delay)
+                if (invalidatesAgain) {
+                    onUpdate()
+                }
+            } finally {
+                withContext(NonCancellable) {
+                    invalidatesAgain = false
+                    onlyOneInBlock.set(false)
+                }
+            }
+        }
+    }
+}
@@ -15,7 +15,7 @@ fun ClickableNoteTag(
    navController: NavController
 ) {
    ClickableText(
-        text = AnnotatedString("@${baesNote.idNote().toShortenHex()} "),
+        text = AnnotatedString("@${baesNote.idNote().toShortenHex()}"),
        onClick = { navController.navigate("Note/${baesNote.idHex}") },
        style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
    )
@@ -7,10 +7,12 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.withStyle
 import androidx.navigation.NavController
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.nip19.Nip19

@Composable
@@ -24,58 +26,72 @@ fun ClickableRoute(
        val userState by userBase.live().metadata.observeAsState()
        val user = userState?.user ?: return

-        val route = "User/${nip19.hex}"
-        val text = user.toBestDisplayName()
-
-        ClickableText(
-            text = AnnotatedString("@$text "),
-            onClick = { navController.navigate(route) },
-            style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
-        )
+        CreateClickableText(user.toBestDisplayName(), nip19.additionalChars, "User/${nip19.hex}", navController)
    } else if (nip19.type == Nip19.Type.ADDRESS) {
        val noteBase = LocalCache.checkGetOrCreateAddressableNote(nip19.hex)

        if (noteBase == null) {
            Text(
-                "@${nip19.hex} "
+                "@${nip19.hex}${nip19.additionalChars} "
            )
        } else {
            val noteState by noteBase.live().metadata.observeAsState()
            val note = noteState?.note ?: return

-            ClickableText(
-                text = AnnotatedString("@${note.idDisplayNote()} "),
-                onClick = { navController.navigate("Note/${nip19.hex}") },
-                style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
-            )
+            CreateClickableText(note.idDisplayNote(), nip19.additionalChars, "Note/${nip19.hex}", navController)
        }
    } else if (nip19.type == Nip19.Type.NOTE) {
        val noteBase = LocalCache.getOrCreateNote(nip19.hex)
        val noteState by noteBase.live().metadata.observeAsState()
        val note = noteState?.note ?: return
+        val channel = note.channel()

        if (note.event is ChannelCreateEvent) {
-            ClickableText(
-                text = AnnotatedString("@${note.idDisplayNote()} "),
-                onClick = { navController.navigate("Channel/${nip19.hex}") },
-                style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
-            )
-        } else if (note.channel() != null) {
-            ClickableText(
-                text = AnnotatedString("@${note.channel()?.toBestDisplayName()} "),
-                onClick = { navController.navigate("Channel/${note.channel()?.idHex}") },
-                style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
-            )
+            CreateClickableText(note.idDisplayNote(), nip19.additionalChars, "Channel/${nip19.hex}", navController)
+        } else if (note.event is PrivateDmEvent) {
+            CreateClickableText(note.idDisplayNote(), nip19.additionalChars, "Room/${note.author?.pubkeyHex}", navController)
+        } else if (channel != null) {
+            CreateClickableText(channel.toBestDisplayName(), nip19.additionalChars, "Channel/${note.channel()?.idHex}", navController)
        } else {
-            ClickableText(
-                text = AnnotatedString("@${note.idDisplayNote()} "),
-                onClick = { navController.navigate("Note/${nip19.hex}") },
-                style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
-            )
+            CreateClickableText(note.idDisplayNote(), nip19.additionalChars, "Note/${nip19.hex}", navController)
+        }
+    } else if (nip19.type == Nip19.Type.EVENT) {
+        val noteBase = LocalCache.getOrCreateNote(nip19.hex)
+        val noteState by noteBase.live().metadata.observeAsState()
+        val note = noteState?.note ?: return
+        val channel = note.channel()
+
+        if (note.event is ChannelCreateEvent) {
+            CreateClickableText(note.idDisplayNote(), nip19.additionalChars, "Channel/${nip19.hex}", navController)
+        } else if (note.event is PrivateDmEvent) {
+            CreateClickableText(note.idDisplayNote(), nip19.additionalChars, "Room/${note.author?.pubkeyHex}", navController)
+        } else if (channel != null) {
+            CreateClickableText(channel.toBestDisplayName(), nip19.additionalChars, "Channel/${note.channel()?.idHex}", navController)
+        } else {
+            CreateClickableText(note.idDisplayNote(), nip19.additionalChars, "Event/${nip19.hex}", navController)
        }
    } else {
        Text(
-            "@${nip19.hex} "
+            "@${nip19.hex}${nip19.additionalChars} "
        )
    }
 }
+
+@Composable
+fun CreateClickableText(clickablePart: String, suffix: String, route: String, navController: NavController) {
+    ClickableText(
+        text = buildAnnotatedString {
+            withStyle(
+                LocalTextStyle.current.copy(color = MaterialTheme.colors.primary).toSpanStyle()
+            ) {
+                append("@$clickablePart")
+            }
+            withStyle(
+                LocalTextStyle.current.copy(color = MaterialTheme.colors.onBackground).toSpanStyle()
+            ) {
+                append("$suffix ")
+            }
+        },
+        onClick = { navController.navigate(route) }
+    )
+}
@@ -12,7 +12,7 @@ fun ClickableUrl(urlText: String, url: String) {
    val uri = LocalUriHandler.current

    ClickableText(
-        text = AnnotatedString("$urlText "),
+        text = AnnotatedString(urlText),
        onClick = { runCatching { uri.openUri(url) } },
        style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
    )
@@ -17,7 +17,7 @@ fun ClickableUserTag(
 ) {
    val innerUserState by user.live().metadata.observeAsState()
    ClickableText(
-        text = AnnotatedString("@${innerUserState?.user?.toBestDisplayName()} "),
+        text = AnnotatedString("@${innerUserState?.user?.toBestDisplayName()}"),
        onClick = { navController.navigate("User/${innerUserState?.user?.pubkeyHex}") },
        style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
    )
@@ -0,0 +1,27 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import android.content.Intent
+import android.net.Uri
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.AnnotatedString
+import androidx.core.content.ContextCompat
+
+@Composable
+fun ClickableWithdrawal(withdrawalString: String) {
+    val context = LocalContext.current
+
+    ClickableText(
+        text = AnnotatedString("$withdrawalString "),
+        onClick = {
+            runCatching {
+                val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$withdrawalString"))
+                ContextCompat.startActivity(context, intent, null)
+            }
+        },
+        style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
+    )
+}
@@ -26,7 +26,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel

 const val SHORT_TEXT_LENGTH = 350
@@ -43,35 +42,35 @@ fun ExpandableRichTextViewer(
 ) {
    var showFullText by remember { mutableStateOf(false) }

+    // Cuts the text in the first space after 350
+    val firstSpaceAfterCut = content.indexOf(' ', SHORT_TEXT_LENGTH).let { if (it < 0) content.length else it }
+    val firstNewLineAfterCut = content.indexOf('\n', SHORT_TEXT_LENGTH).let { if (it < 0) content.length else it }
+
+    val whereToCut = minOf(firstSpaceAfterCut, firstNewLineAfterCut)
+
    val text = if (showFullText) {
        content
    } else {
-        val (lnStart, lnEnd) = LnInvoiceUtil.locateInvoice(content)
-        if (lnStart < SHORT_TEXT_LENGTH && lnEnd > 0) {
-            content.take(lnEnd)
-        } else {
-            content.take(SHORT_TEXT_LENGTH)
-        }
+        content.take(whereToCut)
    }

-    Box(contentAlignment = Alignment.BottomCenter) {
-        // CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Rtl) {
+    Box {
        RichTextViewer(
            text,
            canPreview,
-            modifier,
+            modifier.align(Alignment.TopStart),
            tags,
            backgroundColor,
            accountViewModel,
            navController
        )
-        // }

-        if (content.length > 350 && !showFullText) {
+        if (content.length > whereToCut && !showFullText) {
            Row(
                verticalAlignment = Alignment.CenterVertically,
                horizontalArrangement = Arrangement.Center,
                modifier = Modifier
+                    .align(Alignment.BottomCenter)
                    .fillMaxWidth()
                    .background(
                        brush = Brush.verticalGradient(
@@ -1,7 +1,5 @@
 package com.vitorpamplona.amethyst.ui.components

-import android.content.Intent
-import android.net.Uri
 import android.widget.Toast
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Column
@@ -36,14 +34,21 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.core.content.ContextCompat.startActivity
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
 import kotlinx.coroutines.launch

@Composable
-fun InvoiceRequest(lud16: String, toUserPubKeyHex: String, account: Account, onClose: () -> Unit) {
+fun InvoiceRequest(
+    lud16: String,
+    toUserPubKeyHex: String,
+    account: Account,
+    titleText: String? = null,
+    buttonText: String? = null,
+    onSuccess: (String) -> Unit,
+    onClose: () -> Unit
+) {
    val context = LocalContext.current
    val scope = rememberCoroutineScope()

@@ -73,7 +78,7 @@ fun InvoiceRequest(lud16: String, toUserPubKeyHex: String, account: Account, onC
                )

                Text(
-                    text = stringResource(R.string.lightning_tips),
+                    text = titleText ?: stringResource(R.string.lightning_tips),
                    fontSize = 20.sp,
                    fontWeight = FontWeight.W500,
                    modifier = Modifier.padding(start = 10.dp)
@@ -130,25 +135,21 @@ fun InvoiceRequest(lud16: String, toUserPubKeyHex: String, account: Account, onC
            Button(
                modifier = Modifier.fillMaxWidth().padding(vertical = 10.dp),
                onClick = {
-                    val zapRequest = account.createZapRequestFor(toUserPubKeyHex)
+                    val zapRequest = account.createZapRequestFor(toUserPubKeyHex, message)

                    LightningAddressResolver().lnAddressInvoice(
                        lud16,
                        amount * 1000,
                        message,
                        zapRequest?.toJson(),
-                        onSuccess = {
-                            runCatching {
-                                val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$it"))
-                                startActivity(context, intent, null)
-                            }
-                            onClose()
-                        },
+                        onSuccess = onSuccess,
                        onError = {
                            scope.launch {
                                Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
                                onClose()
                            }
+                        },
+                        onProgress = {
                        }
                    )
                },
@@ -157,7 +158,7 @@ fun InvoiceRequest(lud16: String, toUserPubKeyHex: String, account: Account, onC
                    backgroundColor = MaterialTheme.colors.primary
                )
            ) {
-                Text(text = stringResource(R.string.send_sats), color = Color.White, fontSize = 20.sp)
+                Text(text = buttonText ?: stringResource(R.string.send_sats), color = Color.White, fontSize = 20.sp)
            }
        }
    }
@@ -1,24 +1,26 @@
 package com.vitorpamplona.amethyst.ui.components

+import android.util.Log
 import android.util.Patterns
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.foundation.text.InlineTextContent
+import androidx.compose.foundation.text.appendInlineContent
+import androidx.compose.material.Icon
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.livedata.observeAsState
 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.text.SpanStyle
-import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.style.TextDirection
@@ -32,7 +34,9 @@ import com.halilibo.richtext.ui.RichTextStyle
 import com.halilibo.richtext.ui.material.MaterialRichText
 import com.halilibo.richtext.ui.resolveDefaults
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.checkForHashtagWithIcon
 import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
+import com.vitorpamplona.amethyst.service.lnurl.LnWithdrawalUtil
 import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
@@ -41,13 +45,16 @@ import java.net.URISyntaxException
 import java.net.URL
 import java.util.regex.Pattern

-val imageExtension = Pattern.compile("(.*/)*.+\\.(png|jpg|gif|bmp|jpeg|webp|svg)$")
-val videoExtension = Pattern.compile("(.*/)*.+\\.(mp4|avi|wmv|mpg|amv|webm|mov)$")
-val noProtocolUrlValidator = Pattern.compile("^[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b(?:[-a-zA-Z0-9()@:%_\\+.~#?&//=]*)$")
-val tagIndex = Pattern.compile(".*\\#\\[([0-9]+)\\].*")
+val imageExtensions = listOf("png", "jpg", "gif", "bmp", "jpeg", "webp", "svg")
+val videoExtensions = listOf("mp4", "avi", "wmv", "mpg", "amv", "webm", "mov")

-val mentionsPattern: Pattern = Pattern.compile("@([A-Za-z0-9_-]+)")
-val hashTagsPattern: Pattern = Pattern.compile("#([A-Za-z0-9_-]+)")
+// Group 1 = url, group 4 additional chars
+val noProtocolUrlValidator = Pattern.compile("(([\\w\\d-]+\\.)*[a-zA-Z][\\w-]+[\\.\\:]\\w+([\\/\\?\\=\\&\\#\\.]?[\\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 urlPattern: Pattern = Patterns.WEB_URL

 fun isValidURL(url: String?): Boolean {
@@ -61,6 +68,8 @@ fun isValidURL(url: String?): Boolean {
    }
 }

+val richTextDefaults = RichTextStyle().resolveDefaults()
+
@Composable
 fun RichTextViewer(
    content: String,
@@ -71,8 +80,8 @@ fun RichTextViewer(
    accountViewModel: AccountViewModel,
    navController: NavController
 ) {
-    val myMarkDownStyle = RichTextStyle().resolveDefaults().copy(
-        codeBlockStyle = RichTextStyle().resolveDefaults().codeBlockStyle?.copy(
+    val myMarkDownStyle = richTextDefaults.copy(
+        codeBlockStyle = richTextDefaults.codeBlockStyle?.copy(
            textStyle = TextStyle(
                fontFamily = FontFamily.Monospace,
                fontSize = 14.sp
@@ -86,9 +95,13 @@ fun RichTextViewer(
                    MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
                    RoundedCornerShape(15.dp)
                )
-                .background(MaterialTheme.colors.onSurface.copy(alpha = 0.05f).compositeOver(backgroundColor))
+                .background(
+                    MaterialTheme.colors.onSurface
+                        .copy(alpha = 0.05f)
+                        .compositeOver(backgroundColor)
+                )
        ),
-        stringStyle = RichTextStyle().resolveDefaults().stringStyle?.copy(
+        stringStyle = richTextDefaults.stringStyle?.copy(
            linkStyle = SpanStyle(
                textDecoration = TextDecoration.Underline,
                color = MaterialTheme.colors.primary
@@ -117,6 +130,23 @@ fun RichTextViewer(
                )
            }
        } else {
+            val imagesForPager = mutableListOf<String>()
+
+            content.split('\n').forEach { paragraph ->
+                paragraph.split(' ').forEach { word: String ->
+                    // sequence of images will render in a slideview
+                    if (isValidURL(word)) {
+                        val removedParamsFromUrl = word.split("?")[0].lowercase()
+                        if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
+                            imagesForPager.add(word)
+                        }
+                        if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
+                            imagesForPager.add(word)
+                        }
+                    }
+                }
+            }
+
            // FlowRow doesn't work well with paragraphs. So we need to split them
            content.split('\n').forEach { paragraph ->
                FlowRow() {
@@ -124,28 +154,73 @@ fun RichTextViewer(
                    s.forEach { word: String ->
                        if (canPreview) {
                            // Explicit URL
-                            val lnInvoice = LnInvoiceUtil.findInvoice(word)
-                            if (lnInvoice != null) {
-                                InvoicePreview(lnInvoice)
-                            } else if (isValidURL(word)) {
+                            if (isValidURL(word)) {
                                val removedParamsFromUrl = word.split("?")[0].lowercase()
-                                if (imageExtension.matcher(removedParamsFromUrl).matches()) {
-                                    ZoomableImageView(word)
-                                } else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
-                                    VideoView(word)
+                                if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
+                                    ZoomableImageView(word, imagesForPager)
+                                } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
+                                    ZoomableImageView(word, imagesForPager)
                                } else {
-                                    UrlPreview(word, word)
+                                    UrlPreview(word, "$word ")
+                                }
+                            } else if (word.startsWith("lnbc", true)) {
+                                val lnInvoice = LnInvoiceUtil.findInvoice(word)
+                                if (lnInvoice != null) {
+                                    InvoicePreview(lnInvoice)
+                                } else {
+                                    Text(
+                                        text = "$word ",
+                                        style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+                                    )
+                                }
+                            } else if (word.startsWith("lnurl", true)) {
+                                val lnWithdrawal = LnWithdrawalUtil.findWithdrawal(word)
+                                if (lnWithdrawal != null) {
+                                    ClickableWithdrawal(withdrawalString = lnWithdrawal)
+                                } else {
+                                    Text(
+                                        text = "$word ",
+                                        style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+                                    )
                                }
                            } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
                                ClickableEmail(word)
-                            } else if (Patterns.PHONE.matcher(word).matches() && word.length > 6) {
+                            } else if (word.length > 6 && Patterns.PHONE.matcher(word).matches()) {
                                ClickablePhone(word)
-                            } else if (noProtocolUrlValidator.matcher(word).matches()) {
-                                UrlPreview("https://$word", word)
-                            } else if (tagIndex.matcher(word).matches() && tags != null) {
-                                TagLink(word, tags, canPreview, backgroundColor, accountViewModel, navController)
                            } else if (isBechLink(word)) {
-                                BechLink(word, navController)
+                                BechLink(
+                                    word,
+                                    canPreview,
+                                    backgroundColor,
+                                    accountViewModel,
+                                    navController
+                                )
+                            } else if (word.startsWith("#")) {
+                                if (tagIndex.matcher(word).matches() && tags != null) {
+                                    TagLink(
+                                        word,
+                                        tags,
+                                        canPreview,
+                                        backgroundColor,
+                                        accountViewModel,
+                                        navController
+                                    )
+                                } else if (hashTagsPattern.matcher(word).matches()) {
+                                    HashTag(word, accountViewModel, navController)
+                                } else {
+                                    Text(
+                                        text = "$word ",
+                                        style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+                                    )
+                                }
+                            } else if (noProtocolUrlValidator.matcher(word).matches()) {
+                                val matcher = noProtocolUrlValidator.matcher(word)
+                                matcher.find()
+                                val url = matcher.group(1) // url
+                                val additionalChars = matcher.group(4) ?: "" // additional chars
+
+                                ClickableUrl(url, "https://$url")
+                                Text("$additionalChars ")
                            } else {
                                Text(
                                    text = "$word ",
@@ -155,16 +230,54 @@ fun RichTextViewer(
                        } else {
                            if (isValidURL(word)) {
                                ClickableUrl("$word ", word)
+                            } else if (word.startsWith("lnurl", true)) {
+                                val lnWithdrawal = LnWithdrawalUtil.findWithdrawal(word)
+                                if (lnWithdrawal != null) {
+                                    ClickableWithdrawal(withdrawalString = lnWithdrawal)
+                                } else {
+                                    Text(
+                                        text = "$word ",
+                                        style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+                                    )
+                                }
                            } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
                                ClickableEmail(word)
                            } else if (Patterns.PHONE.matcher(word).matches() && word.length > 6) {
                                ClickablePhone(word)
-                            } else if (noProtocolUrlValidator.matcher(word).matches()) {
-                                ClickableUrl(word, "https://$word")
-                            } else if (tagIndex.matcher(word).matches() && tags != null) {
-                                TagLink(word, tags, canPreview, backgroundColor, accountViewModel, navController)
                            } else if (isBechLink(word)) {
-                                BechLink(word, navController)
+                                BechLink(
+                                    word,
+                                    canPreview,
+                                    backgroundColor,
+                                    accountViewModel,
+                                    navController
+                                )
+                            } else if (word.startsWith("#")) {
+                                if (tagIndex.matcher(word).matches() && tags != null) {
+                                    TagLink(
+                                        word,
+                                        tags,
+                                        canPreview,
+                                        backgroundColor,
+                                        accountViewModel,
+                                        navController
+                                    )
+                                } else if (hashTagsPattern.matcher(word).matches()) {
+                                    HashTag(word, accountViewModel, navController)
+                                } else {
+                                    Text(
+                                        text = "$word ",
+                                        style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+                                    )
+                                }
+                            } else if (noProtocolUrlValidator.matcher(word).matches()) {
+                                val matcher = noProtocolUrlValidator.matcher(word)
+                                matcher.find()
+                                val url = matcher.group(1) // url
+                                val additionalChars = matcher.group(4) ?: "" // additional chars
+
+                                ClickableUrl(url, "https://$url")
+                                Text("$additionalChars ")
                            } else {
                                Text(
                                    text = "$word ",
@@ -184,31 +297,117 @@ private fun isArabic(text: String): Boolean {
 }

 fun isBechLink(word: String): Boolean {
-    val cleaned = word.removePrefix("@").removePrefix("nostr:").removePrefix("@")
+    val cleaned = word.lowercase().removePrefix("@").removePrefix("nostr:").removePrefix("@").take(7)

-    return listOf("npub1", "naddr1", "note1", "nprofile1", "nevent1").any { cleaned.startsWith(it, true) }
+    return listOf("npub1", "naddr1", "note1", "nprofile1", "nevent1").any { cleaned.startsWith(it) }
 }

@Composable
-fun BechLink(word: String, navController: NavController) {
-    val uri = if (word.startsWith("nostr", true)) {
-        word
-    } else if (word.startsWith("@")) {
-        word.replaceFirst("@", "nostr:")
-    } else {
-        "nostr:$word"
-    }
-
-    val nip19Route = try {
-        Nip19.uriToRoute(uri)
-    } catch (e: Exception) {
-        null
-    }
+fun BechLink(word: String, canPreview: Boolean, backgroundColor: Color, accountViewModel: AccountViewModel, navController: NavController) {
+    val nip19Route = Nip19.uriToRoute(word)

    if (nip19Route == null) {
        Text(text = "$word ")
    } else {
-        ClickableRoute(nip19Route, navController)
+        if (nip19Route.type == Nip19.Type.NOTE || nip19Route.type == Nip19.Type.EVENT || nip19Route.type == Nip19.Type.ADDRESS) {
+            val note = LocalCache.checkGetOrCreateNote(nip19Route.hex)
+            if (note != null) {
+                if (canPreview) {
+                    NoteCompose(
+                        baseNote = note,
+                        accountViewModel = accountViewModel,
+                        modifier = Modifier
+                            .padding(top = 2.dp, bottom = 0.dp, start = 0.dp, end = 0.dp)
+                            .fillMaxWidth()
+                            .clip(shape = RoundedCornerShape(15.dp))
+                            .border(
+                                1.dp,
+                                MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
+                                RoundedCornerShape(15.dp)
+                            ),
+                        parentBackgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.05f)
+                            .compositeOver(backgroundColor),
+                        isQuotedNote = true,
+                        navController = navController
+                    )
+                } else {
+                    ClickableRoute(nip19Route, navController)
+                }
+            } else {
+                ClickableRoute(nip19Route, navController)
+            }
+        } else {
+            ClickableRoute(nip19Route, navController)
+        }
+    }
+}
+
+@Composable
+fun HashTag(word: String, accountViewModel: AccountViewModel, navController: NavController) {
+    val hashtagMatcher = hashTagsPattern.matcher(word)
+
+    val (tag, suffix) = try {
+        hashtagMatcher.find()
+        Pair(hashtagMatcher.group(1), hashtagMatcher.group(2))
+    } catch (e: Exception) {
+        Log.e("Hashtag Parser", "Couldn't link hashtag $word", e)
+        Pair(null, null)
+    }
+
+    if (tag != null) {
+        val hashtagIcon = checkForHashtagWithIcon(tag)
+        ClickableText(
+            text = buildAnnotatedString {
+                withStyle(
+                    LocalTextStyle.current.copy(color = MaterialTheme.colors.primary).toSpanStyle()
+                ) {
+                    append("#$tag")
+                }
+            },
+            onClick = { navController.navigate("Hashtag/$tag") }
+        )
+
+        if (hashtagIcon != null) {
+            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
+                        )
+                    ) {
+                        if (hashtagIcon != null) {
+                            Icon(
+                                painter = painterResource(hashtagIcon.icon),
+                                contentDescription = hashtagIcon.description,
+                                tint = hashtagIcon.color,
+                                modifier = hashtagIcon.modifier
+                            )
+                        }
+                    }
+                )
+            )
+
+            // Empty Text for Size of Icon
+            Text(
+                text = emptytext,
+                inlineContent = inlineContent
+            )
+        }
+        Text(text = "$suffix ")
+    } else {
+        Text(text = "$word ")
    }
 }

@@ -216,12 +415,12 @@ fun BechLink(word: String, navController: NavController) {
 fun TagLink(word: String, tags: List<List<String>>, canPreview: Boolean, backgroundColor: Color, accountViewModel: AccountViewModel, navController: NavController) {
    val matcher = tagIndex.matcher(word)

-    val index = try {
+    val (index, extraCharacters) = try {
        matcher.find()
-        matcher.group(1)?.toInt()
+        Pair(matcher.group(1)?.toInt(), matcher.group(2) ?: "")
    } catch (e: Exception) {
-        println("Couldn't link tag $word")
-        null
+        Log.w("Tag Parser", "Couldn't link tag $word", e)
+        Pair(null, null)
    }

    if (index == null) {
@@ -232,13 +431,8 @@ fun TagLink(word: String, tags: List<List<String>>, canPreview: Boolean, backgro
        if (tags[index][0] == "p") {
            val baseUser = LocalCache.checkGetOrCreateUser(tags[index][1])
            if (baseUser != null) {
-                val userState = baseUser.live().metadata.observeAsState()
-                val user = userState.value?.user
-                if (user != null) {
-                    ClickableUserTag(user, navController)
-                } else {
-                    Text(text = "$word ")
-                }
+                ClickableUserTag(baseUser, navController)
+                Text(text = "$extraCharacters ")
            } else {
                // if here the tag is not a valid Nostr Hex
                Text(text = "$word ")
@@ -251,7 +445,7 @@ fun TagLink(word: String, tags: List<List<String>>, canPreview: Boolean, backgro
                        baseNote = note,
                        accountViewModel = accountViewModel,
                        modifier = Modifier
-                            .padding(0.dp)
+                            .padding(top = 2.dp, bottom = 0.dp, start = 0.dp, end = 0.dp)
                            .fillMaxWidth()
                            .clip(shape = RoundedCornerShape(15.dp))
                            .border(
@@ -266,6 +460,7 @@ fun TagLink(word: String, tags: List<List<String>>, canPreview: Boolean, backgro
                    )
                } else {
                    ClickableNoteTag(note, navController)
+                    Text(text = "$extraCharacters ")
                }
            } else {
                // if here the tag is not a valid Nostr Hex
@@ -13,8 +13,6 @@ import coil.request.ImageRequest
 import coil.request.Options
 import okio.Buffer
 import java.security.MessageDigest
-import kotlin.time.ExperimentalTime
-import kotlin.time.measureTimedValue

 private fun toHex(color: Color): String {
    val argb = color.toArgb()
@@ -66,26 +64,20 @@ class HashImageFetcher(
    private val data: Uri
 ) : Fetcher {

-    @OptIn(ExperimentalTime::class)
    override suspend fun fetch(): SourceResult {
-        val (value, elapsed) = measureTimedValue {
-            val source = try {
-                Buffer().apply { write(svgString(data.toString()).toByteArray()) }
-            } finally {
-            }
-
-            SourceResult(
-                source = ImageSource(source, context),
-                mimeType = null,
-                dataSource = DataSource.MEMORY
-            )
+        val source = try {
+            Buffer().apply { write(svgString(data.toString()).toByteArray()) }
+        } finally {
        }
-        println("Elapsed: $elapsed")

-        return value
+        return SourceResult(
+            source = ImageSource(source, context),
+            mimeType = null,
+            dataSource = DataSource.MEMORY
+        )
    }

-    class Factory : Fetcher.Factory<Uri> {
+    object Factory : Fetcher.Factory<Uri> {
        override fun create(data: Uri, options: Options, imageLoader: ImageLoader): Fetcher {
            return HashImageFetcher(options.context, data)
        }
@@ -96,7 +88,7 @@ object Robohash {
        return ImageRequest
            .Builder(context)
            .data("robohash:$message")
-            .fetcherFactory(HashImageFetcher.Factory())
+            .fetcherFactory(HashImageFetcher.Factory)
            .crossfade(100)
            .build()
    }
@@ -0,0 +1,104 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.interaction.collectIsDraggedAsState
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+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.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.google.accompanist.pager.ExperimentalPagerApi
+import com.google.accompanist.pager.HorizontalPager
+import com.google.accompanist.pager.PagerState
+
+@OptIn(ExperimentalPagerApi::class)
+@Composable
+fun SlidingCarousel(
+    modifier: Modifier = Modifier,
+    pagerState: PagerState = remember { PagerState() },
+    itemsCount: Int,
+    itemContent: @Composable (index: Int) -> Unit
+) {
+    val isDragged by pagerState.interactionSource.collectIsDraggedAsState()
+
+    Box(
+        modifier = modifier.fillMaxWidth()
+    ) {
+        HorizontalPager(count = itemsCount, state = pagerState) { page ->
+            itemContent(page)
+        }
+
+        // you can remove the surface in case you don't want
+        // the transparant bacground
+        Surface(
+            modifier = Modifier
+                .padding(bottom = 8.dp)
+                .align(Alignment.BottomCenter),
+            shape = CircleShape,
+            color = Color.Black.copy(alpha = 0.5f)
+        ) {
+            DotsIndicator(
+                modifier = Modifier.padding(horizontal = 8.dp, vertical = 6.dp),
+                totalDots = itemsCount,
+                selectedIndex = if (isDragged) pagerState.currentPage else pagerState.targetPage,
+                dotSize = 8.dp
+            )
+        }
+    }
+}
+
+@Composable
+fun DotsIndicator(
+    modifier: Modifier = Modifier,
+    totalDots: Int,
+    selectedIndex: Int,
+    selectedColor: Color = MaterialTheme.colors.primary /* Color.Yellow */,
+    unSelectedColor: Color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f) /* Color.Gray */,
+    dotSize: Dp
+) {
+    LazyRow(
+        modifier = modifier
+            .wrapContentWidth()
+            .wrapContentHeight()
+    ) {
+        items(totalDots) { index ->
+            IndicatorDot(
+                color = if (index == selectedIndex) selectedColor else unSelectedColor,
+                size = dotSize
+            )
+
+            if (index != totalDots - 1) {
+                Spacer(modifier = Modifier.padding(horizontal = 2.dp))
+            }
+        }
+    }
+}
+
+@Composable
+fun IndicatorDot(
+    modifier: Modifier = Modifier,
+    size: Dp,
+    color: Color
+) {
+    Box(
+        modifier = modifier
+            .size(size)
+            .clip(CircleShape)
+            .background(color)
+    )
+}
@@ -0,0 +1,101 @@
+package com.vitorpamplona.amethyst.ui.screen.loggedIn
+
+import androidx.compose.foundation.BorderStroke
+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.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Divider
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+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.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
+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) {
+    val focusRequester = remember { FocusRequester() }
+    val interactionSource = remember { MutableInteractionSource() }
+    var optionsShowing by remember { mutableStateOf(false) }
+    var currentText by remember { mutableStateOf(placeholder) }
+
+    Box(
+        modifier = modifier
+    ) {
+        OutlinedTextField(
+            value = currentText,
+            onValueChange = {},
+            readOnly = true,
+            label = { Text(label) },
+            modifier = Modifier
+                .fillMaxWidth()
+                .focusRequester(focusRequester)
+        )
+        Box(
+            modifier = Modifier
+                .matchParentSize()
+                .clickable(
+                    interactionSource = interactionSource,
+                    indication = null
+                ) {
+                    optionsShowing = true
+                    focusRequester.requestFocus()
+                }
+        )
+    }
+
+    if (optionsShowing) {
+        options.isNotEmpty().also {
+            SpinnerSelectionDialog(options = options, onDismiss = { optionsShowing = false }) {
+                currentText = options[it]
+                optionsShowing = false
+                onSelect(it)
+            }
+        }
+    }
+}
+
+@Composable
+fun SpinnerSelectionDialog(options: List<String>, onDismiss: () -> Unit, onSelect: (Int) -> Unit) {
+    Dialog(onDismissRequest = onDismiss) {
+        Surface(
+            border = BorderStroke(0.25.dp, Color.LightGray),
+            shape = RoundedCornerShape(5.dp)
+        ) {
+            LazyColumn() {
+                itemsIndexed(options) { index, item ->
+                    Row(
+                        horizontalArrangement = Arrangement.Center,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(16.dp, 16.dp)
+                            .clickable {
+                                onSelect(index)
+                            }
+                    ) {
+                        Text(text = item, color = MaterialTheme.colors.onSurface)
+                    }
+                    if (index < options.lastIndex) {
+                        Divider(color = Color.LightGray, thickness = 0.25.dp)
+                    }
+                }
+            }
+        }
+    }
+}
@@ -18,16 +18,16 @@ import kotlinx.coroutines.withContext

@Composable
 fun UrlPreview(url: String, urlText: String) {
-//    val default = UrlCachedPreviewer.cache[url]?.let {
-//        if (it.url == url) {
-//            UrlPreviewState.Loaded(it)
-//        } else {
-//            UrlPreviewState.Empty
-//        }
-//    } ?: UrlPreviewState.Loading
+    val default = UrlCachedPreviewer.cache[url]?.let {
+        if (it.allFetchComplete() && it.url == url) {
+            UrlPreviewState.Loaded(it)
+        } else {
+            UrlPreviewState.Empty
+        }
+    } ?: UrlPreviewState.Loading
    val context = LocalContext.current

-    var urlPreviewState by remember { mutableStateOf<UrlPreviewState>(UrlPreviewState.Loading) }
+    var urlPreviewState by remember { mutableStateOf<UrlPreviewState>(default) }

    // Doesn't use a viewModel because of viewModel reusing issues (too many UrlPreview are created).
    LaunchedEffect(url) {
@@ -34,12 +34,18 @@ fun UrlPreviewCard(
        modifier = Modifier
            .clickable { runCatching { uri.openUri(url) } }
            .clip(shape = RoundedCornerShape(15.dp))
-            .border(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.12f), RoundedCornerShape(15.dp))
+            .border(
+                1.dp,
+                MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
+                RoundedCornerShape(15.dp)
+            )
    ) {
        Column {
+            val url = URL(previewInfo.url)
+
            // correctly treating relative images
            val imageUrl = if (previewInfo.image.startsWith("/")) {
-                URL(URL(previewInfo.url), previewInfo.image).toString()
+                URL(url, previewInfo.image).toString()
            } else {
                previewInfo.image
            }
@@ -51,12 +57,23 @@ fun UrlPreviewCard(
                modifier = Modifier.fillMaxWidth()
            )

+            Text(
+                text = url.host,
+                style = MaterialTheme.typography.caption,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(start = 10.dp, end = 10.dp, top = 10.dp),
+                color = Color.Gray,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis
+            )
+
            Text(
                text = previewInfo.title,
                style = MaterialTheme.typography.body2,
                modifier = Modifier
                    .fillMaxWidth()
-                    .padding(start = 10.dp, end = 10.dp, top = 10.dp),
+                    .padding(start = 10.dp, end = 10.dp),
                maxLines = 1,
                overflow = TextOverflow.Ellipsis
            )
@@ -19,21 +19,37 @@ import com.google.android.exoplayer2.ui.StyledPlayerView
 import com.vitorpamplona.amethyst.VideoCache

@Composable
-fun VideoView(videoUri: String) {
+fun VideoView(videoUri: String, onDialog: ((Boolean) -> Unit)? = null) {
    val context = LocalContext.current

    val exoPlayer = remember {
        ExoPlayer.Builder(context).build().apply {
            repeatMode = Player.REPEAT_MODE_ALL
            videoScalingMode = C.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING
+            setMediaSource(
+                ProgressiveMediaSource.Factory(VideoCache.get(context.applicationContext)).createMediaSource(MediaItem.fromUri(videoUri))
+            )
+            prepare()
+        }
+    }
+
+    val playerView = remember {
+        StyledPlayerView(context).apply {
+            player = exoPlayer
+            layoutParams = FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT
+            )
+            resizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIXED_WIDTH
+            onDialog?.let { innerOnDialog ->
+                setFullscreenButtonClickListener {
+                    innerOnDialog(it)
+                }
+            }
        }
    }

    DisposableEffect(exoPlayer) {
-        exoPlayer.setMediaSource(
-            ProgressiveMediaSource.Factory(VideoCache.get(context.applicationContext)).createMediaSource(MediaItem.fromUri(videoUri))
-        )
-        exoPlayer.prepare()
        onDispose {
            exoPlayer.release()
        }
@@ -42,14 +58,7 @@ fun VideoView(videoUri: String) {
    AndroidView(
        modifier = Modifier.fillMaxWidth(),
        factory = {
-            StyledPlayerView(context).apply {
-                player = exoPlayer
-                layoutParams = FrameLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.WRAP_CONTENT
-                )
-                resizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIXED_WIDTH
-            }
+            playerView
        }
    )
 }
@@ -1,61 +0,0 @@
-package com.vitorpamplona.amethyst.ui.components
-
-import androidx.compose.foundation.gestures.awaitEachGesture
-import androidx.compose.foundation.gestures.awaitFirstDown
-import androidx.compose.foundation.gestures.calculatePan
-import androidx.compose.foundation.gestures.calculateZoom
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-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.graphics.graphicsLayer
-import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.stringResource
-import coil.compose.AsyncImage
-import com.vitorpamplona.amethyst.R
-
-@Composable
-fun ZoomableAsyncImage(imageUrl: String) {
-    var scale by remember { mutableStateOf(1f) }
-    var offsetX by remember { mutableStateOf(0f) }
-    var offsetY by remember { mutableStateOf(0f) }
-
-    Column(
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally,
-        modifier = Modifier
-            .pointerInput(Unit) {
-                awaitEachGesture {
-                    awaitFirstDown()
-                    do {
-                        val event = awaitPointerEvent()
-                        scale *= event.calculateZoom()
-                        val offset = event.calculatePan()
-                        offsetX += offset.x
-                        offsetY += offset.y
-                    } while (event.changes.any { it.pressed })
-                }
-            }
-    ) {
-        AsyncImage(
-            model = imageUrl,
-            contentDescription = stringResource(id = R.string.profile_image),
-            contentScale = ContentScale.FillWidth,
-            modifier = Modifier
-                .fillMaxSize()
-                .graphicsLayer(
-                    scaleX = scale,
-                    scaleY = scale,
-                    translationX = offsetX,
-                    translationY = offsetY
-                )
-        )
-    }
-}
--- a/Show More
+++ b/Show More